pool/webkit2gtk3
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 940489 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/940489
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/webkit2gtk3?expand=0&rev=131
This commit is contained in:
Dominique Leuenberger 2021-12-16 20:18:48 +00:00 committed by Git OBS Bridge
commit 01a512c2a7
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
webkit2gtk3.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Tue Dec 14 13:30:29 UTC 2021 - Yifan Jiang <yfjiang@suse.com>
- Typo fix for %define usegcc10.
-------------------------------------------------------------------
Tue Dec 14 10:38:41 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Introduce usegcc10 %define in order to have the condition
(0%{?sle_version} && 0%{?sle_version} <= 150400) only at one
point.
- Correct a very old "Obsoletes: webkit2gtk3-plugin-process-gtk2"
to be a versioned obsoletes.
-------------------------------------------------------------------
Tue Dec 14 01:05:29 UTC 2021 - Yifan Jiang <yfjiang@suse.com>
- Make the earlier Obsoletes: libwebkit2gtk3-lang compliant with:
https://en.opensuse.org/openSUSE:Upgrade_dependencies_explanation#Renaming_a_package
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 8 08:07:59 UTC 2021 - Yifan Jiang <yfjiang@suse.com> Wed Dec 8 08:07:59 UTC 2021 - Yifan Jiang <yfjiang@suse.com>

12
webkit2gtk3.spec
View File

@ -25,6 +25,8 @@
ExclusiveArch: do-not-build ExclusiveArch: do-not-build
%endif %endif
%define usegcc10 0%{?sle_version} && 0%{?sle_version} <= 150400
%if "%{flavor}" == "gtk3" %if "%{flavor}" == "gtk3"
%define _gtknamesuffix gtk3 %define _gtknamesuffix gtk3
%define _pkgname_no_slpp libwebkit2gtk3 %define _pkgname_no_slpp libwebkit2gtk3
@ -100,7 +102,7 @@ BuildRequires: bison >= 2.3
BuildRequires: bubblewrap BuildRequires: bubblewrap
BuildRequires: cmake BuildRequires: cmake
BuildRequires: enchant-devel BuildRequires: enchant-devel
%if 0%{?sle_version} && 0%{?sle_version} <= 150400 %if %usegcc10
BuildRequires: gcc10-c++ >= 4.9 BuildRequires: gcc10-c++ >= 4.9
%else %else
BuildRequires: gcc-c++ >= 7.3 BuildRequires: gcc-c++ >= 7.3
@ -125,7 +127,7 @@ BuildRequires: pkgconfig(fontconfig) >= 2.8.0
BuildRequires: pkgconfig(freetype2) >= 2.4.2 BuildRequires: pkgconfig(freetype2) >= 2.4.2
BuildRequires: pkgconfig(geoclue-2.0) >= 2.1.5 BuildRequires: pkgconfig(geoclue-2.0) >= 2.1.5
BuildRequires: pkgconfig(glib-2.0) >= 2.36 BuildRequires: pkgconfig(glib-2.0) >= 2.36
%if 0%{?sle_version} && 0%{?sle_version} <= 150400 %if %usegcc10
BuildRequires: pkgconfig(glproto) BuildRequires: pkgconfig(glproto)
%endif %endif
BuildRequires: pkgconfig(gnutls) >= 3.0.0 BuildRequires: pkgconfig(gnutls) >= 3.0.0
@ -197,7 +199,7 @@ Requires: webkit2gtk-%{_sonameverpkg}-injected-bundles
Requires: xdg-dbus-proxy Requires: xdg-dbus-proxy
Provides: %{_pkgname_no_slpp} = %{version} Provides: %{_pkgname_no_slpp} = %{version}
Provides: WebKit2GTK-%{_apiver} Provides: WebKit2GTK-%{_apiver}
Obsoletes: webkit2gtk3-plugin-process-gtk2 Obsoletes: webkit2gtk3-plugin-process-gtk2 < %{version}
%description -n libwebkit2gtk%{_wk2sover} %description -n libwebkit2gtk%{_wk2sover}
WebKit is a web content engine, derived from KHTML and KJS from KDE, WebKit is a web content engine, derived from KHTML and KJS from KDE,
@ -328,7 +330,7 @@ Summary: Translations for package %{name}
Group: System/Localization Group: System/Localization
Requires: WebKit2GTK-%{_apiver} = %{version} Requires: WebKit2GTK-%{_apiver} = %{version}
Provides: WebKit2GTK-%{_apiver}-lang-all = %{version} Provides: WebKit2GTK-%{_apiver}-lang-all = %{version}
Obsoletes: libwebkit2gtk3-lang Obsoletes: libwebkit2gtk3-lang < %{version}
BuildArch: noarch BuildArch: noarch
%description -n WebKit2GTK-%{_apiver}-lang %description -n WebKit2GTK-%{_apiver}-lang
@ -366,7 +368,7 @@ export PYTHON=%{_bindir}/python3
%cmake \ %cmake \
-GNinja \ -GNinja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
%if 0%{?sle_version} && 0%{?sle_version} <= 150400 %if %usegcc10
-DCMAKE_C_COMPILER=gcc-10 \ -DCMAKE_C_COMPILER=gcc-10 \
-DCMAKE_CXX_COMPILER=g++-10 \ -DCMAKE_CXX_COMPILER=g++-10 \
%endif %endif