- outdated

Changed files:
    control-center-pangoxft_fix.patch -> 1.2
    control-center-xft-hack.patch -> 1.2

diff --git a/control-center-pangoxft_fix.patch b/control-center-pangoxft_fix.patch
deleted file mode 100644 (file)
index a858083..0000000
--- a/control-center-pangoxft_fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -aurN control-center-2.11.91.orig/capplets/keyboard/Makefile.am control-center-2.11.91/capplets/keyboard/Makefile.am
---- control-center-2.11.91.orig/capplets/keyboard/Makefile.am  2004-11-28 09:14:04.000000000 +0100
-+++ control-center-2.11.91/capplets/keyboard/Makefile.am       2005-08-14 23:24:03.000000000 +0200
-@@ -10,6 +10,7 @@
- gnome_keyboard_properties_LDADD =                             \
-       ../accessibility/keyboard/libaccessibility-keyboard.a   \
-       $(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) \
-+      $(PANGOXFT_LIBS) \
-       ../../libgswitchit/libgswitchit.a \
-       ../../libkbdraw/libkbdraw.a
- 
-@@ -29,6 +30,6 @@
- Desktop_in_files = keyboard.desktop.in
- desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
- 
--INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBXKLAVIER_CFLAGS)
-+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBXKLAVIER_CFLAGS) $(PANGOXFT_CFLAGS)
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
- EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA)
-diff -aurN control-center-2.11.91.orig/configure.in control-center-2.11.91/configure.in
---- control-center-2.11.91.orig/configure.in   2005-08-10 11:45:08.000000000 +0200
-+++ control-center-2.11.91/configure.in        2005-08-14 23:18:51.000000000 +0200
-@@ -97,6 +97,11 @@
-  libbonobo-2.0 dnl
-  libbonoboui-2.0 dnl
-  gnome-desktop-2.0 >= 2.2.0"
-+
-+PKG_CHECK_MODULES(PANGOXFT, pangoxft >= 1.9.1)
-+AC_SUBST(PANGOXFT_CFLAGS)
-+AC_SUBST(PANGOXFT_LIBS)
-+
- PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
- PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.11.1)
- PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON,

diff --git a/control-center-xft-hack.patch b/control-center-xft-hack.patch
deleted file mode 100644 (file)
index 4ac6de8..0000000
--- a/control-center-xft-hack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- control-center-2.11.6/configure.in.wiget   2005-07-14 07:31:49.000000000 +0000
-+++ control-center-2.11.6/configure.in 2005-07-14 07:33:52.000000000 +0000
-@@ -19,7 +19,7 @@
- 
- m4_define(gnomevfs_minver, 2.0.0)
- m4_define(fontconfig_minver, 1.0.0)
--m4_define(xft_minver, 2.1.7)
-+m4_define(xft_minver, 2.1.2.2)
- m4_define(gtk_minver, 2.6.0)
- m4_define(libbonobo_minver, 2.0.0)
- m4_define(libgnomeui_minver, 2.2.0)