From 708579b2bcce1869a116c8af7ae93206751c3c49 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Mon, 11 Jan 2016 01:10:32 -0600 Subject: [PATCH] desktop/xfce4-places-plugin: Updated for version 1.7.0. This version integrates better with gtk+3, but if there are problems with it, let me know and I'll revert in 14.1. Signed-off-by: Robby Workman --- ...places-plugin-1.7.0-crashes-with-und.patch | 69 +++++++++++++++++++ .../xfce4-places-plugin.SlackBuild | 6 +- .../xfce4-places-plugin.info | 6 +- 3 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 desktop/xfce4-places-plugin/0001-Bug-11939-xfce4-places-plugin-1.7.0-crashes-with-und.patch diff --git a/desktop/xfce4-places-plugin/0001-Bug-11939-xfce4-places-plugin-1.7.0-crashes-with-und.patch b/desktop/xfce4-places-plugin/0001-Bug-11939-xfce4-places-plugin-1.7.0-crashes-with-und.patch new file mode 100644 index 0000000000..a94d9ea706 --- /dev/null +++ b/desktop/xfce4-places-plugin/0001-Bug-11939-xfce4-places-plugin-1.7.0-crashes-with-und.patch @@ -0,0 +1,69 @@ +From 94d583d0ba257cdc96cde5794ebb7d38001ae3a5 Mon Sep 17 00:00:00 2001 +From: Andrzej +Date: Tue, 7 Jul 2015 22:26:51 +0100 +Subject: [PATCH] Bug 11939: xfce4-places-plugin 1.7.0 crashes with undefined + symbol + +Patch from Fedora. Submitted by Kevin Fenzi. +--- + panel-plugin/model.h | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/panel-plugin/model.h b/panel-plugin/model.h +index 06d9d6f..043e391 100644 +--- a/panel-plugin/model.h ++++ b/panel-plugin/model.h +@@ -36,13 +36,13 @@ struct _PlacesBookmarkAction + void (*finalize) (PlacesBookmarkAction *self); + }; + +-inline PlacesBookmarkAction* ++extern inline PlacesBookmarkAction* + places_bookmark_action_create(gchar *label); + +-inline void ++extern inline void + places_bookmark_action_destroy(PlacesBookmarkAction*); + +-inline void ++extern inline void + places_bookmark_action_call(PlacesBookmarkAction*); + + /* Places Bookmark */ +@@ -70,10 +70,10 @@ struct _PlacesBookmark + void (*finalize) (PlacesBookmark *self); + }; + +-inline PlacesBookmark* ++extern inline PlacesBookmark* + places_bookmark_create(gchar *label); + +-inline void ++extern inline void + places_bookmark_destroy(PlacesBookmark *bookmark); + + /* Places Bookmark Group */ +@@ -86,16 +86,16 @@ struct _PlacesBookmarkGroup + gpointer priv; + }; + +-inline GList* ++extern inline GList* + places_bookmark_group_get_bookmarks(PlacesBookmarkGroup*); + +-inline gboolean ++extern inline gboolean + places_bookmark_group_changed(PlacesBookmarkGroup*); + +-inline PlacesBookmarkGroup* ++extern inline PlacesBookmarkGroup* + places_bookmark_group_create(); + +-inline void ++extern inline void + places_bookmark_group_destroy(PlacesBookmarkGroup*); + + #endif +-- +2.6.4 + diff --git a/desktop/xfce4-places-plugin/xfce4-places-plugin.SlackBuild b/desktop/xfce4-places-plugin/xfce4-places-plugin.SlackBuild index bec8dc21d4..288a615200 100644 --- a/desktop/xfce4-places-plugin/xfce4-places-plugin.SlackBuild +++ b/desktop/xfce4-places-plugin/xfce4-places-plugin.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xfce4-places-plugin -# Copyright 2006-2013 Robby Workman, Northport, Alabama, USA +# Copyright 2006-2016 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-places-plugin -VERSION=${VERSION:-1.6.0} +VERSION=${VERSION:-1.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,6 +69,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/0001-Bug-11939-xfce4-places-plugin-1.7.0-crashes-with-und.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/xfce4-places-plugin/xfce4-places-plugin.info b/desktop/xfce4-places-plugin/xfce4-places-plugin.info index 8d1f7fb4a4..96960adf69 100644 --- a/desktop/xfce4-places-plugin/xfce4-places-plugin.info +++ b/desktop/xfce4-places-plugin/xfce4-places-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-places-plugin" -VERSION="1.6.0" +VERSION="1.7.0" HOMEPAGE="http://goodies.xfce.org" -DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.6/xfce4-places-plugin-1.6.0.tar.bz2" -MD5SUM="8f3ec883efb0775052eeea816bbd8a23" +DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.7/xfce4-places-plugin-1.7.0.tar.bz2" +MD5SUM="fcae9b38a8affcd82699a94991bba29b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""