CVS commit: pkgsrc/sysutils/xfce4-battery-plugin

["Youri Mouton" <youri%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   youri
Date:           Fri Jan 18 17:53:27 UTC 2019

Modified Files:
        pkgsrc/sysutils/xfce4-battery-plugin: Makefile PLIST distinfo
        pkgsrc/sysutils/xfce4-battery-plugin/patches:
            patch-panel-plugin_battery.c

Log Message:
xfce4-battery-plugin: update to 1.1.2:

1.1.2 (2019/01/13):
===================
* Listen for UPower events for power source changes (Bug #14978, thanks to Alexander Butenko)
* Reset averages when a battery is removed/added (Bug #14930, thanks to John Lindgren)
* Re-detect battery presence every 30 seconds (Bug #14930, thanks to John Lindgren)
* Fix null pointer dereference with no battery present (Bug #14930, thanks to John Lindgren)
* Remove deprecated /proc/acpi support in favor of sysfs. (Thanks to John Lindgren)
* Remove APM support on FreeBSD as well, it doesn't even build. (Thanks to John Lindgren)
* Remove historical APM support for Linux, support ACPI only. (Thanks to John Lindgren)
* Initially show/hide widgets according to user config (Bug #9594, thanks to John Lindgren)

1.1.1 (2018/09/22):
===================
* Avoid memory leaks
* Bump to minimal Gtk to 3.16
* Only set progressbar width or height depending on the orientation (Bug #12942)
* Create a single GtkCssProvider in setup_battmon() (Bug #12975)
* Improved spacing and layout in dialogs (Bug #14659)


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/sysutils/xfce4-battery-plugin/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/xfce4-battery-plugin/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/xfce4-battery-plugin/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/xfce4-battery-plugin/Makefile
diff -u pkgsrc/sysutils/xfce4-battery-plugin/Makefile:1.49 pkgsrc/sysutils/xfce4-battery-plugin/Makefile:1.50
--- pkgsrc/sysutils/xfce4-battery-plugin/Makefile:1.49  Sun Nov 25 20:55:41 2018
+++ pkgsrc/sysutils/xfce4-battery-plugin/Makefile       Fri Jan 18 17:53:27 2019
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2018/11/25 20:55:41 martin Exp $
+# $NetBSD: Makefile,v 1.50 2019/01/18 17:53:27 youri Exp $
 
-PKGREVISION= 7
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-VERSION=       1.1.0
+VERSION=       1.1.2
 DISTNAME=      xfce4-battery-plugin-${VERSION}
 CATEGORIES=    sysutils
 MASTER_SITES=  http://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/

Index: pkgsrc/sysutils/xfce4-battery-plugin/PLIST
diff -u pkgsrc/sysutils/xfce4-battery-plugin/PLIST:1.4 pkgsrc/sysutils/xfce4-battery-plugin/PLIST:1.5
--- pkgsrc/sysutils/xfce4-battery-plugin/PLIST:1.4      Thu Jun  9 09:38:23 2016
+++ pkgsrc/sysutils/xfce4-battery-plugin/PLIST  Fri Jan 18 17:53:27 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2016/06/09 09:38:23 youri Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/01/18 17:53:27 youri Exp $
 lib/xfce4/panel/plugins/libbattery.la
 share/icons/hicolor/16x16/apps/xfce4-battery-critical-charging.png
 share/icons/hicolor/16x16/apps/xfce4-battery-critical.png
@@ -43,6 +43,7 @@ share/icons/hicolor/scalable/apps/xfce4-
 share/icons/hicolor/scalable/apps/xfce4-battery-plugin.svg
 share/locale/ar/LC_MESSAGES/xfce4-battery-plugin.mo
 share/locale/ast/LC_MESSAGES/xfce4-battery-plugin.mo
+share/locale/be/LC_MESSAGES/xfce4-battery-plugin.mo
 share/locale/bg/LC_MESSAGES/xfce4-battery-plugin.mo
 share/locale/ca/LC_MESSAGES/xfce4-battery-plugin.mo
 share/locale/cs/LC_MESSAGES/xfce4-battery-plugin.mo

Index: pkgsrc/sysutils/xfce4-battery-plugin/distinfo
diff -u pkgsrc/sysutils/xfce4-battery-plugin/distinfo:1.13 pkgsrc/sysutils/xfce4-battery-plugin/distinfo:1.14
--- pkgsrc/sysutils/xfce4-battery-plugin/distinfo:1.13  Sun Nov 25 20:55:41 2018
+++ pkgsrc/sysutils/xfce4-battery-plugin/distinfo       Fri Jan 18 17:53:27 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2018/11/25 20:55:41 martin Exp $
+$NetBSD: distinfo,v 1.14 2019/01/18 17:53:27 youri Exp $
 
-SHA1 (xfce4-battery-plugin-1.1.0.tar.bz2) = 60e341cbac086b774024372f18ccee09473f52df
-RMD160 (xfce4-battery-plugin-1.1.0.tar.bz2) = 024ed07993b8bdf8c6d8831170e43205794de7c4
-SHA512 (xfce4-battery-plugin-1.1.0.tar.bz2) = d3f5b6d3657abfba2c4c5cb3ab8ddc87f4862f24eb614cb91af48332b3082c3dce7f32eb2e3cb8a9d501ddb01c6259c4fbfbab8ed9c221633e47eb17c623cf09
-Size (xfce4-battery-plugin-1.1.0.tar.bz2) = 398621 bytes
-SHA1 (patch-panel-plugin_battery.c) = 65a4b74fd3a59aea6e2adc00a8a9010410dd76b0
+SHA1 (xfce4-battery-plugin-1.1.2.tar.bz2) = 5f6d397968dd69893a754e58efd90f129a9a8355
+RMD160 (xfce4-battery-plugin-1.1.2.tar.bz2) = ef66fac089e5dcfe324236009220d696f2dd8ea2
+SHA512 (xfce4-battery-plugin-1.1.2.tar.bz2) = 51778d00c34c41bdad234893c4a91f3bd562481df343d811e266719cb7903f60e1d56ba39f64f14ab882ce6419d0f0f4010aa112e9d0059133e7e4d30470f491
+Size (xfce4-battery-plugin-1.1.2.tar.bz2) = 464077 bytes
+SHA1 (patch-panel-plugin_battery.c) = 04c911099f96443439a0bab99ce608e32a2f6dc0

Index: pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c
diff -u pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c:1.3 pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c:1.4
--- pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c:1.3       Sun Nov 25 20:55:42 2018
+++ pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-panel-plugin_battery.c   Fri Jan 18 17:53:27 2019
@@ -1,78 +1,44 @@
-$NetBSD: patch-panel-plugin_battery.c,v 1.3 2018/11/25 20:55:42 martin Exp $
+$NetBSD: patch-panel-plugin_battery.c,v 1.4 2019/01/18 17:53:27 youri Exp $
 
 Fix for NetBSD.
 
---- panel-plugin/battery.c.orig        2016-10-29 08:37:38.000000000 +0200
-+++ panel-plugin/battery.c     2018-11-25 21:49:59.741230700 +0100
-@@ -26,13 +26,28 @@
+--- panel-plugin/battery.c.orig        2019-01-18 17:56:56.433182652 +0000
++++ panel-plugin/battery.c
+@@ -26,13 +26,32 @@
  #include <config.h>
  #endif
  
--#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && (defined(i386) || defined(__i386__))
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#include <sys/ioctl.h>
-+#include <dev/apm/apmbios.h>
-+#include <dev/apm/apmio.h>
-+#define APMDEVICE "/dev/apm"
-+#define _ACPI_APM_BATT_UNKNOWN        0xffff /* from sys/dev/acpi/acpi_apm.c */
-+#elif (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && (defined(i386) || defined(__i386__))
- #include <machine/apm_bios.h>
--#elif (defined(__OpenBSD__) || defined(__NetBSD__))
-+#elif (defined(__OpenBSD__)
- #include <sys/param.h>
- #include <sys/ioctl.h>
-+#if defined(__sparc64__)
-+#include <sparc/apmvar.h>
-+#elif defined(__x86_64__)
-+#include <dev/apm/apmbios.h>
-+#include <dev/apm/apmio.h>
-+#else
- #include <machine/apmvar.h>
-+#endif
- #define APMDEVICE "/dev/apm"
-+#define _ACPI_APM_BATT_UNKNOWN        0xffff /* from sys/dev/acpi/acpi_apm.c */
- #elif __linux__
- #include <libapm.h>
- #endif
-@@ -162,7 +177,7 @@ init_options(t_battmon_options *options)
- gboolean
- detect_battery_info(t_battmon *battmon)
- {
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-   /* This is how I read the information from the APM subsystem under
-      FreeBSD.  Each time this functions is called (once every second)
-      the APM device is opened, read from and then closed.
-@@ -401,7 +416,7 @@ update_apm_status(t_battmon *battmon)
-         acline = apm.ac_line_status ? TRUE : FALSE;
- 
-     }
--#elif __FreeBSD__
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-     else {
-  /* This is how I read the information from the APM subsystem under
-      FreeBSD.  Each time this functions is called (once every second)
-@@ -500,6 +515,11 @@ battmon.c:241: for each function it appe
-     if(battmon->options.display_percentage && charge > 0 && !(battmon->options.hide_when_full && acline && charge >= 99)){
-         gtk_widget_show(GTK_WIDGET(battmon->charge));
-         gtk_widget_show(GTK_WIDGET(battmon->timechargealignment));
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+      if (apm.battery_state == APM_BATT_ABSENT)
-+              g_snprintf(buffer, sizeof(buffer), "--%%");
-+      else
-+#endif
-         g_snprintf(buffer, sizeof(buffer),"%d%% ", charge);
-         gtk_label_set_text(battmon->charge,buffer);
-     } else {
-@@ -509,6 +529,10 @@ battmon.c:241: for each function it appe
-     if (battmon->options.display_time && time_remaining > 0 && !(battmon->options.hide_when_full && acline && charge >= 99 )){
-         gtk_widget_show(GTK_WIDGET(battmon->rtime));
-         gtk_widget_show(GTK_WIDGET(battmon->timechargealignment));
+-#if (defined(__OpenBSD__) || defined(__NetBSD__))
+-#include <sys/param.h>
+-#include <sys/ioctl.h>
+-#include <machine/apmvar.h>
+-#define APMDEVICE "/dev/apm"
 +#if defined(__NetBSD__)
-+      if (acline || time_remaining == _ACPI_APM_BATT_UNKNOWN)
-+              g_snprintf(buffer, sizeof(buffer), "--:--");
-+#endif
-         g_snprintf(buffer, sizeof(buffer),"%02d:%02d ",time_remaining/60,time_remaining%60);
-         gtk_label_set_text(battmon->rtime,buffer);
++      #include <sys/param.h>
++      #include <sys/ioctl.h>
++      #include <dev/apm/apmbios.h>
++      #include <dev/apm/apmio.h>
++      #define APMDEVICE "dev/apm"
++      #define _ACPI_APM_BATT_UNKNOWN 0xffff /* from sys/dev/apci/acpi_apm.c */
++#elif (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && \
++                              (defined(i386) || defined(__i386__))
++      #include <machine/apm_bios.h>
++#elif defined(__OpenBSD__)
++      #include <sys/param.h>
++      #include <sys/ioctl.h>
++      #if defined(__sparc64__)
++              #include <sparc/apmvar.h>
++      #elif defined(__x86_64__)
++              #include <dev/apm/apmbios.h>
++              #include <dev/apm/apmio.h>
++      #else
++              #include <machine/apmvar.h>
++      #endif
++      #define APMDEVICE "/dev/apm"
++      #define _ACPI_APM_BATT_UNKNOWN 0xffff /* from sys/dev/apci/acpi_apm.c */
+ #endif
  
++
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <fcntl.h>