From 54ad7ee873fd3f5b380baff26b61f1ced48df6ab Mon Sep 17 00:00:00 2001 From: BunnyApocalypse Date: Wed, 27 Mar 2019 13:36:57 -0500 Subject: [PATCH 1/5] new version w soname bump --- .gitignore | 1 + sources | 2 +- wpewebkit.spec | 23 ++++++++++++++--------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 9a37250..2eaf447 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.24.0.tar.xz diff --git a/sources b/sources index 58b9f79..14c79d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wpewebkit-2.22.4.tar.xz) = be6d60661cee393d35a21323ecd5b204dfdd140aa3b2ec6f119a1effd1032701b81c0f20968e7c5c58e3f988cffe16084c52c55e0cde5757128a91b7a44b5bca +SHA512 (wpewebkit-2.24.0.tar.xz) = 309bc59b01d1b16eeae81873f4233ce50a58db1b93bb4a72f7de1e39185cb80dec4d55e8ddcf258ea29fcc663b7eab5883c01a4f1f49aaa2145072dd6177e448 diff --git a/wpewebkit.spec b/wpewebkit.spec index 9e8bc3f..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.4 +Version: 2.24.0 Release: 1%{?dist} Summary: A WebKit port optimized for low-end devices @@ -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 @@ -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,12 +156,18 @@ 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 +* 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 From 01a0f0af2147ec8d5240a69c625c739b1b116955 Mon Sep 17 00:00:00 2001 From: Christopher King Date: Fri, 19 Apr 2019 18:58:23 -0500 Subject: [PATCH 2/5] new version --- .gitignore | 1 + sources | 2 +- wpewebkit.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2eaf447..4b67443 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /wpewebkit-2.21.92.tar.xz /wpewebkit-2.22.4.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 f10c6be1728039503657b14c44d41ab741a55ff3 Mon Sep 17 00:00:00 2001 From: Christopher King Date: Mon, 20 May 2019 23:46:16 -0500 Subject: [PATCH 3/5] New version --- .gitignore | 1 + sources | 2 +- wpewebkit.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4b67443..af67cb9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /wpewebkit-2.22.4.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 8cfe27d3e0ba3d699db84ce076fa594d7d10129b Mon Sep 17 00:00:00 2001 From: christopher Date: Sat, 28 Sep 2019 14:33:29 -0600 Subject: [PATCH 4/5] new version --- .gitignore | 1 + fedora-crypto-policy.patch | 24 ------------------------ sources | 2 +- wpewebkit.spec | 19 +++++++++++++++---- 4 files changed, 17 insertions(+), 29 deletions(-) delete mode 100644 fedora-crypto-policy.patch diff --git a/.gitignore b/.gitignore index af67cb9..4ff2272 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,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 cee087d..291d5b5 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.2 +Version: 2.26.1 Release: 1%{?dist} Summary: A WebKit port optimized for low-end devices @@ -14,10 +14,8 @@ 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,13 @@ 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 + * Mon May 20 2019 Chris King - 2.24.2-1 - New version From 0e4007d00978af7870e063a953e63f932ef82140 Mon Sep 17 00:00:00 2001 From: christopher Date: Sat, 28 Sep 2019 20:41:51 -0600 Subject: [PATCH 5/5] 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