Package: pidgin-skype
Version: 20110407+svn612+dfsg-1
Severity: serious
Tags: patch
Justification: fails to build from source
User: multiarch-de...@lists.alioth.debian.org
Usertags: origin-ubuntu oneiric ubuntu-patch multiarch
pidgin-skype currently has include paths hard coded which break with multiarch.
Rather than hardcoding multiarch paths, this patch makes use of pkg-config
* Use pkg-config to find glib and dbus include paths (LP: #756174)
- add debian/patches/use-pkg-config.patch
- update debian/patches/series
* Add libdbus-1-dev and pkg-config to build-deps
- update debian/control
Thanks for considering the patch.
-- System Information:
Debian Release: squeeze/sid
APT prefers natty-updates
APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500,
'natty-proposed'), (500, 'natty'), (100, 'natty-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.38-11-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru pidgin-skype-20110407+svn612+dfsg/debian/changelog pidgin-skype-20110407+svn612+dfsg/debian/changelog
diff -Nru pidgin-skype-20110407+svn612+dfsg/debian/control pidgin-skype-20110407+svn612+dfsg/debian/control
--- pidgin-skype-20110407+svn612+dfsg/debian/control 2011-04-10 19:01:15.000000000 -0500
+++ pidgin-skype-20110407+svn612+dfsg/debian/control 2011-07-20 20:44:59.000000000 -0500
@@ -1,9 +1,9 @@
Source: pidgin-skype
Section: contrib/net
Priority: optional
+Maintainer: Gabriele Giacone <1o5g4...@gmail.com>
Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev,
- libpurple-dev (>= 2.1.1), libx11-dev, librsvg2-bin
+ libpurple-dev (>= 2.1.1), libx11-dev, librsvg2-bin, libdbus-1-dev, pkg-config
Standards-Version: 3.9.2
DM-Upload-Allowed: yes
Homepage: http://eion.robbmob.com/
diff -Nru pidgin-skype-20110407+svn612+dfsg/debian/patches/series pidgin-skype-20110407+svn612+dfsg/debian/patches/series
--- pidgin-skype-20110407+svn612+dfsg/debian/patches/series 2011-04-10 19:01:15.000000000 -0500
+++ pidgin-skype-20110407+svn612+dfsg/debian/patches/series 2011-07-20 20:42:00.000000000 -0500
@@ -1 +1,2 @@
00Makefile
+use-pkg-config.patch
diff -Nru pidgin-skype-20110407+svn612+dfsg/debian/patches/use-pkg-config.patch pidgin-skype-20110407+svn612+dfsg/debian/patches/use-pkg-config.patch
--- pidgin-skype-20110407+svn612+dfsg/debian/patches/use-pkg-config.patch 1969-12-31 18:00:00.000000000 -0600
+++ pidgin-skype-20110407+svn612+dfsg/debian/patches/use-pkg-config.patch 2011-07-24 02:59:04.000000000 -0500
@@ -0,0 +1,19 @@
+Description: Use pkg-config to find include paths
+ We can use pkg-config to find the dbus and glib include paths
+ instead of hard coding them so the build doesn't break w/multiarch.
+Author: Micah Gersten <mic...@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/756174
+
+--- pidgin-skype-20110407+svn612+dfsg.orig/Makefile
++++ pidgin-skype-20110407+svn612+dfsg/Makefile
+@@ -6,8 +6,8 @@ WIN32_COMPILER = /usr/bin/i586-mingw32-g
+ LINUX_ARM_COMPILER = arm-none-linux-gnueabi-gcc
+
+ LIBPURPLE_CFLAGS = -I/usr/include/libpurple -DPURPLE_PLUGINS -DENABLE_NLS
+-GLIB_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib64/glib-2.0/include -I/usr/include
+-DBUS_CFLAGS = -DSKYPE_DBUS -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/lib64/dbus-1.0/include
++GLIB_CFLAGS = `pkg-config --cflags glib-2.0` -I/usr/include
++DBUS_CFLAGS = -DSKYPE_DBUS `pkg-config --cflags dbus-1`
+ WIN32_DEV_DIR = /root/pidgin/win32-dev
+ WIN32_PIDGIN_DIR = /root/pidgin/pidgin-2.6.1
+ WIN32_CFLAGS = -DPURPLE_PLUGINS -DENABLE_NLS -I${WIN32_DEV_DIR}/gtk_2_0/include/glib-2.0 -I${WIN32_PIDGIN_DIR}/libpurple/win32 -I${WIN32_PIDGIN_DIR}/libpurple -I${WIN32_DEV_DIR}/gtk_2_0/include -I${WIN32_DEV_DIR}/gtk_2_0/include/glib-2.0 -I${WIN32_DEV_DIR}/gtk_2_0/lib/glib-2.0/include
