[mupen64plus] 188/262: Link directly against gdk-2.0 instead indirectly through gtk+-2.0

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit 1c10e490a1b9628e4c6f51ccdc79e296f45e8e05
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Mon Jun 28 21:51:25 2010 +0200

    Link directly against gdk-2.0 instead indirectly through gtk+-2.0
---
 debian/changelog              |  3 +++
 debian/patches/link_gdk.patch | 21 +++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dab87d8..9bddc83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ mupen64plus (1.5+dfsg1-12) UNRELEASED; urgency=low
   * Use googlecode.debian.net instead of complex own filters for debian/watch
   * Upgraded to policy 3.9.0, no changes required
   * Build only on i386/amd64 because upstream doesn't to support more
+  * debian/patches:
+    - Add link_gdk.patch, Link directly against gdk-2.0 instead indirectly
+      through gtk+-2.0
 
  -- Sven Eckelmann <sven.eckelmann at gmx.de>  Mon, 31 May 2010 21:13:25 +0200
 
diff --git a/debian/patches/link_gdk.patch b/debian/patches/link_gdk.patch
new file mode 100644
index 0000000..1c610ba
--- /dev/null
+++ b/debian/patches/link_gdk.patch
@@ -0,0 +1,21 @@
+Description: Link directly against gdk
+ We use functions of gdk-2.0 directly and thus we should link against
+ it directly instead of indirectly through gtk+2.0
+Author: Sven Eckelmann <sven.eckelmann at gmx.de>
+
+---
+diff --git a/pre.mk b/pre.mk
+index dd6e58fb421deb770402288d1af6da4c2cdc0a17..c567ec6d72fe3a6a31b502d0f83533037749efde 100644
+--- a/pre.mk
++++ b/pre.mk
+@@ -208,8 +208,8 @@ ifneq ("$(shell pkg-config gtk+-2.0 --modversion | head -c 2)", "2.")
+   $(error No GTK 2.x development libraries found!)
+ endif
+ # set GTK flags and libraries
+-GTK_FLAGS	= $(shell pkg-config gtk+-2.0 --cflags)
+-GTK_LIBS	= $(shell pkg-config gtk+-2.0 --libs)
++GTK_FLAGS	= $(shell pkg-config gtk+-2.0 gdk-2.0 --cflags)
++GTK_LIBS	= $(shell pkg-config gtk+-2.0 gdk-2.0 --libs)
+ GTHREAD_LIBS 	= $(shell pkg-config gthread-2.0 --libs)
+ 
+ # test for presence of liblzma
diff --git a/debian/patches/series b/debian/patches/series
index f49b8cb..286fb2e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,3 +41,4 @@ rsp_ucode2_reset.patch
 rsp_hle_bigendian.patch
 rice-crash-vendorstring.patch
 rice-ati-symbols.patch
+link_gdk.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git