Accepting request 57531 from GNOME:Factory

Accepted submit request 57531 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/57531
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdk-pixbuf?expand=0&rev=5

gdk-pixbuf-add-gir_PACKAGES.patch

@@ -0,0 +1,28 @@
+From b68e5328451d5d805c44b2e33f7b0f0565f3a572 Mon Sep 17 00:00:00 2001
+From: Evan Nemerson <evan@coeus-group.com>
+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
+
+

gdk-pixbuf.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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-pixbuf and
+  using vala-unstable to create own vala bindings.
+- Add gnome-common BuildRequires, because the patch touches
+  Makefile.am, and call to gnome-autogen.sh in the build section.
+
 -------------------------------------------------------------------
 Sat Nov  6 19:05:40 CET 2010 - dimstar@opensuse.org
 

gdk-pixbuf.spec

@@ -29,6 +29,10 @@ 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
+# Needed for patch0
+BuildRequires:  gnome-common
 BuildRequires:  libjasper-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
@@ -89,8 +93,11 @@ This package contains development files for gdk-pixbuf.
 %if "%_lib" == "lib64"
 cp -a %{S:2} .
 %endif
+%patch0 -p1
 
 %build
+# Needed for patch0
+NOCONFIGURE=1 gnome-autogen.sh
 %configure \
         --disable-static \
         --enable-introspection \