summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn N. Laliberte <allanonjl@gentoo.org>2006-01-06 17:19:28 +0000
committerJohn N. Laliberte <allanonjl@gentoo.org>2006-01-06 17:19:28 +0000
commitcfece26906bd240ecf63b85aa259a66526255b2b (patch)
tree43c7087ff1e50c7ccb076fd10e3e86b32cd78c21 /gnome-base
parentFix typo in sed, resolves bug #118040. (diff)
downloadhistorical-cfece26906bd240ecf63b85aa259a66526255b2b.tar.gz
historical-cfece26906bd240ecf63b85aa259a66526255b2b.tar.bz2
historical-cfece26906bd240ecf63b85aa259a66526255b2b.zip
patch Makefile to fix #112659
Package-Manager: portage-2.0.53
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/control-center/ChangeLog6
-rw-r--r--gnome-base/control-center/Manifest5
-rw-r--r--gnome-base/control-center/control-center-2.10.2.ebuild9
-rw-r--r--gnome-base/control-center/files/control-center-libkbdraw-fix.patch11
4 files changed, 25 insertions, 6 deletions
diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 29f927a311d7..5ab485ae8b5f 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/control-center
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.151 2006/01/06 13:48:46 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.152 2006/01/06 17:19:27 allanonjl Exp $
+
+ 06 Jan 2006; John N. Laliberte <allanonjl@gentoo.org>
+ +files/control-center-libkbdraw-fix.patch, control-center-2.10.2.ebuild:
+ patch Makefile to fix #112659
06 Jan 2006; Simon Stelling <blubb@gentoo.org>
control-center-1.4.0.5-r2.ebuild:
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index af7f7ab254f7..b385a1633e8d 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,7 +1,7 @@
-MD5 cc5aa087262da32393105c981303ef3a ChangeLog 19824
+MD5 3d8f17aa1715c42a4d9098e3d8339cf8 ChangeLog 19992
MD5 d4f0febb27460c43fb258412acde17b8 control-center-1.4.0.5-r1.ebuild 1333
MD5 5246a0259a781773cba5a47b5bb7568e control-center-1.4.0.5-r2.ebuild 1403
-MD5 f591b4d2e1987a08027ebfa25c396f36 control-center-2.10.2.ebuild 2013
+MD5 b328b2668f71ee382c72bca66bd43a96 control-center-2.10.2.ebuild 2128
MD5 fb5ca50373f5813456ab01b99119916c control-center-2.12.1.ebuild 2523
MD5 a502a31f43aa1fb5344551f604509d43 control-center-2.12.2-r1.ebuild 2577
MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
@@ -12,6 +12,7 @@ MD5 dac847149ae0099bb34f493727bed270 files/control-center-2.12.2-pathfix.patch 6
MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
+MD5 44e1d1d19fe6e69c3bfbf59a3d1ed3f7 files/control-center-libkbdraw-fix.patch 433
MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r2 76
MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
diff --git a/gnome-base/control-center/control-center-2.10.2.ebuild b/gnome-base/control-center/control-center-2.10.2.ebuild
index ce8bcbbf17c9..ad5794cedafd 100644
--- a/gnome-base/control-center/control-center-2.10.2.ebuild
+++ b/gnome-base/control-center/control-center-2.10.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.10.2.ebuild,v 1.14 2005/12/06 07:41:21 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.10.2.ebuild,v 1.15 2006/01/06 17:19:27 allanonjl Exp $
-inherit eutils gnome2
+inherit eutils gnome2 autotools
DESCRIPTION="The gnome2 Desktop configuration tool"
HOMEPAGE="http://www.gnome.org/"
@@ -70,4 +70,7 @@ src_unpack() {
# gnome-theme-installer. bug #84977
epatch ${FILESDIR}/${PN}-2.10.1-pathfix.patch
+ # fix #112659 , adjust include in makefile
+ epatch ${FILESDIR}/${PN}-libkbdraw-fix.patch
+ eautoreconf
}
diff --git a/gnome-base/control-center/files/control-center-libkbdraw-fix.patch b/gnome-base/control-center/files/control-center-libkbdraw-fix.patch
new file mode 100644
index 000000000000..8517c66d9f53
--- /dev/null
+++ b/gnome-base/control-center/files/control-center-libkbdraw-fix.patch
@@ -0,0 +1,11 @@
+--- control-center-2.10.2/libkbdraw/Makefile.am 2005-02-21 11:42:41.000000000 -0500
++++ control-center-2.10.2.new/libkbdraw/Makefile.am 2006-01-06 10:15:03.000000000 -0500
+@@ -19,6 +19,8 @@
+
+ AM_CFLAGS = $(GTK_CFLAGS) -Wall -Werror
+
++INCLUDES = $(FONT_THUMBNAILER_CFLAGS)
++
+ noinst_LIBRARIES = libkbdraw.a
+ libkbdraw_a_SOURCES = keyboard-marshal.c keyboard-marshal.h \
+ keyboard-drawing.c keyboard-drawing.h