From 5694081ba3b6448c5bf7aa7647c97237247e5617 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Aug 27 2020 12:36:59 +0000 Subject: Fixed #1863719, FTBFS --- diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 1a6dfb9..ef077a6 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.50.%{?prerel}%{?dist} +Release: 0.51.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -25,6 +25,7 @@ Source0: https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_modu # Patch for new CMake policy CMP0071 to explicitly use old behaviour. Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch +Patch3: qtwebkit-5.212.0-json.patch BuildRequires: bison BuildRequires: cmake @@ -151,7 +152,7 @@ CXXFLAGS="${CXXFLAGS:-%optflags} -fpermissive" ; export CXXFLAGS ; %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} # We cannot use default cmake macro here as it overwrites some settings queried # by qtwebkit cmake from qmake -cmake . \ +%cmake \ -DPORT=Qt \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_TOOLS=OFF \ @@ -167,7 +168,7 @@ cmake . \ %{?docs:-DGENERATE_DOCUMENTATION=ON} \ -DPYTHON_EXECUTABLE:PATH="%{__python3}" -%make_build +%cmake_build %if 0%{?docs} %make_build docs @@ -175,7 +176,7 @@ cmake . \ %install -%make_install +%cmake_install find %{buildroot} -name '*.la' -exec rm -f {} ';' @@ -240,6 +241,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Thu Aug 27 2020 Than Ngo - 5.212.0-0.51.alpha4 +- Fixed #1863719, FTBFS + * Sat Aug 01 2020 Fedora Release Engineering - 5.212.0-0.50.alpha4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/qtwebkit-5.212.0-json.patch b/qtwebkit-5.212.0-json.patch new file mode 100644 index 0000000..b09c210 --- /dev/null +++ b/qtwebkit-5.212.0-json.patch @@ -0,0 +1,12 @@ +diff -up qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/generate-bytecode-files.me qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/generate-bytecode-files +--- qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/generate-bytecode-files.me 2020-08-27 13:50:06.506653244 +0200 ++++ qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/generate-bytecode-files 2020-08-27 14:00:52.802018893 +0200 +@@ -163,7 +163,7 @@ if __name__ == "__main__": + initBytecodesFile = openOrExit(initASMFileName, "w") + + try: +- bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") ++ bytecodeSections = json.load(bytecodeFile) + except: + print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) +