SF.net SVN: gar:[22370] csw/mgar/pkg/gtk2/trunk
Maciej (Matchek) Bliziński
maciej at opencsw.org
Wed Jan 1 12:33:54 CET 2014
[+raos directly]
2013/12/31 Laurent Blume <laurent at opencsw.org>
> Hello,
>
> I'm not sure if this is directly related to that commit: I've noticed that
> input method doesn't work anymore for me in at least 2 CSW GTK2 apps where
> it used to work, gvim and pidgin.
>
> Ie, when I set the IM to Chinese, nothing happens, input keeps being the
> direct key symbols. It still works fine in Solaris 10's GNOME apps.
>
> I've set this environment variable:
> GTK_IM_MODULE=xim
>
> A little tinkering and some truss shows no attempt at all of using
> /etc/opt/csw/gtk-2.0/gtk.immodules.
>
> Any idea?
>
> Laurent
>
>
> Le 2013/12/31 16:17 +0100, guengel a écrit:
>
> Revision: 22370
>> http://gar.svn.sourceforge.net/gar/?rev=22370&view=rev
>> Author: guengel
>> Date: 2013-11-04 12:15:31 +0000 (Mon, 04 Nov 2013)
>> Log Message:
>> -----------
>> gtk2/trunk: Updated patch files. Fixed error in post-merge, resulting in
>> etc/csw/64/64 directory. Minor changes.
>>
>> Modified Paths:
>> --------------
>> csw/mgar/pkg/gtk2/trunk/Makefile
>> csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall
>>
>> Added Paths:
>> -----------
>> csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch
>>
>> Removed Paths:
>> -------------
>> csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-
>> line-option.patch
>> csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch
>>
>> Modified: csw/mgar/pkg/gtk2/trunk/Makefile
>> ===================================================================
>> --- csw/mgar/pkg/gtk2/trunk/Makefile 2013-11-04 09:54:03 UTC (rev
>> 22369)
>> +++ csw/mgar/pkg/gtk2/trunk/Makefile 2013-11-04 12:15:31 UTC (rev
>> 22370)
>> @@ -26,13 +26,8 @@
>> EXPANDVARS = CSWgtk2.postinstall
>>
>> # This makes the tests work in the first place
>> -#PATCHFILES += 0002-Use-absolute-path-to-Xvfb.patch
>> +PATCHFILES += 0000-Use-absolute-path-to-Xvfb.patch
>>
>> -# This patch adds a command line option `--update-modules` to
>> -# gtk-query-immodules-2.0 which has the default location of
>> -# gtk.immodules hardcoded and takes 32/64bit ISAs into account.
>> -PATCHFILES += 0001-Add-update-modules-cmd-line-option.patch
>> -
>> PATCHFILES += 0000-Disable-gtk_test_create_
>> widget-g_type_from_name-GtkT.patch
>>
>> PATCHFILES += 0003-Adjust-hardcoded-path-to-opt-csw-share.patch
>> @@ -191,8 +186,6 @@
>> CHECKPKG_OVERRIDES_CSWlibgtk2-dev += missing-dependency|CSWlibglib2-0-0
>>
>>
>> -
>> -
>> PACKAGES += CSWgtk2doc
>> SPKG_DESC_CSWgtk2doc = $(DESCRIPTION), Documentation
>> ARCHALL_CSWgtk2doc = 1
>> @@ -219,6 +212,9 @@
>> BUILD_DEP_PKGS += CSWlibpng-dev
>> BUILD_DEP_PKGS += CSWfontconfig-dev
>> BUILD_DEP_PKGS += CSWlibfreetype-dev
>> +BUILD_DEP_PKGS += CSWlibgcrypt-dev
>> +BUILD_DEP_PKGS += CSWlibgpg-error-dev
>> +BUILD_DEP_PKGS += CSWlibgnutls-dev
>> # Needed to make a test work
>> BUILD_DEP_PKGS += CSWgamin
>> # Used to adjust documentation
>> @@ -244,8 +240,8 @@
>> include gar/category.mk
>>
>> post-merge:
>> - ginstall -d $(PKGROOT)$(sysconfdir)/64/gtk-2.0
>> - ginstall $(PKGROOT)$(sysconfdir)/gtk-2.0/im-multipress.conf
>> $(PKGROOT)$(sysconfdir)/64/gtk-2.0/
>> + ginstall -d $(PKGROOT)$(sysconfdir)/gtk-2.0
>> + [ -f $(PKGROOT)$(sysconfdir)/gtk-2.0/im-multipress.conf ] ||
>> ginstall $(PKGROOT)/etc/opt/csw/gtk-2.0/im-multipress.conf
>> $(PKGROOT)$(sysconfdir)/gtk-2.0/
>> gsed -i -e 's|/usr/share/|$(sharedstatedir)/|g' \
>> -e 's|/usr/lib|$(libdir)|g' \
>> -e 's|/usr/include|$(includedir)|g' `find
>> $(PKGROOT)$(sharedstatedir)/gtk-doc -type f`
>>
>> Added: csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch
>> ===================================================================
>> --- csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch
>> (rev 0)
>> +++ csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch
>> 2013-11-04 12:15:31 UTC (rev 22370)
>> @@ -0,0 +1,1136 @@
>> +From ee4b41c24742a456a5d772bb648d2f1c7b5a9c89 Mon Sep 17 00:00:00 2001
>> +From: Rafael Ostertag <rafi at guengel.ch>
>> +Date: Mon, 4 Nov 2013 11:01:39 +0100
>> +Subject: [PATCH] Use absolute path to Xvfb
>> +
>> +---
>> + Makefile.decl | 6 +++---
>> + Makefile.in | 6 +++---
>> + build/Makefile.in | 6 +++---
>> + build/win32/Makefile.in | 6 +++---
>> + build/win32/vs10/Makefile.in | 6 +++---
>> + build/win32/vs9/Makefile.in | 6 +++---
>> + demos/Makefile.in | 6 +++---
>> + demos/gtk-demo/Makefile.in | 6 +++---
>> + docs/Makefile.in | 6 +++---
>> + docs/faq/Makefile.in | 6 +++---
>> + docs/reference/Makefile.in | 6 +++---
>> + docs/reference/gdk/Makefile.in | 6 +++---
>> + docs/reference/gtk/Makefile.in | 6 +++---
>> + docs/reference/libgail-util/Makefile.in | 6 +++---
>> + docs/tools/Makefile.in | 6 +++---
>> + docs/tutorial/Makefile.in | 6 +++---
>> + gdk/Makefile.in | 6 +++---
>> + gdk/directfb/Makefile.in | 6 +++---
>> + gdk/quartz/Makefile.in | 6 +++---
>> + gdk/tests/Makefile.in | 6 +++---
>> + gdk/win32/Makefile.in | 6 +++---
>> + gdk/win32/rc/Makefile.in | 6 +++---
>> + gdk/x11/Makefile.in | 6 +++---
>> + gtk/Makefile.in | 6 +++---
>> + gtk/tests/Makefile.in | 6 +++---
>> + gtk/theme-bits/Makefile.in | 6 +++---
>> + m4macros/Makefile.in | 6 +++---
>> + modules/Makefile.in | 6 +++---
>> + modules/engines/Makefile.in | 6 +++---
>> + modules/engines/ms-windows/Makefile.in | 6 +++---
>> + modules/engines/ms-windows/Theme/Makefile.in | 6 +++---
>> + modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in | 6 +++---
>> + modules/engines/pixbuf/Makefile.in | 6 +++---
>> + modules/input/Makefile.in | 6 +++---
>> + modules/other/Makefile.in | 6 +++---
>> + modules/other/gail/Makefile.in | 6 +++---
>> + modules/other/gail/libgail-util/Makefile.in | 6 +++---
>> + modules/other/gail/tests/Makefile.in | 6 +++---
>> + modules/printbackends/Makefile.in | 6 +++---
>> + modules/printbackends/cups/Makefile.in | 6 +++---
>> + modules/printbackends/file/Makefile.in | 6 +++---
>> + modules/printbackends/lpr/Makefile.in | 6 +++---
>> + modules/printbackends/test/Makefile.in | 6 +++---
>> + perf/Makefile.in | 6 +++---
>> + tests/Makefile.in | 6 +++---
>> + 45 files changed, 135 insertions(+), 135 deletions(-)
>> +
>> +diff --git a/Makefile.decl b/Makefile.decl
>> +index 2f6c579..46a9864 100644
>> +--- a/Makefile.decl
>> ++++ b/Makefile.decl
>> +@@ -9,8 +9,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -25,7 +25,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> + # call as: $(XVFB_START) && someprogram
>> +
>> +diff --git a/Makefile.in b/Makefile.in
>> +index 14be894..144c7bd 100644
>> +--- a/Makefile.in
>> ++++ b/Makefile.in
>> +@@ -531,8 +531,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -549,7 +549,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + SRC_SUBDIRS = gdk gtk modules demos tests perf
>> +diff --git a/build/Makefile.in b/build/Makefile.in
>> +index 76c8e1f..c3f8dc2 100644
>> +--- a/build/Makefile.in
>> ++++ b/build/Makefile.in
>> +@@ -415,8 +415,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -433,7 +433,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + SUBDIRS = \
>> +diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in
>> +index 8a82342..7ea9e7f 100644
>> +--- a/build/win32/Makefile.in
>> ++++ b/build/win32/Makefile.in
>> +@@ -415,8 +415,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -433,7 +433,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + SUBDIRS = \
>> +diff --git a/build/win32/vs10/Makefile.in b/build/win32/vs10/Makefile.in
>> +index f0981dc..a42270f 100644
>> +--- a/build/win32/vs10/Makefile.in
>> ++++ b/build/win32/vs10/Makefile.in
>> +@@ -361,8 +361,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -379,7 +379,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + all: all-am
>> +diff --git a/build/win32/vs9/Makefile.in b/build/win32/vs9/Makefile.in
>> +index 00013d5..8f49c62 100644
>> +--- a/build/win32/vs9/Makefile.in
>> ++++ b/build/win32/vs9/Makefile.in
>> +@@ -357,8 +357,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -375,7 +375,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + all: all-am
>> +diff --git a/demos/Makefile.in b/demos/Makefile.in
>> +index 6e896b4..66ac0ee 100644
>> +--- a/demos/Makefile.in
>> ++++ b/demos/Makefile.in
>> +@@ -476,8 +476,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -494,7 +494,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + SUBDIRS = gtk-demo
>> +diff --git a/demos/gtk-demo/Makefile.in b/demos/gtk-demo/Makefile.in
>> +index 25ba622..bd320c5 100644
>> +--- a/demos/gtk-demo/Makefile.in
>> ++++ b/demos/gtk-demo/Makefile.in
>> +@@ -457,8 +457,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -475,7 +475,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + democodedir = $(datadir)/gtk-2.0/demo
>> +diff --git a/docs/Makefile.in b/docs/Makefile.in
>> +index adceca2..7eae1b6 100644
>> +--- a/docs/Makefile.in
>> ++++ b/docs/Makefile.in
>> +@@ -419,8 +419,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -437,7 +437,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + SUBDIRS = tutorial faq reference tools
>> +diff --git a/docs/faq/Makefile.in b/docs/faq/Makefile.in
>> +index 6f896a7..aaea95f 100644
>> +--- a/docs/faq/Makefile.in
>> ++++ b/docs/faq/Makefile.in
>> +@@ -355,8 +355,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -373,7 +373,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + all: all-am
>> +diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in
>> +index 86aa70f..46c1dc4 100644
>> +--- a/docs/reference/Makefile.in
>> ++++ b/docs/reference/Makefile.in
>> +@@ -415,8 +415,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -433,7 +433,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + SUBDIRS = gdk gtk libgail-util
>> +diff --git a/docs/reference/gdk/Makefile.in
>> b/docs/reference/gdk/Makefile.in
>> +index 0a5771c..4cb237f 100644
>> +--- a/docs/reference/gdk/Makefile.in
>> ++++ b/docs/reference/gdk/Makefile.in
>> +@@ -362,8 +362,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -380,7 +380,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + AUTOMAKE_OPTIONS = 1.6
>> +diff --git a/docs/reference/gtk/Makefile.in
>> b/docs/reference/gtk/Makefile.in
>> +index c4e031d..399da26 100644
>> +--- a/docs/reference/gtk/Makefile.in
>> ++++ b/docs/reference/gtk/Makefile.in
>> +@@ -393,8 +393,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -411,7 +411,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + AUTOMAKE_OPTIONS = 1.6
>> +diff --git a/docs/reference/libgail-util/Makefile.in
>> b/docs/reference/libgail-util/Makefile.in
>> +index ea6f06a..9be07c9 100644
>> +--- a/docs/reference/libgail-util/Makefile.in
>> ++++ b/docs/reference/libgail-util/Makefile.in
>> +@@ -362,8 +362,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -380,7 +380,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + AUTOMAKE_OPTIONS = 1.7
>> +diff --git a/docs/tools/Makefile.in b/docs/tools/Makefile.in
>> +index 77d105a..72951ee 100644
>> +--- a/docs/tools/Makefile.in
>> ++++ b/docs/tools/Makefile.in
>> +@@ -409,8 +409,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -427,7 +427,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + INCLUDES = \
>> +diff --git a/docs/tutorial/Makefile.in b/docs/tutorial/Makefile.in
>> +index d606fc0..5300503 100644
>> +--- a/docs/tutorial/Makefile.in
>> ++++ b/docs/tutorial/Makefile.in
>> +@@ -366,8 +366,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -384,7 +384,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + all: all-am
>> +diff --git a/gdk/Makefile.in b/gdk/Makefile.in
>> +index 954c755..6ea19a5 100644
>> +--- a/gdk/Makefile.in
>> ++++ b/gdk/Makefile.in
>> +@@ -752,8 +752,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -770,7 +770,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + INTROSPECTION_GIRS = $(am__append_1) $(am__append_2)
>> +diff --git a/gdk/directfb/Makefile.in b/gdk/directfb/Makefile.in
>> +index ccda1b7..34dc589 100644
>> +--- a/gdk/directfb/Makefile.in
>> ++++ b/gdk/directfb/Makefile.in
>> +@@ -445,8 +445,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -463,7 +463,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + libgdkincludedir = $(includedir)/gtk-2.0/gdk
>> +diff --git a/gdk/quartz/Makefile.in b/gdk/quartz/Makefile.in
>> +index 159a437..60ae58a 100644
>> +--- a/gdk/quartz/Makefile.in
>> ++++ b/gdk/quartz/Makefile.in
>> +@@ -444,8 +444,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -462,7 +462,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + libgdkincludedir = $(includedir)/gtk-2.0/gdk
>> +diff --git a/gdk/tests/Makefile.in b/gdk/tests/Makefile.in
>> +index 8506730..7c6a383 100644
>> +--- a/gdk/tests/Makefile.in
>> ++++ b/gdk/tests/Makefile.in
>> +@@ -560,8 +560,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -578,7 +578,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + NULL =
>> +diff --git a/gdk/win32/Makefile.in b/gdk/win32/Makefile.in
>> +index 996acda..3bbb565 100644
>> +--- a/gdk/win32/Makefile.in
>> ++++ b/gdk/win32/Makefile.in
>> +@@ -486,8 +486,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -504,7 +504,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + libgdkincludedir = $(includedir)/gtk-2.0/gdk
>> +diff --git a/gdk/win32/rc/Makefile.in b/gdk/win32/rc/Makefile.in
>> +index a994aae..6280f98 100644
>> +--- a/gdk/win32/rc/Makefile.in
>> ++++ b/gdk/win32/rc/Makefile.in
>> +@@ -357,8 +357,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -375,7 +375,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + @USE_WIN32_TRUE at noinst_DATA = gdk-win32-res.o
>> +diff --git a/gdk/x11/Makefile.in b/gdk/x11/Makefile.in
>> +index 72fa239..cef6cd0 100644
>> +--- a/gdk/x11/Makefile.in
>> ++++ b/gdk/x11/Makefile.in
>> +@@ -652,8 +652,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -670,7 +670,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + libgdkincludedir = $(includedir)/gtk-2.0/gdk
>> +diff --git a/gtk/Makefile.in b/gtk/Makefile.in
>> +index 61491c3..d6908a8 100644
>> +--- a/gtk/Makefile.in
>> ++++ b/gtk/Makefile.in
>> +@@ -1464,8 +1464,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -1482,7 +1482,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + INTROSPECTION_GIRS = $(am__append_16)
>> +diff --git a/gtk/tests/Makefile.in b/gtk/tests/Makefile.in
>> +index 072995f..2c4735d 100644
>> +--- a/gtk/tests/Makefile.in
>> ++++ b/gtk/tests/Makefile.in
>> +@@ -476,8 +476,8 @@ TEST_PROGS = testing liststore treestore treeview
>> treeview-scrolling \
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -494,7 +494,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + INCLUDES = \
>> +diff --git a/gtk/theme-bits/Makefile.in b/gtk/theme-bits/Makefile.in
>> +index 9f17ee0..4539c32 100644
>> +--- a/gtk/theme-bits/Makefile.in
>> ++++ b/gtk/theme-bits/Makefile.in
>> +@@ -407,8 +407,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -425,7 +425,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + INCLUDES = \
>> +diff --git a/m4macros/Makefile.in b/m4macros/Makefile.in
>> +index 7d4364a..25a250b 100644
>> +--- a/m4macros/Makefile.in
>> ++++ b/m4macros/Makefile.in
>> +@@ -385,8 +385,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -403,7 +403,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + installed_m4 = gtk-2.0.m4
>> +diff --git a/modules/Makefile.in b/modules/Makefile.in
>> +index d096963..4eb8a3f 100644
>> +--- a/modules/Makefile.in
>> ++++ b/modules/Makefile.in
>> +@@ -416,8 +416,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -434,7 +434,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + SUBDIRS = input engines other $(am__append_1)
>> +diff --git a/modules/engines/Makefile.in b/modules/engines/Makefile.in
>> +index 61cd1f8..dc71eec 100644
>> +--- a/modules/engines/Makefile.in
>> ++++ b/modules/engines/Makefile.in
>> +@@ -415,8 +415,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -433,7 +433,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + @USE_WIN32_TRUE at wimp = ms-windows
>> +diff --git a/modules/engines/ms-windows/Makefile.in
>> b/modules/engines/ms-windows/Makefile.in
>> +index 06b02a3..64db751 100644
>> +--- a/modules/engines/ms-windows/Makefile.in
>> ++++ b/modules/engines/ms-windows/Makefile.in
>> +@@ -481,8 +481,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -499,7 +499,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + SUBDIRS = Theme
>> +diff --git a/modules/engines/ms-windows/Theme/Makefile.in
>> b/modules/engines/ms-windows/Theme/Makefile.in
>> +index 4d4ea1e..5add436 100644
>> +--- a/modules/engines/ms-windows/Theme/Makefile.in
>> ++++ b/modules/engines/ms-windows/Theme/Makefile.in
>> +@@ -415,8 +415,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -433,7 +433,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + SUBDIRS = gtk-2.0
>> +diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
>> b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
>> +index a88fa10..d2f9145 100644
>> +--- a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
>> ++++ b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
>> +@@ -385,8 +385,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -403,7 +403,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + themedir = $(datadir)/themes/MS-Windows/gtk-2.0
>> +diff --git a/modules/engines/pixbuf/Makefile.in
>> b/modules/engines/pixbuf/Makefile.in
>> +index 78cbc0a..0f71891 100644
>> +--- a/modules/engines/pixbuf/Makefile.in
>> ++++ b/modules/engines/pixbuf/Makefile.in
>> +@@ -440,8 +440,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -458,7 +458,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>> +diff --git a/modules/input/Makefile.in b/modules/input/Makefile.in
>> +index 6c1bf95..241dea7 100644
>> +--- a/modules/input/Makefile.in
>> ++++ b/modules/input/Makefile.in
>> +@@ -657,8 +657,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -675,7 +675,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>> +diff --git a/modules/other/Makefile.in b/modules/other/Makefile.in
>> +index 27fc352..c308000 100644
>> +--- a/modules/other/Makefile.in
>> ++++ b/modules/other/Makefile.in
>> +@@ -415,8 +415,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -433,7 +433,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + SUBDIRS = gail
>> +diff --git a/modules/other/gail/Makefile.in
>> b/modules/other/gail/Makefile.in
>> +index 5d0c421..2b30e1f 100644
>> +--- a/modules/other/gail/Makefile.in
>> ++++ b/modules/other/gail/Makefile.in
>> +@@ -516,8 +516,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -534,7 +534,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + SUBDIRS = libgail-util tests
>> +diff --git a/modules/other/gail/libgail-util/Makefile.in
>> b/modules/other/gail/libgail-util/Makefile.in
>> +index 662d504..39ffa49 100644
>> +--- a/modules/other/gail/libgail-util/Makefile.in
>> ++++ b/modules/other/gail/libgail-util/Makefile.in
>> +@@ -446,8 +446,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -464,7 +464,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>> +diff --git a/modules/other/gail/tests/Makefile.in
>> b/modules/other/gail/tests/Makefile.in
>> +index 7b1bedc..9bfc526 100644
>> +--- a/modules/other/gail/tests/Makefile.in
>> ++++ b/modules/other/gail/tests/Makefile.in
>> +@@ -584,8 +584,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -602,7 +602,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>> +diff --git a/modules/printbackends/Makefile.in b/modules/printbackends/
>> Makefile.in
>> +index b391ee5..4d1a604 100644
>> +--- a/modules/printbackends/Makefile.in
>> ++++ b/modules/printbackends/Makefile.in
>> +@@ -417,8 +417,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -435,7 +435,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + SUBDIRS = file lpr $(am__append_1) $(am__append_2) $(am__append_3)
>> +diff --git a/modules/printbackends/cups/Makefile.in
>> b/modules/printbackends/cups/Makefile.in
>> +index dda693b..7d2db62 100644
>> +--- a/modules/printbackends/cups/Makefile.in
>> ++++ b/modules/printbackends/cups/Makefile.in
>> +@@ -444,8 +444,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -462,7 +462,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>> +diff --git a/modules/printbackends/file/Makefile.in
>> b/modules/printbackends/file/Makefile.in
>> +index b3ed091..7457181 100644
>> +--- a/modules/printbackends/file/Makefile.in
>> ++++ b/modules/printbackends/file/Makefile.in
>> +@@ -443,8 +443,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -461,7 +461,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>> +diff --git a/modules/printbackends/lpr/Makefile.in
>> b/modules/printbackends/lpr/Makefile.in
>> +index f353313..616a0e9 100644
>> +--- a/modules/printbackends/lpr/Makefile.in
>> ++++ b/modules/printbackends/lpr/Makefile.in
>> +@@ -441,8 +441,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -459,7 +459,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>> +diff --git a/modules/printbackends/test/Makefile.in
>> b/modules/printbackends/test/Makefile.in
>> +index a31655a..66a2df5 100644
>> +--- a/modules/printbackends/test/Makefile.in
>> ++++ b/modules/printbackends/test/Makefile.in
>> +@@ -442,8 +442,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -460,7 +460,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
>> +diff --git a/perf/Makefile.in b/perf/Makefile.in
>> +index a1d3491..2a33017 100644
>> +--- a/perf/Makefile.in
>> ++++ b/perf/Makefile.in
>> +@@ -410,8 +410,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -428,7 +428,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + INCLUDES = \
>> +diff --git a/tests/Makefile.in b/tests/Makefile.in
>> +index 8b937c9..2629d74 100644
>> +--- a/tests/Makefile.in
>> ++++ b/tests/Makefile.in
>> +@@ -933,8 +933,8 @@ TEST_PROGS =
>> +
>> + ### testing rules
>> +
>> +-# Xvfb based test rules
>> +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> ++# /usr/X11/bin/Xvfb based test rules
>> ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> +@@ -951,7 +951,7 @@ XVFB_START = \
>> + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo
>> $$id; exit 0; }; done; exit 1` \
>> + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth
>> /dev/null >/dev/null 2>&1 & \
>> + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ;
>> } \
>> +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for
>> X11 target tests."; exit 1; } \
>> ++ || { echo "Gtk+Tests:ERROR: Failed to start /usr/X11/bin/Xvfb
>> environment for X11 target tests."; exit 1; } \
>> + && DISPLAY=:$$XID && export DISPLAY
>> +
>> + INCLUDES = \
>> +--
>> +1.8.4.1
>> +
>>
>> Deleted: csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-
>> line-option.patch
>> ===================================================================
>> --- csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch
>> 2013-11-04 09:54:03 UTC (rev 22369)
>> +++ csw/mgar/pkg/gtk2/trunk/files/0001-Add-update-modules-cmd-line-option.patch
>> 2013-11-04 12:15:31 UTC (rev 22370)
>> @@ -1,109 +0,0 @@
>> -From 12dfaa24cf6f26d7293d68e5b0ad3c1ce1504ea6 Mon Sep 17 00:00:00 2001
>> -From: Rafael Ostertag <raos at opencsw.org>
>> -Date: Mon, 4 Nov 2013 08:43:08 +0100
>> -Subject: [PATCH] Add --update-modules cmd line option
>> -
>> ----
>> - gtk/queryimmodules.c | 55 ++++++++++++++++++++++++++++++
>> ++++++++++++++++++----
>> - 1 file changed, 51 insertions(+), 4 deletions(-)
>> -
>> -diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
>> -index a91ea47..69d89df 100644
>> ---- a/gtk/queryimmodules.c
>> -+++ b/gtk/queryimmodules.c
>> -@@ -23,6 +23,7 @@
>> -
>> - #include <glib.h>
>> - #include <glib/gprintf.h>
>> -+#include <glib/gstdio.h>
>> - #include <gmodule.h>
>> -
>> - #include <errno.h>
>> -@@ -30,6 +31,8 @@
>> - #ifdef HAVE_UNISTD_H
>> - #include <unistd.h>
>> - #endif
>> -+#include <fcntl.h>
>> -+#include <stdlib.h>
>> -
>> - #ifdef USE_LA_MODULES
>> - #define SOEXT ".la"
>> -@@ -162,27 +165,71 @@ query_module (const char *dir, const char *name,
>> GString *contents)
>> - int main (int argc, char **argv)
>> - {
>> - char *cwd;
>> -- int i;
>> -+ int i, fd, retval;
>> - char *path;
>> -+ char *gtk_immodules;
>> - gboolean error = FALSE;
>> - gchar *cache_file = NULL;
>> - gint first_file = 1;
>> - GString *contents;
>> -
>> -+
>> -+
>> - if (argc > 1 && strcmp (argv[1], "--update-cache") == 0)
>> - {
>> - cache_file = gtk_rc_get_im_module_file ();
>> - first_file = 2;
>> - }
>> -
>> -+ /*
>> -+ * Quick an dirty hack.
>> -+ *
>> -+ * This will allow us to create the gtk.immodules in the default
>> -+ * place by providing `--update-modules' as cmd line argument,
>> -+ * without worrying where this might be when calling
>> -+ * gtk-query-immodules-2.0 from a postinstall script.
>> -+ *
>> -+ * The basic idea is to redirect STDOUT to the default file and then
>> -+ * let the normal flow of the program continue like there was no cmd
>> -+ * line argument. Be aware, that this only works when no other cmd
>> -+ * line options were passed.
>> -+ */
>> -+ if ( argc == 2 && strcmp("--update-modules", argv[1]) == 0 )
>> -+ {
>> -+ gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
>> "gtk.immodules", NULL);
>> -+ fd = g_open(gtk_immodules, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR
>> | S_IWUSR | S_IRGRP | S_IROTH);
>> -+ if ( fd == -1 )
>> -+ {
>> -+ g_fprintf(stderr, "Cannot open %s.\n", gtk_immodules);
>> -+ exit(1);
>> -+ }
>> -+
>> -+ if ( dup2(fd, STDOUT_FILENO) == -1 )
>> -+ {
>> -+ g_fprintf(stderr, "Unable to redirect STDOUT.\n");
>> -+ exit(1);
>> -+ }
>> -+
>> -+ /*
>> -+ * cheat, to make it think there are no arguments given
>> -+ */
>> -+ first_file = 2;
>> -+ }
>> -+
>> -+
>> - contents = g_string_new ("");
>> - g_string_append_printf (contents,
>> - "# GTK+ Input Method Modules file\n"
>> - "# Automatically generated file, do not
>> edit\n"
>> -- "# Created by %s from gtk+-%d.%d.%d\n"
>> -- "#\n",
>> -+ "# Created by %s from gtk+-%d.%d.%d (OpenCSW
>> Patch)\n"
>> -+ "#\n"
>> -+ "#\n"
>> -+ "# DefaultFile = %s\n"
>> -+ "# DefaultDir = %s\n",
>> - argv[0],
>> -- GTK_MAJOR_VERSION, GTK_MINOR_VERSION,
>> GTK_MICRO_VERSION);
>> -+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION,
>> GTK_MICRO_VERSION,
>> -+ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
>> "gtk.immodules", NULL),
>> -+ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
>> NULL));
>> -
>> - if (argc == first_file) /* No file arguments given */
>> - {
>> ---
>> -1.8.3.4
>> -
>>
>> Deleted: csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-
>> Xvfb.patch
>> ===================================================================
>> --- csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch
>> 2013-11-04 09:54:03 UTC (rev 22369)
>> +++ csw/mgar/pkg/gtk2/trunk/files/0002-Use-absolute-path-to-Xvfb.patch
>> 2013-11-04 12:15:31 UTC (rev 22370)
>> @@ -1,25 +0,0 @@
>> -From 8f4ed5e421c668213e57da64ee73eb4de443b727 Mon Sep 17 00:00:00 2001
>> -From: Rafael Ostertag <raos at opencsw.org>
>> -Date: Mon, 4 Nov 2013 08:55:28 +0100
>> -Subject: [PATCH] Use absolute path to Xvfb
>> -
>> ----
>> - tests/Makefile.in | 2 +-
>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> -
>> -diff --git a/tests/Makefile.in b/tests/Makefile.in
>> -index 8b937c9..a1b316e 100644
>> ---- a/tests/Makefile.in
>> -+++ b/tests/Makefile.in
>> -@@ -934,7 +934,7 @@ TEST_PROGS =
>> - ### testing rules
>> -
>> - # Xvfb based test rules
>> --XVFB = Xvfb -ac -noreset -screen 0 800x600x16
>> -+XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16
>> - XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309
>> 310 311 \
>> - 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
>> 508 509 \
>> - 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
>> 1006 1007 \
>> ---
>> -1.8.3.4
>> -
>>
>> Modified: csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall
>> ===================================================================
>> --- csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall 2013-11-04
>> 09:54:03 UTC (rev 22369)
>> +++ csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall 2013-11-04
>> 12:15:31 UTC (rev 22370)
>> @@ -41,11 +41,10 @@
>> echo "** Done Updating Icon cache"
>>
>> BIN=gtk-query-immodules-2.0
>> -BIN_OPTS="--update-modules"
>> +BIN_OPTS="--update-cache"
>>
>> echo "** Querying IM Modules"
>>
>> -# Now, do all other
>> for i in @NEEDED_ISAS@
>> do
>> # The default ISA is removed
>> @@ -60,10 +59,6 @@
>> /usr/bin/printf "- ${isa} ISA... "
>> fi
>>
>> - # Figure out the default file path (binary has to be patched for
>> this)
>> - gtk_immodules="`${ISABIN} | /usr/bin/awk '/DefaultFile =/ { print
>> $4 }`"
>> -
>> -
>> /usr/sbin/chroot "${PKG_ROOT_DIR}" "${ISABIN}" ${BIN_OPTS}
>> >/dev/null 2>&1
>> if [ $? -ne 0 ]
>> then
>> @@ -77,4 +72,4 @@
>>
>> /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST}
>>
>> -echo "** Done querying IM Modules"
>> \ No newline at end of file
>> +echo "** Done querying IM Modules"
>>
>> This was sent by the SourceForge.net collaborative development platform,
>> the world's largest Open Source development site.
>>
>>
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.opencsw.org/pipermail/devel/attachments/20140101/8ebe3dcc/attachment-0001.html>
More information about the devel
mailing list