From: Peter Michael Green Date: Wed, 24 Jan 2018 08:43:20 +0000 (+0000) Subject: Manual merge of version 5.212.0~alpha2-6+rpi1 and 5.212.0~alpha2-7 to produce 5.212... X-Git-Tag: archive/raspbian/5.212.0_alpha2-7+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=19e504a3e750c69513a86badac707e8be98b437f;p=qtwebkit-opensource-src.git Manual merge of version 5.212.0~alpha2-6+rpi1 and 5.212.0~alpha2-7 to produce 5.212.0~alpha2-7+rpi1 --- 19e504a3e750c69513a86badac707e8be98b437f diff --cc debian/changelog index f0d8ec13,8d623363..9ad9f768 --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,10 +1,21 @@@ - qtwebkit-opensource-src (5.212.0~alpha2-6+rpi1) buster-staging; urgency=medium ++qtwebkit-opensource-src (5.212.0~alpha2-7+rpi1) buster-staging; urgency=medium + + [changes brought forward from 5.212.0~alpha2-5+rpi1 by Peter Michael Green at Sat, 09 Dec 2017 00:03:30 +0000] + * Update symbols file for raspbian. + * Fix clean target. + [changes introduced in 5.212.0~alpha2-6+rpi1] by Peter Michael Green + * Try unsuccessfully to hack offlineasm to prevent generation of movw/movt + * Disable JIT + - -- Peter Michael Green Thu, 18 Jan 2018 03:09:26 +0000 ++ -- Raspbian forward porter Wed, 24 Jan 2018 08:28:18 +0000 ++ + qtwebkit-opensource-src (5.212.0~alpha2-7) unstable; urgency=medium + + * Build with -O1 instead of -O2 on sh3/sh4 (closes: #887462). + * Update symbols files with buildds’ and sh4 logs (closes: #887463). + * Fix the rules syntax to make sure we build with -g1 on mips/mipsel. + + -- Dmitry Shachnev Thu, 18 Jan 2018 11:33:51 +0300 qtwebkit-opensource-src (5.212.0~alpha2-6) unstable; urgency=medium diff --cc debian/libqt5webkit5.symbols index b380cf48,47653ecd..70e84a90 --- a/debian/libqt5webkit5.symbols +++ b/debian/libqt5webkit5.symbols @@@ -2309,9 -2397,9 +2397,9 @@@ libQt5WebKit.so.5 libqt5webkit5 #MINVER _ZTV24QWebHapticFeedbackPlayer@Base 5.212.0~alpha2 _ZTV25QQuickWebViewExperimental@Base 5.0.2 _ZTV25QWebNotificationPresenter@Base 5.212.0~alpha2 - (arch=amd64 arm64 armel armhf hppa i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64)_ZTVNSt6thread11_State_implINS_8_InvokerISt5tupleIJPFvPN7bmalloc9AsyncTaskINS3_4HeapEMS5_FvvEEEES9_EEEEEE@Base 5.212.0~alpha2 + (arch=alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc powerpcspe ppc64 sh4 x32)_ZTVNSt6thread11_State_implINS_8_InvokerISt5tupleIJPFvPN7bmalloc9AsyncTaskINS3_4HeapEMS5_FvvEEEES9_EEEEEE@Base 5.212.0~alpha2 - (arch=armel)_ZTVSt19_Sp_counted_deleterIPSt5mutexNSt12__shared_ptrIS0_LN9__gnu_cxx12_Lock_policyE1EE8_DeleterISaIS0_EEES7_LS4_1EE@Base 5.212.0~alpha2 - (arch=alpha amd64 arm64 armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc powerpcspe ppc64 sh4 x32)_ZTVSt19_Sp_counted_deleterIPSt5mutexNSt12__shared_ptrIS0_LN9__gnu_cxx12_Lock_policyE2EE8_DeleterISaIS0_EEES7_LS4_2EE@Base 5.212.0~alpha2 + (optional=appeardinraspbian)_ZTVSt19_Sp_counted_deleterIPSt5mutexNSt12__shared_ptrIS0_LN9__gnu_cxx12_Lock_policyE1EE8_DeleterISaIS0_EEES7_LS4_1EE@Base 5.212.0~alpha2 + (optional=disappeardinraspbian)_ZTVSt19_Sp_counted_deleterIPSt5mutexNSt12__shared_ptrIS0_LN9__gnu_cxx12_Lock_policyE2EE8_DeleterISaIS0_EEES7_LS4_2EE@Base 5.212.0~alpha2 _ZZZN21QWebIconImageProvider10identifierEvENKUlvE_clEvE15qstring_literal@Base 5.2.0 _ZlsR11QDataStreamRK11QWebHistory@Base 5.0.2 _ZrsR11QDataStreamR11QWebHistory@Base 5.0.2