diff -Nru webkitgtk-2.4.11/debian/changelog webkitgtk-2.4.11/debian/changelog --- webkitgtk-2.4.11/debian/changelog 2018-05-31 17:38:40.000000000 +0000 +++ webkitgtk-2.4.11/debian/changelog 2018-06-10 09:50:58.000000000 +0000 @@ -1,3 +1,19 @@ +webkitgtk (2.4.11-4+rpi1) buster-staging; urgency=medium + + [changes brought forward from 2.4.7-3+rpi1 by Peter Michael Green at Wed, 10 Dec 2014 08:17:47 +0000] + * Disable jit, it's broken on armv6. + + [Changes introduced in version 2.4.11-3+rpi1 by Peter Michael Green] + * Try to disable documentation build, it seems to be broken. + * Update symbols file for raspbian. + + [Changes by Adam Conrad taken from ubuntu version 2.4.11-3ubuntu3] + * Adjust symbols files to add leaked webkit_marshal_VOID__STRING. + * debian/patches/icu59.patch: Backport upstream fix for icu59 FTBFS. + * debian/rules: Stop acting on dbg packages we don't build anymore. + + -- Raspbian forward porter Sun, 10 Jun 2018 09:50:58 +0000 + webkitgtk (2.4.11-4) unstable; urgency=medium * debian/patches/fix-build-icu.patch: diff -Nru webkitgtk-2.4.11/debian/control webkitgtk-2.4.11/debian/control --- webkitgtk-2.4.11/debian/control 2018-05-31 17:38:40.000000000 +0000 +++ webkitgtk-2.4.11/debian/control 2018-06-10 09:50:58.000000000 +0000 @@ -1,7 +1,8 @@ Source: webkitgtk Priority: optional Section: web -Maintainer: Debian WebKit Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian WebKit Maintainers Uploaders: Gustavo Noronha Silva , Emilio Pozuelo Monfort , Alberto Garcia diff -Nru webkitgtk-2.4.11/debian/libwebkitgtk-1.0-0.symbols webkitgtk-2.4.11/debian/libwebkitgtk-1.0-0.symbols --- webkitgtk-2.4.11/debian/libwebkitgtk-1.0-0.symbols 2018-05-31 17:38:40.000000000 +0000 +++ webkitgtk-2.4.11/debian/libwebkitgtk-1.0-0.symbols 2018-06-10 09:50:56.000000000 +0000 @@ -2004,6 +2004,7 @@ webkit_marshal_VOID__OBJECT_POINTER@Base 1.7.5 webkit_marshal_VOID__OBJECT_POINTER_POINTER@Base 1.3.10 webkit_marshal_VOID__OBJECT_STRING@Base 1.3.10 + (optional=disappeardinraspbian)webkit_marshal_VOID__STRING@Base 2.4.11 webkit_marshal_VOID__STRING_STRING@Base 1.3.10 webkit_micro_version@Base 1.3.10 webkit_minor_version@Base 1.3.10 diff -Nru webkitgtk-2.4.11/debian/libwebkitgtk-3.0-0.symbols webkitgtk-2.4.11/debian/libwebkitgtk-3.0-0.symbols --- webkitgtk-2.4.11/debian/libwebkitgtk-3.0-0.symbols 2018-05-31 17:38:40.000000000 +0000 +++ webkitgtk-2.4.11/debian/libwebkitgtk-3.0-0.symbols 2018-06-10 09:50:56.000000000 +0000 @@ -2004,6 +2004,7 @@ webkit_marshal_VOID__OBJECT_POINTER@Base 1.7.5 webkit_marshal_VOID__OBJECT_POINTER_POINTER@Base 1.3.10 webkit_marshal_VOID__OBJECT_STRING@Base 1.3.10 + (optional=disappearedinraspbian)webkit_marshal_VOID__STRING@Base 2.4.11 webkit_marshal_VOID__STRING_STRING@Base 1.3.10 webkit_micro_version@Base 1.3.10 webkit_minor_version@Base 1.3.10 diff -Nru webkitgtk-2.4.11/debian/patches/icu59.patch webkitgtk-2.4.11/debian/patches/icu59.patch --- webkitgtk-2.4.11/debian/patches/icu59.patch 1970-01-01 00:00:00.000000000 +0000 +++ webkitgtk-2.4.11/debian/patches/icu59.patch 2018-06-10 09:50:56.000000000 +0000 @@ -0,0 +1,57 @@ +Description: Fix build with icu59 +Author: Adam Conrad +Origin: https://trac.webkit.org/changeset/216187/webkit +Last-Update: 2017-10-28 + +--- webkitgtk-2.4.11.orig/Source/JavaScriptCore/API/JSStringRef.cpp ++++ webkitgtk-2.4.11/Source/JavaScriptCore/API/JSStringRef.cpp +@@ -37,7 +37,7 @@ using namespace WTF::Unicode; + JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(chars, numChars).leakRef(); ++ return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); + } + + JSStringRef JSStringCreateWithUTF8CString(const char* string) +@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CStrin + JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef(); ++ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars)).leakRef(); + } + + JSStringRef JSStringRetain(JSStringRef string) +@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef str + + const JSChar* JSStringGetCharactersPtr(JSStringRef string) + { +- return string->characters(); ++ return reinterpret_cast(string->characters()); + } + + size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) +--- webkitgtk-2.4.11.orig/Source/JavaScriptCore/runtime/DateConversion.cpp ++++ webkitgtk-2.4.11/Source/JavaScriptCore/runtime/DateConversion.cpp +@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDat + #if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(&timeZoneInformation); +- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ String timeZoneName(reinterpret_cast(winTimeZoneName)); + #else + struct tm gtm = t; + char timeZoneName[70]; +--- webkitgtk-2.4.11.orig/Source/WebKit2/Shared/API/c/WKString.cpp ++++ webkitgtk-2.4.11/Source/WebKit2/Shared/API/c/WKString.cpp +@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef str + size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) + { + COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); +- return (toImpl(stringRef)->getCharacters(static_cast(buffer), bufferLength)); ++ return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); + } + + size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) diff -Nru webkitgtk-2.4.11/debian/rules webkitgtk-2.4.11/debian/rules --- webkitgtk-2.4.11/debian/rules 2018-05-31 17:38:40.000000000 +0000 +++ webkitgtk-2.4.11/debian/rules 2018-06-10 09:50:58.000000000 +0000 @@ -17,7 +17,6 @@ --disable-silent-rules \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ - --enable-gtk-doc \ --enable-introspection \ --enable-geolocation @@ -38,7 +37,7 @@ endif # disable jit on some architectures (bug #651636) -ifneq (,$(filter $(DEB_BUILD_ARCH),armel mips mipsel)) +ifneq (,$(filter $(DEB_BUILD_ARCH),armel armhf mips mipsel)) COMMON_CONFIGURE_ARGUMENTS += --disable-jit endif