From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 06996158083 for ; Fri, 20 Sep 2024 16:35:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 505FAE29A8; Fri, 20 Sep 2024 16:35:50 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F309DE29A5 for ; Fri, 20 Sep 2024 16:35:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3157F3430DE for ; Fri, 20 Sep 2024 16:35:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98ADB27FC for ; Fri, 20 Sep 2024 16:35:47 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1726850134.ac0757b0a5d4c9caa2f75d20b47ee79d3eb96614.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-polkit/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: mate-extra/mate-polkit/files/mate-polkit-1.26.0-ayatana.patch X-VCS-Directories: mate-extra/mate-polkit/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ac0757b0a5d4c9caa2f75d20b47ee79d3eb96614 X-VCS-Branch: master Date: Fri, 20 Sep 2024 16:35:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: af76b3a9-3613-40a4-97ea-33f38c78b4b9 X-Archives-Hash: 8ca256a47d5f1beb95bc6caeffbd6603 commit: ac0757b0a5d4c9caa2f75d20b47ee79d3eb96614 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Thu Sep 19 17:38:16 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Sep 20 16:35:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac0757b0 mate-extra/mate-polkit: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/mate-polkit-1.26.0-ayatana.patch | 176 --------------------- 1 file changed, 176 deletions(-) diff --git a/mate-extra/mate-polkit/files/mate-polkit-1.26.0-ayatana.patch b/mate-extra/mate-polkit/files/mate-polkit-1.26.0-ayatana.patch deleted file mode 100644 index edd91c2a1111..000000000000 --- a/mate-extra/mate-polkit/files/mate-polkit-1.26.0-ayatana.patch +++ /dev/null @@ -1,176 +0,0 @@ -From 65a6c367e28e338dc74931dece1af9e53338276f Mon Sep 17 00:00:00 2001 -From: lukefromdc -Date: Tue, 31 Jan 2023 01:25:20 -0500 -Subject: [PATCH] Prefer building against Ayatana AppIndicator, but also - support legacy Ubuntu Appindicator - ---- - configure.ac | 54 +++++++++++++++++++++++++++++++++++-------------- - src/Makefile.am | 6 ++++-- - src/main.c | 15 +++++++------- - 3 files changed, 51 insertions(+), 24 deletions(-) - ---- a/configure.ac.old 2023-04-27 16:48:35.940816452 +0200 -+++ b/configure.ac 2023-04-27 16:52:21.303890924 +0200 -@@ -111,8 +111,17 @@ - - AM_CONDITIONAL([HAVE_ACCOUNTSSERVICE], [test "x$enable_accountsservice" = xyes]) - --# Application indicator --APPINDICATOR_PKG=appindicator3-0.1 -+# Application Indicator (Ubuntu and Ayatana implementation) -+ -+AYATANA_APPINDICATOR_PKG=ayatana-appindicator3-0.1 -+UBUNTU_APPINDICATOR_PKG=appindicator3-0.1 -+ -+PKG_CHECK_EXISTS($AYATANA_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED, -+ [have_appindicator_ayatana="yes"], -+ [have_appindicator_ayatana="no"]) -+PKG_CHECK_EXISTS($UBUNTU_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED, -+ [have_appindicator_ubuntu="yes"], -+ [have_appindicator_ubuntu="no"]) - - AC_ARG_ENABLE([appindicator], - AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators]), -@@ -120,22 +129,33 @@ - [enable_appindicator="auto"]) - - --if test "x$enable_appindicator" = "xauto"; then -- PKG_CHECK_EXISTS($APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED, -- [enable_appindicator="yes"], -- [enable_appindicator="no"]) -+if test "x$enable_appindicator" == "xauto" && -+ (test "x$have_appindicator_ayatana" == "xyes" || -+ test "x$have_appindicator_ubuntu" == "xyes"); then -+ AC_MSG_NOTICE([Enabling AppIndicator support (as --enable-appindicator=auto was used).]) -+ enable_appindicator="yes" - fi - --if test "x$enable_appindicator" = "xyes"; then -- PKG_CHECK_MODULES(APPINDICATOR, -- [$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED], -- [AC_DEFINE(HAVE_APPINDICATOR, 1, [Have AppIndicator])]) -+if test "x$enable_appindicator" == "xyes"; then -+ if test "x$have_appindicator_ayatana" == "xyes"; then -+ AC_MSG_NOTICE([Buidling against Ayatana AppIndicator.]) -+ PKG_CHECK_MODULES(AYATANA_APPINDICATOR, -+ [$AYATANA_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED], -+ [AC_DEFINE(HAVE_AYATANA_APPINDICATOR, 1, [Have Ayatana AppIndicator])]) -+ AC_SUBST(AYATANA_APPINDICATOR_CFLAGS) -+ AC_SUBST(AYATANA_APPINDICATOR_LIBS) -+ elif test "x$have_appindicator_ubuntu" == "xyes"; then -+ AC_MSG_NOTICE([Buidling against Ubuntu AppIndicator.]) -+ PKG_CHECK_MODULES(UBUNTU_APPINDICATOR, -+ [$UBUNTU_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED], -+ [AC_DEFINE(HAVE_UBUNTU_APPINDICATOR, 1, [Have Ubuntu AppIndicator])]) -+ AC_SUBST(UBUNTU_APPINDICATOR_CFLAGS) -+ AC_SUBST(UBUNTU_APPINDICATOR_LIBS) -+ else -+ AC_MSG_ERROR([Neither Ayatana AppIndicator nor Ubuntu AppIndicator library is present, but you enabled AppIndicator support.]) -+ fi - fi - --AM_CONDITIONAL(HAVE_APPINDICATOR, test "x$enable_appindicator" = "xyes") --AC_SUBST(APPINDICATOR_CFLAGS) --AC_SUBST(APPINDICATOR_LIBS) -- - # ******************** - # Internationalisation - # ******************** -@@ -181,6 +201,10 @@ - Warning flags: ${WARN_CFLAGS} - - Accountsservice: ${enable_accountsservice} -- Application indicator: ${enable_appindicator} -+ -+ AppIndicator enabled: ${enable_appindicator} -+ Ayatana AppIndicator (preferred) ${have_appindicator_ayatana} -+ Ubuntu AppIndicator (legacy) ${have_appindicator_ubuntu} -+ - Maintainer mode: ${USE_MAINTAINER_MODE} - " -diff --git a/src/Makefile.am b/src/Makefile.am -index a534d1e..5f7ead8 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -35,7 +35,8 @@ polkit_mate_authentication_agent_1_CFLAGS = \ - $(GLIB_CFLAGS) \ - $(POLKIT_AGENT_CFLAGS) \ - $(POLKIT_GOBJECT_CFLAGS) \ -- $(APPINDICATOR_CFLAGS) \ -+ $(AYATANA_APPINDICATOR_CFLAGS) \ -+ $(UBUNTU_APPINDICATOR_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CFLAGS) - -@@ -47,7 +48,8 @@ polkit_mate_authentication_agent_1_LDADD = \ - $(GLIB_LIBS) \ - $(POLKIT_AGENT_LIBS) \ - $(POLKIT_GOBJECT_LIBS) \ -- $(APPINDICATOR_LIBS) -+ $(AYATANA_APPINDICATOR_LIBS) \ -+ $(UBUNTU_APPINDICATOR_LIBS) - - EXTRA_DIST = \ - polkit-mate-authentication-agent-1.desktop.in \ -diff --git a/src/main.c b/src/main.c -index 8c5f437..d60cd8f 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -1,6 +1,5 @@ - /* - * Copyright (C) 2009 Red Hat, Inc. -- * Copyright (C) 2012-2021 MATE Developers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -30,8 +29,10 @@ - #include - #include - --#ifdef HAVE_APPINDICATOR --#include -+#if defined(HAVE_AYATANA_APPINDICATOR) -+# include -+#elif defined(HAVE_UBUNTU_APPINDICATOR) -+# include - #endif - - #include "polkitmatelistener.h" -@@ -51,7 +52,7 @@ static PolkitSubject *session = NULL; - /* the current set of temporary authorizations */ - static GList *current_temporary_authorizations = NULL; - --#ifdef HAVE_APPINDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - static AppIndicator *app_indicator = NULL; - #else - static GtkStatusIcon *status_icon = NULL; -@@ -90,7 +91,7 @@ revoke_tmp_authz (void) - NULL); - } - --#ifdef HAVE_APPINDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - static void - on_menu_item_activate (GtkMenuItem *menu_item, - gpointer user_data) -@@ -151,7 +152,7 @@ update_temporary_authorization_icon_real (void) - if (current_temporary_authorizations != NULL) - { - /* show icon */ --#ifdef HAVE_APPINDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - if (app_indicator == NULL) - { - GtkWidget *item, *menu; -@@ -199,7 +200,7 @@ update_temporary_authorization_icon_real (void) - else - { - /* hide icon */ --#ifdef HAVE_APPINDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - if (app_indicator != NULL) - { - /* keep the app_indicator, hide the icon or it won't come back*/