applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove pangoxft

Browse source
This commit is contained in:
Sergey V. Udaltsov 2005-08-23 23:56:37 +00:00
parent 18a0fc9b3c
commit b5329ba990
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-08-24 Sergey V. Udaltsov <svu@gnome.org>
* configure.in, Makefile.am, capplets/keyboard/Makefile.am:
fixing #313368, no more pangoxft
2005-08-22 Sebastien Bacher <seb128@debian.org> 2005-08-22 Sebastien Bacher <seb128@debian.org>
* configure.in: update to 2.12.0. * configure.in: update to 2.12.0.

2
capplets/keyboard/Makefile.am
View file

@ -9,7 +9,7 @@ gnome_keyboard_properties_SOURCES = gnome-keyboard-properties.c \
gnome-keyboard-properties-xkb.h gnome-keyboard-properties-xkb.h
gnome_keyboard_properties_LDADD = \ gnome_keyboard_properties_LDADD = \
../accessibility/keyboard/libaccessibility-keyboard.a \ ../accessibility/keyboard/libaccessibility-keyboard.a \
$(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) $(PANGOXFT_LIBS) \ $(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) \
../../libgswitchit/libgswitchit.a \ ../../libgswitchit/libgswitchit.a \
../../libkbdraw/libkbdraw.a ../../libkbdraw/libkbdraw.a

6
configure.in
View file

@ -23,7 +23,7 @@ GNOME_DOC_INIT
m4_define(gnomevfs_minver, 2.0.0) m4_define(gnomevfs_minver, 2.0.0)
m4_define(fontconfig_minver, 1.0.0) m4_define(fontconfig_minver, 1.0.0)
m4_define(xft_minver, 2.1.7) m4_define(xft_minver, 2.1.2)
m4_define(gtk_minver, 2.6.0) m4_define(gtk_minver, 2.6.0)
m4_define(libbonobo_minver, 2.0.0) m4_define(libbonobo_minver, 2.0.0)
m4_define(libgnomeui_minver, 2.2.0) m4_define(libgnomeui_minver, 2.2.0)
@ -98,7 +98,7 @@ COMMON_MODULES="gtk+-2.0 >= 2.3.0 dnl
libbonoboui-2.0 dnl libbonoboui-2.0 dnl
gnome-desktop-2.0 >= 2.2.0" gnome-desktop-2.0 >= 2.2.0"
PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.11.1) PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON,
[gtk+-2.0 gconf-2.0 libgnomeui-2.0 esound gnome-desktop-2.0 libglade-2.0]) [gtk+-2.0 gconf-2.0 libgnomeui-2.0 esound gnome-desktop-2.0 libglade-2.0])
PKG_CHECK_MODULES(OLD_CAPPLET, libgnomeui-2.0 libglade-2.0) PKG_CHECK_MODULES(OLD_CAPPLET, libgnomeui-2.0 libglade-2.0)
@ -126,8 +126,6 @@ PKG_CHECK_MODULES(FONT_CAPPLET, $COMMON_MODULES $xft_modules)
PKG_CHECK_MODULES(AT_CAPPLET, $COMMON_MODULES) PKG_CHECK_MODULES(AT_CAPPLET, $COMMON_MODULES)
PKG_CHECK_MODULES(PANGOXFT, pangoxft >= 1.8)
dnl dnl
dnl Check for XRandR, needed for display capplet dnl Check for XRandR, needed for display capplet
dnl dnl