[arch-commits] Commit in libappindicator/trunk (3 files)
Balló György
bgyorgy at archlinux.org
Fri Jul 3 14:39:41 UTC 2020
Date: Friday, July 3, 2020 @ 14:39:41
Author: bgyorgy
Revision: 657637
upgpkg: libappindicator 12.10.0.r296-1: Update to the latest bzr snapshot in order to fix various problems (FS#65885)
Added:
libappindicator/trunk/no-host.patch
Modified:
libappindicator/trunk/PKGBUILD
Deleted:
libappindicator/trunk/no-python.patch
-----------------+
PKGBUILD | 51 +++++++++++++++++++------------------
no-host.patch | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
no-python.patch | 73 ------------------------------------------------------
3 files changed, 92 insertions(+), 97 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-03 13:10:25 UTC (rev 657636)
+++ PKGBUILD 2020-07-03 14:39:41 UTC (rev 657637)
@@ -8,52 +8,56 @@
pkgbase=libappindicator
pkgname=("${pkgbase}-gtk"{2,3})
-pkgver=12.10.0
-pkgrel=14
+_bzrtag=12.10.0
+_bzrrev=296
+pkgver=${_bzrtag}.r${_bzrrev}
+pkgrel=1
pkgdesc='Allow applications to extend a menu via Ayatana indicators in Unity, KDE or Systray'
url='https://launchpad.net/libappindicator'
arch=('x86_64')
license=('LGPL2.1' 'LGPL3')
-makedepends=('dbus-glib' 'gobject-introspection' 'libdbusmenu-gtk'{2,3} 'libindicator-gtk'{2,3} 'vala')
+makedepends=('bzr' 'dbus-glib' 'gnome-common' 'gobject-introspection' 'gtk-doc' 'libdbusmenu-gtk'{2,3} 'libindicator-gtk'{2,3} 'vala')
options=('!emptydirs')
-source=(http://launchpad.net/${pkgbase}/${pkgver%.*}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.gz{,.asc}
- no-python.patch)
-sha512sums=('317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a'
- 'SKIP'
- '0fd8ad2afa6ef25b9d006fb7c7fbbf1acd9b5af282a0373720f4ddc39d28bd5a9ae24b01f02c320593a543b316e5634d3a38dda6801aa9eff76a0b2fbc627fe0')
+source=(bzr+lp:libappindicator#revision=$_bzrrev
+ no-host.patch)
+sha512sums=('SKIP'
+ 'cfc9481ad26712063f9d1bfdd1f94327f579c0c58385cec8adb4e5f12398ef2eb4427a62e6580cda75434d967623235940562f826a909501ee52eef8135703fa')
validpgpkeys=('6FC05581A37D71FCECE165DB5BE41E162CD6358E') # Charles Kerr <charles.kerr at canonical.com>
prepare() {
- (cd ${pkgbase}-${pkgver}
- patch -p1 < "${srcdir}/no-python.patch"
+ (cd ${pkgbase}
+
+ # Fall back to tray icon when StatusNotifierHost is not available.
+ # https://code.launchpad.net/~muktupavels/libappindicator/no-host/+merge/386817
+ patch -p0 < "${srcdir}/no-host.patch"
+
sed -i 's/-Werror//' src/Makefile.am
- autoreconf -fi
+ ./autogen.sh
)
- cp -ra ${pkgbase}-${pkgver}{,-gtk2}
+ cp -ra ${pkgbase}{,-gtk2}
}
build() {
- export CFLAGS="${CFLAGS} -Wno-deprecated-declarations"
- export CSC='/usr/bin/mcs'
-
msg2 'Building gtk3...'
- (cd ${pkgbase}-${pkgver}
+ (cd ${pkgbase}
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
- --with-gtk=3
+ --with-gtk=3 \
+ --enable-gtk-doc
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
+ make -j1
)
msg2 'Building gtk2...'
- (cd ${pkgbase}-${pkgver}-gtk2
+ (cd ${pkgbase}-gtk2
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
- --with-gtk=2
+ --with-gtk=2 \
+ --disable-introspection
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
+ make -j1
)
}
@@ -61,9 +65,8 @@
pkgdesc+=' (GTK+ 2 library)'
depends=('libdbusmenu-gtk2' 'libindicator-gtk2')
- cd ${pkgbase}-${pkgver}-gtk2
+ cd ${pkgbase}-gtk2
make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/usr/share/gtk-doc
}
package_libappindicator-gtk3() {
@@ -70,7 +73,7 @@
pkgdesc+=' (GTK+ 3 library)'
depends=('libdbusmenu-gtk3' 'libindicator-gtk3')
- cd ${pkgbase}-${pkgver}
+ cd ${pkgbase}
make DESTDIR="${pkgdir}" install
}
Added: no-host.patch
===================================================================
--- no-host.patch (rev 0)
+++ no-host.patch 2020-07-03 14:39:41 UTC (rev 657637)
@@ -0,0 +1,65 @@
+=== modified file 'src/app-indicator.c'
+--- src/app-indicator.c 2020-04-08 18:39:30 +0000
++++ src/app-indicator.c 2020-07-03 10:12:45 +0000
+@@ -213,6 +213,38 @@
+ G_DEFINE_TYPE (AppIndicator, app_indicator, G_TYPE_OBJECT);
+
+ static void
++check_is_host_registered (AppIndicator *self)
++{
++ GVariant *variant;
++ gboolean is_host_registered;
++
++ variant = g_dbus_proxy_get_cached_property (self->priv->watcher_proxy,
++ "IsStatusNotifierHostRegistered");
++
++ is_host_registered = FALSE;
++ if (variant != NULL) {
++ is_host_registered = g_variant_get_boolean (variant);
++ g_variant_unref (variant);
++ }
++
++ if (!is_host_registered) {
++ start_fallback_timer (self, FALSE);
++ return;
++ }
++
++ check_connect (self);
++}
++
++static void
++watcher_properties_changed_cb (GDBusProxy *proxy,
++ GVariant *changed_properties,
++ GStrv invalidated_properties,
++ AppIndicator *self)
++{
++ check_is_host_registered (self);
++}
++
++static void
+ watcher_ready_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+@@ -230,7 +262,12 @@
+ return;
+ }
+
+- check_connect (self);
++ g_signal_connect (self->priv->watcher_proxy,
++ "g-properties-changed",
++ G_CALLBACK (watcher_properties_changed_cb),
++ self);
++
++ check_is_host_registered (self);
+ g_object_unref (self);
+ }
+
+@@ -243,7 +280,6 @@
+ AppIndicator *self = (AppIndicator *) user_data;
+
+ g_dbus_proxy_new (self->priv->connection,
+- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
+ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
+ watcher_interface_info,
+ NOTIFICATION_WATCHER_DBUS_ADDR,
+
Deleted: no-python.patch
===================================================================
--- no-python.patch 2020-07-03 13:10:25 UTC (rev 657636)
+++ no-python.patch 2020-07-03 14:39:41 UTC (rev 657637)
@@ -1,73 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Thu, 5 Jul 2018 23:51:25 +0100
-Subject: Disable legacy Python bindings
-
-Forwarded: not-needed, Debian-specific
----
- bindings/Makefile.am | 6 ------
- configure.ac | 29 -----------------------------
- 2 files changed, 35 deletions(-)
-
-diff --git a/bindings/Makefile.am b/bindings/Makefile.am
-index d1f6d73..b4df7fe 100644
---- a/bindings/Makefile.am
-+++ b/bindings/Makefile.am
-@@ -1,11 +1,5 @@
--if USE_GTK3
- SUBDIRS = \
- vala
--else
--SUBDIRS = \
-- python \
-- vala
--endif
-
- if HAS_MONO
- SUBDIRS += mono
-diff --git a/configure.ac b/configure.ac
-index 5a14c7f..4a7c964 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -181,33 +181,6 @@ AM_CONDITIONAL(BUILD_MONO_TEST, test x${have_nunit} = xyes)
- with_localinstall="no"
- AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
-
--###########################
--# Python
--###########################
--
--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)])
--
--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)
--
- #########################
- # Check if build tests
- #########################
-@@ -226,8 +199,6 @@ src/Makefile
- src/appindicator-0.1.pc
- src/appindicator3-0.1.pc
- bindings/Makefile
--bindings/python/Makefile
--bindings/python/appindicator.override
- bindings/vala/Makefile
- bindings/vala/examples/Makefile
- tests/Makefile
More information about the arch-commits
mailing list