diff -Nru webkitgtk-2.4.11/debian/changelog webkitgtk-2.4.11/debian/changelog --- webkitgtk-2.4.11/debian/changelog 2020-03-05 15:00:39.000000000 +0000 +++ webkitgtk-2.4.11/debian/changelog 2020-10-06 13:38:27.000000000 +0000 @@ -1,21 +1,23 @@ -webkitgtk (2.4.11-4~0ppa1~focal10) focal; urgency=medium +webkitgtk (2.4.11-4~0ppa1~focal11) focal; urgency=medium - * Upload for Focal - * Build-depend on python2 and added python-is-python2.patch - or else I get: - configure: error: You need 'python' to compile WebKit - * Add -Wno-class-memaccess to CFLAGS in debian/rules to get - it to compile - * Add CXXFLAGS based on the AUR webkitgtk package + * Use packaging from Evgeny S Maksimov's PPA to get it + to build on Focal - -- Logix Thu, 05 Mar 2020 15:00:39 +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 2020-03-05 14:02:37.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, @@ -43,8 +44,7 @@ libgirepository1.0-dev (>= 0.9.12-4), libgl1-mesa-dev [!armel !armhf !arm64], libegl1-mesa-dev [armel armhf arm64], - libgles2-mesa-dev [armel armhf arm64], - python2 + libgles2-mesa-dev [armel armhf arm64] Build-Conflicts: gir-repository-dev Standards-Version: 3.9.8 Homepage: https://webkitgtk.org/ 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/python-is-python2.patch webkitgtk-2.4.11/debian/patches/python-is-python2.patch --- webkitgtk-2.4.11/debian/patches/python-is-python2.patch 2020-03-05 14:47:20.000000000 +0000 +++ webkitgtk-2.4.11/debian/patches/python-is-python2.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,127 +0,0 @@ ---- a/GNUmakefile.in -+++ b/GNUmakefile.in -@@ -13039,7 +13039,7 @@ - PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ - PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ - PNG_LIBS = @PNG_LIBS@ --PYTHON = @PYTHON@ -+PYTHON = python2 - RANLIB = @RANLIB@ - RUBY = @RUBY@ - SED = @SED@ ---- a/Source/autotools/CheckSystemAndBasicDependencies.m4 -+++ b/Source/autotools/CheckSystemAndBasicDependencies.m4 -@@ -29,7 +29,7 @@ - AC_MSG_ERROR([You need 'perl' to compile WebKit]) - fi - --AC_PATH_PROG(PYTHON, python) -+AC_PATH_PROG(PYTHON, python2) - if test -z "$PYTHON"; then - AC_MSG_ERROR([You need 'python' to compile WebKit]) - fi ---- a/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py -+++ b/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright (c) 2011 Google Inc. All rights reserved. - # Copyright (c) 2012 Intel Corporation. All rights reserved. - # Copyright (c) 2013 Apple Inc. All Rights Reserved. ---- a/Source/JavaScriptCore/inspector/scripts/cssmin.py -+++ b/Source/JavaScriptCore/inspector/scripts/cssmin.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - # Copyright (C) 2013 Apple Inc. All rights reserved. - # ---- a/Source/JavaScriptCore/inspector/scripts/generate-combined-inspector-json.py -+++ b/Source/JavaScriptCore/inspector/scripts/generate-combined-inspector-json.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - # Copyright (C) 2013 Apple Inc. All rights reserved. - # ---- a/Source/JavaScriptCore/inspector/scripts/inline-and-minify-stylesheets-and-scripts.py -+++ b/Source/JavaScriptCore/inspector/scripts/inline-and-minify-stylesheets-and-scripts.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # Copyright (C) 2013 Apple Inc. All rights reserved. - # ---- a/Source/WebCore/html/parser/create-html-entity-table -+++ b/Source/WebCore/html/parser/create-html-entity-table -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright (c) 2010 Google Inc. All rights reserved. - # - # Redistribution and use in source and binary forms, with or without ---- a/Source/WebKit2/Scripts/generate-message-receiver.py -+++ b/Source/WebKit2/Scripts/generate-message-receiver.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # Copyright (C) 2010 Apple Inc. All rights reserved. - # ---- a/Source/WebKit2/Scripts/generate-messages-header.py -+++ b/Source/WebKit2/Scripts/generate-messages-header.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # Copyright (C) 2010 Apple Inc. All rights reserved. - # ---- a/Tools/gtk/check-for-webkitdom-api-breaks -+++ b/Tools/gtk/check-for-webkitdom-api-breaks -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright (C) 2013, 2014 Igalia S.L. - # Copyright (C) 2013 Gustavo Noronha Silva - # ---- a/Tools/gtk/common.py -+++ b/Tools/gtk/common.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright (C) 2011 Igalia S.L. - # - # This library is free software; you can redistribute it and/or ---- a/Tools/gtk/generate-feature-defines-files -+++ b/Tools/gtk/generate-feature-defines-files -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - from __future__ import with_statement - import os - import re ---- a/Tools/gtk/generate-gtkdoc -+++ b/Tools/gtk/generate-gtkdoc -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright (C) 2011 Igalia S.L. - # - # This library is free software; you can redistribute it and/or ---- a/Tools/gtk/generate-inspector-gresource-manifest.py -+++ b/Tools/gtk/generate-inspector-gresource-manifest.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright (C) 2013 Igalia S.L. - # - # This library is free software; you can redistribute it and/or ---- a/Tools/gtk/webkitdom.py -+++ b/Tools/gtk/webkitdom.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # Copyright (C) 2013 Igalia S.L. - # - # This library is free software; you can redistribute it and/or - diff -Nru webkitgtk-2.4.11/debian/patches/series webkitgtk-2.4.11/debian/patches/series --- webkitgtk-2.4.11/debian/patches/series 2020-03-05 14:29:13.000000000 +0000 +++ webkitgtk-2.4.11/debian/patches/series 2020-04-19 15:05:09.000000000 +0000 @@ -12,4 +12,4 @@ gtk-doc-fix2.patch gtk-doc-fix3.patch fix-build-without-icu-config.patch -python-is-python2.patch +fix-build-ppa.patch diff -Nru webkitgtk-2.4.11/debian/rules webkitgtk-2.4.11/debian/rules --- webkitgtk-2.4.11/debian/rules 2020-03-05 15:00:39.000000000 +0000 +++ webkitgtk-2.4.11/debian/rules 2018-05-31 17:38:40.000000000 +0000 @@ -9,13 +9,8 @@ GTK_VERSIONS = 2.0 3.0 -LDFLAGS += -Wl,-O1,--as-needed - -CXXFLAGS += -fno-delete-null-pointer-checks -CFLAGS += -fno-delete-null-pointer-checks - -CFLAGS += '-Wno-expansion-to-defined -Wno-class-memaccess -Wno-error -Wno-redundant-move -Wno-deprecated-declarations' -CXXFLAGS += '-Wno-expansion-to-defined -Wno-class-memaccess -DUPRV_BLOCK_MACRO_BEGIN="" -DUPRV_BLOCK_MACRO_END=""' +CFLAGS += -Wall -fno-delete-null-pointer-checks -Wno-expansion-to-defined +LDFLAGS += -Wl,--as-needed COMMON_CONFIGURE_ARGUMENTS = \ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \