GNOME.org
 

[gtk-osx: 2/5] Update gjs to 3.14.0

commit 55325f7834af9248d690c8f131b87803d7473944
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Nov 23 16:11:04 2014 -0800

    Update gjs to 3.14.0
    
    This adds two patches and removes another one (which was in the wrong
    directory anyway.) The patches are only needed for this point release,
    and should be fine in 3.14.1.

 gjs-Fix-uint-type-in-variable.patch                |   24 --------
 modulesets-stable/gtk-osx-javascript.modules       |   12 +++--
 modulesets/gtk-osx-javascript.modules              |    7 +--
 ...-Don-t-error-out-on-missing-cairo-xlib.pc.patch |   30 ++++++++++
 .../gjs-Bug-737702-Use-R-instead-of-rpath.patch    |   28 ++++++++++
 ...js-Bug-740696-Use-m4-directory-for-macros.patch |   58 ++++++++++++++++++++
 patches/patch status                               |    5 ++-
 7 files changed, 130 insertions(+), 34 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-javascript.modules b/modulesets-stable/gtk-osx-javascript.modules
index fa151e6..d83715b 100644
--- a/modulesets-stable/gtk-osx-javascript.modules
+++ b/modulesets-stable/gtk-osx-javascript.modules
@@ -18,14 +18,18 @@
   </metamodule>
 
   <autotools id="gjs" autogenargs="--enable-installed-tests">
-    <branch version="1.38.1" module="gjs/1.38/gjs-1.38.1.tar.xz"
-            hash="sha256:6b2065a0e7bd1db562a70c5fd52ea2499097f1cf02c9c279d1b82b660bfb8176">
+    <branch version="1.42.0" module="gjs/1.42/gjs-1.42.0.tar.xz"
+            hash="sha256:0c9afb7d5be6ead5b68059596f08eb7c3902b1676ee9c8846aa8df09647dba13">
       <patch strip="1"
-             file="http://git.gnome.org/browse/gtk-osx/plain/patches/gjs-Fix-uint-type-in-variable.patch"/>
+             
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gjs-Bug-737701-Don-t-error-out-on-missing-cairo-xlib.pc.patch"/>
+      <patch strip="1"
+             
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gjs-Bug-737702-Use-R-instead-of-rpath.patch"/>
+      <patch strip="1"
+             
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gjs-Bug-740696-Use-m4-directory-for-macros.patch"/>
     </branch>
     <dependencies>
       <dep package="gobject-introspection"/>
-      <dep package="js17"/>
+      <dep package="js24"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gtk-osx-javascript.modules b/modulesets/gtk-osx-javascript.modules
index f700bcc..0542e13 100644
--- a/modulesets/gtk-osx-javascript.modules
+++ b/modulesets/gtk-osx-javascript.modules
@@ -18,13 +18,10 @@
   </metamodule>
 
   <autotools id="gjs" autogenargs="--enable-installed-tests">
-    <branch tag="gnome-3-10">
-      <patch strip="1"
-             file="http://git.gnome.org/browse/gtk-osx/plain/patches/gjs-Fix-uint-type-in-variable.patch"/>
-    </branch>
+    <branch revision="gnome-3-14"/>
     <dependencies>
       <dep package="gobject-introspection"/>
-      <dep package="js17"/>
+      <dep package="js24"/>
     </dependencies>
   </autotools>
 
