commit: 781e5e2b03a68f4c3ea8ded11a1650cde39664cb Author: Bjorn Pagen <bjornpagen <AT> gmail <DOT> com> AuthorDate: Tue Oct 31 22:09:26 2017 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Thu Nov 2 01:19:50 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=781e5e2b
add mate-extra/mate-power-manager mate-extra/mate-power-manager/Manifest | 5 + .../files/musl-fix-compile-execinfo.patch | 56 ++++++++ .../files/musl-fix-remove-backtrace.patch | 152 +++++++++++++++++++++ .../mate-power-manager-1.18.0.ebuild | 73 ++++++++++ mate-extra/mate-power-manager/metadata.xml | 19 +++ 5 files changed, 305 insertions(+) diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest new file mode 100644 index 0000000..36a8362 --- /dev/null +++ b/mate-extra/mate-power-manager/Manifest @@ -0,0 +1,5 @@ +AUX musl-fix-compile-execinfo.patch 1318 SHA256 651f146c9c7632f520a9f340d02ff6bfc0383aac70f926cf5dfa8a413876707e SHA512 f7c97099144a077d00d0dbee0ed148fb7a82ea902a31b4607b3b37b07d26530dc06695c9ff9565ba457f754c2093610efa46965d0d28329cd23a7a061f1b4249 WHIRLPOOL a49eaef1794c02ead86c44756abfa1ad79613ce34c1231bd6863119b3e71048024db2bb89e57a85b8389eb5dd6cdc0f5f66e47907ba9397cc01658ffcc5fc246 +AUX musl-fix-remove-backtrace.patch 3575 SHA256 b1764f4a772d5287f2c0b33da7ab0b7c8bfe8192e032dcbe7f767b60638b4b42 SHA512 76364f42dbeceb0c13e957e83fe40873cc93f2d83497b658419765ea736a50f436515347960f5f30a021b55aef670fddce04787c892509b8c54995512a5dc1b7 WHIRLPOOL ff8560320d82c30a871067546aeac6fc06db884de529b356ac9e40c4f1208ce0788cde1719c7c3111e1c3da54946e497ecc824316c6fba3896f29a633e0edba2 +DIST mate-power-manager-1.18.0.tar.xz 3180036 SHA256 dd0c5fc82d0ea81246890a95d57de92c60c3d735ad06f5946c79eebe7c52b3be SHA512 dabd0d6757171ce0556d65c8d2c4234a8fd7ab4e191caf45447d0797d779a83f23538c96b36d1f959f5fcb63e2305cd3ede6cb13d504e59a2daaf1e75e5a7bd1 WHIRLPOOL b027f549fa4341472222781959d408060bf9827ff4c6d562aaeb4de87bb58a818bfa785f95f518507cb443a1ed401b91afd13e703d9458be6b3b374d67f450d5 +EBUILD mate-power-manager-1.18.0.ebuild 1768 SHA256 b8e40c3f1142d7cb527394056338668f139df21ea08b535879a7bb5b70af83fd SHA512 108c8bc277edb8a82286ca938179c0301d51248fbaa0b3b8bd617285f49c49cda87b0c833de3d05aa26dd741c93dd8eedb8798d4e9a7bded127c59e13a10f71c WHIRLPOOL 2c4478957b2ccb2419900bc1d7c1f54baa190205b04e2031f550bd6c07259f757df4be84ca5b8bff8a1a4b45fe054a16d2d0d2d180217a2bccc3953158347ee0 +MISC metadata.xml 697 SHA256 80c86ca8ca6b79fd376fc2a74aafb7e2bae57a6fc52973c78c1b002fc50831f8 SHA512 bb4229159bc69879bf967fc082846e75e905ad7fcc772e70de1f3f2cd58117089d7d339903ea44adee01966b1aa04db8192c67b0021196a5fd56f78610a51399 WHIRLPOOL 4a6a1077dd4537ab046c1aff7c0bf16859244f3c3b0eb46deedd35ba90e3ec458564a08017991bd85c29149bd43f7530670f8c7cf8eb2df7620b10f6485b7016 diff --git a/mate-extra/mate-power-manager/files/musl-fix-compile-execinfo.patch b/mate-extra/mate-power-manager/files/musl-fix-compile-execinfo.patch new file mode 100644 index 0000000..2c07ef1 --- /dev/null +++ b/mate-extra/mate-power-manager/files/musl-fix-compile-execinfo.patch @@ -0,0 +1,56 @@ +From f117ad21ce676d67df265e522bfc1047118958ba Mon Sep 17 00:00:00 2001 +From: Alan Lacerda <alace...@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/mate-extra/mate-power-manager/files/musl-fix-remove-backtrace.patch b/mate-extra/mate-power-manager/files/musl-fix-remove-backtrace.patch new file mode 100644 index 0000000..536991b --- /dev/null +++ b/mate-extra/mate-power-manager/files/musl-fix-remove-backtrace.patch @@ -0,0 +1,152 @@ +From b8907c90dec6a7f6fc2a3c682ddb48d4ebf8406e Mon Sep 17 00:00:00 2001 +From: Alan Lacerda <alace...@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/mate-extra/mate-power-manager/mate-power-manager-1.18.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.18.0.ebuild new file mode 100644 index 0000000..55e4030 --- /dev/null +++ b/mate-extra/mate-power-manager/mate-power-manager-1.18.0.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit mate + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64 ~arm ~x86" +fi + +DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop" +LICENSE="GPL-2" +SLOT="0" + +IUSE="+applet gnome-keyring pm-utils policykit systemd test" + +# Interactive testsuite. +RESTRICT="test" + +COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0 + >=dev-libs/glib-2.36:2 + >=media-libs/libcanberra-0.10:0[gtk3] + >=sys-apps/dbus-1:0 + >=x11-apps/xrandr-1.3:0 + >=x11-libs/cairo-1:0 + >=x11-libs/gdk-pixbuf-2.11:2 + >=x11-libs/gtk+-3.14:3 + x11-libs/libX11:0 + x11-libs/libXext:0 + x11-libs/libXrandr:0 + >=x11-libs/libnotify-0.7:0 + x11-libs/pango:0 + applet? ( >=mate-base/mate-panel-1.17.0 ) + gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) + pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 ) + !pm-utils? ( >=sys-power/upower-0.9.23:= ) + systemd? ( sys-apps/systemd ) + !systemd? ( >=sys-auth/consolekit-0.9.2 )" + +RDEPEND="${COMMON_DEPEND} + policykit? ( >=mate-extra/mate-polkit-1.6 )" + +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.3 + app-text/rarian:0 + >=app-text/scrollkeeper-dtd-1:1.0 + app-text/yelp-tools:0 + >=dev-util/intltool-0.50.1:* + x11-proto/randrproto:0 + >=x11-proto/xproto-7.0.15:0 + sys-devel/gettext:* + virtual/pkgconfig:*" + +src_prepare() { + eapply "${FILESDIR}/musl-fix-compile-execinfo.patch" + eapply "${FILESDIR}/musl-fix-remove-backtrace.patch" + eapply_user +} + +src_configure() { + mate_src_configure \ + --enable-compile-warnings=minimum \ + $(use_with gnome-keyring keyring) \ + $(use_enable applet applets) \ + $(use_enable test tests) +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + + dbus-launch Xemake check || die "Test phase failed" +} diff --git a/mate-extra/mate-power-manager/metadata.xml b/mate-extra/mate-power-manager/metadata.xml new file mode 100644 index 0000000..aca679d --- /dev/null +++ b/mate-extra/mate-power-manager/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>m...@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + <use> + <flag name="applet">Enable building of the MATE applet.</flag> + <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag> + <flag name="man">Build power manager's man page.</flag> + <flag name="pm-utils">Adds support for suspend/resume using + <pkg>sys-power/upower-pm-utils</pkg> instead of + <pkg>sys-power/upower</pkg></flag> + </use> + <upstream> + <remote-id type="github">mate-desktop/mate-power-manager</remote-id> + </upstream> +</pkgmetadata>