[arch-commits] Commit in cairo-dock-plugins/trunk (PKGBUILD cd-terminal-vte2.91.patch)

Sun Sep 28 10:53:57 UTC 2014

Date: Sunday, September 28, 2014 @ 12:53:57
  Author: alucryd
Revision: 119686

vte rebuild: cairo-dock-plugins 3.3.2.r3121-1

Added:
  cairo-dock-plugins/trunk/cd-terminal-vte2.91.patch
Modified:
  cairo-dock-plugins/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   28 ++++++++++++-----
 cd-terminal-vte2.91.patch |   70 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2014-09-28 10:46:47 UTC (rev 119685)
+++ PKGBUILD	2014-09-28 10:53:57 UTC (rev 119686)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 # Contributor: Tofe <chris.chapuis at gmail.com>
 # Contributor: zhuqin <zhuqin83 at gmail.com>
 # Contributor: tri1976 <trile7 at gmail.com>
@@ -6,14 +6,17 @@
 # Contributor: snoopy33 <snoopy33 at no-log.org>
 
 pkgname=cairo-dock-plugins
-pkgver=3.3.2
-pkgrel=4
+pkgver=3.3.2.r3121
+pkgrel=1
 pkgdesc='Plugins for Cairo-Dock'
 arch=('i686' 'x86_64')
 url='https://launchpad.net/cairo-dock-plug-ins'
 license=('GPL')
 depends=('cairo-dock')
-makedepends=('cmake' 'alsa-lib' 'fftw' 'gnome-menus' 'gtk-sharp-2' 'gvfs' 'libetpan' 'libexif' 'libical' 'libpulse' 'libxklavier' 'libzeitgeist' 'lm_sensors' 'ndesk-dbus-glib' 'python' 'python2' 'ruby' 'vala' 'vte3' 'webkitgtk3')
+makedepends=('bzr' 'cmake' 'alsa-lib' 'fftw' 'gnome-menus' 'gtk-sharp-2' 'gvfs'
+             'libetpan' 'libexif' 'libical' 'libpulse' 'libxklavier'
+             'libzeitgeist' 'lm_sensors' 'ndesk-dbus-glib' 'python' 'python2'
+             'ruby' 'vala' 'vte3' 'webkitgtk3')
 optdepends=('alsa-lib: Sound Control, Sound Effects applets'
             'fftw: Impulse applet'
             'gnome-menus: Applications Menu applet'
@@ -32,11 +35,20 @@
             'ruby: Ruby API'
             'vte3: Terminal applet'
             'webkitgtk3: Weblets applet')
