Date: Thursday, October 16, 2014 @ 14:07:00
Author: jgc
Revision: 120782
db-move: moved cairo-dock-plugins from [community-testing] to [community]
(i686, x86_64)
Added:
cairo-dock-plugins/repos/community-i686/PKGBUILD
(from rev 120780, cairo-dock-plugins/repos/community-testing-i686/PKGBUILD)
cairo-dock-plugins/repos/community-i686/cd-terminal-vte2.91.patch
(from rev 120780,
cairo-dock-plugins/repos/community-testing-i686/cd-terminal-vte2.91.patch)
cairo-dock-plugins/repos/community-x86_64/PKGBUILD
(from rev 120780,
cairo-dock-plugins/repos/community-testing-x86_64/PKGBUILD)
cairo-dock-plugins/repos/community-x86_64/cd-terminal-vte2.91.patch
(from rev 120780,
cairo-dock-plugins/repos/community-testing-x86_64/cd-terminal-vte2.91.patch)
Deleted:
cairo-dock-plugins/repos/community-i686/PKGBUILD
cairo-dock-plugins/repos/community-testing-i686/
cairo-dock-plugins/repos/community-testing-x86_64/
cairo-dock-plugins/repos/community-x86_64/PKGBUILD
--------------------------------------------+
/PKGBUILD | 136 +++++++++++++++++++++++++++
community-i686/PKGBUILD | 56 -----------
community-i686/cd-terminal-vte2.91.patch | 132 ++++++++++++++++++++++++++
community-x86_64/PKGBUILD | 56 -----------
community-x86_64/cd-terminal-vte2.91.patch | 132 ++++++++++++++++++++++++++
5 files changed, 400 insertions(+), 112 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-10-16 12:06:59 UTC (rev 120781)
+++ community-i686/PKGBUILD 2014-10-16 12:07:00 UTC (rev 120782)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <aluc...@gmail.com>
-# Contributor: Tofe <chris.chap...@gmail.com>
-# Contributor: zhuqin <zhuqi...@gmail.com>
-# Contributor: tri1976 <tri...@gmail.com>
-# Contributor: snoopy33 <snoop...@no-log.org>
-
-pkgname=cairo-dock-plugins
-pkgver=3.3.2
-pkgrel=4
-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')
-optdepends=('alsa-lib: Sound Control, Sound Effects applets'
- 'fftw: Impulse applet'
- 'gnome-menus: Applications Menu applet'
- 'gtk-sharp-2: Mono API'
- 'gvfs: GVFS integration'
- 'libetpan: Mail applet'
- 'libexif: Slider applet'
- 'libical: Clock applet'
- 'libpulse: Impulse applet'
- 'libxklavier: Keyboard Indicator applet'
- 'libzeitgeist: Recent Events applet'
- 'lm_sensors: System Monitor applet'
- 'ndesk-dbus-glib: Mono API'
- 'python: Python 3 API'
- 'python2: Python 2 API'
- 'ruby: Ruby API'
- 'vte3: Terminal applet'
- 'webkitgtk3: Weblets applet')
-source=("${url}/${pkgver%.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('48f0caddb0a563d8a64176f66610ca35df5c952071e5574486d39bb574994643')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build && cd build
-
- cmake .. -DCMAKE_INSTALL_PREFIX='/usr'
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}/build
-
- make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:
Copied: cairo-dock-plugins/repos/community-i686/PKGBUILD (from rev 120780,
cairo-dock-plugins/repos/community-testing-i686/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-10-16 12:07:00 UTC (rev 120782)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Maxime Gauduin <aluc...@archlinux.org>
+# Contributor: Tofe <chris.chap...@gmail.com>
+# Contributor: zhuqin <zhuqi...@gmail.com>
+# Contributor: tri1976 <tri...@gmail.com>
+# Contributor: snoopy33 <snoop...@no-log.org>
+
+pkgname=cairo-dock-plugins
+pkgver=3.3.2.r3121
+pkgrel=2
+pkgdesc='Plugins for Cairo-Dock'
+arch=('i686' 'x86_64')
+url='https://launchpad.net/cairo-dock-plug-ins'
+license=('GPL')
+depends=('cairo-dock')
+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'
+ 'gtk-sharp-2: Mono API'
+ 'gvfs: GVFS integration'
+ 'libetpan: Mail applet'
+ 'libexif: Slider applet'
+ 'libical: Clock applet'
+ 'libpulse: Impulse applet'
+ 'libxklavier: Keyboard Indicator applet'
+ 'libzeitgeist: Recent Events applet'
+ 'lm_sensors: System Monitor applet'
+ 'ndesk-dbus-glib: Mono API'
+ 'python: Python 3 API'
+ 'python2: Python 2 API'
+ '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')
+
+prepare() {
+ cd cairo-dock-plugins
+
+ patch -Np1 -i ../cd-terminal-vte2.91.patch
+}
+
+build() {
+ cd cairo-dock-plugins
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build && cd build
+
+ cmake .. -DCMAKE_INSTALL_PREFIX='/usr'
+ make
+}
+
+package() {
+ cd cairo-dock-plugins/build
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Copied: cairo-dock-plugins/repos/community-i686/cd-terminal-vte2.91.patch (from
rev 120780,
cairo-dock-plugins/repos/community-testing-i686/cd-terminal-vte2.91.patch)
===================================================================
--- community-i686/cd-terminal-vte2.91.patch (rev 0)
+++ community-i686/cd-terminal-vte2.91.patch 2014-10-16 12:07:00 UTC (rev
120782)
@@ -0,0 +1,132 @@
+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),
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-10-16 12:06:59 UTC (rev 120781)
+++ community-x86_64/PKGBUILD 2014-10-16 12:07:00 UTC (rev 120782)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <aluc...@gmail.com>
-# Contributor: Tofe <chris.chap...@gmail.com>
-# Contributor: zhuqin <zhuqi...@gmail.com>
-# Contributor: tri1976 <tri...@gmail.com>
-# Contributor: snoopy33 <snoop...@no-log.org>
-
-pkgname=cairo-dock-plugins
-pkgver=3.3.2
-pkgrel=4
-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')
-optdepends=('alsa-lib: Sound Control, Sound Effects applets'
- 'fftw: Impulse applet'
- 'gnome-menus: Applications Menu applet'
- 'gtk-sharp-2: Mono API'
- 'gvfs: GVFS integration'
- 'libetpan: Mail applet'
- 'libexif: Slider applet'
- 'libical: Clock applet'
- 'libpulse: Impulse applet'
- 'libxklavier: Keyboard Indicator applet'
- 'libzeitgeist: Recent Events applet'
- 'lm_sensors: System Monitor applet'
- 'ndesk-dbus-glib: Mono API'
- 'python: Python 3 API'
- 'python2: Python 2 API'
- 'ruby: Ruby API'
- 'vte3: Terminal applet'
- 'webkitgtk3: Weblets applet')
-source=("${url}/${pkgver%.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('48f0caddb0a563d8a64176f66610ca35df5c952071e5574486d39bb574994643')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build && cd build
-
- cmake .. -DCMAKE_INSTALL_PREFIX='/usr'
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}/build
-
- make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:
Copied: cairo-dock-plugins/repos/community-x86_64/PKGBUILD (from rev 120780,
cairo-dock-plugins/repos/community-testing-x86_64/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-10-16 12:07:00 UTC (rev 120782)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Maxime Gauduin <aluc...@archlinux.org>
+# Contributor: Tofe <chris.chap...@gmail.com>
+# Contributor: zhuqin <zhuqi...@gmail.com>
+# Contributor: tri1976 <tri...@gmail.com>
+# Contributor: snoopy33 <snoop...@no-log.org>
+
+pkgname=cairo-dock-plugins
+pkgver=3.3.2.r3121
+pkgrel=2
+pkgdesc='Plugins for Cairo-Dock'
+arch=('i686' 'x86_64')
+url='https://launchpad.net/cairo-dock-plug-ins'
+license=('GPL')
+depends=('cairo-dock')
+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'
+ 'gtk-sharp-2: Mono API'
+ 'gvfs: GVFS integration'
+ 'libetpan: Mail applet'
+ 'libexif: Slider applet'
+ 'libical: Clock applet'
+ 'libpulse: Impulse applet'
+ 'libxklavier: Keyboard Indicator applet'
+ 'libzeitgeist: Recent Events applet'
+ 'lm_sensors: System Monitor applet'
+ 'ndesk-dbus-glib: Mono API'
+ 'python: Python 3 API'
+ 'python2: Python 2 API'
+ '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')
+
+prepare() {
+ cd cairo-dock-plugins
+
+ patch -Np1 -i ../cd-terminal-vte2.91.patch
+}
+
+build() {
+ cd cairo-dock-plugins
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build && cd build
+
+ cmake .. -DCMAKE_INSTALL_PREFIX='/usr'
+ make
+}
+
+package() {
+ cd cairo-dock-plugins/build
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Copied: cairo-dock-plugins/repos/community-x86_64/cd-terminal-vte2.91.patch
(from rev 120780,
cairo-dock-plugins/repos/community-testing-x86_64/cd-terminal-vte2.91.patch)
===================================================================
--- community-x86_64/cd-terminal-vte2.91.patch (rev 0)
+++ community-x86_64/cd-terminal-vte2.91.patch 2014-10-16 12:07:00 UTC (rev
120782)
@@ -0,0 +1,132 @@
+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),
