community/mate-power-manager: upgrade to 1.26.0

3 files changed, 6 insertions, 216 deletions

diff --git a/community/mate-power-manager/0001-execinfo-patch.patch b/community/mate-power-manager/0001-execinfo-patch.patch
deleted file mode 100644
index 2c07ef12f1e..00000000000
--- a/community/mate-power-manager/0001-execinfo-patch.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f117ad21ce676d67df265e522bfc1047118958ba Mon Sep 17 00:00:00 2001
-From: Alan Lacerda <alacerda@alpinelinux.org>
-Date: Thu, 16 Apr 2015 18:53:43 +0000
-Subject: [PATCH] execinfo patch
-
----
- applets/brightness/egg-debug.c | 2 ++
- applets/inhibit/egg-debug.c    | 2 ++
- src/egg-debug.c                | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/applets/brightness/egg-debug.c b/applets/brightness/egg-debug.c
-index 2f140f2..3a8e6e7 100644
---- a/applets/brightness/egg-debug.c
-+++ b/applets/brightness/egg-debug.c
-@@ -39,7 +39,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <time.h>
-+#if defined (__GLIBC__)
- #include <execinfo.h>
-+#endif
- 
- #include "egg-debug.h"
- 
-diff --git a/applets/inhibit/egg-debug.c b/applets/inhibit/egg-debug.c
-index 2f140f2..3a8e6e7 100644
---- a/applets/inhibit/egg-debug.c
-+++ b/applets/inhibit/egg-debug.c
-@@ -39,7 +39,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <time.h>
-+#if defined (__GLIBC__)
- #include <execinfo.h>
-+#endif
- 
- #include "egg-debug.h"
- 
-diff --git a/src/egg-debug.c b/src/egg-debug.c
-index 2f140f2..3a8e6e7 100644
---- a/src/egg-debug.c
-+++ b/src/egg-debug.c
-@@ -39,7 +39,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <time.h>
-+#if defined (__GLIBC__)
- #include <execinfo.h>
-+#endif
- 
- #include "egg-debug.h"
- 
--- 
-2.3.3
-
diff --git a/community/mate-power-manager/0001-removing-backtrace.patch b/community/mate-power-manager/0001-removing-backtrace.patch
deleted file mode 100644
index 536991bc164..00000000000
--- a/community/mate-power-manager/0001-removing-backtrace.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From b8907c90dec6a7f6fc2a3c682ddb48d4ebf8406e Mon Sep 17 00:00:00 2001
-From: Alan Lacerda <alacerda@alpinelinux.org>
-Date: Fri, 17 Apr 2015 11:34:47 +0000
-Subject: [PATCH] removing backtrace
-
----
- applets/brightness/egg-debug.c | 28 ----------------------------
- applets/inhibit/egg-debug.c    | 28 ----------------------------
- src/egg-debug.c                | 28 ----------------------------
- 3 files changed, 84 deletions(-)
-
-diff --git a/applets/brightness/egg-debug.c b/applets/brightness/egg-debug.c
-index 3a8e6e7..b06b540 100644
---- a/applets/brightness/egg-debug.c
-+++ b/applets/brightness/egg-debug.c
-@@ -75,31 +75,6 @@ pk_set_console_mode (guint console_code)
- }
- 
- /**
-- * egg_debug_backtrace:
-- **/
--void
--egg_debug_backtrace (void)
--{
--	void *call_stack[512];
--	int  call_stack_size;
--	char **symbols;
--	int i = 1;
--
--	call_stack_size = backtrace (call_stack, G_N_ELEMENTS (call_stack));
--	symbols = backtrace_symbols (call_stack, call_stack_size);
--	if (symbols != NULL) {
--		pk_set_console_mode (CONSOLE_RED);
--		g_print ("Traceback:\n");
--		while (i < call_stack_size) {
--			g_print ("\t%s\n", symbols[i]);
--			i++;
--		}
--		pk_set_console_mode (CONSOLE_RESET);
--		free (symbols);
--	}
--}
--
--/**
-  * pk_log_line:
-  **/
- static void
-@@ -229,9 +204,6 @@ egg_error_real (const gchar *func, const gchar *file, const int line, const gcha
- 	pk_print_line (func, file, line, buffer, CONSOLE_RED);
- 	g_free(buffer);
- 
--	/* we want to fix this! */
--	egg_debug_backtrace ();
--
- 	exit (1);
- }
- 
-diff --git a/applets/inhibit/egg-debug.c b/applets/inhibit/egg-debug.c
-index 3a8e6e7..b06b540 100644
---- a/applets/inhibit/egg-debug.c
-+++ b/applets/inhibit/egg-debug.c
-@@ -75,31 +75,6 @@ pk_set_console_mode (guint console_code)
- }
- 
- /**
-- * egg_debug_backtrace:
-- **/
--void
--egg_debug_backtrace (void)
--{
--	void *call_stack[512];
--	int  call_stack_size;
--	char **symbols;
--	int i = 1;
--
--	call_stack_size = backtrace (call_stack, G_N_ELEMENTS (call_stack));
--	symbols = backtrace_symbols (call_stack, call_stack_size);
--	if (symbols != NULL) {
--		pk_set_console_mode (CONSOLE_RED);
--		g_print ("Traceback:\n");
--		while (i < call_stack_size) {
--			g_print ("\t%s\n", symbols[i]);
--			i++;
--		}
--		pk_set_console_mode (CONSOLE_RESET);
--		free (symbols);
--	}
--}
--
--/**
-  * pk_log_line:
-  **/
- static void
-@@ -229,9 +204,6 @@ egg_error_real (const gchar *func, const gchar *file, const int line, const gcha
- 	pk_print_line (func, file, line, buffer, CONSOLE_RED);
- 	g_free(buffer);
- 
--	/* we want to fix this! */
--	egg_debug_backtrace ();
--
- 	exit (1);
- }
- 
-diff --git a/src/egg-debug.c b/src/egg-debug.c
-index 3a8e6e7..b06b540 100644
---- a/src/egg-debug.c
-+++ b/src/egg-debug.c
-@@ -75,31 +75,6 @@ pk_set_console_mode (guint console_code)
- }
- 
- /**
-- * egg_debug_backtrace:
-- **/
--void
--egg_debug_backtrace (void)
--{
--	void *call_stack[512];
--	int  call_stack_size;
--	char **symbols;
--	int i = 1;
--
--	call_stack_size = backtrace (call_stack, G_N_ELEMENTS (call_stack));
--	symbols = backtrace_symbols (call_stack, call_stack_size);
--	if (symbols != NULL) {
--		pk_set_console_mode (CONSOLE_RED);
--		g_print ("Traceback:\n");
--		while (i < call_stack_size) {
--			g_print ("\t%s\n", symbols[i]);
--			i++;
--		}
--		pk_set_console_mode (CONSOLE_RESET);
--		free (symbols);
--	}
--}
--
--/**
-  * pk_log_line:
-  **/
- static void
-@@ -229,9 +204,6 @@ egg_error_real (const gchar *func, const gchar *file, const int line, const gcha
- 	pk_print_line (func, file, line, buffer, CONSOLE_RED);
- 	g_free(buffer);
- 
--	/* we want to fix this! */
--	egg_debug_backtrace ();
--
- 	exit (1);
- }
- 
--- 
-2.3.3
-
diff --git a/community/mate-power-manager/APKBUILD b/community/mate-power-manager/APKBUILD
index a0c5e65f0fd..10c1d93d538 100644
--- a/community/mate-power-manager/APKBUILD
+++ b/community/mate-power-manager/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <alacerda@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=mate-power-manager
-pkgver=1.24.3
+pkgver=1.26.0
 pkgrel=0
 pkgdesc="A Power Manager for MATE"
 url="https://github.com/mate-desktop/mate-power-manager"
