diff options
| author |   John N. Laliberte <allanonjl@gentoo.org> | 2006-01-07 14:52:10 +0000 |
|---|---|---|
| committer | John N. Laliberte <allanonjl@gentoo.org> | 2006-01-07 14:52:10 +0000 |
| commit | 6d8f78715f98b06b57e616e605c47c8b7fb08998 (patch) | |
| tree | c479f8b45beaf89e27f9862f78bbeb4de11695b5 /gnome-base/control-center | |
| parent | Initial commit (diff) | |
| download | gentoo-2-6d8f78715f98b06b57e616e605c47c8b7fb08998.tar.gz gentoo-2-6d8f78715f98b06b57e616e605c47c8b7fb08998.tar.bz2 gentoo-2-6d8f78715f98b06b57e616e605c47c8b7fb08998.zip | |
update patch, thanks to Flameeyes for the help.
(Portage version: 2.0.53)
Diffstat (limited to 'gnome-base/control-center')
| -rw-r--r-- | gnome-base/control-center/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/control-center/Manifest | 4 | ||||
| -rw-r--r-- | gnome-base/control-center/files/control-center-libkbdraw-fix.patch | 31 |
3 files changed, 33 insertions, 8 deletions
diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog index 5ab485ae8b5f..1602ee479bc2 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.152 2006/01/06 17:19:27 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.153 2006/01/07 14:52:10 allanonjl Exp $ + + 07 Jan 2006; John N. Laliberte <allanonjl@gentoo.org> + files/control-center-libkbdraw-fix.patch: + update patch, thanks to Flameeyes for the help. 06 Jan 2006; John N. Laliberte <allanonjl@gentoo.org> +files/control-center-libkbdraw-fix.patch, control-center-2.10.2.ebuild: diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest index b385a1633e8d..35a3ee60ea1b 100644 --- a/gnome-base/control-center/Manifest +++ b/gnome-base/control-center/Manifest @@ -1,4 +1,4 @@ -MD5 3d8f17aa1715c42a4d9098e3d8339cf8 ChangeLog 19992 +MD5 78daeb6b9ec467a785f5fd135174d99c ChangeLog 20143 MD5 d4f0febb27460c43fb258412acde17b8 control-center-1.4.0.5-r1.ebuild 1333 MD5 5246a0259a781773cba5a47b5bb7568e control-center-1.4.0.5-r2.ebuild 1403 MD5 b328b2668f71ee382c72bca66bd43a96 control-center-2.10.2.ebuild 2128 @@ -12,7 +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 19f752d2b464cdd5fbbc16d4ae13313e files/control-center-libkbdraw-fix.patch 1482 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/files/control-center-libkbdraw-fix.patch b/gnome-base/control-center/files/control-center-libkbdraw-fix.patch index 8517c66d9f53..8e4a2d84ed03 100644 --- a/gnome-base/control-center/files/control-center-libkbdraw-fix.patch +++ b/gnome-base/control-center/files/control-center-libkbdraw-fix.patch @@ -1,11 +1,32 @@ --- 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 @@ - ++++ control-center-2.10.2.new/libkbdraw/Makefile.am 2006-01-07 08:51:29.000000000 -0500 +@@ -20,6 +20,7 @@ AM_CFLAGS = $(GTK_CFLAGS) -Wall -Werror -+INCLUDES = $(FONT_THUMBNAILER_CFLAGS) -+ noinst_LIBRARIES = libkbdraw.a ++libkbdraw_a_CFLAGS = $(PANGOXFT_CFLAGS) $(GTK_CFLAGS) libkbdraw_a_SOURCES = keyboard-marshal.c keyboard-marshal.h \ keyboard-drawing.c keyboard-drawing.h + +--- control-center-2.10.2/capplets/keyboard/Makefile.am 2005-02-21 11:42:39.000000000 -0500 ++++ control-center-2.10.2.new/capplets/keyboard/Makefile.am 2006-01-07 08:52:14.000000000 -0500 +@@ -11,7 +11,8 @@ + ../accessibility/keyboard/libaccessibility-keyboard.a \ + $(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) \ + ../../libgswitchit/libgswitchit.a \ +- ../../libkbdraw/libkbdraw.a ++ ../../libkbdraw/libkbdraw.a \ ++ $(PANGOXFT_LIBS) + + @INTLTOOL_DESKTOP_RULE@ + +--- control-center-2.10.2/configure.in 2005-07-04 16:31:46.000000000 -0400 ++++ control-center-2.10.2.new/configure.in 2006-01-07 08:27:31.000000000 -0500 +@@ -104,6 +104,7 @@ + PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0) + PKG_CHECK_MODULES(SOUND_CAPPLET, esound) + PKG_CHECK_MODULES(METACITY, libmetacity-private) ++PKG_CHECK_MODULES(PANGOXFT, pangoxft >= 1.10) + PKG_CHECK_MODULES(LIBXKLAVIER, libxklavier >= 1.14,, + AC_MSG_ERROR([gnome-control-center depends on libxklavier. + The latest release is available from http://prdownloads.sourceforge.net/gswitchit], 1)) |