From 051560d28cf2730e2aabcfeaf7952184ccd9daf3 Mon Sep 17 00:00:00 2001 From: gutteridge Date: Sat, 4 May 2019 19:23:45 +0000 Subject: xfce4-places-plugin: update to 1.8.0 Change log: * Port to GTK+ 3! * Bumped dependencies to modern stack: - GTK 3.22 - GLib 2.42 - Xfce 4.12 * Added support for Xfce Panel's icon size preference * Improved appearance of the preferences dialog * Fixed crash with undefined symbol (bug #11939) * Updated translations --- x11/xfce4-places-plugin/Makefile | 10 +-- x11/xfce4-places-plugin/PLIST | 3 +- x11/xfce4-places-plugin/distinfo | 14 ++-- .../patches/patch-panel-plugin_model.c | 95 ---------------------- .../patches/patch-panel-plugin_model.h | 56 ------------- .../patches/patch-panel-plugin_model__user.c | 23 ------ .../patches/patch-panel-plugin_model__volumes.c | 14 ---- 7 files changed, 12 insertions(+), 203 deletions(-) delete mode 100644 x11/xfce4-places-plugin/patches/patch-panel-plugin_model.c delete mode 100644 x11/xfce4-places-plugin/patches/patch-panel-plugin_model.h delete mode 100644 x11/xfce4-places-plugin/patches/patch-panel-plugin_model__user.c delete mode 100644 x11/xfce4-places-plugin/patches/patch-panel-plugin_model__volumes.c diff --git a/x11/xfce4-places-plugin/Makefile b/x11/xfce4-places-plugin/Makefile index e8579432130..b563f363d18 100644 --- a/x11/xfce4-places-plugin/Makefile +++ b/x11/xfce4-places-plugin/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.41 2018/11/14 22:22:52 kleink Exp $ +# $NetBSD: Makefile,v 1.42 2019/05/04 19:23:45 gutteridge Exp $ -PKGREVISION= 9 .include "../../meta-pkgs/xfce4/Makefile.common" -DISTNAME= xfce4-places-plugin-1.7.0 +VERSION= 1.8.0 +DISTNAME= xfce4-places-plugin-${VERSION} CATEGORIES= x11 -MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.7/ +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/${VERSION:R}/ HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin COMMENT= Xfce Places plugin -.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../x11/xfce4-exo/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-places-plugin/PLIST b/x11/xfce4-places-plugin/PLIST index 7e5f82d3950..52e4492dd24 100644 --- a/x11/xfce4-places-plugin/PLIST +++ b/x11/xfce4-places-plugin/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.4 2015/06/29 10:46:31 youri Exp $ +@comment $NetBSD: PLIST,v 1.5 2019/05/04 19:23:45 gutteridge Exp $ bin/xfce4-popup-places lib/xfce4/panel/plugins/libplaces.la +share/locale/am/LC_MESSAGES/xfce4-places-plugin.mo share/locale/ar/LC_MESSAGES/xfce4-places-plugin.mo share/locale/ast/LC_MESSAGES/xfce4-places-plugin.mo share/locale/be/LC_MESSAGES/xfce4-places-plugin.mo diff --git a/x11/xfce4-places-plugin/distinfo b/x11/xfce4-places-plugin/distinfo index a358413d83a..ce5b4d03b4e 100644 --- a/x11/xfce4-places-plugin/distinfo +++ b/x11/xfce4-places-plugin/distinfo @@ -1,10 +1,6 @@ -$NetBSD: distinfo,v 1.6 2015/11/04 03:29:05 agc Exp $ +$NetBSD: distinfo,v 1.7 2019/05/04 19:23:45 gutteridge Exp $ -SHA1 (xfce4-places-plugin-1.7.0.tar.bz2) = 30ff524c5540d374bb0a50a8379a4eb9468a0d8b -RMD160 (xfce4-places-plugin-1.7.0.tar.bz2) = 669cf15608214044ad4f64718bc38ce8d2b2771f -SHA512 (xfce4-places-plugin-1.7.0.tar.bz2) = ae324a29584d7dc6beb4840bec7e4c5802e94c25512f449ab959c588c91f4030d895fe185dad87ab9442611e9fe01f8ccec82e8cb5153cf192d1124156be6bd3 -Size (xfce4-places-plugin-1.7.0.tar.bz2) = 371395 bytes -SHA1 (patch-panel-plugin_model.c) = 5d54977ad8b94b4f2641f65388ad5c908a051854 -SHA1 (patch-panel-plugin_model.h) = 20f27a1243ff5f2c6556a12037c1213770bcd740 -SHA1 (patch-panel-plugin_model__user.c) = 0b8b0e11b1cfc3a4e04faa5ebcd69ca19819ee19 -SHA1 (patch-panel-plugin_model__volumes.c) = dd004cf548d722ad6b070239f06af486172dde41 +SHA1 (xfce4-places-plugin-1.8.0.tar.bz2) = 8bf88d48295c9555f07cd568b2093b1a5a27d166 +RMD160 (xfce4-places-plugin-1.8.0.tar.bz2) = ffb02a33ede53bf689a24e3c1c64e0db46df545d +SHA512 (xfce4-places-plugin-1.8.0.tar.bz2) = 9db3b311881292a9cd380d505be8cd529b51ee92c25e0bbdcbc28dc099369cd7ea078e7c729856d9718967de8f8e2f08db045efb00a4be097d4ebf766da51263 +Size (xfce4-places-plugin-1.8.0.tar.bz2) = 371134 bytes diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.c b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.c deleted file mode 100644 index d3ff7850a25..00000000000 --- a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.c +++ /dev/null @@ -1,95 +0,0 @@ -$NetBSD: patch-panel-plugin_model.c,v 1.2 2015/04/21 08:56:45 jperkin Exp $ - -Fix inline use. ---- panel-plugin/model.c.orig 2012-09-01 17:20:59.000000000 +0000 -+++ panel-plugin/model.c -@@ -29,7 +29,7 @@ - - /********** PlacesBookmarkAction **********/ - --inline PlacesBookmarkAction* -+PlacesBookmarkAction* - places_bookmark_action_create(gchar *label) - { - PlacesBookmarkAction *action; -@@ -40,7 +40,7 @@ places_bookmark_action_create(gchar *lab - return action; - } - --inline void -+void - places_bookmark_action_destroy(PlacesBookmarkAction *act) - { - g_assert(act != NULL); -@@ -51,7 +51,7 @@ places_bookmark_action_destroy(PlacesBoo - g_free(act); - } - --inline void -+void - places_bookmark_action_call(PlacesBookmarkAction *act) - { - g_assert(act != NULL); -@@ -66,7 +66,7 @@ places_bookmark_action_call(PlacesBookma - static int bookmarks = 0; - #endif - --inline PlacesBookmark* -+PlacesBookmark* - places_bookmark_create(gchar *label) - { - PlacesBookmark *bookmark; -@@ -81,7 +81,7 @@ places_bookmark_create(gchar *label) - return bookmark; - } - --static inline void -+static void - places_bookmark_actions_destroy(GList *actions) - { - while(actions != NULL){ -@@ -92,7 +92,7 @@ places_bookmark_actions_destroy(GList *a - g_list_free(actions); - } - --inline void -+void - places_bookmark_destroy(PlacesBookmark *bookmark) - { - g_assert(bookmark != NULL); -@@ -121,7 +121,7 @@ places_bookmark_destroy(PlacesBookmark * - - /********** PlacesBookmarkGroup **********/ - --inline GList* -+GList* - places_bookmark_group_get_bookmarks(PlacesBookmarkGroup *pbg) - { - g_assert(pbg->get_bookmarks != NULL); -@@ -129,7 +129,7 @@ places_bookmark_group_get_bookmarks(Plac - return pbg->get_bookmarks(pbg); - } - --inline gboolean -+gboolean - places_bookmark_group_changed(PlacesBookmarkGroup *pbg) - { - g_assert(pbg->changed != NULL); -@@ -137,7 +137,7 @@ places_bookmark_group_changed(PlacesBook - return pbg->changed(pbg); - } - --inline PlacesBookmarkGroup* -+PlacesBookmarkGroup* - places_bookmark_group_create(void) - { - PlacesBookmarkGroup *bookmark_group; -@@ -146,7 +146,7 @@ places_bookmark_group_create(void) - return bookmark_group; - } - --inline void -+void - places_bookmark_group_destroy(PlacesBookmarkGroup *pbg) - { - if(pbg->finalize != NULL) diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.h b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.h deleted file mode 100644 index 8e1ca247fcd..00000000000 --- a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.h +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-panel-plugin_model.h,v 1.2 2015/04/21 08:56:45 jperkin Exp $ - -Fix inline use. ---- panel-plugin/model.h.orig 2013-11-10 14:34:13.000000000 +0000 -+++ panel-plugin/model.h -@@ -36,13 +36,13 @@ struct _PlacesBookmarkAction - void (*finalize) (PlacesBookmarkAction *self); - }; - --inline PlacesBookmarkAction* -+PlacesBookmarkAction* - places_bookmark_action_create(gchar *label); - --inline void -+void - places_bookmark_action_destroy(PlacesBookmarkAction*); - --inline void -+void - places_bookmark_action_call(PlacesBookmarkAction*); - - /* Places Bookmark */ -@@ -70,10 +70,10 @@ struct _PlacesBookmark - void (*finalize) (PlacesBookmark *self); - }; - --inline PlacesBookmark* -+PlacesBookmark* - places_bookmark_create(gchar *label); - --inline void -+void - places_bookmark_destroy(PlacesBookmark *bookmark); - - /* Places Bookmark Group */ -@@ -86,16 +86,16 @@ struct _PlacesBookmarkGroup - gpointer priv; - }; - --inline GList* -+GList* - places_bookmark_group_get_bookmarks(PlacesBookmarkGroup*); - --inline gboolean -+gboolean - places_bookmark_group_changed(PlacesBookmarkGroup*); - --inline PlacesBookmarkGroup* -+PlacesBookmarkGroup* - places_bookmark_group_create(); - --inline void -+void - places_bookmark_group_destroy(PlacesBookmarkGroup*); - - #endif diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model__user.c b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model__user.c deleted file mode 100644 index 5280c84d626..00000000000 --- a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model__user.c +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-panel-plugin_model__user.c,v 1.1 2015/04/21 08:56:45 jperkin Exp $ - -Fix inline use. ---- panel-plugin/model_user.c.orig 2013-11-10 14:34:13.000000000 +0000 -+++ panel-plugin/model_user.c -@@ -60,7 +60,7 @@ typedef struct - - } PBUserData; - --static inline time_t -+static time_t - pbuser_get_mtime(const gchar *filename) - { - struct stat buf; -@@ -70,7 +70,7 @@ pbuser_get_mtime(const gchar *filename) - return 1; - } - --static inline gboolean -+static gboolean - pbuser_dir_exists(const gchar *path) - { - return g_file_test(path, G_FILE_TEST_IS_DIR); diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model__volumes.c b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model__volumes.c deleted file mode 100644 index d430513ffed..00000000000 --- a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model__volumes.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-panel-plugin_model__volumes.c,v 1.1 2015/04/21 08:56:45 jperkin Exp $ - -Fix inline use. ---- panel-plugin/model_volumes.c.orig 2012-08-28 09:17:10.000000000 +0000 -+++ panel-plugin/model_volumes.c -@@ -383,7 +383,7 @@ pbvol_is_present(GVolume *volume) - return has_media && !is_shadowed; - } - --static inline gboolean -+static gboolean - pbvol_show_volume(GVolume *volume){ - GMount *mount = g_volume_get_mount(volume); - DBG("Volume: %s [mounted=%x removable=%x present=%x]", g_volume_get_name(volume), -- cgit v1.2.3