Update to 2.40.1

Upgrade to 2.40.0
Update to 2.38.5
2023-04-19 17:10:40 -05:00 · 2023-03-17 21:45:04 -05:00 · 2023-02-15 13:37:37 -06:00 · 2023-02-02 15:16:27 -06:00 · 2022-12-22 12:04:47 -06:00 · 2022-11-04 11:03:21 -05:00
3 changed files with 69 additions and 15 deletions
--- a/.gitignore
+++ b/.gitignore
@ -99,3 +99,33 @@
 /webkitgtk-2.35.90.tar.xz.asc
 /webkitgtk-2.36.0.tar.xz
 /webkitgtk-2.36.0.tar.xz.asc
+/webkitgtk-2.36.1.tar.xz
+/webkitgtk-2.36.1.tar.xz.asc
+/webkitgtk-2.36.2.tar.xz
+/webkitgtk-2.36.2.tar.xz.asc
+/webkitgtk-2.36.3.tar.xz
+/webkitgtk-2.36.3.tar.xz.asc
+/webkitgtk-2.36.4.tar.xz
+/webkitgtk-2.36.4.tar.xz.asc
+/webkitgtk-2.36.5.tar.xz
+/webkitgtk-2.36.5.tar.xz.asc
+/webkitgtk-2.36.6.tar.xz
+/webkitgtk-2.36.6.tar.xz.asc
+/webkitgtk-2.36.7.tar.xz
+/webkitgtk-2.36.7.tar.xz.asc
+/webkitgtk-2.38.0.tar.xz
+/webkitgtk-2.38.0.tar.xz.asc
+/webkitgtk-2.38.1.tar.xz
+/webkitgtk-2.38.1.tar.xz.asc
+/webkitgtk-2.38.2.tar.xz
+/webkitgtk-2.38.2.tar.xz.asc
+/webkitgtk-2.38.3.tar.xz
+/webkitgtk-2.38.3.tar.xz.asc
+/webkitgtk-2.38.4.tar.xz
+/webkitgtk-2.38.4.tar.xz.asc
+/webkitgtk-2.38.5.tar.xz
+/webkitgtk-2.38.5.tar.xz.asc
+/webkitgtk-2.40.0.tar.xz
+/webkitgtk-2.40.0.tar.xz.asc
+/webkitgtk-2.40.1.tar.xz
+/webkitgtk-2.40.1.tar.xz.asc
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.36.0.tar.xz) = 0926a792da295b8efa8c0fb80fbb0cb27c43bb86011317d076fbe5eef347f2bc02e8afc4c75699a5c6a14363f4abcbfa2d941fdddd6646a63c7679e2380080da
-SHA512 (webkitgtk-2.36.0.tar.xz.asc) = ee0d31152c287d356843e726139663711b525f062457a87aac73a8b799cbd39fb700d17fd9d88a99141f041f1565e62d6c973d7fda2bebe218181c4f80e48b63
+SHA512 (webkitgtk-2.40.1.tar.xz) = e94b9a651b3c120e3dc918831c8a7fcfbd35f6760a53b7b39a07c7d792ddf99082030bf8b44a522001df4a7368c2b9145606f7a1cc8e0ed60498a0b78325bc5c
+SHA512 (webkitgtk-2.40.1.tar.xz.asc) = 105496359f3fdb2e4ab97696c5db8efcf55d17a4d560fa62f59febd62e1bba5094ad700e837a19ead15e5654e7ffbc4275761c70983d8cd81f8175bd5a446252
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@ -16,7 +16,7 @@
 %bcond_without docs

 Name:           webkit2gtk3
-Version:        2.36.0
+Version:        2.40.1
 Release:        %autorelease
 Summary:        GTK Web content engine library

@ -35,13 +35,14 @@ BuildRequires:  cmake
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
+BuildRequires:  gi-docgen
 BuildRequires:  git
 BuildRequires:  gnupg2
 BuildRequires:  gperf
-BuildRequires:  gtk-doc
 BuildRequires:  hyphen-devel
 BuildRequires:  libatomic
 BuildRequires:  ninja-build
+BuildRequires:  openssl-devel
 BuildRequires:  perl(English)
 BuildRequires:  perl(File::Copy::Recursive)
 BuildRequires:  perl(FindBin)
