[Pkg-xfce-commits] r6152 - in goodies/trunk/xfce4-clipman-plugin/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Mon Oct 24 02:14:25 UTC 2011
Author: corsac
Date: 2011-10-24 14:14:24 +0000 (Mon, 24 Oct 2011)
New Revision: 6152
Removed:
goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch
goodies/trunk/xfce4-clipman-plugin/debian/patches/02_use-exo-1.patch
goodies/trunk/xfce4-clipman-plugin/debian/patches/series
Modified:
goodies/trunk/xfce4-clipman-plugin/debian/changelog
Log:
* debian/patches:
- 0001-daemon-Fix-possible-NULL-values-bug-6119-6120 and 02_use-exo-1
dropped, included upstream.
Modified: goodies/trunk/xfce4-clipman-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/changelog 2011-10-24 14:09:10 UTC (rev 6151)
+++ goodies/trunk/xfce4-clipman-plugin/debian/changelog 2011-10-24 14:14:24 UTC (rev 6152)
@@ -1,6 +1,9 @@
xfce4-clipman-plugin (2:1.2.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/patches:
+ - 0001-daemon-Fix-possible-NULL-values-bug-6119-6120 and 02_use-exo-1
+ dropped, included upstream.
-- Yves-Alexis Perez <corsac at debian.org> Mon, 24 Oct 2011 16:09:05 +0200
Deleted: goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch 2011-10-24 14:09:10 UTC (rev 6151)
+++ goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch 2011-10-24 14:14:24 UTC (rev 6152)
@@ -1,37 +0,0 @@
-From d06e35ee62a0477adc84b5d7aeb29e348bb0b813 Mon Sep 17 00:00:00 2001
-From: Mike Massonnet <mmassonnet at xfce.org>
-Date: Thu, 7 Jan 2010 00:04:34 +0100
-Subject: [PATCH 01/20] [daemon] Fix possible NULL values (bug #6119 #6120)
-
-As reported, the abrt program detected a possible crash when the default
-cache is used to restore content or fill the selection while it is NULL.
----
- daemon/gsd-clipboard-manager.c | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/gsd-clipboard-manager.c b/daemon/gsd-clipboard-manager.c
-index e5c85a4..1027dea 100644
---- a/daemon/gsd-clipboard-manager.c
-+++ b/daemon/gsd-clipboard-manager.c
-@@ -121,7 +121,7 @@ default_clipboard_get_func (GtkClipboard *clipboard,
- GtkSelectionData *selection_data_cache = NULL;
-
- list = manager->priv->default_cache;
-- for (; list->next != NULL; list = list->next) {
-+ for (; list != NULL && list->next != NULL; list = list->next) {
- selection_data_cache = list->data;
- if (selection_data->target == selection_data_cache->target) {
- break;
-@@ -154,8 +154,11 @@ default_clipboard_restore (GsdClipboardManager *manager)
- GtkSelectionData *sdata;
- GSList *list;
-
-- target_list = gtk_target_list_new (NULL, 0);
- list = manager->priv->default_cache;
-+ if (list == NULL) {
-+ return;
-+ }
-+ target_list = gtk_target_list_new (NULL, 0);
- for (; list->next != NULL; list = list->next) {
- sdata = list->data;
- gtk_target_list_add (target_list, sdata->target, 0, 0);
Deleted: goodies/trunk/xfce4-clipman-plugin/debian/patches/02_use-exo-1.patch
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/patches/02_use-exo-1.patch 2011-10-24 14:09:10 UTC (rev 6151)
+++ goodies/trunk/xfce4-clipman-plugin/debian/patches/02_use-exo-1.patch 2011-10-24 14:14:24 UTC (rev 6152)
@@ -1,70 +0,0 @@
-Description: Fix build with exo 0.5.x
-Origin: backport, http://bugzilla.xfce.org/attachment.cgi?id=3201
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6853
---- xfce4-clipman-plugin-1.1.3.orig/configure
-+++ xfce4-clipman-plugin-1.1.3/configure
-@@ -12435,26 +12435,26 @@ $as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&
- fi
-
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-0.3 >= 0.3.0" >&5
--$as_echo_n "checking for exo-0.3 >= 0.3.0... " >&6; }
-- if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then
-- EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"`
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exo-1 >= 0.5.0" >&5
-+$as_echo_n "checking for exo-1 >= 0.5.0... " >&6; }
-+ if $PKG_CONFIG "--atleast-version=0.5.0" "exo-1" >/dev/null 2>&1; then
-+ EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_VERSION" >&5
- $as_echo "$EXO_VERSION" >&6; }
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking EXO_CFLAGS" >&5
- $as_echo_n "checking EXO_CFLAGS... " >&6; }
-- EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"`
-+ EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_CFLAGS" >&5
- $as_echo "$EXO_CFLAGS" >&6; }
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking EXO_LIBS" >&5
- $as_echo_n "checking EXO_LIBS... " >&6; }
-- EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"`
-+ EXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXO_LIBS" >&5
- $as_echo "$EXO_LIBS" >&6; }
-
-- EXO_REQUIRED_VERSION=0.3.0
-+ EXO_REQUIRED_VERSION=0.5.0
-
-
-
-@@ -12462,15 +12462,15 @@ $as_echo "$EXO_LIBS" >&6; }
-
-
-
-- elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then
-- xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"`
-+ elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
-+ xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5
- $as_echo "found, but $xdt_cv_version" >&6; }
-
-
-- echo "*** The required package exo-0.3 was found on your system,"
-+ echo "*** The required package exo-1 was found on your system,"
- echo "*** but the installed version ($xdt_cv_version) is too old."
-- echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust"
-+ echo "*** Please upgrade exo-1 to atleast version 0.5.0, or adjust"
- echo "*** the PKG_CONFIG_PATH environment variable if you installed"
- echo "*** the new version of the package in a nonstandard prefix so"
- echo "*** pkg-config is able to find it."
-@@ -12481,8 +12481,8 @@ $as_echo "found, but $xdt_cv_version" >&
- $as_echo "not found" >&6; }
-
-
-- echo "*** The required package exo-0.3 was not found on your system."
-- echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust"
-+ echo "*** The required package exo-1 was not found on your system."
-+ echo "*** Please install exo-1 (atleast version 0.5.0) or adjust"
- echo "*** the PKG_CONFIG_PATH environment variable if you"
- echo "*** installed the package in a nonstandard prefix so that"
- echo "*** pkg-config is able to find it."
Deleted: goodies/trunk/xfce4-clipman-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/patches/series 2011-10-24 14:09:10 UTC (rev 6151)
+++ goodies/trunk/xfce4-clipman-plugin/debian/patches/series 2011-10-24 14:14:24 UTC (rev 6152)
@@ -1,2 +0,0 @@
-0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch
-02_use-exo-1.patch
More information about the Pkg-xfce-commits
mailing list