From 99b5bbef2ec9a52067450ef9924515ce46db781b0ad0623d268d6e30e7bef140 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 31 Aug 2017 07:45:44 +0000 Subject: [PATCH 1/3] Accepting request 519621 from GNOME:Next - Migrate to meosn build system: + Add meson BuildRequires: new dependency. + Add xsltproc, gdk-doc and docbook-xsl-stylesheets BuildRequires: new dependencies, as gtk-doc and man pages are no longer pre-built. + Replace configure, make, make_install calls for respective meson, meson_build and meson_install macros. - Drop libjasper-devel BuildRequires: drop JPEG2000 support: it is not enabled per default by upstream. OBS-URL: https://build.opensuse.org/request/show/519621 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=138 --- gdk-pixbuf.changes | 13 +++++++++++++ gdk-pixbuf.spec | 32 ++++++++++++++++---------------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index 6fb82e5..2ecf899 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Aug 22 13:25:02 UTC 2017 - dimstar@opensuse.org + +- Migrate to meosn build system: + + Add meson BuildRequires: new dependency. + + Add xsltproc, gdk-doc and docbook-xsl-stylesheets + BuildRequires: new dependencies, as gtk-doc and man pages are + no longer pre-built. + + Replace configure, make, make_install calls for respective + meson, meson_build and meson_install macros. +- Drop libjasper-devel BuildRequires: drop JPEG2000 support: it is + not enabled per default by upstream. + ------------------------------------------------------------------- Sat Aug 19 17:37:46 UTC 2017 - zaitor@opensuse.org diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 34f0d82..3d308b0 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -18,7 +18,6 @@ # When updating the binary version, do not forget to also update baselibs.conf %define gdk_pixbuf_binary_version 2.10.0 - Name: gdk-pixbuf Version: 2.36.9 Release: 0 @@ -32,16 +31,20 @@ Source2: README.SUSE Source99: baselibs.conf # PATCH-FIX-UPSTREAM u_contrib-gdk-pixbuf-xlib-Fix-rgb888amsb.patch boo#929462 bsc#1010497 bgo#775896 mstaudt@suse.com -- Fix RGBA conversion for big endian X11 environments Patch0: u_contrib-gdk-pixbuf-xlib-Fix-rgb888amsb.patch -BuildRequires: libjasper-devel +BuildRequires: docbook-xsl-stylesheets +BuildRequires: gtk-doc BuildRequires: libjpeg-devel BuildRequires: libtiff-devel -%if !0%{?is_opensuse} -BuildRequires: translation-update-upstream -%endif +BuildRequires: meson +BuildRequires: pkgconfig +BuildRequires: xsltproc BuildRequires: pkgconfig(glib-2.0) >= 2.48.0 BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(x11) +%if !0%{?is_opensuse} +BuildRequires: translation-update-upstream +%endif %description gdk-pixbuf is an image loading library that can be extended by loadable @@ -52,10 +55,10 @@ Clutter. Summary: An image loading library # Provide %%{name} to make the lang package installable Group: System/Libraries -Provides: %{name} = %{version} Requires(post): gdk-pixbuf-query-loaders Recommends: %{name}-lang = %{version} Conflicts: gtk2 < 2.21.3 +Provides: %{name} = %{version} %description -n libgdk_pixbuf-2_0-0 gdk-pixbuf is an image loading library that can be extended by loadable @@ -111,6 +114,7 @@ Clutter. This package contains development files for gdk-pixbuf. %lang_package + %prep %setup -q %if !0%{?is_opensuse} @@ -118,20 +122,16 @@ translation-update-upstream %endif %patch0 -p1 %if "%_lib" == "lib64" -cp -a %{S:2} . +cp -a %{SOURCE2} . %endif %build -%configure \ - --disable-static \ - --enable-introspection \ - --with-libjasper \ - --with-x11 -%{__make} %{?_smp_mflags} +%meson -D with_docs=true +%meson_build %install -%makeinstall -find %{buildroot}%{_libdir} -name '*.la' -delete -print +%meson_install +rm -rf %{buildroot}{%{_libexecdir},%{_datadir}}/installed-tests/ %find_lang %{name} touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders.cache %if "%_lib" == "lib64" @@ -140,7 +140,7 @@ touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders %endif # Install rpm macros mkdir -p %{buildroot}%{_sysconfdir}/rpm -cp %{S:1} %{buildroot}%{_sysconfdir}/rpm +cp %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm ########################################################################### # Note: when updating scriptlets, don't forget to also update baselibs.conf From 2a2947aa96f6f76278dec7242b4e711147f22b7f6ebfe31de222af3573574922 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 9 Sep 2017 10:24:58 +0000 Subject: [PATCH 2/3] Accepting request 522683 from home:jengelh:branches:GNOME:Factory - Update summaries and RPM categories. OBS-URL: https://build.opensuse.org/request/show/522683 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=139 --- gdk-pixbuf.changes | 5 +++++ gdk-pixbuf.spec | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index 2ecf899..e8cb990 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 8 22:35:48 UTC 2017 - jengelh@inai.de + +- Update summaries and RPM categories. + ------------------------------------------------------------------- Tue Aug 22 13:25:02 UTC 2017 - dimstar@opensuse.org diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 3d308b0..8f83899 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -23,7 +23,7 @@ Version: 2.36.9 Release: 0 Summary: An image loading library License: LGPL-2.1+ -Group: System/Libraries +Group: Development/Libraries/GNOME Url: http://www.gnome.org/ Source: https://download.gnome.org/sources/gdk-pixbuf/2.36/%{name}-%{version}.tar.xz Source1: macros.gdk-pixbuf @@ -66,7 +66,7 @@ modules for new image formats. It is used by toolkits such as GTK+ or Clutter. %package -n typelib-1_0-GdkPixbuf-2_0 -Summary: An image loading library -- Introspection bindings +Summary: Introspection bindins for gdk-pixbuf Group: System/Libraries %description -n typelib-1_0-GdkPixbuf-2_0 @@ -77,8 +77,8 @@ Clutter. This package provides the GObject Introspection bindings for gdk-pixbuf. %package query-loaders -Summary: An image loading library - Utility to create loaders cache -Group: System/Libraries +Summary: Utility to create a cache of gdk-pixbuf loaders +Group: System/X11/Utilities %description query-loaders gdk-pixbuf is an image loading library that can be extended by loadable @@ -90,7 +90,7 @@ loadable modules. %package thumbnailer Summary: System helper creating thumbnails -Group: System/Libraries +Group: System/X11/Utilities Supplements: libgdk_pixbuf-2_0-0 %description thumbnailer @@ -101,7 +101,7 @@ Clutter. This package contains the thumbnailer utility. %package devel -Summary: An image loading library - Development Files +Summary: Development files for gdk-pixbuf, an image loading library Group: Development/Languages/C and C++ Requires: libgdk_pixbuf-2_0-0 = %{version} Requires: typelib-1_0-GdkPixbuf-2_0 = %{version} @@ -111,7 +111,7 @@ gdk-pixbuf is an image loading library that can be extended by loadable modules for new image formats. It is used by toolkits such as GTK+ or Clutter. -This package contains development files for gdk-pixbuf. +This package contains the development files for gdk-pixbuf. %lang_package From fe03b549ce5e3b1ace21860ce6793a7f2dc51e32921cf272436d1071461cc52d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 11 Sep 2017 18:22:18 +0000 Subject: [PATCH 3/3] Accepting request 523315 from GNOME:Next New upstream release OBS-URL: https://build.opensuse.org/request/show/523315 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=140 --- gdk-pixbuf-2.36.10.tar.xz | 3 +++ gdk-pixbuf-2.36.9.tar.xz | 3 --- gdk-pixbuf.changes | 9 +++++++++ gdk-pixbuf.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 gdk-pixbuf-2.36.10.tar.xz delete mode 100644 gdk-pixbuf-2.36.9.tar.xz diff --git a/gdk-pixbuf-2.36.10.tar.xz b/gdk-pixbuf-2.36.10.tar.xz new file mode 100644 index 0000000..cde1abf --- /dev/null +++ b/gdk-pixbuf-2.36.10.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace +size 5772196 diff --git a/gdk-pixbuf-2.36.9.tar.xz b/gdk-pixbuf-2.36.9.tar.xz deleted file mode 100644 index d7c63e2..0000000 --- a/gdk-pixbuf-2.36.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8013b271ff1a691514b5bbc9b99f6ed456422d4da4a721a9db0b783abe8e740a -size 5769124 diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index e8cb990..aa24145 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Sep 11 15:55:29 UTC 2017 - zaitor@opensuse.org + +- Update to version 2.36.10: + + build: meson build improvements. + + build: win32 build fixes. + + tests: show error before failing (bgo#786259). + + Updated translations. + ------------------------------------------------------------------- Fri Sep 8 22:35:48 UTC 2017 - jengelh@inai.de diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 8f83899..c11f8f6 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -19,7 +19,7 @@ # When updating the binary version, do not forget to also update baselibs.conf %define gdk_pixbuf_binary_version 2.10.0 Name: gdk-pixbuf -Version: 2.36.9 +Version: 2.36.10 Release: 0 Summary: An image loading library License: LGPL-2.1+