Package: cairo-dock-plug-ins
Version: 3.4.0-1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for cairo-dock-plug-ins (versioned as 3.4.0-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru cairo-dock-plug-ins-3.4.0/debian/changelog
cairo-dock-plug-ins-3.4.0/debian/changelog
--- cairo-dock-plug-ins-3.4.0/debian/changelog 2014-10-23 08:39:56.000000000
+0200
+++ cairo-dock-plug-ins-3.4.0/debian/changelog 2015-10-16 16:29:38.000000000
+0200
@@ -1,3 +1,15 @@
+cairo-dock-plug-ins (3.4.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use libzeitgeist-2.0-dev instead of libzeitgeist-dev, libzeitgeist 1.0 is
+ deprecated for quite some time and this package is the last one to use it.
+ (Closes: #801969)
+ * d/p/0004-Add-CMake-check-for-vte-2.91-and-fix-VTE_CHECK_VERSI.patch: Use
+ libvte-2.91 instead of libvte-2.90 (Thanks to Rodolphe PELLOUX-PRAYER
+ <rodol...@damsy.net>, Closes: #788019)
+
+ -- Laurent Bigonville <bi...@debian.org> Fri, 16 Oct 2015 16:25:44 +0200
+
cairo-dock-plug-ins (3.4.0-1) unstable; urgency=medium
* Imported Upstream version 3.4.0.
diff -Nru cairo-dock-plug-ins-3.4.0/debian/control
cairo-dock-plug-ins-3.4.0/debian/control
--- cairo-dock-plug-ins-3.4.0/debian/control 2014-10-23 08:39:37.000000000
+0200
+++ cairo-dock-plug-ins-3.4.0/debian/control 2015-10-16 16:25:32.000000000
+0200
@@ -32,13 +32,13 @@
librsvg2-dev,
libsensors4-dev,
libupower-glib-dev,
- libvte-2.90-dev,
+ libvte-2.91-dev,
libwebkitgtk-3.0-dev,
libxklavier-dev,
libxml2-dev,
libxtst-dev,
libxxf86vm-dev,
- libzeitgeist-dev,
+ libzeitgeist-2.0-dev,
mono-devel [amd64 armel i386 kfreebsd-any powerpc s390x],
mono-gmcs [amd64 armel i386 kfreebsd-any powerpc s390x],
python,
diff -Nru
cairo-dock-plug-ins-3.4.0/debian/patches/0004-Add-CMake-check-for-vte-2.91-and-fix-VTE_CHECK_VERSI.patch
cairo-dock-plug-ins-3.4.0/debian/patches/0004-Add-CMake-check-for-vte-2.91-and-fix-VTE_CHECK_VERSI.patch
---
cairo-dock-plug-ins-3.4.0/debian/patches/0004-Add-CMake-check-for-vte-2.91-and-fix-VTE_CHECK_VERSI.patch
1970-01-01 01:00:00.000000000 +0100
+++
cairo-dock-plug-ins-3.4.0/debian/patches/0004-Add-CMake-check-for-vte-2.91-and-fix-VTE_CHECK_VERSI.patch
2015-10-16 16:25:32.000000000 +0200
@@ -0,0 +1,77 @@
+From: Maxime Gauduin <aluc...@gmail.com>
+Date: Mon, 20 Oct 2014 11:41:17 +0200
+Subject: Add CMake check for vte-2.91 and fix VTE_CHECK_VERSION number
+
+---
+ CMakeLists.txt | 6 +++++-
+ terminal/src/terminal-widget.c | 10 +++++-----
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 83bb3ec..5adb278 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1341,9 +1341,13 @@ 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)
++ set (TERMINAL_MODULE vte-2.90)
++ pkg_check_modules (VTE ${TERMINAL_MODULE})
++ endif()
++ 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}")
+diff --git a/terminal/src/terminal-widget.c b/terminal/src/terminal-widget.c
+index c3f29aa..b8f6fe9 100755
+--- a/terminal/src/terminal-widget.c
++++ b/terminal/src/terminal-widget.c
+@@ -263,7 +263,7 @@ static void _term_apply_settings_on_vterm(GtkWidget *vterm)
+ {
+ g_return_if_fail (vterm != NULL);
+
+- #if VTE_CHECK_VERSION(2,91,0)
++ #if VTE_CHECK_VERSION(0,38,0)
+ vte_terminal_set_colors (VTE_TERMINAL(vterm), &myConfig.forecolor.rgba,
&myConfig.backcolor.rgba, NULL, 0);
+ #else
+ vte_terminal_set_colors_rgba (VTE_TERMINAL(vterm),
&myConfig.forecolor.rgba, &myConfig.backcolor.rgba, NULL, 0);
+@@ -271,7 +271,7 @@ static void _term_apply_settings_on_vterm(GtkWidget *vterm)
+
+ if (myConfig.bCustomFont)
+ {
+- #if VTE_CHECK_VERSION(2,91,0)
++ #if VTE_CHECK_VERSION(0,38,0)
+ PangoFontDescription *fd =
pango_font_description_from_string(myConfig.cCustomFont);
+ vte_terminal_set_font (VTE_TERMINAL (vterm), fd);
+ #else
+@@ -325,7 +325,7 @@ static void _create_terminal (GtkWidget *vterm)
+ #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};
+- #if VTE_CHECK_VERSION(2,91,0)
++ #if VTE_CHECK_VERSION(0,38,0)
+ vte_terminal_spawn_sync (
+ #else
+ vte_terminal_fork_command_full (
+@@ -339,7 +339,7 @@ static void _create_terminal (GtkWidget *vterm)
+ NULL, // GSpawnChildSetupFunc child_setup
+ NULL, // gpointer child_setup_data
+ &pid,
+- #if VTE_CHECK_VERSION(2,91,0)
++ #if VTE_CHECK_VERSION(0,38,0)
+ NULL, // cancellable
+ #endif
+ NULL);
+@@ -565,7 +565,7 @@ 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 !
+- #if ! VTE_CHECK_VERSION(2,91,0)
++ #if ! VTE_CHECK_VERSION(0,38,0)
+ vte_terminal_set_emulation (VTE_TERMINAL(vterm), "xterm");
+ #endif
+
diff -Nru cairo-dock-plug-ins-3.4.0/debian/patches/series
cairo-dock-plug-ins-3.4.0/debian/patches/series
--- cairo-dock-plug-ins-3.4.0/debian/patches/series 2014-10-23
07:31:54.000000000 +0200
+++ cairo-dock-plug-ins-3.4.0/debian/patches/series 2015-10-16
16:25:32.000000000 +0200
@@ -1,3 +1,4 @@
0001-Fix-typo-about-SystemMonitor-Mail-dnd2share-Stack-GV.patch
0001-Fix-MATCH-as-FreeBSD.patch
ruby-vendor-dir.patch
+0004-Add-CMake-check-for-vte-2.91-and-fix-VTE_CHECK_VERSI.patch