-source=("${url}/${pkgver%.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('48f0caddb0a563d8a64176f66610ca35df5c952071e5574486d39bb574994643')
+#source=("https://launchpad.net/cairo-dock-plug-ins/${pkgver%.?}/${pkgver}/+download/cairo-dock-plugins-${pkgver}.tar.gz")
+source=("cairo-dock-plugins::bzr+lp:cairo-dock-plug-ins#revision=${pkgver#*.r}"
+        'cd-terminal-vte2.91.patch')
+sha256sums=('SKIP'
+            '7f8cd8f5532f2d08e23aa98a3a8e161c08b6865d11c15a698986515465c1d263')
 
+prepare() {
+  cd cairo-dock-plugins
+
+  patch -Np1 -i ../cd-terminal-vte2.91.patch
+}
+
 build() {
-  cd ${pkgname}-${pkgver}
+  cd cairo-dock-plugins
 
   if [[ -d build ]]; then
     rm -rf build
@@ -48,7 +60,7 @@
 }
 
 package() {
-  cd ${pkgname}-${pkgver}/build
+  cd cairo-dock-plugins/build
 
   make DESTDIR="${pkgdir}" install
 }

Added: cd-terminal-vte2.91.patch
===================================================================
--- cd-terminal-vte2.91.patch	                        (rev 0)
+++ cd-terminal-vte2.91.patch	2014-09-28 10:53:57 UTC (rev 119686)
@@ -0,0 +1,70 @@
+diff -rupN cairo-dock-plugins.orig/CMakeLists.txt cairo-dock-plugins/CMakeLists.txt
+--- cairo-dock-plugins.orig/CMakeLists.txt	2014-09-28 11:56:56.841693400 +0200
++++ cairo-dock-plugins/CMakeLists.txt	2014-09-28 11:57:14.664204700 +0200
+@@ -1345,7 +1345,7 @@ add_subdirectory (systray)
+ message (STATUS "> Terminal:")
+ enable_if_not_defined (enable-terminal)
+ if (enable-terminal)
+-	set (TERMINAL_MODULE vte-2.90)
++	set (TERMINAL_MODULE vte-2.91)
+ 	pkg_check_modules (VTE ${TERMINAL_MODULE})
+ 	if (NOT VTE_FOUND)
+ 		message (STATUS "Could not find ${TERMINAL_MODULE}; Cairo-Dock won't be built with terminal applet.")
+diff -rupN cairo-dock-plugins.orig/terminal/src/terminal-widget.c cairo-dock-plugins/terminal/src/terminal-widget.c
+--- cairo-dock-plugins.orig/terminal/src/terminal-widget.c	2014-09-28 11:56:56.788514700 +0200
++++ cairo-dock-plugins/terminal/src/terminal-widget.c	2014-09-28 12:25:33.651331600 +0200
+@@ -263,12 +263,9 @@ static void _term_apply_settings_on_vter
+ {
+ 	g_return_if_fail (vterm != NULL);
+ 
+-	vte_terminal_set_colors_rgba (VTE_TERMINAL(vterm), &myConfig.forecolor.rgba, &myConfig.backcolor.rgba, NULL, 0);
++	vte_terminal_set_colors (VTE_TERMINAL(vterm), &myConfig.forecolor.rgba, &myConfig.backcolor.rgba, NULL, 0);
+ 
+-	if (myConfig.bCustomFont)
+-		vte_terminal_set_font_from_string (VTE_TERMINAL (vterm), myConfig.cCustomFont);
+-	else
+-		vte_terminal_set_font (VTE_TERMINAL (vterm), NULL);
++	vte_terminal_set_font (VTE_TERMINAL (vterm), NULL);
+ 
+ 	vte_terminal_set_scroll_on_output (VTE_TERMINAL (vterm), myConfig.bScrollOutput);
+ 	vte_terminal_set_scroll_on_keystroke (VTE_TERMINAL (vterm), myConfig.bScrollKeystroke);
+@@ -324,7 +321,7 @@ static void on_terminal_child_exited(Vte
+ 		#if (GLIB_MAJOR_VERSION > 2) || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 18)  // VTE_CHECK_VERSION doesn't exist in Hardy.
+ 			#if VTE_CHECK_VERSION(0,26,0)
+ 			const gchar *argv[] = {g_getenv ("SHELL"), NULL};
+-			vte_terminal_fork_command_full (VTE_TERMINAL(vterm),
++			vte_terminal_spawn_sync (VTE_TERMINAL(vterm),
+ 				VTE_PTY_NO_LASTLOG | VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP,
+ 				"~/",
+ 				(gchar**)argv,  // argv
+@@ -333,6 +330,7 @@ static void on_terminal_child_exited(Vte
+ 				NULL,  // GSpawnChildSetupFunc child_setup
+ 				NULL,  // gpointer child_setup_data
+ 				&pid,
++				NULL,
+ 				NULL);
+ 			#else
+ 			pid = vte_terminal_fork_command (VTE_TERMINAL(vterm),
+@@ -541,12 +539,11 @@ void terminal_new_tab(void)
+ 	//\_________________ On cree un nouveau terminal.
+ 	GtkWidget *vterm = vte_terminal_new();
+ 	GTK_WIDGET_GET_CLASS (vterm)->get_accessible = _get_dummy_accessible;  // this is to prevent a bug in libvet2.90; it gives a warning, but it's better than a crash !
+-	vte_terminal_set_emulation (VTE_TERMINAL(vterm), "xterm");
+ 	pid_t pid; 
+ 	#if (GLIB_MAJOR_VERSION > 2) || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 18)  // VTE_CHECK_VERSION doesn't exist in Hardy.
+ 		#if VTE_CHECK_VERSION(0,26,0)
+ 		const gchar *argv[] = {g_getenv ("SHELL"), NULL};
+-		vte_terminal_fork_command_full (VTE_TERMINAL(vterm),
++		vte_terminal_spawn_sync (VTE_TERMINAL(vterm),
+ 			VTE_PTY_NO_LASTLOG | VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP,
+ 			"~/",
+ 			(gchar**)argv,  // argv
+@@ -555,6 +552,7 @@ void terminal_new_tab(void)
+ 			NULL,  // GSpawnChildSetupFunc child_setup
+ 			NULL,  // gpointer child_setup_data
+ 			&pid,
++			NULL,
+ 			NULL);
+ 		#else
+ 		pid = vte_terminal_fork_command (VTE_TERMINAL(vterm),
+Binary files cairo-dock-plugins.orig/terminal/src/.terminal-widget.c.swp and cairo-dock-plugins/terminal/src/.terminal-widget.c.swp differ


Property changes on: cairo-dock-plugins/trunk/cd-terminal-vte2.91.patch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property

