[gtk-osx] Adapt libglade to newer glibs with a separate gmodule.pc
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Adapt libglade to newer glibs with a separate gmodule.pc
- Date: Sun, 3 Mar 2013 02:30:03 +0000 (UTC)
commit a818abffecfc3582c9c75f37705905b05a200017
Author: John Ralls <jralls ceridwen us>
Date: Wed Feb 20 14:35:19 2013 -0800
Adapt libglade to newer glibs with a separate gmodule.pc
modulesets-stable/gtk-osx-random.modules | 16 +++++++++++++++-
patches/libglade-gmodule.patch | 12 ++++++++++++
2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 1f08246..4d5fa04 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -52,7 +52,10 @@
Libglade itself is deprecated. This is the last release. -->
<autotools id="libglade" autogen-sh="configure">
<branch module="libglade/2.6/libglade-2.6.4.tar.bz2" version="2.6.4"
- md5sum="d1776b40f4e166b5e9c107f1c8fe4139"/>
+ md5sum="d1776b40f4e166b5e9c107f1c8fe4139"
+ autogen-template="autoreconf -fis && %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s
--libdir %(libdir)s %(autogenargs)s>
+ <patch file="file="http://git.gnome.org/browse/gtk-osx/plain/patches/libglade-gmodule.patch" skip="1"/>
+ </branch>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-core"/>
@@ -233,6 +236,17 @@ Libglade itself is deprecated. This is the last release. -->
<dep package="dbus-glib"/>
</dependencies>
</autotools>
+<!-- Still having issues with GConf and gdbus on OSX, this is the last
+ release of GConf that uses glib-dbus. -->
+ <autotools id="gconf2" autogen-sh="configure"
+ autogenargs="--disable-defaults-service">
+ <branch module="GConf/2.28/GConf-2.28.1.tar.bz2" version="2.28.1"
+ hash="sha256:53c477f9086057b0c84816a1c979e01537b862fbcacb6af4b62f8cffec4b3000"/>
+ <dependencies>
+ <dep package="ORBit2"/>
+ <dep package="dbus-glib"/>
+ </dependencies>
+ </autotools>
<autotools id="lcms" autogen-sh="configure">
<branch module="lcms/lcms2-2.4.tar.gz" version="2.4" repo="sourceforge"
diff --git a/patches/libglade-gmodule.patch b/patches/libglade-gmodule.patch
new file mode 100644
index 0000000..2bf5e37
--- /dev/null
+++ b/patches/libglade-gmodule.patch
@@ -0,0 +1,12 @@
+--- a/configure.in 2009-03-17 07:19:01.000000000 -0700
++++ b/configure.in 2013-02-20 14:27:10.000000000 -0800
+@@ -46,7 +46,8 @@
+ libxml-2.0 >= required_libxml_version dnl
+ atk >= required_atk_version dnl
+ gtk+-2.0 >= required_gtk_version dnl
+- glib-2.0 >= required_glib_version])
++ glib-2.0 >= required_glib_version dnl
++ gmodule-2.0])
+
+ AC_MSG_CHECKING([for native Win32])
+ case "$host" in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]