summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/libappindicator/files')
-rw-r--r--dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch72
-rw-r--r--dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-g-signal-emit.patch74
-rw-r--r--dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-iterate-search-path.patch11
-rw-r--r--dev-libs/libappindicator/files/libappindicator-12.10.0-vala-inherit.patch14
4 files changed, 0 insertions, 171 deletions
diff --git a/dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch b/dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch
deleted file mode 100644
index c916d9ba2cf6..000000000000
--- a/dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/bindings/Makefile.am 2015-07-10 10:04:18.091199191 +0200
-+++ b/bindings/Makefile.am 2015-07-10 10:19:47.047974439 +0200
-@@ -3,8 +3,10 @@
- vala
- else
- SUBDIRS = \
-- python \
- vala
-+if HAS_PYTHON
-+SUBDIRS += python
-+endif
- endif
-
- if HAS_MONO
---- a/configure.ac 2015-07-16 13:28:41.007502838 +0200
-+++ b/configure.ac_new 2015-07-16 13:53:18.118602877 +0200
-@@ -188,25 +188,37 @@
- PYGTK_REQUIRED=2.14.0
- PYGOBJECT_REQUIRED=0.22
-
--AM_PATH_PYTHON(2.3.5)
--AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-+AC_ARG_ENABLE([python],
-+ AC_HELP_STRING([--enable-python], [Enable python for GTK2 build]),,
-+ [enable_python=yes])
-
--PKG_CHECK_MODULES(APPINDICATOR_PYTHON,
-+if test x"$with_gtk" = x"3" ; then
-+ enable_python=no
-+fi
-+
-+AM_CONDITIONAL(HAS_PYTHON, test x"${enable_python}" != x"no")
-+
-+if test x"$enable_python" != x"no" ; then
-+ AM_PATH_PYTHON(2.3.5)
-+ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-+
-+ PKG_CHECK_MODULES(APPINDICATOR_PYTHON,
- [
- pygtk-2.0 >= $PYGTK_REQUIRED
- gtk+-2.0 >= $GTK_REQUIRED_VERSION
- pygobject-2.0 >= $PYGOBJECT_REQUIRED
- ])
-
--AC_MSG_CHECKING(for pygtk defs)
--PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
--AC_SUBST(PYGTK_DEFSDIR)
--AC_MSG_RESULT($PYGTK_DEFSDIR)
--
--AC_MSG_CHECKING(for pygtk codegen)
--PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
--AC_SUBST(PYGTK_CODEGEN)
--AC_MSG_RESULT($PYGTK_CODEGEN)
-+ AC_MSG_CHECKING(for pygtk defs)
-+ PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-+ AC_SUBST(PYGTK_DEFSDIR)
-+ AC_MSG_RESULT($PYGTK_DEFSDIR)
-+
-+ AC_MSG_CHECKING(for pygtk codegen)
-+ PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
-+ AC_SUBST(PYGTK_CODEGEN)
-+ AC_MSG_RESULT($PYGTK_CODEGEN)
-+fi
-
- #########################
- # Check if build tests
-@@ -278,4 +290,5 @@
- Tests: $enable_tests
- Mono tests: $have_nunit
- gcov: $use_gcov
-+ Python: $enable_python
- ])
diff --git a/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-g-signal-emit.patch b/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-g-signal-emit.patch
deleted file mode 100644
index bea1274ed243..000000000000
--- a/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-g-signal-emit.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/src/app-indicator.c 2012-07-11 13:28:34.415113869 -0400
-+++ b/src/app-indicator.c 2020-03-19 12:14:47.813191652 -0400
-@@ -443,7 +443,7 @@
- G_STRUCT_OFFSET (AppIndicatorClass, new_icon),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
-- G_TYPE_NONE, 0, G_TYPE_NONE);
-+ G_TYPE_NONE, 0);
-
- /**
- * AppIndicator::new-attention-icon:
-@@ -457,7 +457,7 @@
- G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
-- G_TYPE_NONE, 0, G_TYPE_NONE);
-+ G_TYPE_NONE, 0);
-
- /**
- * AppIndicator::new-status:
-@@ -505,7 +505,7 @@
- G_STRUCT_OFFSET (AppIndicatorClass, connection_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
-- G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE);
-+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-
- /**
- * AppIndicator::new-icon-theme-path:
-@@ -1175,7 +1175,7 @@
- gchar * guide = priv->label_guide != NULL ? priv->label_guide : "";
-
- g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0,
-- label, guide, TRUE);
-+ label, guide);
- if (priv->dbus_registration != 0 && priv->connection != NULL) {
- GError * error = NULL;
-
-@@ -1490,7 +1490,7 @@
- static void
- theme_changed_cb (GtkIconTheme * theme, gpointer user_data)
- {
-- g_signal_emit (user_data, signals[NEW_ICON], 0, TRUE);
-+ g_signal_emit (user_data, signals[NEW_ICON], 0);
-
- AppIndicator * self = (AppIndicator *)user_data;
- AppIndicatorPrivate *priv = self->priv;
-@@ -1904,7 +1904,7 @@
- }
-
- if (changed) {
-- g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
-+ g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0);
-
- if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
- GError * error = NULL;
-@@ -1982,7 +1982,7 @@
- }
-
- if (changed) {
-- g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
-+ g_signal_emit (self, signals[NEW_ICON], 0);
-
- if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
- GError * error = NULL;
-@@ -2048,7 +2048,7 @@
-
- self->priv->icon_theme_path = g_strdup(icon_theme_path);
-
-- g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE);
-+ g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path);
-
- if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
- GError * error = NULL;
diff --git a/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-iterate-search-path.patch b/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-iterate-search-path.patch
deleted file mode 100644
index 34471fbfa265..000000000000
--- a/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-iterate-search-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/app-indicator.c 2020-10-31 03:31:51.966830232 -0700
-+++ b/src/app-indicator.c 2020-10-31 03:36:04.252822972 -0700
-@@ -1606,7 +1606,7 @@ status_icon_changes (AppIndicator * self
- gint n_elements, i;
- gboolean found=FALSE;
- gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements);
-- for (i=0; i< n_elements || path[i] == NULL; i++) {
-+ for (i=0; i< n_elements; i++) {
- if(g_strcmp0(path[i], self->priv->icon_theme_path) == 0) {
- found=TRUE;
- break;
diff --git a/dev-libs/libappindicator/files/libappindicator-12.10.0-vala-inherit.patch b/dev-libs/libappindicator/files/libappindicator-12.10.0-vala-inherit.patch
deleted file mode 100644
index e71cb690c15e..000000000000
--- a/dev-libs/libappindicator/files/libappindicator-12.10.0-vala-inherit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# http://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.12.10/revision/244
-=== modified file 'bindings/vala/appindicator-0.1-custom.vala'
---- a/bindings/vala/appindicator-0.1-custom.vala 2011-09-23 15:46:27 +0000
-+++ b/bindings/vala/appindicator-0.1-custom.vala 2012-10-10 23:33:35 +0000
-@@ -23,7 +23,7 @@
- */
-
- namespace AppIndicator {
-- [CCode (type_check_function = "IS_APP_INDICATOR")]
-+ [CCode (type_check_function = "IS_APP_INDICATOR", type_id = "app_indicator_get_type ()")]
- public class Indicator : GLib.Object {
- }
- }
-