From 096f14f9189ac36c21c27d06efc5d1997b185efb6d76aa484a724d5dd907e709 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 24 Mar 2021 16:31:32 +0000 Subject: [PATCH 1/3] Accepting request 880930 from GNOME:Next GNOME 40 - here we come OBS-URL: https://build.opensuse.org/request/show/880930 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=176 --- _service | 2 +- gdk-pixbuf-2.42.2.zip | 3 --- gdk-pixbuf-2.42.4.zip | 3 +++ gdk-pixbuf.changes | 22 ++++++++++++++++++++++ gdk-pixbuf.spec | 10 ++++++---- 5 files changed, 32 insertions(+), 8 deletions(-) delete mode 100644 gdk-pixbuf-2.42.2.zip create mode 100644 gdk-pixbuf-2.42.4.zip diff --git a/_service b/_service index f64f38f..3420617 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https download.gnome.org - sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.2.tar.xz + sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.4.tar.xz diff --git a/gdk-pixbuf-2.42.2.zip b/gdk-pixbuf-2.42.2.zip deleted file mode 100644 index 377a280..0000000 --- a/gdk-pixbuf-2.42.2.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25ec35113309bede111b7c929950849673141c991bd079f02fd7cc02103a50d1 -size 7771922 diff --git a/gdk-pixbuf-2.42.4.zip b/gdk-pixbuf-2.42.4.zip new file mode 100644 index 0000000..4c92d7a --- /dev/null +++ b/gdk-pixbuf-2.42.4.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3bc6ac5bc949939017fb76b315865b65d6839ced3e8cd2aa7ea0d721a87d0e7 +size 11198676 diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index b1b491f..ba3a49e 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sun Mar 21 15:51:52 UTC 2021 - Dominique Leuenberger + +- Update to version 2.42.4: + + Make enum type registration thread safe. + + Do not install skipped test files. + + Fix GIF initialization. + + Always run GIF loader tests. + + Fix leaks discovered via ASan. + + Expose GdkPixbufLoader API via introspection. + + Fix revert-to-previous first frame behaviour for GIF files. + + Link to libintl if needed. + + Improve support for using gdk-pixbuf as a subproject. + + Fix build with GModule disabled. + + Use gi-docgen to generate the API reference from introspection + data. +- Replace gtk-doc BuildRequires with python3-gi-docgen: follow + upstreams port. +- As a workaround to + https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/177, delete + the installed gi-docgen program files. + ------------------------------------------------------------------- Tue Dec 8 08:24:53 UTC 2020 - dimstar@opensuse.org diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 424be64..97b5d23 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -1,7 +1,7 @@ # # spec file for package gdk-pixbuf # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define gdk_pixbuf_binary_version 2.10.0 Name: gdk-pixbuf -Version: 2.42.2 +Version: 2.42.4 Release: 0 Summary: An image loading library License: LGPL-2.1-or-later @@ -38,11 +38,11 @@ Source3: gdk-pixbuf-rpmlintrc Source99: baselibs.conf BuildRequires: docbook-xsl-stylesheets -BuildRequires: gtk-doc BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: meson >= 0.55.3 BuildRequires: pkgconfig +BuildRequires: python3-gi-docgen BuildRequires: translation-update-upstream BuildRequires: unzip BuildRequires: xsltproc @@ -158,6 +158,8 @@ cp -a %{SOURCE2} . %install %meson_install rm -rf %{buildroot}{%{_libexecdir},%{_datadir}}/installed-tests/ +# https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/177 +rm -r %{buildroot}%{python3_sitelib}/gidocgen %{buildroot}%{_bindir}/gi-docgen %find_lang %{name} touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders.cache %if "%{_lib}" == "lib64" @@ -251,7 +253,7 @@ fi %{_libdir}/*.so %{_datadir}/gir-1.0/GdkPixbuf-2.0.gir %{_datadir}/gir-1.0/GdkPixdata-2.0.gir -%doc %{_datadir}/gtk-doc/html/gdk-pixbuf +%doc %{_datadir}/doc/gdk-pixbuf %{_rpmmacrodir}/macros.gdk-pixbuf %files lang -f %{name}.lang From e3d839af39ee3e4c830fd8f2987755ee856bb027ccd5ad6cbe6c20f3f3b6a112 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 27 Mar 2021 19:56:04 +0000 Subject: [PATCH 2/3] Accepting request 881674 from GNOME:Next - Disable building of docs: creates a cycle with python: + Drop python3-gi-docgen BuildRequires. + Pass gtk_doc=falso to meson OBS-URL: https://build.opensuse.org/request/show/881674 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=177 --- gdk-pixbuf.changes | 7 +++++++ gdk-pixbuf.spec | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index ba3a49e..7f89126 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Mar 27 20:45:00 UTC 2021 - Dominique Leuenberger + +- Disable building of docs: creates a cycle with python: + + Drop python3-gi-docgen BuildRequires. + + Pass gtk_doc=falso to meson + ------------------------------------------------------------------- Sun Mar 21 15:51:52 UTC 2021 - Dominique Leuenberger diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 97b5d23..d3daecb 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -42,7 +42,6 @@ BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: meson >= 0.55.3 BuildRequires: pkgconfig -BuildRequires: python3-gi-docgen BuildRequires: translation-update-upstream BuildRequires: unzip BuildRequires: xsltproc @@ -146,7 +145,7 @@ cp -a %{SOURCE2} . -Djasper=false \ -Dx11=false \ -Dbuiltin_loaders=none \ - -Dgtk_doc=true \ + -Dgtk_doc=false \ -Dintrospection=enabled \ -Dman=true \ -Drelocatable=false \ @@ -158,8 +157,6 @@ cp -a %{SOURCE2} . %install %meson_install rm -rf %{buildroot}{%{_libexecdir},%{_datadir}}/installed-tests/ -# https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/177 -rm -r %{buildroot}%{python3_sitelib}/gidocgen %{buildroot}%{_bindir}/gi-docgen %find_lang %{name} touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders.cache %if "%{_lib}" == "lib64" @@ -253,7 +250,6 @@ fi %{_libdir}/*.so %{_datadir}/gir-1.0/GdkPixbuf-2.0.gir %{_datadir}/gir-1.0/GdkPixdata-2.0.gir -%doc %{_datadir}/doc/gdk-pixbuf %{_rpmmacrodir}/macros.gdk-pixbuf %files lang -f %{name}.lang From 21d1e97cb04e4dd524551eee70ec8dc62f6d6d5f89b2959258b7f247a1000c2a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 27 Mar 2021 21:31:41 +0000 Subject: [PATCH 3/3] Fix typo OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=178 --- gdk-pixbuf.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index 7f89126..3e5f1cc 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -3,7 +3,7 @@ Sat Mar 27 20:45:00 UTC 2021 - Dominique Leuenberger - Disable building of docs: creates a cycle with python: + Drop python3-gi-docgen BuildRequires. - + Pass gtk_doc=falso to meson + + Pass gtk_doc=false to meson ------------------------------------------------------------------- Sun Mar 21 15:51:52 UTC 2021 - Dominique Leuenberger