@ -51,6 +52,7 @@ BuildRequires:  python3
 BuildRequires:  ruby
 BuildRequires:  rubygems
 BuildRequires:  rubygem-json
+BuildRequires:  unifdef
 BuildRequires:  xdg-dbus-proxy

 BuildRequires:  pkgconfig(atspi-2)
@ -59,16 +61,20 @@ BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(enchant-2)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(gbm)
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(glesv2)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gstreamer-plugins-bad-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  pkgconfig(icu-uc)
 BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(libavif)
+BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libgcrypt)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libnotify)
@ -117,6 +123,12 @@ Recommends:     xdg-desktop-portal-gtk
 Obsoletes:      webkitgtk4 < %{version}-%{release}
 Provides:       webkitgtk4 = %{version}-%{release}

+# In Fedora 37+, this package is renamed to webkit2gtk4.0. Add provides for the
+# new name so that other packages don't need to conditionalize their spec
+# files.
+Provides:       webkit2gtk4.0 = %{version}-%{release}
+Provides:       webkit2gtk4.0%{?_isa} = %{version}-%{release}
+
 # We're supposed to specify versions here, but these libraries don't do
 # normal releases. Accordingly, they're not suitable to be system libs.
 Provides:       bundled(angle)
@ -141,6 +153,10 @@ Requires:       %{name}-jsc%{?_isa} = %{version}-%{release}
 Requires:       %{name}-jsc-devel%{?_isa} = %{version}-%{release}
 Obsoletes:      webkitgtk4-devel < %{version}-%{release}
 Provides:       webkitgtk4-devel = %{version}-%{release}
+# In Fedora 37+, this package is renamed to webkit2gtk4.0. Add provides for the
+# new name so that other packages don't need to conditionalize their spec
+# files.
+Provides:       webkit2gtk4.0-devel = %{version}-%{release}

 %description    devel
 The %{name}-devel package contains libraries, build data, and header
@ -153,6 +169,11 @@ BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 Obsoletes:      webkitgtk4-doc < %{version}-%{release}
 Provides:       webkitgtk4-doc = %{version}-%{release}
+# In Fedora 37+, this package is renamed to webkit2gtk4.0. Add provides for the
+# new name so that other packages don't need to conditionalize their spec
+# files.
+Provides:       webkit2gtk4.0-doc = %{version}-%{release}
+Recommends:     gi-docgen-fonts

 %description    doc
 This package contains developer documentation for %{name}.
@ -162,6 +183,10 @@ This package contains developer documentation for %{name}.
 Summary:        JavaScript engine from %{name}
 Obsoletes:      webkitgtk4-jsc < %{version}-%{release}
 Provides:       webkitgtk4-jsc = %{version}-%{release}
+# In Fedora 37+, this package is renamed to webkit2gtk4.0. Add provides for the
+# new name so that other packages don't need to conditionalize their spec
+# files.
+Provides:       javascriptcoregtk4.0 = %{version}-%{release}

 %description    jsc
 This package contains JavaScript engine from %{name}.
@ -171,6 +196,10 @@ Summary:        Development files for JavaScript engine from %{name}
 Requires:       %{name}-jsc%{?_isa} = %{version}-%{release}
 Obsoletes:      webkitgtk4-jsc-devel < %{version}-%{release}
 Provides:       webkitgtk4-jsc-devel = %{version}-%{release}
+# In Fedora 37+, this package is renamed to webkit2gtk4.0. Add provides for the
+# new name so that other packages don't need to conditionalize their spec
+# files.
+Provides:       javascriptcoregtk4.0-devel = %{version}-%{release}

 %description    jsc-devel
 The %{name}-jsc-devel package contains libraries, build data, and header
@ -206,7 +235,6 @@ rm -rf Source/ThirdParty/qunit/
  -GNinja \
  -DPORT=GTK \
  -DCMAKE_BUILD_TYPE=Release \
-  -DENABLE_MINIBROWSER=ON \
  -DUSE_SOUP2=ON \
  -DUSE_LD_GOLD=OFF \
 %if %{with docs}
@ -214,25 +242,21 @@ rm -rf Source/ThirdParty/qunit/
 %endif
 %if !0%{?with_gamepad}
  -DENABLE_GAMEPAD=OFF \
-%endif
-%if 0%{?fedora}
-  -DUSER_AGENT_BRANDING="Fedora" \
 %endif
  %{nil}

