From dfae5563aad7528a4874dcb3cbc928a1a202452c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 6 Nov 2015 09:33:51 +0100 Subject: [PATCH] mate-power-manager: update to 1.12.0. --- .../patches/0001-execinfo-patch.patch | 56 ------- .../patches/0001-get_nprocs-patch.patch | 27 ---- .../patches/0001-removing-backtrace.patch | 152 ------------------ srcpkgs/mate-power-manager/template | 9 +- 4 files changed, 4 insertions(+), 240 deletions(-) delete mode 100644 srcpkgs/mate-power-manager/patches/0001-execinfo-patch.patch delete mode 100644 srcpkgs/mate-power-manager/patches/0001-get_nprocs-patch.patch delete mode 100644 srcpkgs/mate-power-manager/patches/0001-removing-backtrace.patch diff --git a/srcpkgs/mate-power-manager/patches/0001-execinfo-patch.patch b/srcpkgs/mate-power-manager/patches/0001-execinfo-patch.patch deleted file mode 100644 index 2c07ef12f1e..00000000000 --- a/srcpkgs/mate-power-manager/patches/0001-execinfo-patch.patch +++ /dev/null @@ -1,56 +0,0 @@ -From f117ad21ce676d67df265e522bfc1047118958ba Mon Sep 17 00:00:00 2001 -From: Alan Lacerda -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 - #include - #include -+#if defined (__GLIBC__) - #include -+#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 - #include - #include -+#if defined (__GLIBC__) - #include -+#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 - #include - #include -+#if defined (__GLIBC__) - #include -+#endif - - #include "egg-debug.h" - --- -2.3.3 - diff --git a/srcpkgs/mate-power-manager/patches/0001-get_nprocs-patch.patch b/srcpkgs/mate-power-manager/patches/0001-get_nprocs-patch.patch deleted file mode 100644 index c71fabedea7..00000000000 --- a/srcpkgs/mate-power-manager/patches/0001-get_nprocs-patch.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 274b58cef2501ff45e18e8ba98ce7a2e0f1478a3 Mon Sep 17 00:00:00 2001 -From: Alan Lacerda -Date: Fri, 17 Apr 2015 20:02:16 +0000 -Subject: [PATCH] get_nprocs patch - ---- - src/gpm-load.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gpm-load.c b/src/gpm-load.c -index 3b0f572..5e78cb7 100644 ---- a/src/gpm-load.c -+++ b/src/gpm-load.c -@@ -29,9 +29,9 @@ - #include - #include - #include -+#include - #if defined(sun) && defined(__SVR4) - #include --#include - #endif - #ifdef HAVE_UNISTD_H - #include --- -2.3.3 - diff --git a/srcpkgs/mate-power-manager/patches/0001-removing-backtrace.patch b/srcpkgs/mate-power-manager/patches/0001-removing-backtrace.patch deleted file mode 100644 index 536991bc164..00000000000 --- a/srcpkgs/mate-power-manager/patches/0001-removing-backtrace.patch +++ /dev/null @@ -1,152 +0,0 @@ -From b8907c90dec6a7f6fc2a3c682ddb48d4ebf8406e Mon Sep 17 00:00:00 2001 -From: Alan Lacerda -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/srcpkgs/mate-power-manager/template b/srcpkgs/mate-power-manager/template index b1b0d972d02..451685a0a3f 100644 --- a/srcpkgs/mate-power-manager/template +++ b/srcpkgs/mate-power-manager/template @@ -1,14 +1,13 @@ # Template file for 'mate-power-manager' pkgname=mate-power-manager -version=1.10.2 +version=1.12.0 revision=1 -patch_args="-Np1" build_pie=yes build_style=gnu-configure -configure_args="--sbindir=/usr/bin --with-gtk=2.0 --disable-schemas-compile" +configure_args="--sbindir=/usr/bin --with-gtk=3.0 --disable-schemas-compile" hostmakedepends="pkg-config intltool itstool libtool glib-devel dbus-glib-devel mate-common mate-desktop-devel" -makedepends="gtk+-devel dbus-glib-devel libnotify-devel libunique1-devel +makedepends="gtk+3-devel dbus-glib-devel libnotify-devel libunique-devel upower0-devel libcanberra-devel libgnome-keyring-devel libmate-panel-devel mate-desktop-devel" depends="dconf" @@ -17,7 +16,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=49eed514cb8507d3ae7699e701afb33a90002aa833bdc507f9ac0dd031ce04de +checksum=e578ea838cb9a78b23fabf61dd11709cd4be70c240f5bb00e2f387f628a65adb pre_configure() { NOCONFIGURE=1 ./autogen.sh