attempt to fix crashing xfce4-places-plugin with undefined symbol (patch cherry picked from upstream)

3 files changed, 96 insertions, 0 deletions

diff --git a/xfce-extra/xfce4-places-plugin/Manifest b/xfce-extra/xfce4-places-plugin/Manifest
new file mode 100644
index 00000000..5227aa8f
--- /dev/null
+++ b/xfce-extra/xfce4-places-plugin/Manifest
@@ -0,0 +1 @@
+DIST xfce4-places-plugin-1.7.0.tar.bz2 371395 SHA256 4175c614749abbb5bcf6f49c88125fb0dd36db69f4c374df23563907b16e2c3f SHA512 ae324a29584d7dc6beb4840bec7e4c5802e94c25512f449ab959c588c91f4030d895fe185dad87ab9442611e9fe01f8ccec82e8cb5153cf192d1124156be6bd3 WHIRLPOOL 8b3a16ad17cbda883c3f798288706e3f9a3caf03d8c74c74fc52fb3453c484a3679740b01d38b70c3b8bdbdfdc2c1274cd2e36913cba1e4091fb1c9e5f1231be
diff --git a/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.7.0-undefined-symbol.patch b/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.7.0-undefined-symbol.patch
new file mode 100644
index 00000000..85c29368
--- /dev/null
+++ b/xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.7.0-undefined-symbol.patch
@@ -0,0 +1,54 @@
+diff -Nur a/panel-plugin/model.h b/panel-plugin/model.h
+--- a/panel-plugin/model.h	2013-12-28 11:30:18.000000000 +0000
++++ b/panel-plugin/model.h	2016-12-30 17:54:49.638223315 +0000
+@@ -36,13 +36,13 @@
+     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 @@
+     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 @@
+     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
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0-r1.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0-r1.ebuild
new file mode 100644
index 00000000..cbde23d0
--- /dev/null
+++ b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A panel plug-in to provide quick access to files, folders and removable media"
+HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug libnotify"
+
+RDEPEND=">=dev-libs/glib-2.28:=
+	>=x11-libs/gtk+-2.20:2=
+	x11-libs/libX11:=
+	>=xfce-base/exo-0.6:=
+	>=xfce-base/libxfce4ui-4.8:=
+	>=xfce-base/libxfce4util-4.8:=
+	>=xfce-base/xfce4-panel-4.8:=
+	>=xfce-base/xfconf-4.8:=
+	libnotify? ( >=x11-libs/libnotify-0.7:= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	XFCONF=(
+		$(use_enable libnotify notifications)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+src_prepare() {
+	epatch ${FILESDIR}/${P}-undefined-symbol.patch
+}