-# Show the build time in the status. Require 2 GB of RAM per vCPU.
+# Show the build time in the status. Require 3 GB of RAM per vCPU.
 export NINJA_STATUS="[%f/%t][%e] "
-%cmake_build %limit_build -m 2048
+%cmake_build %limit_build -m 3072

 %install
 %cmake_install

-%find_lang WebKit2GTK-4.0
+%find_lang WebKitGTK-4.0

 # Finally, copy over and rename various files for %%license inclusion
 %add_to_license_files Source/JavaScriptCore/COPYING.LIB
 %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/libXNVCtrl/LICENSE
 %add_to_license_files Source/WebCore/LICENSE-APPLE
 %add_to_license_files Source/WebCore/LICENSE-LGPL-2
@ -244,7 +268,7 @@ export NINJA_STATUS="[%f/%t][%e] "
 %add_to_license_files Source/WTF/wtf/dtoa/COPYING
 %add_to_license_files Source/WTF/wtf/dtoa/LICENSE

-%files -f WebKit2GTK-4.0.lang
+%files -f WebKitGTK-4.0.lang
 %license _license_files/*ThirdParty*
 %license _license_files/*WebCore*
 %license _license_files/*WebInspectorUI*
@ -291,9 +315,9 @@ export NINJA_STATUS="[%f/%t][%e] "
 %files doc
 %dir %{_datadir}/gtk-doc
 %dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/jsc-glib-4.0/
+%{_datadir}/gtk-doc/html/javascriptcoregtk-4.0/
 %{_datadir}/gtk-doc/html/webkit2gtk-4.0/
-%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
+%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.0/
 %endif

 %changelog
Author	SHA1	Message	Date
Michael Catanzaro	0156de9ddc	Update to 2.40.1	2023-04-19 17:10:40 -05:00
Michael Catanzaro	c47e3defd6	Upgrade to 2.40.0	2023-03-17 21:45:04 -05:00
Michael Catanzaro	1e46db5006	Update to 2.38.5	2023-02-15 13:37:37 -06:00
Michael Catanzaro	d7d9448d76	Update to 2.38.4	2023-02-02 15:16:27 -06:00
Michael Catanzaro	10518e3ba3	Update to 2.38.3	2022-12-22 12:04:47 -06:00
Michael Catanzaro	3da64f3771	Update to 2.38.2	2022-11-04 11:03:21 -05:00
Michael Catanzaro	bacba104cd	Update to 2.38.1	2022-10-25 10:57:14 -05:00
Michael Catanzaro	3e60c400d4	Switch gtk-doc -> gi-docgen Also, ENABLE_MINIBROWSER is now default	2022-09-16 09:40:32 -05:00
Michael Catanzaro	da16052e96	Update to 2.38.0	2022-09-16 09:13:40 -05:00
Michael Catanzaro	7eae503a6d	Update to 2.36.7	2022-08-24 17:52:57 -05:00
Kalev Lember	6f68972c3d	Add provides for webkit2gtk4.0 webkit2gtk3 is getting renamed to webkit2gtk4.0 in F37+. Add provides for the new names to make it easier for other packages to depend on webkitgtk without having to conditionalize their spec files.	2022-08-11 11:46:04 +02:00
Michael Catanzaro	b5517bdc15	Upgrade to 2.36.6	2022-08-08 09:22:39 -05:00
Michael Catanzaro	bf82e1ca6d	Revert change that caused Eclipse to crash	2022-08-01 11:48:29 -05:00
Michael Catanzaro	5fcaceb185	Update to 2.36.5	2022-07-28 12:27:44 -05:00
Michael Catanzaro	7a012f1a17	Update to 2.36.4	2022-07-05 12:38:07 -05:00
Michael Catanzaro	c544a656a5	Update to 3.36.3	2022-06-02 09:45:19 -05:00
Michael Catanzaro	745ed08a55	Update to 2.36.2	2022-05-18 08:10:28 -05:00
Michael Catanzaro	a4e0df7abe	Upgrade to 2.36.1	2022-04-21 14:18:51 -05:00
Michael Catanzaro	72441e9552	Add patch for crashes on exit https://bugs.webkit.org/show_bug.cgi?id=235224 https://bugzilla.redhat.com/show_bug.cgi?id=2065464	2022-04-20 13:56:31 -05:00