Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-photos for openSUSE:Factory checked in at 2023-03-03 22:24:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-photos (Old) and /work/SRC/openSUSE:Factory/.gnome-photos.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-photos" Fri Mar 3 22:24:26 2023 rev:60 rq:1068691 version:43.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-photos/gnome-photos.changes 2022-09-21 14:42:08.957707841 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-photos.new.31432/gnome-photos.changes 2023-03-03 22:24:33.874545748 +0100 @@ -1,0 +2,8 @@ +Thu Mar 2 08:55:51 UTC 2023 - Bjørn Lie <bjorn....@gmail.com> + +- Add 64c6f733a44bac5b7f08445a686c000681f93f5f.patch and + 9db32c3508a8c5d357a053d5f8278c34b4df18f3.patch: build: accept + both babl and babl-0.1, and following this, add boolean + pkgconfig(babl-0.1) BuildRequires. + +------------------------------------------------------------------- New: ---- 64c6f733a44bac5b7f08445a686c000681f93f5f.patch 9db32c3508a8c5d357a053d5f8278c34b4df18f3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-photos.spec ++++++ --- /var/tmp/diff_new_pack.prIAmR/_old 2023-03-03 22:24:34.354547571 +0100 +++ /var/tmp/diff_new_pack.prIAmR/_new 2023-03-03 22:24:34.362547602 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-photos # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,11 @@ Source0: https://download.gnome.org/sources/gnome-photos/43/%{name}-%{version}.tar.xz # PATCH-NEEDS-REBASE gnome-photos-on-demand-activate-dleyna.patch bsc#992420, glgo#GNOME/gnome-photos#75 sck...@suse.com -- Activate dleyna-renderer-service on demand instead of on start-up. WAS PATCH-FIX-UPSTREAM Patch0: gnome-photos-on-demand-activate-dleyna.patch +# PATCH-FIX-UPSTREAM 64c6f733a44bac5b7f08445a686c000681f93f5f.patch -- Use babl-0.1 +Patch1: https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/64c6f733a44bac5b7f08445a686c000681f93f5f.patch +# PATCH-FIX-UPSTREAM 9db32c3508a8c5d357a053d5f8278c34b4df18f3.patch -- build: accept both babl and babl-0.1 +Patch2: https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/9db32c3508a8c5d357a053d5f8278c34b4df18f3.patch + BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -36,7 +41,7 @@ BuildRequires: libjpeg-devel BuildRequires: pkgconfig BuildRequires: yelp-tools -BuildRequires: pkgconfig(babl) +BuildRequires: (pkgconfig(babl) or pkgconfig(babl-0.1)) BuildRequires: pkgconfig(cairo) >= 1.14.0 BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(exempi-2.0) >= 1.99.5 @@ -88,6 +93,8 @@ %prep %autosetup -N +%patch1 -p1 +%patch2 -p1 %build %meson ++++++ 64c6f733a44bac5b7f08445a686c000681f93f5f.patch ++++++ >From 64c6f733a44bac5b7f08445a686c000681f93f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreaj...@gmail.com> Date: Thu, 15 Dec 2022 22:09:12 +0000 Subject: [PATCH] build: fix babl not found error --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 0a7e8cf0..7fa36f5f 100644 --- a/meson.build +++ b/meson.build @@ -152,7 +152,7 @@ libgd = subproject( ) libgd_dep = libgd.get_variable('libgd_dep') -babl_dep = dependency('babl') +babl_dep = dependency('babl-0.1') cairo_dep = dependency('cairo', version: '>= 1.14.0') gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.36.8') gegl_dep = dependency('gegl-0.4', version: '>= 0.4.0') -- GitLab ++++++ 9db32c3508a8c5d357a053d5f8278c34b4df18f3.patch ++++++ >From 9db32c3508a8c5d357a053d5f8278c34b4df18f3 Mon Sep 17 00:00:00 2001 From: Abderrahim Kitouni <akito...@gnome.org> Date: Sun, 12 Feb 2023 13:13:21 +0100 Subject: [PATCH] build: accept both babl and babl-0.1 The latest release of babl is named babl, while the latest git head is named babl-0.1 Fixes #208 --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 7fa36f5f..a0bd204b 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( version: '43.0', license: 'GPL3+', default_options: 'buildtype=debugoptimized', - meson_version: '>= 0.50.0', + meson_version: '>= 0.60.0', ) photos_prefix = get_option('prefix') @@ -152,7 +152,7 @@ libgd = subproject( ) libgd_dep = libgd.get_variable('libgd_dep') -babl_dep = dependency('babl-0.1') +babl_dep = dependency('babl-0.1', 'babl') cairo_dep = dependency('cairo', version: '>= 1.14.0') gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.36.8') gegl_dep = dependency('gegl-0.4', version: '>= 0.4.0') -- GitLab
