diff -Nru webkitgtk-2.4.11/debian/changelog webkitgtk-2.4.11/debian/changelog --- webkitgtk-2.4.11/debian/changelog 2019-08-22 13:34:07.000000000 +0000 +++ webkitgtk-2.4.11/debian/changelog 2020-10-06 13:38:27.000000000 +0000 @@ -1,15 +1,23 @@ -webkitgtk (2.4.11-4~0ppa1~eoan) eoan; urgency=medium +webkitgtk (2.4.11-4~0ppa1~focal11) focal; urgency=medium - * Upload for Eoan + * Use packaging from Evgeny S Maksimov's PPA to get it + to build on Focal - -- Logix Thu, 22 Aug 2019 16:05:23 +0000 + -- Logix Tue, 06 Oct 2020 16:32:55 +0000 -webkitgtk (2.4.11-4~0ppa1~disco3) disco; urgency=medium +webkitgtk (2.4.11-4ppa6~ubuntu20.04) focal; urgency=medium - * Upload for Disco - * Use new patch to build without icu config + * Backported to Focal Fossa - -- Logix Thu, 22 Aug 2019 16:05:23 +0000 + -- Evgeny S Maksimov Sun, 19 Apr 2020 18:05:09 +0300 + +webkitgtk (2.4.11-4ppa1~ubuntu19.04) disco; urgency=medium + + * Backported to Disco Dingo + * debian/patches/fix-build-without-icu-config.patch: + + Fix build without icu-config + + -- Evgeny S Maksimov Sat, 13 Apr 2019 19:13:20 +0300 webkitgtk (2.4.11-4) unstable; urgency=medium 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 2020-04-19 11:37:41.000000000 +0000 @@ -29,6 +29,7 @@ bison, flex, ruby, + python, libjpeg-dev, libpng-dev, libwebp-dev, diff -Nru webkitgtk-2.4.11/debian/patches/fix-build-ppa.patch webkitgtk-2.4.11/debian/patches/fix-build-ppa.patch --- webkitgtk-2.4.11/debian/patches/fix-build-ppa.patch 1970-01-01 00:00:00.000000000 +0000 +++ webkitgtk-2.4.11/debian/patches/fix-build-ppa.patch 2020-04-19 15:05:09.000000000 +0000 @@ -0,0 +1,37 @@ +--- webkitgtk-2.4.11.orig/Source/WebCore/dom/Document.cpp ++++ webkitgtk-2.4.11/Source/WebCore/dom/Document.cpp +@@ -3912,12 +3912,12 @@ static bool isValidNameNonASCII(const UC + unsigned i = 0; + + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNameStart(c)) + return false; + + while (i < length) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNamePart(c)) + return false; + } +@@ -3980,7 +3980,7 @@ bool Document::parseQualifiedName(const + const UChar* s = qualifiedName.deprecatedCharacters(); + for (unsigned i = 0; i < length;) { + UChar32 c; +- U16_NEXT(s, i, length, c) ++ U16_NEXT(s, i, length, c); + if (c == ':') { + if (sawColon) { + ec = NAMESPACE_ERR; +--- webkitgtk-2.4.11.orig/Source/WebCore/platform/graphics/SegmentedFontData.cpp ++++ webkitgtk-2.4.11/Source/WebCore/platform/graphics/SegmentedFontData.cpp +@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacte + { + UChar32 c; + for (int i = 0; i < length; ) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!containsCharacter(c)) + return false; + } diff -Nru webkitgtk-2.4.11/debian/patches/series webkitgtk-2.4.11/debian/patches/series --- webkitgtk-2.4.11/debian/patches/series 2019-04-13 16:13:20.000000000 +0000 +++ webkitgtk-2.4.11/debian/patches/series 2020-04-19 15:05:09.000000000 +0000 @@ -12,3 +12,4 @@ gtk-doc-fix2.patch gtk-doc-fix3.patch fix-build-without-icu-config.patch +fix-build-ppa.patch