From 6a3dd6b3632b7e44e71ec9be2ba10bad49e2b9c8 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 26 Apr 2012 16:04:52 +0000
Subject: main/gnome-control-center: split out -lang and gmodule link fix

---
 main/gnome-control-center/APKBUILD           | 10 ++++++----
 main/gnome-control-center/link-gmodule.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 main/gnome-control-center/link-gmodule.patch

(limited to 'main')

diff --git a/main/gnome-control-center/APKBUILD b/main/gnome-control-center/APKBUILD
index 3ebe306a6..c7c1417ca 100644
--- a/main/gnome-control-center/APKBUILD
+++ b/main/gnome-control-center/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=gnome-control-center
 pkgver=2.32.1
-pkgrel=4
+pkgrel=5
 pkgdesc="GNOME configuration applets"
 url="http://www.gnome.org"
 arch="all"
@@ -34,8 +34,9 @@ depends_dev="gtk+-dev
 	     libxklavier-dev"
 makedepends="$depends_dev intltool gobject-introspection-dev desktop-file-utils"
 install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
-subpackages=
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
+subpackages="$pkgname-lang"
+source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+	link-gmodule.patch"
 
 _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {
@@ -66,4 +67,5 @@ package() {
 	find "$pkgdir" -name '*.la' -delete
 }
 
-md5sums="b4e8ab5c7556ae07addbfcfb4fa2f761  gnome-control-center-2.32.1.tar.bz2"
+md5sums="b4e8ab5c7556ae07addbfcfb4fa2f761  gnome-control-center-2.32.1.tar.bz2
+ccbfe3d954cc7d0bb91ef081a51793ea  link-gmodule.patch"
diff --git a/main/gnome-control-center/link-gmodule.patch b/main/gnome-control-center/link-gmodule.patch
new file mode 100644
index 000000000..9bf14ec96
--- /dev/null
+++ b/main/gnome-control-center/link-gmodule.patch
@@ -0,0 +1,26 @@
+diff --git a/capplets/appearance/Makefile.in b/capplets/appearance/Makefile.in
+index 4b8df30..9c62c4f 100644
+--- a/capplets/appearance/Makefile.in
++++ b/capplets/appearance/Makefile.in
+@@ -386,7 +386,7 @@ gnome_appearance_properties_LDADD = \
+ 	$(top_builddir)/capplets/common/libcommon.la \
+ 	$(GNOMECC_CAPPLETS_LIBS) \
+ 	$(FONT_CAPPLET_LIBS) \
+-	$(METACITY_LIBS)
++	$(METACITY_LIBS) -lgmodule-2.0
+ 
+ gnome_appearance_properties_LDFLAGS = -export-dynamic
+ gtkbuilderdir = $(pkgdatadir)/ui
+diff --git a/capplets/common/Makefile.in b/capplets/common/Makefile.in
+index 00e594a..5f1849a 100644
+--- a/capplets/common/Makefile.in
++++ b/capplets/common/Makefile.in
+@@ -365,7 +365,7 @@ gnome_theme_test_SOURCES = \
+ 
+ gnome_theme_test_LDADD = \
+ 	libcommon.la							\
+-	$(GNOMECC_CAPPLETS_LIBS)
++	$(GNOMECC_CAPPLETS_LIBS) -lgmodule-2.0
+ 
+ all: all-am
+ 
-- 
cgit v1.2.3