* [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-control-center/files/
@ 2016-08-12 13:54 NP Hardass
0 siblings, 0 replies; 4+ messages in thread
From: NP Hardass @ 2016-08-12 13:54 UTC (permalink / raw
To: gentoo-commits
commit: 97a5fb08ec8f6db3c2ff95b2543ec644855e028e
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 13:53:56 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 13:54:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a5fb08
mate-base/mate-control-center: Add missing patch
Package-Manager: portage-2.3.0
...er-1.12.1-backport-appindicator-configure.patch | 67 ++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch b/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch
new file mode 100644
index 0000000..b713b7f
--- /dev/null
+++ b/mate-base/mate-control-center/files/mate-control-center-1.12.1-backport-appindicator-configure.patch
@@ -0,0 +1,67 @@
+From 90195c0c2e3f45a355286f1640c2f0020a5556b8 Mon Sep 17 00:00:00 2001
+From: raveit65 <chat-to-me@raveit.de>
+Date: Fri, 17 Jun 2016 20:34:06 +0200
+Subject: [PATCH] configure: fix build with libappindicator3
+
+---
+ configure.ac | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9b27671..a11bfdc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,6 +63,8 @@ dnl ==============================================
+ dnl Check GTK+ API version
+ dnl ==============================================
+
++APPINDICATOR_REQUIRED=0.0.13
++
+ AC_MSG_CHECKING([which gtk+ version to compile against])
+ AC_ARG_WITH([gtk],
+ [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
+@@ -80,6 +82,7 @@ case "$with_gtk" in
+ LIBCANBERRA_API_VERSION=
+ LIBUNIQUE_API_VERSION=1.0
+ ENGINES_FOLDER="engines"
++ APPINDICATOR_API_VERSION=
+ ;;
+ 3.0) GTK_API_VERSION=3.0
+ GTK_REQUIRED=3.0.0
+@@ -87,6 +90,7 @@ case "$with_gtk" in
+ LIBCANBERRA_API_VERSION=3
+ LIBUNIQUE_API_VERSION=3.0
+ ENGINES_FOLDER="theming-engines"
++ APPINDICATOR_API_VERSION=3
+ ;;
+ esac
+ AC_SUBST(GTK_API_VERSION)
+@@ -101,7 +105,7 @@ AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
+ AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
+
+ dnl app indicator
+-APPINDICATOR_REQUIRED=0.0.7
++APPINDICATOR_PKG=appindicator$APPINDICATOR_API_VERSION-0.1
+
+ AC_ARG_ENABLE(appindicator,
+ AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]),
+@@ -109,16 +113,16 @@ AC_ARG_ENABLE(appindicator,
+ [enable_appindicator="auto"])
+
+ if test x$enable_appindicator = xauto ; then
+- PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],
++ PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],
+ enable_appindicator="yes",
+ enable_appindicator="no")
+ fi
+
+ if test x$enable_appindicator = xyes ; then
+- PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],,
++ PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],,
+ AC_MSG_ERROR([appindicator-0.1 is not installed]))
+ PKG_CHECK_MODULES(APP_INDICATOR,
+- appindicator-0.1 >= $APPINDICATOR_REQUIRED)
++ $APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED)
+ AC_SUBST(APP_INDICATOR_CFLAGS)
+ AC_SUBST(APP_INDICATOR_LIBS)
+ AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-control-center/files/
@ 2016-12-22 15:56 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2016-12-22 15:56 UTC (permalink / raw
To: gentoo-commits
commit: 639506b114271367704b6197f9271cafc88631b9
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Dec 18 18:52:10 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 15:56:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=639506b1
mate-base/mate-control-center: remove unused patch
.../files/mate-control-center-1.6.2-libsecret.patch | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch b/mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch
deleted file mode 100644
index b66a9af..00000000
--- a/mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/libslab/app-shell.c b/libslab/app-shell.c
-index 3c33230..5f4af23 100644
---- a/libslab/app-shell.c
-+++ b/libslab/app-shell.c
-@@ -987,8 +987,8 @@ static void handle_menu_action_performed (Tile * launcher, TileEvent * event, Ti
- return TRUE;
- }
-
-- /* discard mate-keyring-manager if CASA is installed */
-- if ((exec && !strcmp (exec, "mate-keyring-manager"))
-+ /* discard gnome-keyring-manager if CASA is installed */
-+ if ((exec && !strcmp (exec, "gnome-keyring-manager"))
- && (path = g_find_program_in_path ("CASAManager.sh")))
- {
- g_free (path);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-control-center/files/
@ 2023-05-14 11:14 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2023-05-14 11:14 UTC (permalink / raw
To: gentoo-commits
commit: 8145f732c5529b7a59d1fbefd5f5ff520cc38cec
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 11:11:53 2023 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun May 14 11:11:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8145f732
mate-base/mate-control-center: Fix ayatana patch
Fix building when library is found but support is disabled, and remove bashisms
Thanks-to: Joakim Tjernlund
Thanks-to: Sam James
Closes: https://bugs.gentoo.org/905176
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../mate-control-center-1.26.0-ayatana-detection.patch | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch b/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch
index c8253b7fbf7f..ed1c8aec619e 100644
--- a/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch
+++ b/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch
@@ -26,9 +26,9 @@
- 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
++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
@@ -41,15 +41,15 @@
- AC_SUBST(APP_INDICATOR_CFLAGS)
- AC_SUBST(APP_INDICATOR_LIBS)
- AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
-+if test "x$enable_appindicator" == "xyes"; then
-+ if test "x$have_appindicator_ayatana" == "xyes"; then
++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
++ 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],
@@ -61,8 +61,8 @@
+ fi
fi
-AM_CONDITIONAL(HAVE_APP_INDICATOR, test x"$enable_appindicator" = xyes)
-+AM_CONDITIONAL(HAVE_AYATANA_APPINDICATOR, test x"$have_appindicator_ayatana" = xyes)
-+AM_CONDITIONAL(HAVE_UBUNTU_APPINDICATOR, test x"$have_appindicator_ubuntu" = xyes)
++AM_CONDITIONAL(HAVE_AYATANA_APPINDICATOR, test x"$have_appindicator_ayatana" = xyes -a x"$enable_appindicator" = xyes)
++AM_CONDITIONAL(HAVE_UBUNTU_APPINDICATOR, test x"$have_appindicator_ubuntu" = xyes -a x"$enable_appindicator" = xyes)
dnl keyboard-properties-capplet
savecppflags=$CPPFLAGS
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-control-center/files/
@ 2024-09-20 16:35 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-09-20 16:35 UTC (permalink / raw
To: gentoo-commits
commit: 03e264d04410d30d5a06629cad978a462ffbb6ea
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Sep 19 17:37:37 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 16:35:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03e264d0
mate-base/mate-control-center: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...e-control-center-1.26.0-ayatana-detection.patch | 435 ---------------------
1 file changed, 435 deletions(-)
diff --git a/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch b/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch
deleted file mode 100644
index ed1c8aec619e..000000000000
--- a/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch
+++ /dev/null
@@ -1,435 +0,0 @@
---- mate-control-center-1.26.0.old/configure.ac 2023-04-28 16:12:05.281295458 +0200
-+++ mate-control-center-1.26.0/configure.ac 2023-04-28 16:48:44.374329792 +0200
-@@ -84,30 +84,50 @@
-
- AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
-
--dnl app indicator
--APPINDICATOR_PKG=appindicator3-0.1
-+dnl app 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 ]),
- [enable_appindicator=$enableval],
- [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_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],,
-- AC_MSG_ERROR([appindicator-0.1 is not installed]))
-- PKG_CHECK_MODULES(APP_INDICATOR,
-- $APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED)
-- AC_SUBST(APP_INDICATOR_CFLAGS)
-- AC_SUBST(APP_INDICATOR_LIBS)
-- AC_DEFINE(HAVE_APP_INDICATOR, 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_APP_INDICATOR, test x"$enable_appindicator" = xyes)
-+AM_CONDITIONAL(HAVE_AYATANA_APPINDICATOR, test x"$have_appindicator_ayatana" = xyes -a x"$enable_appindicator" = xyes)
-+AM_CONDITIONAL(HAVE_UBUNTU_APPINDICATOR, test x"$have_appindicator_ubuntu" = xyes -a x"$enable_appindicator" = xyes)
-
- dnl keyboard-properties-capplet
- savecppflags=$CPPFLAGS
-@@ -322,7 +342,10 @@
- Warning flags: ${WARN_CFLAGS}
- Linker flags: ${LDFLAGS}
-
-- Appindicator: ${enable_appindicator}
-+ AppIndicator enabled: ${enable_appindicator}
-+ Ayatana AppIndicator (preferred) ${have_appindicator_ayatana}
-+ Ubuntu AppIndicator (legacy) ${have_appindicator_ubuntu}
-+
- Libmate-slab: ${have_libmateslab}
- Accountsservice: ${have_accountsservice}
- Native Language support: ${USE_NLS}
---- mate-control-center-1.26.0.old/typing-break/drwright.c 2023-04-28 16:12:05.282295452 +0200
-+++ mate-control-center-1.26.0/typing-break/drwright.c 2023-04-28 16:27:03.082651572 +0200
-@@ -30,9 +30,11 @@
- #include <gtk/gtk.h>
- #include <gio/gio.h>
-
--#ifdef HAVE_APP_INDICATOR
--#include <libappindicator/app-indicator.h>
--#endif /* HAVE_APP_INDICATOR */
-+#if defined(HAVE_AYATANA_APPINDICATOR)
-+# include <libayatana-appindicator/app-indicator.h>
-+#elif defined(HAVE_UBUNTU_APPINDICATOR)
-+# include <libappindicator/app-indicator.h>
-+#endif
-
- #define MATE_DESKTOP_USE_UNSTABLE_API
- #include <libmate-desktop/mate-desktop-utils.h>
-@@ -43,11 +45,11 @@
- #include "drw-utils.h"
- #include "drw-timer.h"
-
--#ifndef HAVE_APP_INDICATOR
-+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
- #define BLINK_TIMEOUT 200
- #define BLINK_TIMEOUT_MIN 120
- #define BLINK_TIMEOUT_FACTOR 100
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- typedef enum {
- STATE_START,
-@@ -59,10 +61,10 @@
- STATE_BREAK_DONE
- } DrwState;
-
--#ifdef HAVE_APP_INDICATOR
-+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
- #define TYPING_MONITOR_ACTIVE_ICON "bar-green"
- #define TYPING_MONITOR_ATTENTION_ICON "bar-red"
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- struct _DrWright {
- /* Widgets. */
-@@ -88,7 +90,7 @@
- gboolean enabled;
-
- guint clock_timeout_id;
--#ifdef HAVE_APP_INDICATOR
-+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
- AppIndicator *indicator;
- #else
- guint blink_timeout_id;
-@@ -102,7 +104,7 @@
- cairo_surface_t *green_bar;
- cairo_surface_t *disabled_bar;
- GdkPixbuf *composite_bar;
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- GtkWidget *warn_dialog;
- };
-@@ -124,11 +126,11 @@
- DrWright *dr);
- static void popup_about_cb (GtkAction *action,
- DrWright *dr);
--#ifdef HAVE_APP_INDICATOR
-+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
- static void init_app_indicator (DrWright *dr);
- #else
- static void init_tray_icon (DrWright *dr);
--#endif /* HAVE_APP_INDICATOR */
-+#endif
- static GList * create_secondary_break_windows (void);
-
- static const GtkActionEntry actions[] = {
-@@ -147,7 +149,7 @@
- dr->break_time = 10;
- }
-
--#ifdef HAVE_APP_INDICATOR
-+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
- static void
- update_app_indicator (DrWright *dr)
- {
-@@ -304,32 +306,32 @@
-
- return FALSE;
- }
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- static void
- start_blinking (DrWright *dr)
- {
--#ifndef HAVE_APP_INDICATOR
-+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
- if (!dr->blink_timeout_id) {
- dr->blink_on = TRUE;
- blink_timeout_cb (dr);
- }
-
- /*gtk_widget_show (GTK_WIDGET (dr->icon));*/
--#endif /* HAVE_APP_INDICATOR */
-+#endif
- }
-
- static void
- stop_blinking (DrWright *dr)
- {
--#ifndef HAVE_APP_INDICATOR
-+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
- if (dr->blink_timeout_id) {
- g_source_remove (dr->blink_timeout_id);
- dr->blink_timeout_id = 0;
- }
-
- /*gtk_widget_hide (GTK_WIDGET (dr->icon));*/
--#endif /* HAVE_APP_INDICATOR */
-+#endif
- }
-
- static gboolean
-@@ -397,9 +399,9 @@
- dr->break_window = NULL;
- }
-
--#ifndef HAVE_APP_INDICATOR
-+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
- set_status_icon (dr->icon, dr->neutral_bar);
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- dr->save_last_time = 0;
-
-@@ -437,9 +439,9 @@
- }
-
- stop_blinking (dr);
--#ifndef HAVE_APP_INDICATOR
-+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
- set_status_icon (dr->icon, dr->red_bar);
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- drw_timer_start (dr->timer);
-
-@@ -480,9 +482,9 @@
-
- case STATE_BREAK_DONE_SETUP:
- stop_blinking (dr);
--#ifndef HAVE_APP_INDICATOR
-+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
- set_status_icon (dr->icon, dr->green_bar);
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- dr->state = STATE_BREAK_DONE;
- break;
-@@ -498,11 +500,11 @@
-
- dr->last_elapsed_time = elapsed_time;
-
--#ifdef HAVE_APP_INDICATOR
-+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
- update_app_indicator (dr);
- #else
- update_icon (dr);
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- return TRUE;
- }
-@@ -512,45 +514,45 @@
- {
- gint min;
- gchar *str;
--#ifdef HAVE_APP_INDICATOR
-+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
- GtkWidget *item;
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- if (!dr->enabled) {
--#ifdef HAVE_APP_INDICATOR
-+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
- app_indicator_set_status (dr->indicator,
- APP_INDICATOR_STATUS_PASSIVE);
- #else
- gtk_status_icon_set_tooltip_text (dr->icon,
- _("Disabled"));
--#endif /* HAVE_APP_INDICATOR */
-+#endif
- return TRUE;
- }
-
- min = get_time_left (dr);
-
- if (min >= 1) {
--#ifdef HAVE_APP_INDICATOR
-+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
- str = g_strdup_printf (_("Take a break now (next in %dm)"), min);
- #else
- str = g_strdup_printf (ngettext("%d minute until the next break",
- "%d minutes until the next break",
- min), min);
--#endif /* HAVE_APP_INDICATOR */
-+#endif
- } else {
--#ifdef HAVE_APP_INDICATOR
-+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
- str = g_strdup_printf (_("Take a break now (next in less than one minute)"));
- #else
- str = g_strdup_printf (_("Less than one minute until the next break"));
--#endif /* HAVE_APP_INDICATOR */
-+#endif
- }
-
--#ifdef HAVE_APP_INDICATOR
-+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
- item = gtk_ui_manager_get_widget (dr->ui_manager, "/Pop/TakeABreak");
- gtk_menu_item_set_label (GTK_MENU_ITEM (item), str);
- #else
- gtk_status_icon_set_tooltip_text (dr->icon, str);
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- g_free (str);
-
-@@ -665,7 +667,7 @@
- NULL);
- }
-
--#ifndef HAVE_APP_INDICATOR
-+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
- static void
- popup_menu_cb (GtkWidget *widget,
- guint button,
-@@ -684,7 +686,7 @@
- 0,
- gtk_get_current_event_time ());
- }
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- static void
- break_window_done_cb (GtkWidget *window,
-@@ -724,11 +726,11 @@
- drw_timer_start (dr->timer);
- maybe_change_state (dr);
- update_status (dr);
--#ifdef HAVE_APP_INDICATOR
-+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
- update_app_indicator (dr);
- #else
- update_icon (dr);
--#endif /* HAVE_APP_INDICATOR */
-+#endif
- }
-
- static void
-@@ -745,7 +747,7 @@
- dr->secondary_break_windows = NULL;
- }
-
--#ifdef HAVE_APP_INDICATOR
-+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
- static void
- init_app_indicator (DrWright *dr)
- {
-@@ -792,7 +794,7 @@
- G_CALLBACK (popup_menu_cb),
- dr);
- }
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- static GList *
- create_secondary_break_windows (void)
-@@ -891,7 +893,7 @@
- G_CALLBACK (activity_detected_cb),
- dr);
-
--#ifdef HAVE_APP_INDICATOR
-+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR)
- init_app_indicator (dr);
- #else
- dr->neutral_bar = cairo_image_surface_create_from_png (IMAGEDIR "/bar.png");
-@@ -900,7 +902,7 @@
- dr->disabled_bar = cairo_image_surface_create_from_png (IMAGEDIR "/bar-disabled.png");
-
- init_tray_icon (dr);
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- g_timeout_add_seconds (12,
- (GSourceFunc) update_status,
---- mate-control-center-1.26.0.old/typing-break/Makefile.am 2023-04-28 16:12:05.283295447 +0200
-+++ mate-control-center-1.26.0/typing-break/Makefile.am 2023-04-28 16:30:45.343491923 +0200
-@@ -32,9 +32,14 @@
- mate_typing_monitor_LDADD += @LIBCANBERRA_GTK_LIBS@
- endif
-
--if HAVE_APP_INDICATOR
-- mate_typing_monitor_CFLAGS += -DHAVE_APP_INDICATOR @APP_INDICATOR_CFLAGS@
-- mate_typing_monitor_LDADD += @APP_INDICATOR_LIBS@
-+if HAVE_AYATANA_APPINDICATOR
-+ mate_typing_monitor_CFLAGS += -DHAVE_AYATANA_APPINDICATOR @AYATANA_APPINDICATOR_CFLAGS@
-+ mate_typing_monitor_LDADD += @AYATANA_APPINDICATOR_LIBS@
-+endif
-+
-+if HAVE_UBUNTU_APPINDICATOR
-+ mate_typing_monitor_CFLAGS += -DHAVE_UBUNTU_APPINDICATOR @UBUNTU_APPINDICATOR_CFLAGS@
-+ mate_typing_monitor_LDADD += @UBUNTU_APPINDICATOR_LIBS@
- endif
-
- imagedir = $(pkgdatadir)/pixmaps
---- mate-control-center-1.26.0.old/typing-break/main.c 2023-04-28 16:12:05.282295452 +0200
-+++ mate-control-center-1.26.0/typing-break/main.c 2023-04-28 16:32:09.781067404 +0200
-@@ -31,7 +31,7 @@
-
- gboolean debug = FALSE;
-
--#ifndef HAVE_APP_INDICATOR
-+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
- static gboolean
- have_tray (void)
- {
-@@ -50,7 +50,7 @@
- return FALSE;
- }
- }
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- int
- main (int argc, char *argv[])
-@@ -98,7 +98,7 @@
- return 0;
- }
-
--#ifndef HAVE_APP_INDICATOR
-+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR)
- if (!no_check && !have_tray ()) {
- GtkWidget *dialog;
-
-@@ -116,7 +116,7 @@
-
- gtk_widget_destroy (dialog);
- }
--#endif /* HAVE_APP_INDICATOR */
-+#endif
-
- drwright_new ();
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-09-20 16:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-20 16:35 [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-control-center/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-05-14 11:14 Pacho Ramos
2016-12-22 15:56 Michael Palimaka
2016-08-12 13:54 NP Hardass
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox