* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libappindicator/files/, dev-libs/libappindicator/
@ 2020-11-01 6:14 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2020-11-01 6:14 UTC (permalink / raw
To: gentoo-commits
commit: 77ff0c5e421f1ff1a4eab09ebf2c666172358a85
Author: Henry Chan <29583860+enlich <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Oct 31 12:02:45 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Nov 1 06:13:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ff0c5e
dev-libs/libappindicator: fix segfault in app_indicator_set_icon_full
Applies the two patches from paulieg and sersorrel attached to
https://bugs.launchpad.net/archlinux/+source/libappindicator/+bug/1867996
Signed-off-by: Henry Chan <29583860+enlich <AT> users.noreply.github.com>
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Closes: https://github.com/gentoo/gentoo/pull/18090
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...cator-12.10.0-lp1867996-fix-g-signal-emit.patch | 74 ++++++++++++++++++++++
...12.10.0-lp1867996-fix-iterate-search-path.patch | 11 ++++
.../libappindicator-12.10.0-r301.ebuild | 3 +
3 files changed, 88 insertions(+)
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
new file mode 100644
index 00000000000..bea1274ed24
--- /dev/null
+++ b/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-g-signal-emit.patch
@@ -0,0 +1,74 @@
+--- 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
new file mode 100644
index 00000000000..34471fbfa26
--- /dev/null
+++ b/dev-libs/libappindicator/files/libappindicator-12.10.0-lp1867996-fix-iterate-search-path.patch
@@ -0,0 +1,11 @@
+--- 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/libappindicator-12.10.0-r301.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
index 0a3bd6b4073..53469023131 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
@@ -33,6 +33,9 @@ PATCHES=(
"${FILESDIR}"/${P}-conditional-py-bindings.patch
# http://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.12.10/revision/244
"${FILESDIR}"/${P}-vala-inherit.patch
+ # https://bugs.launchpad.net/archlinux/+source/libappindicator/+bug/1867996
+ "${FILESDIR}"/${P}-lp1867996-fix-g-signal-emit.patch
+ "${FILESDIR}"/${P}-lp1867996-fix-iterate-search-path.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libappindicator/files/, dev-libs/libappindicator/
@ 2022-08-14 8:59 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2022-08-14 8:59 UTC (permalink / raw
To: gentoo-commits
commit: c8f09804b110d9c1054a5de55bb6c1ed1937c751
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 14 08:38:18 2022 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Aug 14 08:38:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8f09804
dev-libs/libappindicator: drop 12.10.0-r301
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
dev-libs/libappindicator/Manifest | 1 -
...indicator-12.10.0-conditional-py-bindings.patch | 72 --------------------
...cator-12.10.0-lp1867996-fix-g-signal-emit.patch | 74 ---------------------
...12.10.0-lp1867996-fix-iterate-search-path.patch | 11 ----
.../libappindicator-12.10.0-vala-inherit.patch | 14 ----
.../libappindicator-12.10.0-r301.ebuild | 76 ----------------------
6 files changed, 248 deletions(-)
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index dd1b5ead3d13..ba1472b33390 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -1,2 +1 @@
-DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
DIST libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz 75204 BLAKE2B ccc7909f25946413cf39275d8565afca253b3a2676272e4d3833f030a114e7be695fe958d2d99868a20d03a2b9c4a1fcd7fdfba07325b7a9f7f39879851e0366 SHA512 cc60875b1c4ab06348eece442a59a4057d7e13f25605435902242558e8dd5e66aeeee6725b9bd2662ef89052d3614dc4577ed8c233e9b84236a75e771aa67352
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 {
- }
- }
-
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
deleted file mode 100644
index 21db99eac660..000000000000
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools multilib-minimal vala xdg-utils
-
-DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
-HOMEPAGE="https://launchpad.net/libappindicator"
-SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 LGPL-3"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
-IUSE="+introspection"
-
-RDEPEND="
- >=dev-libs/dbus-glib-0.98[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
- >=dev-libs/libdbusmenu-0.6.2[gtk3,${MULTILIB_USEDEP}]
- >=dev-libs/libindicator-12.10.0:3[${MULTILIB_USEDEP}]
- >=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP},introspection?]
- introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}
- introspection? ( $(vala_depend) )
- dev-util/gtk-doc-am
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-conditional-py-bindings.patch
- # http://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.12.10/revision/244
- "${FILESDIR}"/${P}-vala-inherit.patch
- # https://bugs.launchpad.net/archlinux/+source/libappindicator/+bug/1867996
- "${FILESDIR}"/${P}-lp1867996-fix-g-signal-emit.patch
- "${FILESDIR}"/${P}-lp1867996-fix-iterate-search-path.patch
-)
-
-src_prepare() {
- default
-
- xdg_environment_reset
- export MAKEOPTS+=" -j1" #638782
-
- # Don't use -Werror
- sed -i -e 's/ -Werror//' {src,tests}/Makefile.{am,in} || die
-
- eautoreconf
-
- # Disable MONO for now because of https://bugs.gentoo.org/382491
- sed -i -e '/^MONO_REQUIRED_VERSION/s:=.*:=9999:' configure || die
-}
-
-multilib_src_configure() {
- if multilib_is_native_abi; then
- local -x VALAC VALA_API_GEN VAPIGEN_VAPIDIR PKG_CONFIG_PATH
- use introspection && vala_src_prepare && export VALA_API_GEN="${VAPIGEN}"
- fi
-
- ECONF_SOURCE="${S}" \
- econf \
- --disable-static \
- --with-gtk=3 \
- $(multilib_native_use_enable introspection)
-}
-
-multilib_src_install() {
- emake -j1 DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-14 8:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-14 8:59 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libappindicator/files/, dev-libs/libappindicator/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-11-01 6:14 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox