From d561007adc2eef571de987dcc3dbec4c6488a074bd039939616d6130cf389853 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 6 Jan 2011 01:37:04 +0000 Subject: [PATCH 1/2] Accepting request 56830 from home:dimstar:branches:GNOME:Factory thanks OBS-URL: https://build.opensuse.org/request/show/56830 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=19 --- gdk-pixbuf-add-gir_PACKAGES.patch | 28 ++++++++++++++++++++++++++++ gdk-pixbuf.changes | 11 +++++++++++ gdk-pixbuf.spec | 5 +++++ 3 files changed, 44 insertions(+) create mode 100644 gdk-pixbuf-add-gir_PACKAGES.patch diff --git a/gdk-pixbuf-add-gir_PACKAGES.patch b/gdk-pixbuf-add-gir_PACKAGES.patch new file mode 100644 index 0000000..8668321 --- /dev/null +++ b/gdk-pixbuf-add-gir_PACKAGES.patch @@ -0,0 +1,28 @@ +From b68e5328451d5d805c44b2e33f7b0f0565f3a572 Mon Sep 17 00:00:00 2001 +From: Evan Nemerson +Date: Sat, 20 Nov 2010 09:39:07 -0800 +Subject: [PATCH] introspection: Add C include and exported packages information to GIR + +https://bugzilla.gnome.org/show_bug.cgi?id=635364 +--- + gdk-pixbuf/Makefile.am | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am +index d4105d2..72f4aa5 100644 +--- a/gdk-pixbuf/Makefile.am ++++ b/gdk-pixbuf/Makefile.am +@@ -677,7 +677,8 @@ EXTRA_DIST += \ + if HAVE_INTROSPECTION + + GdkPixbuf-2.0.gir: libgdk_pixbuf-2.0.la Makefile +-GdkPixbuf_2_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk ++GdkPixbuf_2_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk --c-include="gdk-pixbuf/gdk-pixdata.h" ++GdkPixbuf_2_0_gir_EXPORT_PACKAGES = gdk-pixbuf-2.0 + GdkPixbuf_2_0_gir_INCLUDES = GModule-2.0 Gio-2.0 + GdkPixbuf_2_0_gir_LIBS = libgdk_pixbuf-2.0.la + GdkPixbuf_2_0_gir_CFLAGS = $(INCLUDES) +-- +1.7.2.3 + + diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index f2a555f..625f008 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Dec 28 22:20:56 UTC 2010 - dimstar@opensuse.org + +- Add gdk-pixbuf-add-gir_PACKAGES.patch: vapigen 0.12 parses the + .gir and the .vapi file, complaining about duplicate definitions. + The error is seen in packages building against gdk-pixgbuf and + using vala-unstable to create own vala bindings. +- Add gnome-common BuildRequires, because the patch touches + Makefile.am +- Add call to gnome-autogen.sh in the build section. + ------------------------------------------------------------------- Sat Nov 6 19:05:40 CET 2010 - dimstar@opensuse.org diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 01ac9a1..3199c6d 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -29,6 +29,9 @@ Source: %{name}-%{version}.tar.bz2 Source1: macros.gdk-pixbuf Source2: README.SUSE Source99: baselibs.conf +# PATCH-FIX-UPSTREAM gdk-pixbuf-add-gir_PACKAGES.patch bgo#635364 dimstar@opensuse.org -- Add gir_PACKAGES. This helps vapigen 0.12 to add proper package information, needed to bind .vapi and .gir files, in case both are installed. +Patch0: gdk-pixbuf-add-gir_PACKAGES.patch +BuildRequires: gnome-common BuildRequires: libjasper-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel @@ -89,8 +92,10 @@ This package contains development files for gdk-pixbuf. %if "%_lib" == "lib64" cp -a %{S:2} . %endif +%patch0 -p1 %build +NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static \ --enable-introspection \ From 895ea4956fba1e38d98259050eb0e4a409070cc9194124e1fab73675520f36ad Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 6 Jan 2011 01:37:55 +0000 Subject: [PATCH 2/2] Accepting request 57218 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/57218 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=20 --- gdk-pixbuf.changes | 5 ++--- gdk-pixbuf.spec | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index 625f008..f81e152 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -3,11 +3,10 @@ Tue Dec 28 22:20:56 UTC 2010 - dimstar@opensuse.org - Add gdk-pixbuf-add-gir_PACKAGES.patch: vapigen 0.12 parses the .gir and the .vapi file, complaining about duplicate definitions. - The error is seen in packages building against gdk-pixgbuf and + The error is seen in packages building against gdk-pixbuf and using vala-unstable to create own vala bindings. - Add gnome-common BuildRequires, because the patch touches - Makefile.am -- Add call to gnome-autogen.sh in the build section. + Makefile.am, and call to gnome-autogen.sh in the build section. ------------------------------------------------------------------- Sat Nov 6 19:05:40 CET 2010 - dimstar@opensuse.org diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 3199c6d..d5909c8 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -31,6 +31,7 @@ Source2: README.SUSE Source99: baselibs.conf # PATCH-FIX-UPSTREAM gdk-pixbuf-add-gir_PACKAGES.patch bgo#635364 dimstar@opensuse.org -- Add gir_PACKAGES. This helps vapigen 0.12 to add proper package information, needed to bind .vapi and .gir files, in case both are installed. Patch0: gdk-pixbuf-add-gir_PACKAGES.patch +# Needed for patch0 BuildRequires: gnome-common BuildRequires: libjasper-devel BuildRequires: libjpeg-devel @@ -95,6 +96,7 @@ cp -a %{S:2} . %patch0 -p1 %build +# Needed for patch0 NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static \