[GTK] Update xserver version in jhbuild
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Nov 2015 12:43:39 +0000 (12:43 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Nov 2015 12:43:39 +0000 (12:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=151383

Reviewed by Alejandro G. Castro.

In r192568 I assumed the bots would have a recent enough Xvfb
to use the -displayfd option, but I forgot we build our own
xserver just for Xvfb. The version we build is too old, so
we could just use an updated version (the same bots have
installed, for example) to use the -displayfd option.

* gtk/jhbuild.modules: Update xserver to 1.16.4.
* gtk/patches/xserver-fix-glx-init.patch: Deleted.
* gtk/patches/xserver-remove-bogus-dependencies.patch: Updated to
apply on 1.16.4.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@192572 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/gtk/jhbuild.modules
Tools/gtk/patches/xserver-fix-glx-init.patch [deleted file]
Tools/gtk/patches/xserver-remove-bogus-dependencies.patch

index b88733d..723108b 100644 (file)
@@ -1,5 +1,23 @@
 2015-11-18  Carlos Garcia Campos  <cgarcia@igalia.com>
 
+        [GTK] Update xserver version in jhbuild
+        https://bugs.webkit.org/show_bug.cgi?id=151383
+
+        Reviewed by Alejandro G. Castro.
+
+        In r192568 I assumed the bots would have a recent enough Xvfb
+        to use the -displayfd option, but I forgot we build our own
+        xserver just for Xvfb. The version we build is too old, so
+        we could just use an updated version (the same bots have
+        installed, for example) to use the -displayfd option.
+
+        * gtk/jhbuild.modules: Update xserver to 1.16.4.
+        * gtk/patches/xserver-fix-glx-init.patch: Deleted.
+        * gtk/patches/xserver-remove-bogus-dependencies.patch: Updated to
+        apply on 1.16.4.
+
+2015-11-18  Carlos Garcia Campos  <cgarcia@igalia.com>
+
         Unreviewed. Fix webkitpy tests after r192568.
 
         Instead of ignoring exception when closing mock fds, use a helper
index a28adaa..b4ce89b 100644 (file)
             md5sum="64a3e2cda2687132cadca4efdc63f3b4"/>
   </autotools>
 
-  <autotools id="xserver" autogenargs="--disable-xinerama --enable-glx --enable-composite --disable-xorg --disable-dmx --disable-xnest --disable-xquartz --disable-xwin --disable-xephyr --disable-xfake --disable-xfbdev --disable-install-setuid --disable-unit-tests --enable-unix-transport --enable-tcp-transport --disable-local-transport --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb --with-xkb-bin-directory=/usr/bin --without-dtrace">
+  <autotools id="xserver" autogenargs="--disable-xinerama --enable-glx --enable-composite --disable-xorg --disable-dmx --disable-xnest --disable-xquartz --disable-xwin --disable-xephyr --disable-xfake --disable-xfbdev --disable-install-setuid --disable-unit-tests --disable-present --enable-unix-transport --enable-tcp-transport --disable-local-transport --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb --with-xkb-bin-directory=/usr/bin --without-dtrace">
     <dependencies>
       <dep package="pixman"/>
     </dependencies>
-    <branch module="/releases/individual/xserver/xorg-server-1.12.4.tar.gz" version="1.12.4"
+    <branch module="/releases/individual/xserver/xorg-server-1.16.4.tar.bz2" version="1.16.4"
             repo="xorg"
-            hash="sha256:d88225cd3c4a6ecd92d1360b34a0e5b6346e2a04c842c018cef36d8a370714ef"
-            md5sum="19c17bf7ac3e2ce34bc40108692c031f">
+            hash="sha256:abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871"
+            md5sum="80d140f631d862b76dc67ae983151c77">
       <patch file="xserver-remove-bogus-dependencies.patch" strip="1"/>
-      <patch file="xserver-fix-glx-init.patch" strip="1"/>
     </branch>
   </autotools>
 
diff --git a/Tools/gtk/patches/xserver-fix-glx-init.patch b/Tools/gtk/patches/xserver-fix-glx-init.patch
deleted file mode 100644 (file)
index 2dc965b..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/mi/miinitext.c b/mi/miinitext.c
-index 6ceae05..cda4e43 100644
---- a/mi/miinitext.c
-+++ b/mi/miinitext.c
-@@ -540,6 +540,9 @@ static ExtensionModule staticExtensions[] = {
- #ifdef DAMAGE
-     {DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL},
- #endif
-+#ifdef GLXEXT
-+    {GlxExtensionInit, "GLX", &noGlxExtension, NULL},
-+#endif
-     {NULL, NULL, NULL, NULL, NULL}
- };
index 97b1a13..e17753e 100644 (file)
@@ -16,8 +16,8 @@ diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
 index 9f4992c..06830ae 100644
 --- a/hw/vfb/Makefile.am
 +++ b/hw/vfb/Makefile.am
-@@ -25,7 +25,7 @@ XVFB_LIBS = \
-       $(XSERVER_LIBS)
+@@ -20,7 +20,7 @@ XVFB_LIBS = \
+       $(top_builddir)/Xi/libXistubs.la
  
  Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS)
 -Xvfb_DEPENDENCIES = $(XVFB_LIBS)
@@ -29,7 +29,7 @@ diff --git a/test/Makefile.am b/test/Makefile.am
 index 34f53fc..3509306 100644
 --- a/test/Makefile.am
 +++ b/test/Makefile.am
-@@ -117,7 +117,7 @@ libxservertest_la_LIBADD += \
+@@ -131,7 +131,7 @@ libxservertest_la_LIBADD += \
  endif
  endif