← Back to branch summary

~ubuntu-branches/ubuntu/saucy/libfm/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/90_add_gobject_link.patch

  • Committer: Bazaar Package Importer
  • Author(s): Julien Lavergne
  • Date: 2010-12-02 00:20:44 UTC
  • mfrom: (1.1.5 upstream) (0.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20101202002044-qhja03c1hk95b0q7
Tags: 0.1.14-2ubuntu1
https://launchpad.net/bugs/617655
* Sync with Debian unstable.
 - Fix crash on right click (LP: #617655)
* Ubuntu remaining changes:
 - debian/patches/90_add_gobject_link.patch:
  + From upstream, add "gobject-2.0" in configure.ac explicitly.
 - debian/patches/03_disable_deprecated_gio_module.patch:
  + Disable -DG_DISABLE_DEPRECATED for the gio module to build with glib
    2.27+.
 - debian/control:
  + Add Replaces/Conflicts for libfm0 and libfm-gtk0 (<= 0.1.11-1) to ensure
    migration from lucid.
  + Build-depends on dh-autoreconf.
 - debian/rules:
  + Use dh --with autoreconf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/90_add_gobject_link.patch
 
1
From 1a249bfbc5775bdf7e38e909626c14dff20fc1b9 Mon Sep 17 00:00:00 2001
 
2
From: Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
 
3
Date: Mon, 8 Nov 2010 04:02:06 +0800
 
4
Subject: [PATCH 1/1] List "gobject-2.0" in configure.ac explicitly.
 
5
 
 
6
---
 
7
 configure.ac |    4 ++--
 
8
 1 files changed, 2 insertions(+), 2 deletions(-)
 
9
 
 
10
diff --git a/configure.ac b/configure.ac
 
11
index a9f5e05..790f7b6 100644
 
12
--- a/configure.ac
 
13
+++ b/configure.ac
 
14
@@ -43,12 +43,12 @@ PKG_CHECK_MODULES(GTK, [$pkg_modules])
 
15
 AC_SUBST(GTK_CFLAGS)
 
16
 AC_SUBST(GTK_LIBS)
 
17
 
 
18
-glib_modules="glib-2.0 >= 2.18.0"
 
19
+glib_modules="glib-2.0 >= 2.18.0 gobject-2.0"
 
20
 PKG_CHECK_MODULES(GLIB, [$glib_modules])
 
21
 AC_SUBST(GLIB_CFLAGS)
 
22
 AC_SUBST(GLIB_LIBS)
 
23
 
 
24
-gio_modules="gthread-2.0 gio-unix-2.0 glib-2.0 >= 2.18.0"
 
25
+gio_modules="gthread-2.0 gio-unix-2.0 glib-2.0 >= 2.18.0 gobject-2.0"
 
26
 PKG_CHECK_MODULES(GIO, [$gio_modules])
 
27
 AC_SUBST(GIO_CFLAGS)
 
28
 AC_SUBST(GIO_LIBS)
 
29
-- 
 
30
1.7.0.1
 
31