Package: sary-ruby
Version: 1.2.0-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
*** /tmp/tmpgerdwh
In Ubuntu, the attached patch was applied to achieve the following:
* Add patch to fix FTBFS caused by non-explicit glib-2.0 dependency.
(LP: #755960)
This does not cause FTBFS on Debian yet, but it will if/when glib-2.0 is moved
to a multi-arch setup. The patch builds and functions correctly on sid.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-9-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/changelog'
=== added file 'debian/patches/00list'
--- debian/patches/00list 1970-01-01 00:00:00 +0000
+++ debian/patches/00list 2011-09-12 18:36:55 +0000
@@ -0,0 +1 @@
+50_fix_multiarch_ftbfs.dpatch
=== added file 'debian/patches/50_fix_multiarch_ftbfs.dpatch'
--- debian/patches/50_fix_multiarch_ftbfs.dpatch 1970-01-01 00:00:00
+0000
+++ debian/patches/50_fix_multiarch_ftbfs.dpatch 2011-09-12 18:35:06
+0000
@@ -0,0 +1,39 @@
+#!/bin/sh -e
+## 50_fix_multiarch_ftbfs.dpatch.dpatch by Clint Byrum <cl...@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fails to build because it can't find glib-2.0
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as
argument"
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+=== modified file 'extconf.rb'
+--- a/extconf.rb 2004-01-08 20:13:07 +0000
++++ b/extconf.rb 2011-09-12 18:06:43 +0000
+@@ -15,7 +15,9 @@
+ ENV['PKG_CONFIG_PATH'] = '/usr/local/lib/pkgconfig/'
+ end
+
++$CFLAGS += ' ' + `#{pkg_config} glib-2.0 --cflags`.chomp
+ $CFLAGS += ' ' + `#{pkg_config} sary --cflags`.chomp
++$LDFLAGS += ' ' + `#{pkg_config} glib-2.0 --libs`.chomp
+ $LDFLAGS += ' ' + `#{pkg_config} sary --libs`.chomp
+
+ if have_header('sary.h') &&
+
