From 5326f1c92b1e7a20a403b5a05a49ea9f5263882b Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 28 Feb 2019 21:30:01 +0000 Subject: [PATCH 01/10] Update wayland deps Just wayland-devel is enough these days. --- wpewebkit.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wpewebkit.spec b/wpewebkit.spec index 9e8bc3f..f78a4ea 100644 --- a/wpewebkit.spec +++ b/wpewebkit.spec @@ -7,7 +7,7 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: wpewebkit Version: 2.22.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A WebKit port optimized for low-end devices License: LGPLv2 and BSD @@ -39,10 +39,8 @@ BuildRequires: libpng-devel BuildRequires: libsoup-devel BuildRequires: libwebp-devel BuildRequires: libxslt-devel -BuildRequires: libwayland-client-devel -BuildRequires: libwayland-egl-devel -BuildRequires: libwayland-server-devel BuildRequires: mesa-libgbm-devel +BuildRequires: wayland-devel BuildRequires: wayland-protocols-devel BuildRequires: mesa-libEGL-devel BuildRequires: perl-File-Copy-Recursive @@ -163,6 +161,9 @@ popd %changelog +* Thu Feb 28 2019 Pete Walter - 2.22.4-2 +- Update wayland deps + * Sat Feb 09 2019 Chris King - 2.22.4-1 - New version and removing patches that were upstreamed in this version From 0c50ee817f2cf03ba21ae9e55435b9d4c76cf6e5 Mon Sep 17 00:00:00 2001 From: BunnyApocalypse Date: Tue, 26 Mar 2019 09:46:54 -0500 Subject: [PATCH 02/10] New version, reverting breaking changes --- .gitignore | 1 + sources | 2 +- wpewebkit.spec | 17 +++++++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 9a37250..c44a661 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /wpewebkit-2.21.2.tar.xz /wpewebkit-2.21.92.tar.xz /wpewebkit-2.22.4.tar.xz +/wpewebkit-2.22.5.tar.xz diff --git a/sources b/sources index 58b9f79..02979f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wpewebkit-2.22.4.tar.xz) = be6d60661cee393d35a21323ecd5b204dfdd140aa3b2ec6f119a1effd1032701b81c0f20968e7c5c58e3f988cffe16084c52c55e0cde5757128a91b7a44b5bca +SHA512 (wpewebkit-2.22.5.tar.xz) = d84ca94e4108e8e0a4fef6a34611d639f6f2de593092b5bc3fe6003edd594a33a2f4048215171d58128e8260033df8cee0901ab33d2528149d4d249084806e79 diff --git a/wpewebkit.spec b/wpewebkit.spec index f78a4ea..15fd8f5 100644 --- a/wpewebkit.spec +++ b/wpewebkit.spec @@ -6,8 +6,8 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: wpewebkit -Version: 2.22.4 -Release: 2%{?dist} +Version: 2.22.5 +Release: 1%{?dist} Summary: A WebKit port optimized for low-end devices License: LGPLv2 and BSD @@ -19,7 +19,7 @@ Patch0: fedora-crypto-policy.patch # Explicitly specify python2 over python to avoid build fails Patch1: python2.patch - +BuildRequires: openjpeg2-devel BuildRequires: bison BuildRequires: cairo-devel BuildRequires: cmake @@ -39,8 +39,10 @@ BuildRequires: libpng-devel BuildRequires: libsoup-devel BuildRequires: libwebp-devel BuildRequires: libxslt-devel +BuildRequires: libwayland-client-devel +BuildRequires: libwayland-egl-devel +BuildRequires: libwayland-server-devel BuildRequires: mesa-libgbm-devel -BuildRequires: wayland-devel BuildRequires: wayland-protocols-devel BuildRequires: mesa-libEGL-devel BuildRequires: perl-File-Copy-Recursive @@ -161,8 +163,11 @@ popd %changelog -* Thu Feb 28 2019 Pete Walter - 2.22.4-2 -- Update wayland deps +* Tue Mar 19 2019 Chris King - 2.22.5-1 +- New version + +* Thu Feb 21 2019 Chris King - 2.23.90-1 +- New version * Sat Feb 09 2019 Chris King - 2.22.4-1 - New version and removing patches that were upstreamed in this version From 76f31847511611ac3198314d24fd681ee2feeed9 Mon Sep 17 00:00:00 2001 From: BunnyApocalypse Date: Wed, 27 Mar 2019 13:36:19 -0500 Subject: [PATCH 03/10] new version w soname bump --- .gitignore | 1 + sources | 2 +- wpewebkit.spec | 19 +++++++++---------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index c44a661..a9cd1fb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /wpewebkit-2.21.92.tar.xz /wpewebkit-2.22.4.tar.xz /wpewebkit-2.22.5.tar.xz +/wpewebkit-2.24.0.tar.xz diff --git a/sources b/sources index 02979f8..14c79d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wpewebkit-2.22.5.tar.xz) = d84ca94e4108e8e0a4fef6a34611d639f6f2de593092b5bc3fe6003edd594a33a2f4048215171d58128e8260033df8cee0901ab33d2528149d4d249084806e79 +SHA512 (wpewebkit-2.24.0.tar.xz) = 309bc59b01d1b16eeae81873f4233ce50a58db1b93bb4a72f7de1e39185cb80dec4d55e8ddcf258ea29fcc663b7eab5883c01a4f1f49aaa2145072dd6177e448 diff --git a/wpewebkit.spec b/wpewebkit.spec index 15fd8f5..ecdbede 100644 --- a/wpewebkit.spec +++ b/wpewebkit.spec @@ -6,7 +6,7 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: wpewebkit -Version: 2.22.5 +Version: 2.24.0 Release: 1%{?dist} Summary: A WebKit port optimized for low-end devices @@ -136,7 +136,6 @@ popd %add_to_license_files Source/WebCore/LICENSE-LGPL-2 %add_to_license_files Source/WebCore/LICENSE-LGPL-2.1 %add_to_license_files Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE -%add_to_license_files Source/WebInspectorUI/UserInterface/External/ESLint/LICENSE %add_to_license_files Source/WebInspectorUI/UserInterface/External/Esprima/LICENSE %add_to_license_files Source/WebInspectorUI/UserInterface/External/three.js/LICENSE %add_to_license_files Source/WTF/icu/LICENSE @@ -145,10 +144,10 @@ popd %files %{_bindir}/WPEWebDriver -%{_libdir}/libWPEWebKit-0.1.so.2 -%{_libdir}/libWPEWebKit-0.1.so.2.* -%{_libexecdir}/wpe-webkit-0.1 -%{_libdir}/wpe-webkit-0.1 +%{_libdir}/libWPEWebKit-1.0.so.2 +%{_libdir}/libWPEWebKit-1.0.so.2.* +%{_libexecdir}/wpe-webkit-1.0 +%{_libdir}/wpe-webkit-1.0 %doc NEWS %license _license_files/*ThirdParty* %license _license_files/*WebCore* @@ -157,16 +156,16 @@ popd %license _license_files/*JavaScriptCore* %files devel -%{_includedir}/wpe-webkit-0.1 -%{_libdir}/libWPEWebKit-0.1.so +%{_includedir}/wpe-webkit-1.0 +%{_libdir}/libWPEWebKit-1.0.so %{_libdir}/pkgconfig/*.pc %changelog -* Tue Mar 19 2019 Chris King - 2.22.5-1 +* Wed Mar 27 2019 Chris King - 2.24.0-1 - New version -* Thu Feb 21 2019 Chris King - 2.23.90-1 +* Tue Mar 19 2019 Chris King - 2.22.5-1 - New version * Sat Feb 09 2019 Chris King - 2.22.4-1 From f2280767737f0e9595a2ab6a96e71f638e4c1965 Mon Sep 17 00:00:00 2001 From: Christopher King Date: Fri, 19 Apr 2019 18:48:28 -0500 Subject: [PATCH 04/10] new version --- .gitignore | 1 + sources | 2 +- wpewebkit.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a9cd1fb..c2de4ae 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /wpewebkit-2.22.4.tar.xz /wpewebkit-2.22.5.tar.xz /wpewebkit-2.24.0.tar.xz +/wpewebkit-2.24.1.tar.xz diff --git a/sources b/sources index 14c79d1..ac8aeab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wpewebkit-2.24.0.tar.xz) = 309bc59b01d1b16eeae81873f4233ce50a58db1b93bb4a72f7de1e39185cb80dec4d55e8ddcf258ea29fcc663b7eab5883c01a4f1f49aaa2145072dd6177e448 +SHA512 (wpewebkit-2.24.1.tar.xz) = fc89ff2100bd66a859afaaafcfcbed33c70f608174b7157d07b0ebe6c0dc0d000571b7faaa00d0617ce05c9bcd23499ab3bfc691ef6696b76c0218700211aaea diff --git a/wpewebkit.spec b/wpewebkit.spec index ecdbede..eb33b88 100644 --- a/wpewebkit.spec +++ b/wpewebkit.spec @@ -6,7 +6,7 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: wpewebkit -Version: 2.24.0 +Version: 2.24.1 Release: 1%{?dist} Summary: A WebKit port optimized for low-end devices @@ -162,6 +162,9 @@ popd %changelog +* Fri Apr 19 2019 Chris King - 2.24.1-1 +- New version + * Wed Mar 27 2019 Chris King - 2.24.0-1 - New version From 9858f9c01eb47f3fc23aed43780317cbe6785288 Mon Sep 17 00:00:00 2001 From: Christopher King Date: Mon, 20 May 2019 23:45:39 -0500 Subject: [PATCH 05/10] New version --- .gitignore | 1 + sources | 2 +- wpewebkit.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c2de4ae..cf1b2f8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /wpewebkit-2.22.5.tar.xz /wpewebkit-2.24.0.tar.xz /wpewebkit-2.24.1.tar.xz +/wpewebkit-2.24.2.tar.xz diff --git a/sources b/sources index ac8aeab..106aff2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wpewebkit-2.24.1.tar.xz) = fc89ff2100bd66a859afaaafcfcbed33c70f608174b7157d07b0ebe6c0dc0d000571b7faaa00d0617ce05c9bcd23499ab3bfc691ef6696b76c0218700211aaea +SHA512 (wpewebkit-2.24.2.tar.xz) = ee3f6767d9d153043635426f0998f9e5264fb8dfbe2ac2fbebcf0461d993c11b82d63d192f6053f9b1947e3488ead9c9526fa7c07d2e9dfc798bd49000956798 diff --git a/wpewebkit.spec b/wpewebkit.spec index eb33b88..cee087d 100644 --- a/wpewebkit.spec +++ b/wpewebkit.spec @@ -6,7 +6,7 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: wpewebkit -Version: 2.24.1 +Version: 2.24.2 Release: 1%{?dist} Summary: A WebKit port optimized for low-end devices @@ -162,6 +162,9 @@ popd %changelog +* Mon May 20 2019 Chris King - 2.24.2-1 +- New version + * Fri Apr 19 2019 Chris King - 2.24.1-1 - New version From d72ca13d57d7714d16b96f1aebda7a0724debaf7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:42:47 +0000 Subject: [PATCH 06/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wpewebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wpewebkit.spec b/wpewebkit.spec index cee087d..808391c 100644 --- a/wpewebkit.spec +++ b/wpewebkit.spec @@ -7,7 +7,7 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: wpewebkit Version: 2.24.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A WebKit port optimized for low-end devices License: LGPLv2 and BSD @@ -162,6 +162,9 @@ popd %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.24.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon May 20 2019 Chris King - 2.24.2-1 - New version From e3d9b63485e93ec6c36a88297df60bf709af0bd3 Mon Sep 17 00:00:00 2001 From: christopher Date: Sat, 28 Sep 2019 14:30:34 -0600 Subject: [PATCH 07/10] new version --- .gitignore | 1 + fedora-crypto-policy.patch | 24 ------------------------ sources | 2 +- wpewebkit.spec | 18 +++++++++++++----- 4 files changed, 15 insertions(+), 30 deletions(-) delete mode 100644 fedora-crypto-policy.patch diff --git a/.gitignore b/.gitignore index cf1b2f8..3281b19 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /wpewebkit-2.24.0.tar.xz /wpewebkit-2.24.1.tar.xz /wpewebkit-2.24.2.tar.xz +/wpewebkit-2.26.1.tar.xz diff --git a/fedora-crypto-policy.patch b/fedora-crypto-policy.patch deleted file mode 100644 index 90e1d67..0000000 --- a/fedora-crypto-policy.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up wpewebkit-2.20.1/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp.fedora-crypto-policy webkitgtk-2.17.92/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp ---- wpewebkit-2.20.1/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp.fedora-crypto-policy 2017-09-05 13:39:59.294426661 +0200 -+++ wpewebkit-2.20.1/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp 2017-09-05 13:40:09.144389997 +0200 -@@ -43,7 +43,7 @@ int main(int argc, char** argv) - // overwrite this priority string if it's already set by the user. - // https://bugzilla.gnome.org/show_bug.cgi?id=738633 - // WARNING: This needs to be KEPT IN SYNC with WebProcessMain.cpp. -- setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0); -+ setenv("G_TLS_GNUTLS_PRIORITY", "@SYSTEM:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0); - - #if USE(GCRYPT) - PAL::GCrypt::initialize(); -diff -up wpewebkit-2.20.1/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp.fedora-crypto-policy webkitgtk-2.17.92/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp ---- wpewebkit-2.20.1/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp.fedora-crypto-policy 2017-09-05 13:40:28.558317735 +0200 -+++ wpewebkit-2.20.1/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp 2017-09-05 13:40:56.057215378 +0200 -@@ -43,7 +43,7 @@ int main(int argc, char** argv) - // overwrite this priority string if it's already set by the user. - // https://bugzilla.gnome.org/show_bug.cgi?id=738633 - // WARNING: This needs to be KEPT IN SYNC with WebProcessMain.cpp. -- setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0); -+ setenv("G_TLS_GNUTLS_PRIORITY", "@SYSTEM:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0); - - #if USE(GCRYPT) - PAL::GCrypt::initialize(); diff --git a/sources b/sources index 106aff2..d4464a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wpewebkit-2.24.2.tar.xz) = ee3f6767d9d153043635426f0998f9e5264fb8dfbe2ac2fbebcf0461d993c11b82d63d192f6053f9b1947e3488ead9c9526fa7c07d2e9dfc798bd49000956798 +SHA512 (wpewebkit-2.26.1.tar.xz) = eabfa1ba4b98c7a37db51b94559c1251164988fba42a1df7872912e8a174d3ca0d04dad5e0191e16c417957c563eb18b1bd2a6722cb19a273e4e4b06bf906636 diff --git a/wpewebkit.spec b/wpewebkit.spec index 808391c..291d5b5 100644 --- a/wpewebkit.spec +++ b/wpewebkit.spec @@ -6,18 +6,16 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: wpewebkit -Version: 2.24.2 -Release: 2%{?dist} +Version: 2.26.1 +Release: 1%{?dist} Summary: A WebKit port optimized for low-end devices License: LGPLv2 and BSD URL: http://www.%{name}.org/ Source0: http://wpewebkit.org/releases/%{name}-%{version}.tar.xz -# https://bugs.webkit.org/show_bug.cgi?id=158785 -Patch0: fedora-crypto-policy.patch # Explicitly specify python2 over python to avoid build fails -Patch1: python2.patch +Patch0: python2.patch BuildRequires: openjpeg2-devel BuildRequires: bison @@ -54,6 +52,12 @@ BuildRequires: rubygems BuildRequires: sqlite-devel BuildRequires: woff2-devel BuildRequires: libepoxy-devel +BuildRequires: atk-devel at-spi2-atk-devel +BuildRequires: bubblewrap +BuildRequires: libseccomp-devel +BuildRequires: xdg-dbus-proxy +Requires: atk +Requires: at-spi2-atk %description WPE allows embedders to create simple and performant systems based on @@ -162,6 +166,10 @@ popd %changelog +* Sat Sep 28 2019 Chris King - 2.26.1-1 +- New version, added atk/bubblewrap libs for build, removed crypto patch as its + no longer needed. + * Sat Jul 27 2019 Fedora Release Engineering - 2.24.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 6dc9213d94afd75b11e6285ea4f9943c857cc960 Mon Sep 17 00:00:00 2001 From: christopher Date: Sat, 28 Sep 2019 15:39:49 -0600 Subject: [PATCH 08/10] sobump --- wpewebkit.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wpewebkit.spec b/wpewebkit.spec index 291d5b5..a789487 100644 --- a/wpewebkit.spec +++ b/wpewebkit.spec @@ -148,8 +148,8 @@ popd %files %{_bindir}/WPEWebDriver -%{_libdir}/libWPEWebKit-1.0.so.2 -%{_libdir}/libWPEWebKit-1.0.so.2.* +%{_libdir}/libWPEWebKit-1.0.so.3 +%{_libdir}/libWPEWebKit-1.0.so.3.* %{_libexecdir}/wpe-webkit-1.0 %{_libdir}/wpe-webkit-1.0 %doc NEWS @@ -168,7 +168,7 @@ popd %changelog * Sat Sep 28 2019 Chris King - 2.26.1-1 - New version, added atk/bubblewrap libs for build, removed crypto patch as its - no longer needed. + no longer needed. Also, sobump. * Sat Jul 27 2019 Fedora Release Engineering - 2.24.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From a6e1c6da9744cb4126f4506ff92e8850b2e5a3a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:56:57 +0000 Subject: [PATCH 09/10] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wpewebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wpewebkit.spec b/wpewebkit.spec index a789487..3ebfb19 100644 --- a/wpewebkit.spec +++ b/wpewebkit.spec @@ -7,7 +7,7 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: wpewebkit Version: 2.26.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A WebKit port optimized for low-end devices License: LGPLv2 and BSD @@ -166,6 +166,9 @@ popd %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2.26.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Sep 28 2019 Chris King - 2.26.1-1 - New version, added atk/bubblewrap libs for build, removed crypto patch as its no longer needed. Also, sobump. From 6e42a0e261e2be6514b50abb2d113edf6c1a4c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 18 May 2020 14:03:59 +0200 Subject: [PATCH 10/10] Orphaned for 6+ weeks --- .gitignore | 8 -- README.md | 3 - dead.package | 1 + python2.patch | 20 ----- sources | 1 - wpewebkit.spec | 210 ------------------------------------------------- 6 files changed, 1 insertion(+), 242 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.md create mode 100644 dead.package delete mode 100644 python2.patch delete mode 100644 sources delete mode 100644 wpewebkit.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3281b19..0000000 --- a/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/wpewebkit-2.21.2.tar.xz -/wpewebkit-2.21.92.tar.xz -/wpewebkit-2.22.4.tar.xz -/wpewebkit-2.22.5.tar.xz -/wpewebkit-2.24.0.tar.xz -/wpewebkit-2.24.1.tar.xz -/wpewebkit-2.24.2.tar.xz -/wpewebkit-2.26.1.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 6274646..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# wpewebkit - -WPE allows embedders to create simple and performant systems based on Web platform technologies. It is designed with hardware acceleration in mind, leveraging common 3D graphics APIs for best performance. diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/python2.patch b/python2.patch deleted file mode 100644 index a27f508..0000000 --- a/python2.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 494e4abb7a5130376d3cdb41a5e3963650b8659f Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Mon, 16 Jul 2018 06:34:53 +0200 -Subject: [PATCH] Fix the broken build due to python2 - - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl -index 4bb7037d..3071b45f 100755 ---- a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl -+++ b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl -@@ -155,7 +155,7 @@ my $inspectorLicense = <<'EOF'; - EOF - - my $perl = $^X; --my $python = ($OSNAME =~ /cygwin/) ? "/usr/bin/python" : "python"; -+my $python = ($OSNAME =~ /cygwin/) ? "/usr/bin/python2" : "python2"; - my $derivedSourcesDir = $ENV{'DERIVED_SOURCES_DIR'}; - my $scriptsRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'Scripts'); - my $sharedScriptsRoot = File::Spec->catdir($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'}); diff --git a/sources b/sources deleted file mode 100644 index d4464a7..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (wpewebkit-2.26.1.tar.xz) = eabfa1ba4b98c7a37db51b94559c1251164988fba42a1df7872912e8a174d3ca0d04dad5e0191e16c417957c563eb18b1bd2a6722cb19a273e4e4b06bf906636 diff --git a/wpewebkit.spec b/wpewebkit.spec deleted file mode 100644 index 3ebfb19..0000000 --- a/wpewebkit.spec +++ /dev/null @@ -1,210 +0,0 @@ -## NOTE: Lots of files in various subdirectories have the same name (such as -## "LICENSE") so this short macro allows us to distinguish them by using their -## directory names (from the source tree) as prefixes for the files. -%global add_to_license_files() \ - mkdir -p _license_files ; \ -cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') - -Name: wpewebkit -Version: 2.26.1 -Release: 2%{?dist} -Summary: A WebKit port optimized for low-end devices - -License: LGPLv2 and BSD -URL: http://www.%{name}.org/ -Source0: http://wpewebkit.org/releases/%{name}-%{version}.tar.xz - -# Explicitly specify python2 over python to avoid build fails -Patch0: python2.patch - -BuildRequires: openjpeg2-devel -BuildRequires: bison -BuildRequires: cairo-devel -BuildRequires: cmake -BuildRequires: libwpe-devel -BuildRequires: wpebackend-fdo-devel -BuildRequires: flex -BuildRequires: gcc-c++ -BuildRequires: gnutls-devel -BuildRequires: gperf -BuildRequires: gstreamer1-devel -BuildRequires: gstreamer1-plugins-base-devel -BuildRequires: gstreamer1-plugins-bad-free-devel -BuildRequires: harfbuzz-devel -BuildRequires: libicu-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: libsoup-devel -BuildRequires: libwebp-devel -BuildRequires: libxslt-devel -BuildRequires: libwayland-client-devel -BuildRequires: libwayland-egl-devel -BuildRequires: libwayland-server-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: wayland-protocols-devel -BuildRequires: mesa-libEGL-devel -BuildRequires: perl-File-Copy-Recursive -BuildRequires: perl-JSON-PP -BuildRequires: perl-Switch -BuildRequires: python2 -BuildRequires: ruby -BuildRequires: rubygems -BuildRequires: sqlite-devel -BuildRequires: woff2-devel -BuildRequires: libepoxy-devel -BuildRequires: atk-devel at-spi2-atk-devel -BuildRequires: bubblewrap -BuildRequires: libseccomp-devel -BuildRequires: xdg-dbus-proxy -Requires: atk -Requires: at-spi2-atk - -%description -WPE allows embedders to create simple and performant systems based on -Web platform technologies. It is designed with hardware acceleration -in mind, leveraging common 3D graphics APIs for best performance. - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -The %{name}-devel package contains libraries, build data, and header -files for developing applications that use %{name} - -%prep -%autosetup -p1 -n wpewebkit-%{version} - -%build -# Increase the DIE limit so our debuginfo packages could be size optimized. -# Decreases the size for x86_64 from ~5G to ~1.1G. -# https://bugzilla.redhat.com/show_bug.cgi?id=1456261 -%global _dwz_max_die_limit 250000000 - -# The _dwz_max_die_limit is being overridden by the arch specific ones from the -# redhat-rpm-config so we need to set the arch specific ones as well - now it -# is only needed for x86_64. -%global _dwz_max_die_limit_x86_64 250000000 - -%ifarch s390 aarch64 -# Use linker flags to reduce memory consumption - on other arches the ld.gold is -# used and also it doesn't have the --reduce-memory-overheads option -%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads -%endif - -# Decrease debuginfo even on ix86 because of: -# https://bugs.webkit.org/show_bug.cgi?id=140176 -%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} %{mips} -# Decrease debuginfo verbosity to reduce memory consumption even more -%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') -%endif - -%ifarch ppc -# Use linker flag -relax to get WebKit build under ppc(32) with JIT disabled -%global optflags %{optflags} -Wl,-relax -%endif - -# Disable ld.gold on s390 as it does not have it. -# Also for aarch64 as the support is in upstream, but not packaged in Fedora. -# FIXME: Ideally the CMAKE_EXE_LINKER_FLAGS would not be necessary, but builds seem to be failing otherwise. -mkdir -p %{_target_platform} -pushd %{_target_platform} -%cmake \ - -DPORT=WPE \ - -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_MINIBROWSER=ON \ -%ifarch s390 aarch64 - -DUSE_LD_GOLD=OFF \ -%endif -%ifarch s390 s390x ppc %{power64} - -DENABLE_JIT=OFF \ - -DUSE_SYSTEM_MALLOC=ON \ -%endif -.. -popd - -%make_build -C %{_target_platform} - -%install -%make_install -C %{_target_platform} - -# Finally, copy over and rename various files for %license inclusion -%add_to_license_files Source/JavaScriptCore/COPYING.LIB -%add_to_license_files Source/JavaScriptCore/icu/LICENSE -%add_to_license_files Source/ThirdParty/ANGLE/LICENSE -%add_to_license_files Source/ThirdParty/ANGLE/src/common/third_party/smhasher/LICENSE -%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/compiler/LICENSE -%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/LICENSE -%add_to_license_files Source/WebCore/icu/LICENSE -%add_to_license_files Source/WebCore/LICENSE-APPLE -%add_to_license_files Source/WebCore/LICENSE-LGPL-2 -%add_to_license_files Source/WebCore/LICENSE-LGPL-2.1 -%add_to_license_files Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE -%add_to_license_files Source/WebInspectorUI/UserInterface/External/Esprima/LICENSE -%add_to_license_files Source/WebInspectorUI/UserInterface/External/three.js/LICENSE -%add_to_license_files Source/WTF/icu/LICENSE -%add_to_license_files Source/WTF/wtf/dtoa/COPYING -%add_to_license_files Source/WTF/wtf/dtoa/LICENSE - -%files -%{_bindir}/WPEWebDriver -%{_libdir}/libWPEWebKit-1.0.so.3 -%{_libdir}/libWPEWebKit-1.0.so.3.* -%{_libexecdir}/wpe-webkit-1.0 -%{_libdir}/wpe-webkit-1.0 -%doc NEWS -%license _license_files/*ThirdParty* -%license _license_files/*WebCore* -%license _license_files/*WebInspectorUI* -%license _license_files/*WTF* -%license _license_files/*JavaScriptCore* - -%files devel -%{_includedir}/wpe-webkit-1.0 -%{_libdir}/libWPEWebKit-1.0.so -%{_libdir}/pkgconfig/*.pc - - -%changelog -* Fri Jan 31 2020 Fedora Release Engineering - 2.26.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Sep 28 2019 Chris King - 2.26.1-1 -- New version, added atk/bubblewrap libs for build, removed crypto patch as its - no longer needed. Also, sobump. - -* Sat Jul 27 2019 Fedora Release Engineering - 2.24.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon May 20 2019 Chris King - 2.24.2-1 -- New version - -* Fri Apr 19 2019 Chris King - 2.24.1-1 -- New version - -* Wed Mar 27 2019 Chris King - 2.24.0-1 -- New version - -* Tue Mar 19 2019 Chris King - 2.22.5-1 -- New version - -* Sat Feb 09 2019 Chris King - 2.22.4-1 -- New version and removing patches that were upstreamed in this version - -* Sun Feb 03 2019 Fedora Release Engineering - 2.21.92-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jan 24 2019 Pete Walter - 2.21.92-3 -- Rebuild for ICU 63 - -* Fri Sep 21 2018 Chris King - 2.21.92-2 -- Adding another patch so the package properly installs - -* Fri Sep 14 2018 Chris King - 2.21.92-1 -- Adding some patches to fix failing builds - -* Mon Sep 10 2018 Chris King - 2.21.92-1 -- Soname bump and version update - -* Tue Jul 17 2018 Chris King - 2.21.2-1 -- Initial RPM package.