| 1 |
commit: 3cfe589815027ded09d76070f76cae70123c122a |
| 2 |
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 2 04:52:56 2020 +0000 |
| 4 |
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 2 05:55:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=3cfe5898 |
| 7 |
|
| 8 |
mate-extra/mate-power-manager: Sync with ::gentoo |
| 9 |
|
| 10 |
Re-add consolekit support |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 13 |
RepoMan-Options: --force |
| 14 |
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org> |
| 15 |
|
| 16 |
mate-extra/mate-power-manager/Manifest | 3 +- |
| 17 |
.../mate-power-manager-1.24.1-libsecret.patch | 287 +++++++++++++++++++++ |
| 18 |
....ebuild => mate-power-manager-1.22.2-r1.ebuild} | 3 +- |
| 19 |
....ebuild => mate-power-manager-1.24.1-r1.ebuild} | 5 +- |
| 20 |
....ebuild => mate-power-manager-1.24.1-r2.ebuild} | 22 +- |
| 21 |
mate-extra/mate-power-manager/metadata.xml | 1 + |
| 22 |
6 files changed, 308 insertions(+), 13 deletions(-) |
| 23 |
|
| 24 |
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest |
| 25 |
index 65a55e6..ab90b55 100644 |
| 26 |
--- a/mate-extra/mate-power-manager/Manifest |
| 27 |
+++ b/mate-extra/mate-power-manager/Manifest |
| 28 |
@@ -1,3 +1,2 @@ |
| 29 |
-DIST mate-power-manager-1.22.1.tar.xz 3188048 BLAKE2B af32a18e2561cc9689382ff9a94382180a5d2dc6ade34a6dc400a7b65730a6c26c6f32b72b6ec973210ac3baf4e8b6c54e489230e64b877cee4ffbbf1a195d28 SHA512 8eabd7f8171f0a6be610c849fad8346bb30ca2c69208e2e117f436daaa5ada3bf0fef479dc017f32f56ec6bd52a7ff7ff69d18baf01b402c5fa2747245261a81 |
| 30 |
DIST mate-power-manager-1.22.2.tar.xz 3188752 BLAKE2B 351c18436183679b2b0ecf549a8efe16a691876b7299f06d88d7f7c3434feab1f35ac26a015b5425260dc1a41a4734f0244825a69bb77211320d60f4328ff63b SHA512 99a273558c072ce1d23c8964d9292f45a29a2d5a5e89b504e79e3686a65ad8cc7b200441ba22147d3d828f574e2cebc260c47531338e286b2c47988263763af6 |
| 31 |
-DIST mate-power-manager-1.24.0.tar.xz 5776576 BLAKE2B 3846006bc86fda166e2220848648a8d0bf3f0b5952a6b32e8d24ec56adf670f04d4422b06aa3a09a769c01644ff3f3f71edc0f551de3f22631071a16f849d549 SHA512 6194d1156a004c1006b3b0b5d50a4def5e6d07df5229aafac487843e4e544e144b85e2a9b45ee0b932b8de9a6969aa844f8f61ac607f9f5e6234fd4ff5d8a4d5 |
| 32 |
+DIST mate-power-manager-1.24.1.tar.xz 6245524 BLAKE2B b9be1aab7e2f397edba9a681310a9903b11e11abf1af8557c613a1e6bf7b89d5aa495ddfcef4bc23f11aa6aca215b86e3a1c9adfdfd481f0e4353268ca5dd7cd SHA512 57bae519bfa2894bc6923bf0932f823bcabe2dc0de06dc6676597708482b369a24f39bb94558163f0fdcc2d764702b87f58abc1793679a1c7fb7f53be074bae5 |
| 33 |
|
| 34 |
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.24.1-libsecret.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.24.1-libsecret.patch |
| 35 |
new file mode 100644 |
| 36 |
index 0000000..11a9f94 |
| 37 |
--- /dev/null |
| 38 |
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.24.1-libsecret.patch |
| 39 |
@@ -0,0 +1,287 @@ |
| 40 |
+From b2d876a16de9214270f248d7c445542120ae7800 Mon Sep 17 00:00:00 2001 |
| 41 |
+From: NP-Hardass <np.hardass@×××××.com> |
| 42 |
+Date: Mon, 3 Aug 2020 01:46:00 -0400 |
| 43 |
+Subject: [PATCH 1/5] Add autotools support for libsecret |
| 44 |
+ |
| 45 |
+--- |
| 46 |
+ README | 1 + |
| 47 |
+ configure.ac | 22 ++++++++++++++++++++++ |
| 48 |
+ src/Makefile.am | 3 +++ |
| 49 |
+ 3 files changed, 26 insertions(+) |
| 50 |
+ |
| 51 |
+diff --git a/README b/README |
| 52 |
+index 118da697..32a8a5cc 100644 |
| 53 |
+--- a/README |
| 54 |
++++ b/README |
| 55 |
+@@ -15,6 +15,7 @@ To build, MATE Power Manager requires |
| 56 |
+ |
| 57 |
+ - Glib (2.36.0 or later) |
| 58 |
+ - GTK+3 (3.14.0 or later) |
| 59 |
++ - libsecret (0.11 or later) |
| 60 |
+ - GNOME Keyring (3.0.0 or later) |
| 61 |
+ - DBus (0.70 or later) |
| 62 |
+ - libnotify (0.7.0 or later) |
| 63 |
+diff --git a/configure.ac b/configure.ac |
| 64 |
+index 1db39321..b4758dca 100644 |
| 65 |
+--- a/configure.ac |
| 66 |
++++ b/configure.ac |
| 67 |
+@@ -68,6 +68,7 @@ GLIB_REQUIRED=2.50.0 |
| 68 |
+ GIO_REQUIRED=2.50.0 |
| 69 |
+ GDK_REQUIRED=3.22.0 |
| 70 |
+ GTK_REQUIRED=3.22.0 |
| 71 |
++LIBSECRET_REQUIRED=0.11 |
| 72 |
+ GNOME_KEYRING_REQUIRED=3.0.0 |
| 73 |
+ DBUS_REQUIRED=1.0 |
| 74 |
+ DBUS_GLIB_REQUIRED=0.70 |
| 75 |
+@@ -134,6 +135,22 @@ else |
| 76 |
+ fi |
| 77 |
+ AM_CONDITIONAL([HAVE_TESTS], [test $have_tests = yes]) |
| 78 |
+ |
| 79 |
++dnl --------------------------------------------------------------------------- |
| 80 |
++dnl - Build libsecret support |
| 81 |
++dnl --------------------------------------------------------------------------- |
| 82 |
++AC_ARG_WITH(libsecret, |
| 83 |
++ [AS_HELP_STRING([--with-libsecret], |
| 84 |
++ [Enable the use of libsecret])], |
| 85 |
++ [], |
| 86 |
++ [with_libsecret=no]) |
| 87 |
++ |
| 88 |
++AM_CONDITIONAL([WITH_LIBSECRET],[test "$with_libsecret" = "yes"]) |
| 89 |
++ |
| 90 |
++if test "$with_libsecret" = "yes"; then |
| 91 |
++ PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= $LIBSECRET_REQUIRED) |
| 92 |
++ AC_DEFINE([WITH_LIBSECRET],[1],[Define if LIBSECRET support is enabled]) |
| 93 |
++fi |
| 94 |
++ |
| 95 |
+ dnl --------------------------------------------------------------------------- |
| 96 |
+ dnl - Build gnome-keyring support |
| 97 |
+ dnl --------------------------------------------------------------------------- |
| 98 |
+@@ -150,6 +167,10 @@ if test "$with_keyring" = "yes"; then |
| 99 |
+ AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled]) |
| 100 |
+ fi |
| 101 |
+ |
| 102 |
++if test "$with_libsecret" = "yes" -a "$with_keyring" = "yes"; then |
| 103 |
++ AC_MSG_ERROR([Please select only 1, keyring or libsecret]) |
| 104 |
++fi |
| 105 |
++ |
| 106 |
+ dnl --------------------------------------------------------------------------- |
| 107 |
+ dnl - Build applets |
| 108 |
+ dnl --------------------------------------------------------------------------- |
| 109 |
+@@ -222,6 +243,7 @@ echo " |
| 110 |
+ compiler: ${CC} |
| 111 |
+ cflags: ${CFLAGS} |
| 112 |
+ cwarnings: ${WARN_CFLAGS} |
| 113 |
++ libsecret support: ${with_libsecret} |
| 114 |
+ gnome-keyring support: ${with_keyring} |
| 115 |
+ Building extra applets: ${enable_applets} |
| 116 |
+ Self test support: ${have_tests} |
| 117 |
+diff --git a/src/Makefile.am b/src/Makefile.am |
| 118 |
+index 1a966e8f..47815c5f 100644 |
| 119 |
+--- a/src/Makefile.am |
| 120 |
++++ b/src/Makefile.am |
| 121 |
+@@ -14,6 +14,7 @@ AM_CPPFLAGS = \ |
| 122 |
+ $(GLIB_CFLAGS) \ |
| 123 |
+ $(DBUS_CFLAGS) \ |
| 124 |
+ $(CAIRO_CFLAGS) \ |
| 125 |
++ $(LIBSECRET_CFLAGS) \ |
| 126 |
+ $(KEYRING_CFLAGS) \ |
| 127 |
+ $(X11_CFLAGS) \ |
| 128 |
+ $(LIBNOTIFY_CFLAGS) \ |
| 129 |
+@@ -197,6 +198,7 @@ mate_power_manager_LDADD = \ |
| 130 |
+ $(X11_LIBS) \ |
| 131 |
+ $(GSTREAMER_LIBS) \ |
| 132 |
+ $(CAIRO_LIBS) \ |
| 133 |
++ $(LIBSECRET_LIBS) \ |
| 134 |
+ $(KEYRING_LIBS) \ |
| 135 |
+ $(DBUS_LIBS) \ |
| 136 |
+ $(X11_LIBS) \ |
| 137 |
+@@ -259,6 +261,7 @@ mate_power_self_test_LDADD = \ |
| 138 |
+ $(GLIB_LIBS) \ |
| 139 |
+ $(X11_LIBS) \ |
| 140 |
+ $(CAIRO_LIBS) \ |
| 141 |
++ $(LIBSECRET_LIBS) \ |
| 142 |
+ $(KEYRING_LIBS) \ |
| 143 |
+ $(GSTREAMER_LIBS) \ |
| 144 |
+ $(UPOWER_LIBS) \ |
| 145 |
+ |
| 146 |
+From 7dbbf59fc5dc64cf512932993616a06903d5f22b Mon Sep 17 00:00:00 2001 |
| 147 |
+From: NP-Hardass <np.hardass@×××××.com> |
| 148 |
+Date: Mon, 3 Aug 2020 01:49:47 -0400 |
| 149 |
+Subject: [PATCH 2/5] gpm-control.c: Add libsecret implementation to |
| 150 |
+ gpm_control_suspend() |
| 151 |
+ |
| 152 |
+--- |
| 153 |
+ src/gpm-control.c | 39 +++++++++++++++++++++++++++++++++++++++ |
| 154 |
+ 1 file changed, 39 insertions(+) |
| 155 |
+ |
| 156 |
+diff --git a/src/gpm-control.c b/src/gpm-control.c |
| 157 |
+index 4834a050..e64bfb12 100644 |
| 158 |
+--- a/src/gpm-control.c |
| 159 |
++++ b/src/gpm-control.c |
| 160 |
+@@ -39,6 +39,9 @@ |
| 161 |
+ #include <gio/gio.h> |
| 162 |
+ #include <glib/gi18n.h> |
| 163 |
+ |
| 164 |
++#ifdef WITH_LIBSECRET |
| 165 |
++#include <libsecret/secret.h> |
| 166 |
++#endif /* WITH_LIBSECRET */ |
| 167 |
+ #ifdef WITH_KEYRING |
| 168 |
+ #include <gnome-keyring.h> |
| 169 |
+ #endif /* WITH_KEYRING */ |
| 170 |
+@@ -210,6 +213,13 @@ gpm_control_suspend (GpmControl *control, GError **error) |
| 171 |
+ EggConsoleKit *console; |
| 172 |
+ GpmScreensaver *screensaver; |
| 173 |
+ guint32 throttle_cookie = 0; |
| 174 |
++#ifdef WITH_LIBSECRET |
| 175 |
++ gboolean lock_libsecret; |
| 176 |
++ GCancellable *libsecret_cancellable = NULL; |
| 177 |
++ SecretService *secretservice_proxy = NULL; |
| 178 |
++ gint num_secrets_locked; |
| 179 |
++ GList *libsecret_collections = NULL; |
| 180 |
++#endif /* WITH_LIBSECRET */ |
| 181 |
+ #ifdef WITH_KEYRING |
| 182 |
+ gboolean lock_gnome_keyring; |
| 183 |
+ GnomeKeyringResult keyres; |
| 184 |
+@@ -233,6 +243,35 @@ gpm_control_suspend (GpmControl *control, GError **error) |
| 185 |
+ } |
| 186 |
+ } |
| 187 |
+ |
| 188 |
++#ifdef WITH_LIBSECRET |
| 189 |
++ /* we should perhaps lock keyrings when sleeping #375681 */ |
| 190 |
++ lock_libsecret = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND); |
| 191 |
++ if (lock_libsecret) { |
| 192 |
++ libsecret_cancellable = g_cancellable_new(); |
| 193 |
++ secretservice_proxy = secret_service_get_sync(SECRET_SERVICE_LOAD_COLLECTIONS, |
| 194 |
++ libsecret_cancellable, |
| 195 |
++ error); |
| 196 |
++ if (secretservice_proxy == NULL) { |
| 197 |
++ g_warning ("failed to connect to secret service"); |
| 198 |
++ } else { |
| 199 |
++ libsecret_collections = secret_service_get_collections(secretservice_proxy); |
| 200 |
++ if ( libsecret_collections == NULL) { |
| 201 |
++ g_warning ("failed to get secret collections"); |
| 202 |
++ } else { |
| 203 |
++ num_secrets_locked = secret_service_lock_sync(secretservice_proxy, |
| 204 |
++ libsecret_collections, |
| 205 |
++ libsecret_cancellable, |
| 206 |
++ NULL, |
| 207 |
++ error); |
| 208 |
++ if (num_secrets_locked <= 0) |
| 209 |
++ g_warning ("could not lock keyring"); |
| 210 |
++ g_list_free(libsecret_collections); |
| 211 |
++ } |
| 212 |
++ g_object_unref(secretservice_proxy); |
| 213 |
++ } |
| 214 |
++ g_object_unref(libsecret_cancellable); |
| 215 |
++ } |
| 216 |
++#endif /* WITH_LIBSECRET */ |
| 217 |
+ #ifdef WITH_KEYRING |
| 218 |
+ /* we should perhaps lock keyrings when sleeping #375681 */ |
| 219 |
+ lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND); |
| 220 |
+ |
| 221 |
+From 74acfabab04f10e95dc91fdc633a893a4564a820 Mon Sep 17 00:00:00 2001 |
| 222 |
+From: NP-Hardass <np.hardass@×××××.com> |
| 223 |
+Date: Mon, 3 Aug 2020 01:55:43 -0400 |
| 224 |
+Subject: [PATCH 3/5] gpm-control.c: Add libsecret implementation to |
| 225 |
+ gpm_control_hibernate() |
| 226 |
+ |
| 227 |
+--- |
| 228 |
+ src/gpm-control.c | 36 ++++++++++++++++++++++++++++++++++++ |
| 229 |
+ 1 file changed, 36 insertions(+) |
| 230 |
+ |
| 231 |
+diff --git a/src/gpm-control.c b/src/gpm-control.c |
| 232 |
+index e64bfb12..98bb6f4e 100644 |
| 233 |
+--- a/src/gpm-control.c |
| 234 |
++++ b/src/gpm-control.c |
| 235 |
+@@ -367,6 +367,13 @@ gpm_control_hibernate (GpmControl *control, GError **error) |
| 236 |
+ EggConsoleKit *console; |
| 237 |
+ GpmScreensaver *screensaver; |
| 238 |
+ guint32 throttle_cookie = 0; |
| 239 |
++#ifdef WITH_LIBSECRET |
| 240 |
++ gboolean lock_libsecret; |
| 241 |
++ GCancellable *libsecret_cancellable = NULL; |
| 242 |
++ SecretService *secretservice_proxy = NULL; |
| 243 |
++ gint num_secrets_locked; |
| 244 |
++ GList *libsecret_collections = NULL; |
| 245 |
++#endif /* WITH_LIBSECRET */ |
| 246 |
+ #ifdef WITH_KEYRING |
| 247 |
+ gboolean lock_gnome_keyring; |
| 248 |
+ GnomeKeyringResult keyres; |
| 249 |
+@@ -390,6 +397,35 @@ gpm_control_hibernate (GpmControl *control, GError **error) |
| 250 |
+ } |
| 251 |
+ } |
| 252 |
+ |
| 253 |
++#ifdef WITH_LIBSECRET |
| 254 |
++ /* we should perhaps lock keyrings when sleeping #375681 */ |
| 255 |
++ lock_libsecret = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND); |
| 256 |
++ if (lock_libsecret) { |
| 257 |
++ libsecret_cancellable = g_cancellable_new(); |
| 258 |
++ secretservice_proxy = secret_service_get_sync(SECRET_SERVICE_LOAD_COLLECTIONS, |
| 259 |
++ libsecret_cancellable, |
| 260 |
++ error); |
| 261 |
++ if (secretservice_proxy == NULL) { |
| 262 |
++ g_warning ("failed to connect to secret service"); |
| 263 |
++ } else { |
| 264 |
++ libsecret_collections = secret_service_get_collections(secretservice_proxy); |
| 265 |
++ if ( libsecret_collections == NULL) { |
| 266 |
++ g_warning ("failed to get secret collections"); |
| 267 |
++ } else { |
| 268 |
++ num_secrets_locked = secret_service_lock_sync(secretservice_proxy, |
| 269 |
++ libsecret_collections, |
| 270 |
++ libsecret_cancellable, |
| 271 |
++ NULL, |
| 272 |
++ error); |
| 273 |
++ if (num_secrets_locked <= 0) |
| 274 |
++ g_warning ("could not lock keyring"); |
| 275 |
++ g_list_free(libsecret_collections); |
| 276 |
++ } |
| 277 |
++ g_object_unref(secretservice_proxy); |
| 278 |
++ } |
| 279 |
++ g_object_unref(libsecret_cancellable); |
| 280 |
++ } |
| 281 |
++#endif /* WITH_LIBSECRET */ |
| 282 |
+ #ifdef WITH_KEYRING |
| 283 |
+ /* we should perhaps lock keyrings when sleeping #375681 */ |
| 284 |
+ lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE); |
| 285 |
+ |
| 286 |
+From a5b4e5b14510ea3aeb8824294876c152635503ae Mon Sep 17 00:00:00 2001 |
| 287 |
+From: NP-Hardass <np.hardass@×××××.com> |
| 288 |
+Date: Mon, 3 Aug 2020 02:01:10 -0400 |
| 289 |
+Subject: [PATCH 5/5] Switch default from libgnome-keyring to libsecret |
| 290 |
+ |
| 291 |
+--- |
| 292 |
+ configure.ac | 12 ++++++------ |
| 293 |
+ 1 file changed, 6 insertions(+), 6 deletions(-) |
| 294 |
+ |
| 295 |
+diff --git a/configure.ac b/configure.ac |
| 296 |
+index b4758dca..7fbc8206 100644 |
| 297 |
+--- a/configure.ac |
| 298 |
++++ b/configure.ac |
| 299 |
+@@ -139,10 +139,10 @@ dnl --------------------------------------------------------------------------- |
| 300 |
+ dnl - Build libsecret support |
| 301 |
+ dnl --------------------------------------------------------------------------- |
| 302 |
+ AC_ARG_WITH(libsecret, |
| 303 |
+- [AS_HELP_STRING([--with-libsecret], |
| 304 |
+- [Enable the use of libsecret])], |
| 305 |
++ [AS_HELP_STRING([--without-libsecret], |
| 306 |
++ [Disable the use of libsecret])], |
| 307 |
+ [], |
| 308 |
+- [with_libsecret=no]) |
| 309 |
++ [with_libsecret=yes]) |
| 310 |
+ |
| 311 |
+ AM_CONDITIONAL([WITH_LIBSECRET],[test "$with_libsecret" = "yes"]) |
| 312 |
+ |
| 313 |
+@@ -155,10 +155,10 @@ dnl --------------------------------------------------------------------------- |
| 314 |
+ dnl - Build gnome-keyring support |
| 315 |
+ dnl --------------------------------------------------------------------------- |
| 316 |
+ AC_ARG_WITH(keyring, |
| 317 |
+- [AS_HELP_STRING([--without-keyring], |
| 318 |
+- [Disable the use of gnome-keyring])], |
| 319 |
++ [AS_HELP_STRING([--with-keyring], |
| 320 |
++ [Enable the use of gnome-keyring])], |
| 321 |
+ [], |
| 322 |
+- [with_keyring=yes]) |
| 323 |
++ [with_keyring=no]) |
| 324 |
+ |
| 325 |
+ AM_CONDITIONAL([WITH_KEYRING],[test "$with_keyring" = "yes"]) |
| 326 |
+ |
| 327 |
|
| 328 |
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.22.2-r1.ebuild |
| 329 |
similarity index 99% |
| 330 |
rename from mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild |
| 331 |
rename to mate-extra/mate-power-manager/mate-power-manager-1.22.2-r1.ebuild |
| 332 |
index f37314b..c3d316b 100644 |
| 333 |
--- a/mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild |
| 334 |
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.22.2-r1.ebuild |
| 335 |
@@ -44,7 +44,8 @@ RDEPEND="${COMMON_DEPEND} |
| 336 |
!systemd? ( |
| 337 |
elogind? ( sys-auth/elogind ) |
| 338 |
!elogind? ( >=sys-auth/consolekit-0.9.2 ) |
| 339 |
- )" |
| 340 |
+ ) |
| 341 |
+" |
| 342 |
|
| 343 |
DEPEND="${COMMON_DEPEND} |
| 344 |
app-text/docbook-xml-dtd:4.3 |
| 345 |
|
| 346 |
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.24.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.24.1-r1.ebuild |
| 347 |
similarity index 97% |
| 348 |
rename from mate-extra/mate-power-manager/mate-power-manager-1.24.0.ebuild |
| 349 |
rename to mate-extra/mate-power-manager/mate-power-manager-1.24.1-r1.ebuild |
| 350 |
index b188be8..db031cf 100644 |
| 351 |
--- a/mate-extra/mate-power-manager/mate-power-manager-1.24.0.ebuild |
| 352 |
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.24.1-r1.ebuild |
| 353 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 354 |
inherit mate |
| 355 |
|
| 356 |
if [[ ${PV} != 9999 ]]; then |
| 357 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 358 |
+ KEYWORDS="amd64 ~arm ~arm64 x86" |
| 359 |
fi |
| 360 |
|
| 361 |
DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop" |
| 362 |
@@ -45,7 +45,8 @@ RDEPEND="${COMMON_DEPEND} |
| 363 |
!systemd? ( |
| 364 |
elogind? ( sys-auth/elogind ) |
| 365 |
!elogind? ( >=sys-auth/consolekit-0.9.2 ) |
| 366 |
- )" |
| 367 |
+ ) |
| 368 |
+" |
| 369 |
|
| 370 |
DEPEND="${COMMON_DEPEND} |
| 371 |
app-text/docbook-xml-dtd:4.3 |
| 372 |
|
| 373 |
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.22.2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.24.1-r2.ebuild |
| 374 |
similarity index 82% |
| 375 |
rename from mate-extra/mate-power-manager/mate-power-manager-1.22.2.ebuild |
| 376 |
rename to mate-extra/mate-power-manager/mate-power-manager-1.24.1-r2.ebuild |
| 377 |
index ecc7912..343f1cf 100644 |
| 378 |
--- a/mate-extra/mate-power-manager/mate-power-manager-1.22.2.ebuild |
| 379 |
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.24.1-r2.ebuild |
| 380 |
@@ -13,7 +13,7 @@ DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop |
| 381 |
|
| 382 |
LICENSE="FDL-1.1+ GPL-2+ LGPL-2+" |
| 383 |
SLOT="0" |
| 384 |
-IUSE="+applet elogind gnome-keyring policykit systemd test" |
| 385 |
+IUSE="+applet elogind libsecret policykit systemd test" |
| 386 |
|
| 387 |
REQUIRED_USE="?? ( elogind systemd )" |
| 388 |
|
| 389 |
@@ -25,6 +25,7 @@ COMMON_DEPEND=" |
| 390 |
>=dev-libs/glib-2.50:2 |
| 391 |
>=media-libs/libcanberra-0.10:0[gtk3] |
| 392 |
>=sys-apps/dbus-1 |
| 393 |
+ >=sys-power/upower-0.99.8:= |
| 394 |
>=x11-apps/xrandr-1.3 |
| 395 |
>=x11-libs/cairo-1 |
| 396 |
>=x11-libs/gdk-pixbuf-2.11:2 |
| 397 |
@@ -35,32 +36,37 @@ COMMON_DEPEND=" |
| 398 |
>=x11-libs/libnotify-0.7:0 |
| 399 |
x11-libs/pango |
| 400 |
applet? ( >=mate-base/mate-panel-1.17.0 ) |
| 401 |
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3 ) |
| 402 |
- >=sys-power/upower-0.9.23:=" |
| 403 |
+ libsecret? ( >=app-crypt/libsecret-0.11 ) |
| 404 |
+" |
| 405 |
|
| 406 |
RDEPEND="${COMMON_DEPEND} |
| 407 |
+ virtual/libintl |
| 408 |
policykit? ( >=mate-extra/mate-polkit-1.6 ) |
| 409 |
systemd? ( sys-apps/systemd ) |
| 410 |
!systemd? ( |
| 411 |
elogind? ( sys-auth/elogind ) |
| 412 |
!elogind? ( >=sys-auth/consolekit-0.9.2 ) |
| 413 |
- )" |
| 414 |
+ ) |
| 415 |
+" |
| 416 |
|
| 417 |
DEPEND="${COMMON_DEPEND} |
| 418 |
app-text/docbook-xml-dtd:4.3 |
| 419 |
app-text/rarian |
| 420 |
>=app-text/scrollkeeper-dtd-1:1.0 |
| 421 |
app-text/yelp-tools |
| 422 |
+ dev-libs/libxml2 |
| 423 |
dev-util/glib-utils |
| 424 |
- >=dev-util/intltool-0.50.1 |
| 425 |
- sys-devel/gettext |
| 426 |
+ >=sys-devel/gettext-0.19.8:* |
| 427 |
virtual/pkgconfig |
| 428 |
- x11-base/xorg-proto" |
| 429 |
+ x11-base/xorg-proto |
| 430 |
+" |
| 431 |
+ |
| 432 |
+PATCHES=( "${FILESDIR}/${P}-libsecret.patch" ) |
| 433 |
|
| 434 |
src_configure() { |
| 435 |
mate_src_configure \ |
| 436 |
--enable-compile-warnings=minimum \ |
| 437 |
- $(use_with gnome-keyring keyring) \ |
| 438 |
+ $(use_with libsecret) \ |
| 439 |
$(use_enable applet applets) \ |
| 440 |
$(use_enable test tests) |
| 441 |
} |
| 442 |
|
| 443 |
diff --git a/mate-extra/mate-power-manager/metadata.xml b/mate-extra/mate-power-manager/metadata.xml |
| 444 |
index ff952f0..2eb98c6 100644 |
| 445 |
--- a/mate-extra/mate-power-manager/metadata.xml |
| 446 |
+++ b/mate-extra/mate-power-manager/metadata.xml |
| 447 |
@@ -7,6 +7,7 @@ |
| 448 |
</maintainer> |
| 449 |
<use> |
| 450 |
<flag name="applet">Enable building of the MATE applet.</flag> |
| 451 |
+ <flag name="libsecret">Support locking of keyring via <pkg>app-crypt/libsecret</pkg></flag> |
| 452 |
</use> |
| 453 |
<upstream> |
| 454 |
<remote-id type="github">mate-desktop/mate-power-manager</remote-id> |
Archives