Index: branches/2019Q2/sysutils/xfce4-power-manager/Makefile =================================================================== --- branches/2019Q2/sysutils/xfce4-power-manager/Makefile (revision 501228) +++ branches/2019Q2/sysutils/xfce4-power-manager/Makefile (revision 501229) @@ -1,39 +1,46 @@ # Created by: J.R. Oldroyd # $FreeBSD$ PORTNAME= xfce4-power-manager PORTVERSION= 1.6.1 +PORTREVISION= 1 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 +.include + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug +.endif + +.include Index: branches/2019Q2/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c =================================================================== --- branches/2019Q2/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c (nonexistent) +++ branches/2019Q2/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c (revision 501229) @@ -0,0 +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 +@@ -512,6 +512,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 Property changes on: branches/2019Q2/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q2/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings-app.c =================================================================== --- branches/2019Q2/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings-app.c (nonexistent) +++ branches/2019Q2/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings-app.c (revision 501229) @@ -0,0 +1,10 @@ +--- 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); Property changes on: branches/2019Q2/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings-app.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q2/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings.c =================================================================== --- branches/2019Q2/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings.c (nonexistent) +++ branches/2019Q2/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings.c (revision 501229) @@ -0,0 +1,14 @@ +--- 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) Property changes on: branches/2019Q2/sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q2/sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c =================================================================== --- branches/2019Q2/sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c (nonexistent) +++ branches/2019Q2/sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c (revision 501229) @@ -0,0 +1,42 @@ +--- src/xfpm-backlight-helper.c.orig 2017-11-23 23:52:06 UTC ++++ src/xfpm-backlight-helper.c +@@ -49,6 +49,8 @@ + #define EXIT_CODE_INVALID_USER 4 + #define EXIT_CODE_NO_BRIGHTNESS_SWITCH 5 + ++#define MAX_DEVICE_NUM 8 ++ + #if !defined(BACKEND_TYPE_FREEBSD) + #define BACKLIGHT_SYSFS_LOCATION "/sys/class/backlight" + #define BRIGHTNESS_SWITCH_LOCATION "/sys/module/video/parameters/brightness_switch_enabled" +@@ -204,19 +206,23 @@ backlight_helper_get_device (void) + /* devices in priority order */ + gchar *types[] = { "lcd", "crt", "out", "ext", "tv", NULL }; + gchar *device = NULL; +- gint i; ++ gint i, j; + +- device = (gchar *) g_malloc (sizeof (gchar)); ++ device = (gchar *) g_malloc (sizeof (gchar) * 8); + + for (i = 0; types[i] != NULL; i++) { +- g_snprintf (device, (gulong) strlen (types[i]), "%s0", types[i]); ++ for (j = 0; j < MAX_DEVICE_NUM; j++) { ++ g_snprintf (device, 8, "%s%i", types[i], j); + +- /* stop, when first device is found */ +- if (acpi_video_is_enabled (device)) +- break; ++ /* stop, when first device is found */ ++ if (acpi_video_is_enabled (device)) ++ return (device); ++ } + } + +- return device; ++ g_free (device); ++ ++ return (NULL); + } + + /* Property changes on: branches/2019Q2/sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q2/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c =================================================================== --- branches/2019Q2/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c (nonexistent) +++ branches/2019Q2/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c (revision 501229) @@ -0,0 +1,18 @@ +--- src/xfpm-dpms.c.orig 2015-07-14 08:02:18 UTC ++++ src/xfpm-dpms.c +@@ -122,13 +122,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")) + *ret_standby_mode = TRUE; + else + *ret_standby_mode = FALSE; Property changes on: branches/2019Q2/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q2 =================================================================== --- branches/2019Q2 (revision 501228) +++ branches/2019Q2 (revision 501229) Property changes on: branches/2019Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r501188