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