[geany/geany-osx] b97656: Add gtk 3 modules and fix VTE 0.34 to work correctly on OS X - Commits

21 May 2016


      Branch:      refs/heads/master
Author:      Jiří Techet techet@gmail.com
Committer:   Jiří Techet techet@gmail.com
Date:        Sat, 21 May 2016 20:34:51 UTC
Commit:      b976568e1ebde608a653d592a15cebdb1ad8b717
             https://github.com/geany/geany-osx/commit/b976568e1ebde608a653d592a15cebdb1a...
Log Message:
-----------
Add gtk 3 modules and fix VTE 0.34 to work correctly on OS X
Modified Paths:
--------------
    geany.modules
    patches/01-vte_0.28_fix.diff
    patches/02-vte_0.28_relpath.diff
    patches/03-vte_0.34_noatime.diff
    patches/04-vte_0.34_relpath.diff
Modified: geany.modules
88 lines changed, 86 insertions(+), 2 deletions(-)
===================================================================
@@ -33,9 +33,22 @@
     <branch module="vte/0.28/vte-0.28.2.tar.xz" 
             version="0.28.2">
       <!-- Fix for draw -->
-      <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-vte_fix.diff" strip="1" />
+      <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-vte_0.28_fix.diff" strip="1" />
       <!-- Make paths relative to bundle (fallback to system paths if not found) -->
-      <patch file="https://github.com/geany/geany-osx/raw/master/patches/02-vte_relpath.diff" strip="1" />
+      <patch file="https://github.com/geany/geany-osx/raw/master/patches/02-vte_0.28_relpath.diff" strip="1" />
+    </branch>
+  </autotools>
+
+  <!-- The last version supported by Geany for GTK 3 -->
+  <autotools id="vte34"
+             autogenargs="--disable-Bsymbolic" 
+             autogen-sh="configure">
+    <branch module="vte/0.34/vte-0.34.9.tar.xz" 
+            version="0.34.9">
+      <!-- Don't use O_NOATIME -->
+      <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-vte_0.34_noatime.diff" strip="1" />
+      <!-- Make paths relative to bundle (fallback to system paths if not found) -->
+      <patch file="https://github.com/geany/geany-osx/raw/master/patches/04-vte_0.34_relpath.diff" strip="1" />
     </branch>
   </autotools>
@@ -87,6 +100,17 @@
     </dependencies>
   </metamodule>
+  <metamodule id="geany-deps-gtk3">
+    <dependencies>
+      <dep package="vte34" />
+      <dep package="docutils" />
+      <dep package="gtk-mac-bundler" />
+      <dep package="gtk-mac-integration-fixed" />
+      <!-- mime information for g_content_type_guess() -->
+      <dep package="shared-mime-info" />
+    </dependencies>
+  </metamodule>
+
   <!-- Geany -->
   <autotools id="geany"
              autogenargs="--enable-mac-integration">
@@ -98,6 +122,17 @@
     </dependencies>
   </autotools>
+  <!-- Geany GTK 3-->
+  <autotools id="geany-gtk3"
+             autogenargs="--enable-mac-integration --enable-gtk3">
+    <branch repo="github.com"
+            module="geany/geany.git"    
+            revision="master" />
+    <dependencies>
+      <dep package="geany-deps-gtk3" />
+    </dependencies>
+  </autotools>
+
   <!-- Geany tarball release -->
   <autotools id="geany-release"
              autogenargs="--enable-mac-integration">
@@ -109,6 +144,17 @@
     </dependencies>
   </autotools>
+  <!-- Geany tarball release GTK 3 -->
+  <autotools id="geany-release-gtk3"
+             autogenargs="--enable-mac-integration --enable-gtk3">
+    <branch repo="download.geany.org"
+            module="geany-1.27.tar.bz2" 
+            version="1.27"/>
+    <dependencies>
+      <dep package="geany-deps-gtk3" />
+    </dependencies>
+  </autotools>
+
   <!-- Geany-plugins dependencies -->
   <metamodule id="geany-plugins-deps">
     <dependencies>
@@ -130,6 +176,17 @@
     </dependencies>
   </autotools>
+  <!-- Geany-plugins GTK 3 -->
+  <autotools id="geany-plugins-gtk3">
+    <branch repo="github.com"
+            module="geany/geany-plugins.git"
+            revision="master" />
+    <dependencies>
+      <dep package="geany-gtk3" />
+      <dep package="geany-plugins-deps" />
+    </dependencies>
+  </autotools>
+
   <!-- Geany-plugins tarball release -->
   <autotools id="geany-plugins-release">
     <branch repo="download.geany.org"
@@ -141,6 +198,17 @@
     </dependencies>
   </autotools>
+  <!-- Geany-plugins tarball release GTK 3 -->
+  <autotools id="geany-plugins-release-gtk3">
+    <branch repo="download.geany.org"
+            module="geany-plugins/geany-plugins-1.27.tar.bz2" 
+            version="1.27"/>
+    <dependencies>
+      <dep package="geany-release-gtk3" />
+      <dep package="geany-plugins-deps" />
+    </dependencies>
+  </autotools>
+
   <!-- Build everything necessary for Geany bundle -->
   <metamodule id="geany-bundle">
     <dependencies>
