From ca031e5c3da1735c528bdd23fb48f04d2459e87313dbcd5c6e9d6e48d9baa17e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Sep 2022 07:31:45 +0000 Subject: [PATCH] Accepting request 1002603 from GNOME:Next GNOME 43.rc - let's get this into Staging to see what we break (e.g meson:test seems to be an issue already) OBS-URL: https://build.opensuse.org/request/show/1002603 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/bijiben?expand=0&rev=129 --- bijiben-switch-to-soup3.patch | 11 +++++++++++ bijiben.changes | 7 +++++++ bijiben.spec | 4 +++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 bijiben-switch-to-soup3.patch diff --git a/bijiben-switch-to-soup3.patch b/bijiben-switch-to-soup3.patch new file mode 100644 index 0000000..6cad0fb --- /dev/null +++ b/bijiben-switch-to-soup3.patch @@ -0,0 +1,11 @@ +--- orig-bijiben-40.1/meson.build 2021-04-30 13:59:10.302303300 +0200 ++++ bijiben-40.1/meson.build 2022-08-30 22:11:07.619192939 +0200 +@@ -126,7 +126,7 @@ + dependency('libxml-2.0'), + dependency('libcurl'), + dependency('uuid'), +- dependency('webkit2gtk-4.0', version: '>= 2.26'), ++ dependency('webkit2gtk-4.1', version: '>= 2.26'), + cc.find_library('m') + ] + diff --git a/bijiben.changes b/bijiben.changes index ba37786..396430b 100644 --- a/bijiben.changes +++ b/bijiben.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 30 20:12:53 UTC 2022 - Bjørn Lie + +- Add bijiben-switch-to-soup3.patch: Backport upstream switch to + soup3. Following this, replace pkgconfig(webkit2gtk-4.0) with + pkgconfig(webkit2gtk-4.1) BuildRequires. + ------------------------------------------------------------------- Fri Apr 15 11:01:36 UTC 2022 - Dominique Leuenberger diff --git a/bijiben.spec b/bijiben.spec index fe343cd..947e757 100644 --- a/bijiben.spec +++ b/bijiben.spec @@ -26,6 +26,8 @@ URL: https://wiki.gnome.org/Apps/Bijiben Source0: https://download.gnome.org/sources/bijiben/40/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM 158.patch -- Fix build with meson 0.61.0 and newer Patch0: https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/158.patch +# PATCH-FIX-UPSTREAM bijiben-switch-to-soup3.patch -- Backport upstream switch to soup3 +Patch1: bijiben-switch-to-soup3.patch BuildRequires: fdupes BuildRequires: gettext @@ -45,7 +47,7 @@ BuildRequires: pkgconfig(libhandy-1) >= 1.0.0 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(tracker-sparql-3.0) BuildRequires: pkgconfig(uuid) -BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.26.0 +BuildRequires: pkgconfig(webkit2gtk-4.1) >= 2.26.0 %description Bijiben is a note editor designed to remain simple to use.