@@ -10,11 +10,9 @@ license="GPL-2.0-or-later"
 makedepends="$depends_dev intltool gettext-dev itstool glib-dev libcanberra-dev
 	dbus-glib-dev mate-desktop-dev dconf-dev libnotify-dev
 	upower-dev libgnome-keyring-dev mate-panel-dev harfbuzz-dev
-	polkit-dev"
+	polkit-dev libsecret-dev"
 subpackages="$pkgname-doc $pkgname-lang"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-power-manager-$pkgver.tar.xz
-	0001-execinfo-patch.patch
-	0001-removing-backtrace.patch
 	0001-get_nprocs-patch.patch
 	"
 
@@ -36,7 +34,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="6aad5c5346e563ce0fbc4e72bccce49323843e3b12738b9e45040dd804f962344a1dbc8f26d518b28fc35ca9ec87a2068f81731eb0c094be114378f2f93a2a8c  mate-power-manager-1.24.3.tar.xz
-f7c97099144a077d00d0dbee0ed148fb7a82ea902a31b4607b3b37b07d26530dc06695c9ff9565ba457f754c2093610efa46965d0d28329cd23a7a061f1b4249  0001-execinfo-patch.patch
-76364f42dbeceb0c13e957e83fe40873cc93f2d83497b658419765ea736a50f436515347960f5f30a021b55aef670fddce04787c892509b8c54995512a5dc1b7  0001-removing-backtrace.patch
-76d93fb1313e3fabbd333d9ccb3a97907cea5292150aecf813ca32f4e434eab69f337ff7578ce3d0e940bb8fad28d1b13264bd6130cdaea7de618104c5826779  0001-get_nprocs-patch.patch"
+sha512sums="
+1ddede827f72738e87870d2abeed7f0767ef2e383b8325b24faa0fd1e811ed634446516e6634b19a6546ddd7185092fd757b2b2ff97f51b88a9d2c313407abd4  mate-power-manager-1.26.0.tar.xz
+76d93fb1313e3fabbd333d9ccb3a97907cea5292150aecf813ca32f4e434eab69f337ff7578ce3d0e940bb8fad28d1b13264bd6130cdaea7de618104c5826779  0001-get_nprocs-patch.patch
+"