summaryrefslogtreecommitdiff
path: root/sysutils/xfce4-fsguard-plugin
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/xfce4-fsguard-plugin')
-rw-r--r--sysutils/xfce4-fsguard-plugin/Makefile5
-rw-r--r--sysutils/xfce4-fsguard-plugin/distinfo6
-rw-r--r--sysutils/xfce4-fsguard-plugin/files/patch-panel-plugin_fsguard.c148
-rw-r--r--sysutils/xfce4-fsguard-plugin/pkg-plist2
4 files changed, 8 insertions, 153 deletions
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index db4444274756..eed525a24c0e 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-fsguard-plugin
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -13,7 +13,8 @@ COMMENT= Panel plugin which displays free space of mountpoint
# COPYING file is wrong compared to license header
LICENSE= BSD2CLAUSE
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+ xfce xorg
USE_GNOME= cairo gtk30 intltool
USE_XFCE= panel
USE_XORG= x11
diff --git a/sysutils/xfce4-fsguard-plugin/distinfo b/sysutils/xfce4-fsguard-plugin/distinfo
index 4127caf3d206..ccad4de21393 100644
--- a/sysutils/xfce4-fsguard-plugin/distinfo
+++ b/sysutils/xfce4-fsguard-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488101299
-SHA256 (xfce4/xfce4-fsguard-plugin-1.1.0.tar.bz2) = 6b038322b49d29625219e6a54497085b8f834b9c1fd15282ce286a6529d7c445
-SIZE (xfce4/xfce4-fsguard-plugin-1.1.0.tar.bz2) = 360463
+TIMESTAMP = 1565692437
+SHA256 (xfce4/xfce4-fsguard-plugin-1.1.1.tar.bz2) = d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+SIZE (xfce4/xfce4-fsguard-plugin-1.1.1.tar.bz2) = 367902
diff --git a/sysutils/xfce4-fsguard-plugin/files/patch-panel-plugin_fsguard.c b/sysutils/xfce4-fsguard-plugin/files/patch-panel-plugin_fsguard.c
deleted file mode 100644
index 77586f71c9b3..000000000000
--- a/sysutils/xfce4-fsguard-plugin/files/patch-panel-plugin_fsguard.c
+++ /dev/null
@@ -1,148 +0,0 @@
---- panel-plugin/fsguard.c.orig 2016-10-29 06:43:10 UTC
-+++ panel-plugin/fsguard.c
-@@ -70,6 +70,7 @@ typedef struct
- XfcePanelPlugin *plugin;
- gboolean seen;
- gint icon_id;
-+ gchar *css_class;
- gint timeout;
- guint limit_warning;
- guint limit_urgent;
-@@ -135,6 +136,7 @@ fsguard_set_icon (FsGuard *fsguard, gint
- if (id == fsguard->icon_id)
- return;
-
-+ DBG ("icon id: new=%d, cur=%d", id, fsguard->icon_id);
- fsguard->icon_id = id;
- size = xfce_panel_plugin_get_size (fsguard->plugin);
- size /= xfce_panel_plugin_get_nrows (fsguard->plugin);
-@@ -177,7 +179,7 @@ fsguard_refresh_icon (FsGuard *fsguard)
- }
-
- static void
--fsguard_refresh_monitor (FsGuard *fsguard)
-+fsguard_refresh_monitor_color (FsGuard *fsguard, gchar *css_class)
- {
- GdkRGBA color;
-
-@@ -197,23 +199,15 @@ fsguard_refresh_monitor (FsGuard *fsguar
- }
-
- #if GTK_CHECK_VERSION (3, 16, 0)
-- GtkCssProvider *css_provider;
--#if GTK_CHECK_VERSION (3, 20, 0)
-- gchar * css = g_strdup_printf("progressbar trough { min-width: 4px; min-height: 4px; } \
-- progressbar progress { min-width: 4px; min-height: 4px; \
-- background-color: %s; background-image: none; }",
--#else
-- gchar * css = g_strdup_printf(".progressbar { background-color: %s; background-image: none; }",
--#endif
-- gdk_rgba_to_string(&color));
-- /* Setup Gtk style */
-- css_provider = gtk_css_provider_new ();
-- gtk_css_provider_load_from_data (css_provider, css, strlen(css), NULL);
-- gtk_style_context_add_provider (
-- GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))),
-- GTK_STYLE_PROVIDER (css_provider),
-- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-- g_free(css);
-+ DBG("removing class %s, adding %s", fsguard->css_class, css_class);
-+ gtk_style_context_remove_class (
-+ GTK_STYLE_CONTEXT(gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))),
-+ fsguard->css_class);
-+ gtk_style_context_add_class (
-+ GTK_STYLE_CONTEXT(gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))),
-+ css_class);
-+ g_free(fsguard->css_class);
-+ fsguard->css_class = g_strdup(css_class);
- #else
- gtk_widget_override_background_color (GTK_WIDGET (fsguard->progress_bar),
- GTK_STATE_PRELIGHT,
-@@ -270,6 +264,7 @@ fsguard_check_fs (FsGuard *fsguard)
- float totalblocks = 0;
- long blocksize = 0;
- int err;
-+ gchar *css_class = "normal";
- gchar msg_size[100], msg_total_size[100], msg[100];
- gint icon_id = ICON_INSENSITIVE;
- static struct statfs fsd;
-@@ -285,10 +280,13 @@ fsguard_check_fs (FsGuard *fsguard)
-
- if (freespace > (total * fsguard->limit_warning / 100)) {
- icon_id = ICON_NORMAL;
-+ css_class = "normal";
- } else if (freespace > (total * fsguard->limit_urgent / 100) && freespace <= (total * fsguard->limit_warning / 100)) {
- icon_id = ICON_WARNING;
-+ css_class = "warning";
- } else {
- icon_id = ICON_URGENT;
-+ css_class = "urgent";
- }
- }
- g_snprintf (msg, sizeof (msg),
-@@ -316,7 +314,8 @@ fsguard_check_fs (FsGuard *fsguard)
- if (fsguard->show_progress_bar) {
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(fsguard->progress_bar),
- (total > 0 ) ? 1.0 - (freespace / total) : 0.0);
-- fsguard_refresh_monitor (fsguard);
-+ if (icon_id != fsguard->icon_id)
-+ fsguard_refresh_monitor_color (fsguard, css_class);
- }
-
- gtk_widget_set_tooltip_text(fsguard->ebox, msg);
-@@ -347,6 +346,7 @@ fsguard_read_config (FsGuard *fsguard)
- fsguard->name = g_strdup ("");
- fsguard->show_name = FALSE;
- fsguard->path = g_strdup ("/");
-+ fsguard->css_class = g_strdup ("normal");
- fsguard->show_size = TRUE;
- fsguard->show_progress_bar = TRUE;
- fsguard->hide_button = FALSE;
-@@ -406,6 +406,9 @@ fsguard_write_config (XfcePanelPlugin *p
- static FsGuard *
- fsguard_new (XfcePanelPlugin *plugin)
- {
-+#if GTK_CHECK_VERSION (3, 16, 0)
-+ GtkCssProvider *css_provider;
-+#endif
- FsGuard *fsguard = g_new0(FsGuard, 1);
-
- fsguard->plugin = plugin;
-@@ -429,6 +432,37 @@ fsguard_new (XfcePanelPlugin *plugin)
- fsguard->icon_panel = gtk_image_new ();
-
- fsguard->progress_bar = gtk_progress_bar_new ();
-+#if GTK_CHECK_VERSION (3, 16, 0)
-+ css_provider = gtk_css_provider_new ();
-+#if GTK_CHECK_VERSION (3, 20, 0)
-+ gtk_css_provider_load_from_data (css_provider, "\
-+ progressbar.horizontal trough { min-height: 4px; }\
-+ progressbar.horizontal progress { min-height: 4px; }\
-+ progressbar.vertical trough { min-width: 4px; }\
-+ progressbar.vertical progress { min-width: 4px; }\
-+ .normal progress { background-color: " COLOR_NORMAL " ; background-image: none; }\
-+ .warning progress { background-color: " COLOR_WARNING " ; background-image: none; }\
-+ .urgent progress { background-color: " COLOR_URGENT " ; background-image: none; }",
-+ -1, NULL);
-+#else
-+ gtk_css_provider_load_from_data (css_provider, "\
-+ .progressbar.horizontal trough { min-height: 4px; }\
-+ .progressbar.horizontal progress { min-height: 4px; }\
-+ .progressbar.vertical trough { min-width: 4px; }\
-+ .progressbar.vertical progress { min-width: 4px; }\
-+ .normal progress { background-color: " COLOR_NORMAL " ; background-image: none; }\
-+ .warning progress { background-color: " COLOR_WARNING " ; background-image: none; }\
-+ .urgent progress { background-color: " COLOR_URGENT " ; background-image: none; }",
-+ -1, NULL);
-+#endif
-+ gtk_style_context_add_provider (
-+ GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))),
-+ GTK_STYLE_PROVIDER (css_provider),
-+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-+ gtk_style_context_add_class (
-+ GTK_STYLE_CONTEXT(gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))),
-+ fsguard->css_class);
-+#endif
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(fsguard->progress_bar), 0.0);
- gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR(fsguard->progress_bar), (orientation == GTK_ORIENTATION_HORIZONTAL));
- gtk_orientable_set_orientation (GTK_ORIENTABLE(fsguard->progress_bar), !orientation);
diff --git a/sysutils/xfce4-fsguard-plugin/pkg-plist b/sysutils/xfce4-fsguard-plugin/pkg-plist
index f2bc7bf27cb1..1bc13d39c70d 100644
--- a/sysutils/xfce4-fsguard-plugin/pkg-plist
+++ b/sysutils/xfce4-fsguard-plugin/pkg-plist
@@ -22,6 +22,7 @@ share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin-warning.svg
share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin.svg
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-fsguard-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-fsguard-plugin.mo
@@ -39,6 +40,7 @@ share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin.svg
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-fsguard-plugin.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-fsguard-plugin.mo