[arch-commits] Commit in cairo-dock-plugins/trunk (PKGBUILD cd-terminal-vte2.91.patch)
Maxime Gauduin
alucryd at archlinux.org
Mon Oct 20 09:31:45 UTC 2014
Date: Monday, October 20, 2014 @ 11:31:45
Author: alucryd
Revision: 121034
upgpkg: cairo-dock-plugins 3.4.0-1
Modified:
cairo-dock-plugins/trunk/PKGBUILD
Deleted:
cairo-dock-plugins/trunk/cd-terminal-vte2.91.patch
---------------------------+
PKGBUILD | 24 +++-----
cd-terminal-vte2.91.patch | 132 --------------------------------------------
2 files changed, 11 insertions(+), 145 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-10-20 08:05:57 UTC (rev 121033)
+++ PKGBUILD 2014-10-20 09:31:45 UTC (rev 121034)
@@ -6,14 +6,14 @@
# Contributor: snoopy33 <snoopy33 at no-log.org>
pkgname=cairo-dock-plugins
-pkgver=3.3.2.r3121
-pkgrel=2
+pkgver=3.4.0
+pkgrel=1
pkgdesc='Plugins for Cairo-Dock'
arch=('i686' 'x86_64')
-url='https://launchpad.net/cairo-dock-plug-ins'
+url='http://glx-dock.org'
license=('GPL')
depends=('cairo-dock')
-makedepends=('bzr' 'cmake' 'alsa-lib' 'fftw' 'gnome-menus' 'gtk-sharp-2' 'gvfs'
+makedepends=('alsa-lib' 'cmake' 'fftw' 'gnome-menus' 'gtk-sharp-2' 'gvfs'
'libetpan' 'libexif' 'libical' 'libpulse' 'libxklavier'
'libzeitgeist' 'lm_sensors' 'ndesk-dbus-glib' 'python' 'python2'
'ruby' 'vala' 'vte3' 'webkitgtk3')
@@ -35,20 +35,18 @@
'ruby: Ruby API'
'vte3: Terminal applet'
'webkitgtk3: Weblets applet')
-#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'
- 'b6258ed01337832a2c0bec0152e53e039fbd7422f7b8c5c6a376c3581e1d33bd')
+source=("https://launchpad.net/cairo-dock-plug-ins/${pkgver%.?}/${pkgver}/+download/cairo-dock-plugins-${pkgver}.tar.gz")
+sha256sums=('7ffcf40f07cd05bef826ad47f1f11940b9813d279c9e5117384f14f1f32d8dbd')
prepare() {
- cd cairo-dock-plugins
+ cd cairo-dock-plugins-${pkgver}
- patch -Np1 -i ../cd-terminal-vte2.91.patch
+ sed 's/vte-2.90/vte-2.91/' -i CMakeLists.txt
+ sed 's/(2,91,0)/(0,38,1)/g' -i terminal/src/terminal-widget.c
}
build() {
- cd cairo-dock-plugins
+ cd cairo-dock-plugins-${pkgver}
if [[ -d build ]]; then
rm -rf build
@@ -60,7 +58,7 @@
}
package() {
- cd cairo-dock-plugins/build
+ cd cairo-dock-plugins-${pkgver}/build
make DESTDIR="${pkgdir}" install
}
Deleted: cd-terminal-vte2.91.patch
===================================================================
--- cd-terminal-vte2.91.patch 2014-10-20 08:05:57 UTC (rev 121033)
+++ cd-terminal-vte2.91.patch 2014-10-20 09:31:45 UTC (rev 121034)
@@ -1,132 +0,0 @@
-diff -rupN cairo-dock-plugins.orig/CMakeLists.txt cairo-dock-plugins/CMakeLists.txt
---- cairo-dock-plugins.orig/CMakeLists.txt 2014-09-28 19:07:48.336966300 +0200
-+++ cairo-dock-plugins/CMakeLists.txt 2014-09-28 19:24:58.793109500 +0200
-@@ -1345,13 +1345,20 @@ 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)
-+ set (PANGO_MODULE pango)
- pkg_check_modules (VTE ${TERMINAL_MODULE})
-+ pkg_check_modules (PANGO ${PANGO_MODULE})
- if (NOT VTE_FOUND)
- message (STATUS "Could not find ${TERMINAL_MODULE}; Cairo-Dock won't be built with terminal applet.")
- message (WARNING "This module is required to compile Terminal applet: ${TERMINAL_MODULE}")
- set (MODULES_MISSING "${MODULES_MISSING} ${TERMINAL_MODULE}")
- set (with_terminal no)
-+ elseif (NOT PANGO_FOUND)
-+ message (STATUS "Could not find ${PANGO_MODULE}; Cairo-Dock won't be built with terminal applet.")
-+ message (WARNING "This module is required to compile Terminal applet: ${PANGO_MODULE}")
-+ set (MODULES_MISSING "${MODULES_MISSING} ${PANGO_MODULE}")
-+ set (with_terminal no)
- else()
- set (GETTEXT_TERMINAL ${GETTEXT_PLUGINS})
- set (VERSION_TERMINAL "1.0.13")
-diff -rupN cairo-dock-plugins.orig/terminal/src/CMakeLists.txt cairo-dock-plugins/terminal/src/CMakeLists.txt
---- cairo-dock-plugins.orig/terminal/src/CMakeLists.txt 2014-09-28 19:07:48.283802000 +0200
-+++ cairo-dock-plugins/terminal/src/CMakeLists.txt 2014-09-28 19:27:52.496698900 +0200
-@@ -31,15 +31,18 @@ add_definitions (-DVTE_MINOR=${VTE_MINOR
-
- include_directories (
- ${PACKAGE_INCLUDE_DIRS}
-- ${VTE_INCLUDE_DIRS})
-+ ${VTE_INCLUDE_DIRS}
-+ ${PANGO_INCLUDE_DIRS})
-
- link_directories (
- ${PACKAGE_LIBRARY_DIRS}
-- ${VTE_LIBRARY_DIRS})
-+ ${VTE_LIBRARY_DIRS}
-+ ${PANGO_LIBRARY_DIRS})
-
- target_link_libraries (${PACKAGE_TERMINAL}
- ${PACKAGE_LIBRARIES}
-- ${VTE_LIBRARIES})
-+ ${VTE_LIBRARIES}
-+ ${PANGO_LIBRARIES})
-
- ########### install files ###############
-
-@@ -73,6 +76,7 @@ install(TARGETS ${PACKAGE_TERMINAL} DEST
- # -I$(top_srcdir)/src
- # $(PACKAGE_CFLAGS)
- # $(VTE_CFLAGS)
-+# $(PANGO_CFLAGS)
- # -DMY_APPLET_SHARE_DATA_DIR=""${terminaldatadir)""
- # -DMY_APPLET_PREVIEW_FILE=""preview.jpg""
- # -DMY_APPLET_CONF_FILE=""terminal.conf""
-@@ -89,6 +93,7 @@ install(TARGETS ${PACKAGE_TERMINAL} DEST
- #libcd_terminal_la_LIBADD =
- # $(PACKAGE_LIBS) -lm
- # $(VTE_LIBS)
-+# $(PANGO_LIBS)
- #
- #
- #libcd_terminal_la_LDFLAGS =
-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 19:07:48.283362800 +0200
-+++ cairo-dock-plugins/terminal/src/terminal-widget.c 2014-09-28 19:07:56.040701000 +0200
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <signal.h>
- #include <gdk/gdk.h>
-+#include <pango/pango-font.h>
-
- #include <vte/vte.h>
-
-@@ -263,10 +264,13 @@ 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);
-+ {
-+ PangoFontDescription *font_desc = pango_font_description_from_string(myConfig.cCustomFont);
-+ vte_terminal_set_font (VTE_TERMINAL (vterm), font_desc);
-+ }
- else
- vte_terminal_set_font (VTE_TERMINAL (vterm), NULL);
-
-@@ -324,7 +326,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 +335,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 +544,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 +557,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),
More information about the arch-commits
mailing list