diff --git a/patches/gjs-Bug-737701-Don-t-error-out-on-missing-cairo-xlib.pc.patch 
b/patches/gjs-Bug-737701-Don-t-error-out-on-missing-cairo-xlib.pc.patch
new file mode 100644
index 0000000..6ff68e2
--- /dev/null
+++ b/patches/gjs-Bug-737701-Don-t-error-out-on-missing-cairo-xlib.pc.patch
@@ -0,0 +1,30 @@
+From a9723e1015e918f9800a6cf2b18ccc0a03531a26 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip chimento gmail com>
+Date: Tue, 30 Sep 2014 23:39:03 -0700
+Subject: [PATCH 1/2] build: Don't error out on missing cairo-xlib.pc
+
+When building on OSX, we would be using Cairo without XLib support, so
+instead of erroring out if pkg-config can't find cairo-xlib, print a
+warning. The X-based code will not be used anyway if Cairo hasn't
+detected XLib.
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6efd58d..aa38663 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -98,7 +98,8 @@ AM_CONDITIONAL(ENABLE_CAIRO, test x$have_cairo = xyes)
+ AS_IF([test x$have_cairo = xyes], [
+   AC_DEFINE([ENABLE_CAIRO],[1],[Define if you want to build with cairo support])
+ ])
+-PKG_CHECK_MODULES([GJS_CAIRO_XLIB], [cairo-xlib], , )
++PKG_CHECK_MODULES([GJS_CAIRO_XLIB], [cairo-xlib], [],
++  [AC_MSG_WARN([Cairo-xlib support not found])])
+ 
+ # Optional GTK+ dep (enabled by default)
+ AC_ARG_WITH(gtk,
+-- 
+1.9.3 (Apple Git-50)
+
diff --git a/patches/gjs-Bug-737702-Use-R-instead-of-rpath.patch 
b/patches/gjs-Bug-737702-Use-R-instead-of-rpath.patch
new file mode 100644
index 0000000..743b9c3
--- /dev/null
+++ b/patches/gjs-Bug-737702-Use-R-instead-of-rpath.patch
@@ -0,0 +1,28 @@
+From 8c53b7167b77a10c5c45982831eefc5ea022350d Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip chimento gmail com>
+Date: Wed, 1 Oct 2014 00:38:14 -0700
+Subject: [PATCH 2/2] build: Use -R instead of -rpath
+
+When linking with libtool, you are supposed to use -R, not -rpath. This
+caused a build failure on OSX due to two -rpath options being given in
+one invocation of ld, which libtool fixes when you use -R.
+---
+ Makefile-insttest.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile-insttest.am b/Makefile-insttest.am
+index 59d76e9..e13979a 100644
+--- a/Makefile-insttest.am
++++ b/Makefile-insttest.am
+@@ -40,7 +40,7 @@ endif
+ # This rpath /nowhere thing is the libtool upstream recommended way to
+ # force generation of shared libraries, which we need in order for the
+ # tests to work uninstalled.
+-common_test_ldflags = -avoid-version -rpath /nowhere
++common_test_ldflags = -avoid-version -R /nowhere
+ common_test_libadd = $(GJS_LIBS)
+ 
+ nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
+-- 
+1.9.3 (Apple Git-50)
+
diff --git a/patches/gjs-Bug-740696-Use-m4-directory-for-macros.patch 
b/patches/gjs-Bug-740696-Use-m4-directory-for-macros.patch
new file mode 100644
index 0000000..1027dcf
--- /dev/null
+++ b/patches/gjs-Bug-740696-Use-m4-directory-for-macros.patch
@@ -0,0 +1,58 @@
+From f362ae624c6fc46a8a2f183dda2e6a68f4e41f35 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip chimento gmail com>
+Date: Tue, 25 Nov 2014 11:28:26 -0500
+Subject: [PATCH] build: Use m4 directory for macros
+
+Previously, ACLOCAL_AMFLAGS was set to ${ACLOCAL_FLAGS}. This caused
+problems when running libtoolize --force --copy as part of autoreconf.
+On JHBuild when ACLOCAL_FLAGS was set to the build tree's share/aclocal
+directory, libtoolize would actually remove the libtool macros from
+there.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740696
+---
+ .gitignore   | 1 +
+ Makefile.am  | 2 +-
+ configure.ac | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/.gitignore b/.gitignore
+index 85de3e8..3f203a7 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -31,6 +31,7 @@ gjs_gi_probes.h
+ install-sh
+ libtool
+ ltmain.sh
++/m4
+ missing
+ stamp-h1
+ test_user_data
+diff --git a/Makefile.am b/Makefile.am
+index 4dbd318..ff2c008 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -14,7 +14,7 @@ EXTRA_DIST =
+ TEST_PROGS =
+ check_PROGRAMS = $(TEST_PROGS)
+ INTROSPECTION_GIRS =
+-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
++ACLOCAL_AMFLAGS = -I m4
+ AM_CFLAGS = $(WARN_CFLAGS) -DG_LOG_DOMAIN=\"Gjs\"
+ AM_CPPFLAGS = $(WARN_CXXFLAGS) -DG_LOG_DOMAIN=\"Gjs\"
+ 
+diff --git a/configure.ac b/configure.ac
+index 6efd58d..d6d0a86 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,6 +11,7 @@ AC_PREREQ(2.61)
+ AC_INIT([gjs], pkg_version, [http://bugzilla.gnome.org/enter_bug.cgi?product=gjs])
+ AM_INIT_AUTOMAKE([dist-xz no-dist-gzip])
+ AC_CONFIG_SRCDIR([gjs/console.cpp])
++AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_HEADER([config.h])
+ 
+ AC_DEFINE([GJS_VERSION], pkg_int_version, [The gjs version as an integer])
+-- 
+1.9.3 (Apple Git-50)
+
diff --git a/patches/patch status b/patches/patch status
index 9ac895f..3e33295 100644
--- a/patches/patch status      
+++ b/patches/patch status      
@@ -50,7 +50,10 @@ devhelp:     devhelp-646962-variable-name.patch
 dbus:          dbus-install.patch
                dbus-msg-nosignal.patch
 
-gjs:           gjs-Fix-uint-type-in-variable.patch Bug 712242, fixed in master.
+gjs:           gjs-Bug-737701-Don-t-error-out-on-missing-cairo-xlib.pc.patch
+               gjs-Bug-737702-Use-R-instead-of-rpath.patch
+               gjs-Bug-740696-Use-m4-directory-for-macros.patch
+               All committed to master and gtk-3-14, only needed for modulesets-stable.
 
 faad2:         faad2-2.7-ac-config-headers.patch
                Reported at https://sourceforge.net/p/faac/bugs/190/ but there hasn't
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]