diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile index 5764046f2722..c655ddbd6a87 100644 --- a/sysutils/xfce4-power-manager/Makefile +++ b/sysutils/xfce4-power-manager/Makefile @@ -1,46 +1,45 @@ # Created by: J.R. Oldroyd # $FreeBSD$ PORTNAME= xfce4-power-manager -PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTVERSION= 1.6.2 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}/ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Power manager for the Xfce Desktop LICENSE= GPLv2 LIB_DEPENDS= libnotify.so:devel/libnotify \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libpolkit-gobject-1.so:sysutils/polkit \ libupower-glib.so:sysutils/upower USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3 USE_GNOME= cairo glib20 gtk30 intlhack intltool USE_XFCE= panel USE_XORG= ice sm xrandr x11 xext xtst xscrnsaver GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --disable-network-manager \ --enable-polkit \ --enable-xfce4panel INSTALL_TARGET= install-strip OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext-runtime .include .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif .include diff --git a/sysutils/xfce4-power-manager/distinfo b/sysutils/xfce4-power-manager/distinfo index f83f677e64d0..12f3aac3c95c 100644 --- a/sysutils/xfce4-power-manager/distinfo +++ b/sysutils/xfce4-power-manager/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513639899 -SHA256 (xfce4/xfce4-power-manager-1.6.1.tar.bz2) = 1ea825452343b895566068018b6d5078608f8f46ce8075ba6bbb4b848f48656b -SIZE (xfce4/xfce4-power-manager-1.6.1.tar.bz2) = 1180710 +TIMESTAMP = 1558102449 +SHA256 (xfce4/xfce4-power-manager-1.6.2.tar.bz2) = 66ac34b33a2021b5af04c0181dfab6e6ee2bfab0ae07ed4527ca4552a66e1c01 +SIZE (xfce4/xfce4-power-manager-1.6.2.tar.bz2) = 1212990 diff --git a/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c b/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c index 8225e5a83abb..0c4ad2ae702d 100644 --- a/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c +++ b/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c @@ -1,10 +1,10 @@ ---- panel-plugins/power-manager-plugin/power-manager-button.c.orig 2017-11-23 23:52:06 UTC +--- panel-plugins/power-manager-plugin/power-manager-button.c.orig 2019-05-17 13:43:56 UTC +++ panel-plugins/power-manager-plugin/power-manager-button.c -@@ -512,6 +512,7 @@ power_manager_button_update_device_icon_and_details (P +@@ -510,6 +510,7 @@ power_manager_button_update_device_icon_and_details (P * so we can disconnect it later */ battery_device->img = gtk_image_new_from_pixbuf (battery_device->pix); + g_object_ref (battery_device->img); G_GNUC_BEGIN_IGNORE_DEPRECATIONS gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(battery_device->menu_item), battery_device->img); G_GNUC_END_IGNORE_DEPRECATIONS diff --git a/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings-app.c b/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings-app.c deleted file mode 100644 index bd46f77cd94c..000000000000 --- a/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings-app.c +++ /dev/null @@ -1,10 +0,0 @@ ---- settings/xfpm-settings-app.c.orig 2017-11-23 23:52:06 UTC -+++ settings/xfpm-settings-app.c -@@ -195,7 +195,6 @@ xfpm_settings_app_launch (GApplication *app) - if (start_xfpm_if_not_running == GTK_RESPONSE_YES) - { - GAppInfo *app_info; -- GError *error = NULL; - - app_info = g_app_info_create_from_commandline ("xfce4-power-manager", "Xfce4 Power Manager", - G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION, NULL); diff --git a/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings.c b/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings.c deleted file mode 100644 index cc1b4570a38d..000000000000 --- a/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings.c +++ /dev/null @@ -1,14 +0,0 @@ ---- settings/xfpm-settings.c.orig 2017-11-23 23:52:06 UTC -+++ settings/xfpm-settings.c -@@ -1499,9 +1499,9 @@ format_light_locker_value_cb (GtkScale *scale, gdouble - - if ( (gint)value <= 0 ) - return g_strdup (_("Never")); -- else if ( value <= 59.0 ) -+ else if ( value < 60.0 ) - return g_strdup_printf ("%d %s", (gint)value, _("seconds")); -- else if ( value >= 60.0) -+ else - { - min = (gint)value - 60; - if (min == 0) diff --git a/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c b/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c index 2f4e7865ec01..50d9af42f798 100644 --- a/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c +++ b/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c @@ -1,18 +1,18 @@ ---- src/xfpm-dpms.c.orig 2015-07-14 08:02:18 UTC +--- src/xfpm-dpms.c.orig 2019-05-17 13:43:56 UTC +++ src/xfpm-dpms.c -@@ -122,13 +122,13 @@ xfpm_dpms_get_enabled (XfpmDpms *dpms, gboolean *dpms_ +@@ -119,13 +119,13 @@ xfpm_dpms_get_enabled (XfpmDpms *dpms, gboolean *dpms_ static void xfpm_dpms_get_sleep_mode (XfpmDpms *dpms, gboolean *ret_standby_mode) { - gchar *sleep_mode; + gchar *sleep_mode = NULL; - + g_object_get (G_OBJECT (dpms->priv->conf), DPMS_SLEEP_MODE, &sleep_mode, NULL); - + - if ( !g_strcmp0 (sleep_mode, "Standby")) -+ if (sleep_mode != NULL && !g_strcmp0 (sleep_mode, "Standby")) ++ if ( sleep_mode != NULL && !g_strcmp0 (sleep_mode, "Standby")) *ret_standby_mode = TRUE; else *ret_standby_mode = FALSE; diff --git a/sysutils/xfce4-power-manager/pkg-plist b/sysutils/xfce4-power-manager/pkg-plist index 9d3d84a49d07..942411de8a6b 100644 --- a/sysutils/xfce4-power-manager/pkg-plist +++ b/sysutils/xfce4-power-manager/pkg-plist @@ -1,152 +1,154 @@ bin/xfce4-power-manager bin/xfce4-power-manager-settings etc/xdg/autostart/xfce4-power-manager.desktop lib/xfce4/panel/plugins/libxfce4powermanager.so man/man1/xfce4-power-manager-settings.1.gz man/man1/xfce4-power-manager.1.gz sbin/xfce4-pm-helper sbin/xfpm-power-backlight-helper -share/appdata/xfce4-power-manager.appdata.xml share/applications/xfce4-power-manager-settings.desktop share/icons/hicolor/32x32/status/ac-adapter.png share/icons/hicolor/32x32/status/battery-caution-charging.png share/icons/hicolor/32x32/status/battery-caution.png share/icons/hicolor/32x32/status/battery-empty-charging.png share/icons/hicolor/32x32/status/battery-empty.png share/icons/hicolor/32x32/status/battery-full-charged.png share/icons/hicolor/32x32/status/battery-full-charging.png share/icons/hicolor/32x32/status/battery-full.png share/icons/hicolor/32x32/status/battery-good-charging.png share/icons/hicolor/32x32/status/battery-good.png share/icons/hicolor/32x32/status/battery-low-charging.png share/icons/hicolor/32x32/status/battery-low.png share/icons/hicolor/32x32/status/battery-missing.png share/icons/hicolor/32x32/status/computer.png share/icons/hicolor/32x32/status/input-keyboard.png share/icons/hicolor/32x32/status/input-mouse.png share/icons/hicolor/32x32/status/multimedia-player.png share/icons/hicolor/32x32/status/pda.png share/icons/hicolor/32x32/status/phone.png share/icons/hicolor/32x32/status/tablet.png share/icons/hicolor/32x32/status/uninterruptible-power-supply.png share/icons/hicolor/32x32/status/video-display.png share/icons/hicolor/48x48/status/ac-adapter.png share/icons/hicolor/48x48/status/battery-caution-charging.png share/icons/hicolor/48x48/status/battery-caution.png share/icons/hicolor/48x48/status/battery-empty-charging.png share/icons/hicolor/48x48/status/battery-empty.png share/icons/hicolor/48x48/status/battery-full-charged.png share/icons/hicolor/48x48/status/battery-full-charging.png share/icons/hicolor/48x48/status/battery-full.png share/icons/hicolor/48x48/status/battery-good-charging.png share/icons/hicolor/48x48/status/battery-good.png share/icons/hicolor/48x48/status/battery-low-charging.png share/icons/hicolor/48x48/status/battery-low.png share/icons/hicolor/48x48/status/battery-missing.png share/icons/hicolor/48x48/status/computer.png share/icons/hicolor/48x48/status/display-brightness.png share/icons/hicolor/48x48/status/input-keyboard.png share/icons/hicolor/48x48/status/input-mouse.png share/icons/hicolor/48x48/status/keyboard-brightness.png share/icons/hicolor/48x48/status/multimedia-player.png share/icons/hicolor/48x48/status/pda.png share/icons/hicolor/48x48/status/phone.png share/icons/hicolor/48x48/status/tablet.png share/icons/hicolor/48x48/status/uninterruptible-power-supply.png share/icons/hicolor/48x48/status/video-display.png share/icons/hicolor/scalable/status/ac-adapter-symbolic.svg share/icons/hicolor/scalable/status/ac-adapter.svg share/icons/hicolor/scalable/status/battery-caution-charging-symbolic.svg share/icons/hicolor/scalable/status/battery-caution-charging.svg share/icons/hicolor/scalable/status/battery-caution-symbolic.svg share/icons/hicolor/scalable/status/battery-caution.svg share/icons/hicolor/scalable/status/battery-empty-charging-symbolic.svg share/icons/hicolor/scalable/status/battery-empty-charging.svg share/icons/hicolor/scalable/status/battery-empty-symbolic.svg share/icons/hicolor/scalable/status/battery-empty.svg share/icons/hicolor/scalable/status/battery-full-charged-symbolic.svg share/icons/hicolor/scalable/status/battery-full-charged.svg share/icons/hicolor/scalable/status/battery-full-charging-symbolic.svg share/icons/hicolor/scalable/status/battery-full-charging.svg share/icons/hicolor/scalable/status/battery-full-symbolic.svg share/icons/hicolor/scalable/status/battery-full.svg share/icons/hicolor/scalable/status/battery-good-charging-symbolic.svg share/icons/hicolor/scalable/status/battery-good-charging.svg share/icons/hicolor/scalable/status/battery-good-symbolic.svg share/icons/hicolor/scalable/status/battery-good.svg share/icons/hicolor/scalable/status/battery-low-charging-symbolic.svg share/icons/hicolor/scalable/status/battery-low-charging.svg share/icons/hicolor/scalable/status/battery-low-symbolic.svg share/icons/hicolor/scalable/status/battery-low.svg share/icons/hicolor/scalable/status/battery-missing-symbolic.svg share/icons/hicolor/scalable/status/battery-missing.svg share/icons/hicolor/scalable/status/computer.svg share/icons/hicolor/scalable/status/display-brightness-symbolic.svg share/icons/hicolor/scalable/status/display-brightness.svg share/icons/hicolor/scalable/status/keyboard-brightness-symbolic.svg share/icons/hicolor/scalable/status/keyboard-brightness.svg share/icons/hicolor/scalable/status/keyboard.svg share/icons/hicolor/scalable/status/mouse.svg share/icons/hicolor/scalable/status/multimedia-player.svg share/icons/hicolor/scalable/status/pda.svg share/icons/hicolor/scalable/status/phone.svg share/icons/hicolor/scalable/status/tablet.svg share/icons/hicolor/scalable/status/uninterruptible-power-supply.svg share/icons/hicolor/scalable/status/video-display.svg share/icons/hicolor/scalable/status/xfce4-power-manager-settings.svg %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-power-manager.mo +%%NLS%%share/locale/be/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/da/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/de/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/el/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/es/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/et/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/he/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/is/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/it/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/kn/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/ms/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/nn/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/oc/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/ro/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/si/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/sl/LC_MESSAGES/xfce4-power-manager.mo +%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/te/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/th/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/ur/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/vi/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-power-manager.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-power-manager.mo +share/metainfo/xfce4-power-manager.appdata.xml share/polkit-1/actions/org.xfce.power.policy share/xfce4/panel/plugins/power-manager-plugin.desktop