@@ -149,6 +217,14 @@
     </dependencies>
   </metamodule>
+  <!-- Build everything necessary for Geany bundle GTK 3 -->
+  <metamodule id="geany-bundle-gtk3">
+    <dependencies>
+      <dep package="geany-gtk3" />
+      <dep package="geany-plugins-gtk3" />
+    </dependencies>
+  </metamodule>
+
   <!-- Build everything necessary for Geany bundle from release tarballs -->
   <metamodule id="geany-bundle-release">
     <dependencies>
@@ -157,4 +233,12 @@
     </dependencies>
   </metamodule>
+  <!-- Build everything necessary for Geany bundle from release tarballs GTK 3 -->
+  <metamodule id="geany-bundle-release-gtk3">
+    <dependencies>
+      <dep package="geany-release-gtk3" />
+      <dep package="geany-plugins-release-gtk3" />
+    </dependencies>
+  </metamodule>
+
 </moduleset>
Modified: patches/01-vte_0.28_fix.diff
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: patches/02-vte_0.28_relpath.diff
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: patches/03-vte_0.34_noatime.diff
34 lines changed, 34 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,34 @@
+From b5c8bf99d6bac7617c5eea557fafebb2b4e7eb39 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= techet@gmail.com
+Date: Sat, 21 May 2016 20:16:58 +0200
+Subject: [PATCH] Don't use O_NOATIME as it doesn't exist on OS X
+
+---
+ src/vteutils.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/vteutils.c b/src/vteutils.c
+index 1371cb2..c552ada 100644
+--- a/src/vteutils.c
++++ b/src/vteutils.c
+@@ -48,7 +48,7 @@ _vte_mkstemp (void)
+ 
+ #ifdef O_TMPFILE
+         fd = open (g_get_tmp_dir (),
+-                   O_TMPFILE | O_EXCL | O_RDWR | O_NOATIME,
++                   O_TMPFILE | O_EXCL | O_RDWR,
+                    0600);
+         if (fd != -1)
+                 goto done;
+@@ -63,8 +63,6 @@ _vte_mkstemp (void)
+         unlink (file_name);
+         g_free (file_name);
+ 
+-        do { } while (fcntl (fd, F_SETFL, O_NOATIME) == -1 && errno == EINTR);
+-
+ #ifdef O_TMPFILE
+  done:
+ #endif
+-- 
+2.8.1
+
Modified: patches/04-vte_0.34_relpath.diff
63 lines changed, 63 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,63 @@
+From b6b98bc5860f7c02f77d9584e00681089af67485 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= techet@gmail.com
+Date: Sat, 21 May 2016 20:42:30 +0200
+Subject: [PATCH] Make VTE independent of installation path when bundling
+
+The wrapper shell script defines the GTK_PATH to point to
+the resources directory - use this path to avoid absolute paths
+in the source.
+---
+ src/pty.c | 13 +++++++++++--
+ src/vte.c | 12 +++++++++++-
+ 2 files changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/src/pty.c b/src/pty.c
+index 5c6afd5..f9d9c36 100644
+--- a/src/pty.c
++++ b/src/pty.c
+@@ -1265,8 +1265,17 @@ _vte_pty_start_helper(GError **error)
+ 		close(tunnel);
+ 		close(_vte_pty_helper_tunnel);
+ 		/* Exec our helper. */
+-		execl(LIBEXECDIR "/gnome-pty-helper",
+-		      "gnome-pty-helper", NULL);
++		gchar *path = g_build_filename(g_getenv("GTK_PATH"),
++					 "libexec",
++					 "gnome-pty-helper",
++					 NULL);
++		if (!g_file_test(path, G_FILE_TEST_EXISTS))
++		{
++			g_free(path);
++			path = g_strdup(LIBEXECDIR "/gnome-pty-helper");
++		}
++		execl(path, "gnome-pty-helper", NULL);
++		g_free(path);
+ 		/* Bail. */
+ 		_exit(1);
+ 	}
+diff --git a/src/vte.c b/src/vte.c
+index 3227b07..b2b2e4e 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -11761,7 +11761,17 @@ vte_terminal_class_init(VteTerminalClass *klass)
+ 	}
+ #endif
+ 
+-	bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
++	gchar *localedir = g_build_filename(g_getenv("GTK_PATH"),
++				 "share",
++				 "locale",
++				 NULL);
++	if (!g_file_test(localedir, G_FILE_TEST_IS_DIR))
++	{
++		g_free(localedir);
++		localedir = g_strdup(LOCALEDIR);
++	}
++	bindtextdomain(GETTEXT_PACKAGE, localedir);
++	g_free(localedir);
+ #ifdef HAVE_DECL_BIND_TEXTDOMAIN_CODESET
+ 	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+ #endif
+-- 
+2.8.1
+
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    