patches/gnome-settings-daemon-06-xft.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 14808 ef078fe5db12
child 22162 28963895fef8
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11619
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     1
diff -up gnome-settings-daemon-2.21.5/config.h.in.orig gnome-settings-daemon-2.21.5/config.h.in
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     2
--- gnome-settings-daemon-2.21.5/config.h.in.orig	2008-01-24 07:29:51.136459000 +0000
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     3
+++ gnome-settings-daemon-2.21.5/config.h.in	2008-01-24 07:32:05.292550000 +0000
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     4
@@ -54,6 +54,9 @@
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     5
 /* Define to 1 if you have the <unistd.h> header file. */
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     6
 #undef HAVE_UNISTD_H
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     7
 
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     8
+/* Define if Xft functionality is available */
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     9
+#undef HAVE_XFT2
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    10
+
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    11
 /* Define to 1 if you have the <X11/extensions/xf86misc.h> header file. */
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    12
 #undef HAVE_X11_EXTENSIONS_XF86MISC_H
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    13
 
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    14
14808
ef078fe5db12 2008-12-24 Dave Lin <[email protected]>
davelam
parents: 11619
diff changeset
    15
--- gnome-settings-daemon-2.25.2/configure.ac.ori	2008-12-24 08:27:48.785545893 +0000
ef078fe5db12 2008-12-24 Dave Lin <[email protected]>
davelam
parents: 11619
diff changeset
    16
+++ gnome-settings-daemon-2.25.2/configure.ac	2008-12-24 08:30:24.733312829 +0000
ef078fe5db12 2008-12-24 Dave Lin <[email protected]>
davelam
parents: 11619
diff changeset
    17
@@ -113,6 +113,16 @@
11619
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    18
 dnl - X11 stuff
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    19
 dnl ---------------------------------------------------------------------------
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    20
 
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    21
+dnl
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    22
+dnl Check for Xft version 2; we build in extra functionality to the font capplet
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    23
+dnl when we have it.
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    24
+dnl
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    25
+xft_modules=
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    26
+if $PKG_CONFIG --exists xft ; then
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    27
+  xft_modules="xft"
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    28
+  AC_DEFINE(HAVE_XFT2,,[Define if Xft functionality is available])
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    29
+fi
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    30
+
14808
ef078fe5db12 2008-12-24 Dave Lin <[email protected]>
davelam
parents: 11619
diff changeset
    31
 # Like AC_CHECK_HEADERS, but it uses the already-computed -I directories.
11619
142af4376d61 2008-02-12 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    32
 #
14808
ef078fe5db12 2008-12-24 Dave Lin <[email protected]>
davelam
parents: 11619
diff changeset
    33
 AC_DEFUN([AC_CHECK_X_HEADERS], [