Attachment 204172 Details for Bug 237714 – patch

[patch] patch

xfce4-power-manager.patch (text/plain), 5.21 KB, created by Ivan Rozhuk on 2019-05-02 21:05:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2019-05-02 21:05:58 UTC

Size: 5.21 KB

patch

obsolete

>Index: sysutils/xfce4-power-manager/Makefile
>===================================================================
>--- sysutils/xfce4-power-manager/Makefile	(revision 500679)
>+++ sysutils/xfce4-power-manager/Makefile	(working copy)
>@@ -30,10 +30,17 @@
> 		--enable-xfce4panel
> INSTALL_TARGET=	install-strip
> 
>-OPTIONS_DEFINE=		NLS
>+OPTIONS_DEFINE=		DEBUG NLS
> OPTIONS_SUB=		yes
> 
> NLS_CONFIGURE_ENABLE=	nls
> NLS_USES=		gettext-runtime
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG)
>+CONFIGURE_ARGS+=	--enable-debug
>+WITH_DEBUG?=		yes
>+.endif
>+
> .include <bsd.port.mk>
>Index: sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c
>===================================================================
>--- sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c	(nonexistent)
>+++ sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- panel-plugins/power-manager-plugin/power-manager-button.c.orig	2017-11-24 02:52:06.000000000 +0300
>++++ panel-plugins/power-manager-plugin/power-manager-button.c	2019-04-30 08:15:36.291290000 +0300
>+@@ -511,7 +511,7 @@
>+         /* update the image, keep track of the signal ids and the img
>+          * 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
>Index: sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings-app.c
>===================================================================
>--- sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings-app.c	(nonexistent)
>+++ sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings-app.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- settings/xfpm-settings-app.c.orig	2019-04-30 07:55:08.466616000 +0300
>++++ settings/xfpm-settings-app.c	2019-04-30 07:55:30.532869000 +0300
>+@@ -195,7 +195,6 @@
>+         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);
>Index: sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings.c
>===================================================================
>--- sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings.c	(nonexistent)
>+++ sysutils/xfce4-power-manager/files/patch-settings_xfpm-settings.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- settings/xfpm-settings.c.orig	2019-04-30 07:55:03.506860000 +0300
>++++ settings/xfpm-settings.c	2019-04-30 07:55:35.541556000 +0300
>+@@ -1509,6 +1509,7 @@
>+         else
>+             return g_strdup_printf ("%d %s", (gint)min + 1, _("minutes"));
>+     }
>++    return g_strdup (_("Unknown"));
>+ }
>+ 
>+ void
>Index: sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c
>===================================================================
>--- sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c	(nonexistent)
>+++ sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c	(working copy)
>@@ -0,0 +1,35 @@
>+--- src/xfpm-backlight-helper.c.orig	2017-11-24 02:52:06.000000000 +0300
>++++ src/xfpm-backlight-helper.c	2019-04-06 22:47:07.184438000 +0300
>+@@ -203,20 +203,23 @@
>+ {
>+ 	/* devices in priority order */
>+ 	gchar *types[] = { "lcd", "crt", "out", "ext", "tv", NULL };
>+-	gchar *device = NULL;
>+-	gint i;
>++	gchar *device;
>++	gint i, j;
>+ 
>+-	device = (gchar *) g_malloc (sizeof (gchar));
>++	device = (gchar*)g_malloc(sizeof(gchar) * 64);
>+ 
>+ 	for (i = 0; types[i] != NULL; i++) {
>+-		g_snprintf (device, (gulong) strlen (types[i]), "%s0", types[i]);
>+-
>+-		/* stop, when first device is found */
>+-		if (acpi_video_is_enabled (device))
>+-			break;
>++		for (j = 0; j < 8; j++) {
>++			g_snprintf(device, 64, "%s%i", types[i], j);
>++			/* Stop, when first device is found. */
>++			if (acpi_video_is_enabled (device))
>++				return (device);
>++		}
>+ 	}
>+ 
>+-	return device;
>++	g_free(device);
>++
>++	return (NULL);
>+ }
>+ 
>+ /*
>Index: sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c
>===================================================================
>--- sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c	(nonexistent)
>+++ sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c	(working copy)
>@@ -0,0 +1,18 @@
>+--- src/xfpm-dpms.c.orig	2015-07-14 11:02:18.000000000 +0300
>++++ src/xfpm-dpms.c	2019-04-30 08:07:05.531028000 +0300
>+@@ -122,13 +122,13 @@
>+ 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 (NULL != sleep_mode && !g_strcmp0 (sleep_mode, "Standby"))
>+ 	*ret_standby_mode = TRUE;
>+     else
>+ 	*ret_standby_mode = FALSE;

Actions: View | Diff

Attachments on bug 237714: 204172 | 204312