Date: Monday, November 7, 2022 @ 22:07:04
Author: arojas
Revision: 1345873
upgpkg: libappindicator 12.10.0.r298-1: Update to r298
Modified:
libappindicator/trunk/PKGBUILD
Deleted:
libappindicator/trunk/no-host.patch
---------------+
PKGBUILD | 14 +++---------
no-host.patch | 65 --------------------------------------------------------
2 files changed, 4 insertions(+), 75 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-07 21:39:24 UTC (rev 1345872)
+++ PKGBUILD 2022-11-07 22:07:04 UTC (rev 1345873)
@@ -9,9 +9,9 @@
pkgbase=libappindicator
pkgname=("${pkgbase}-gtk"{2,3})
_bzrtag=12.10.0
-_bzrrev=296
+_bzrrev=298
pkgver=${_bzrtag}.r${_bzrrev}
-pkgrel=2
+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')
@@ -18,19 +18,13 @@
license=('LGPL2.1' 'LGPL3')
makedepends=('bzr' 'dbus-glib' 'gnome-common' 'gobject-introspection'
'gtk-doc' 'libdbusmenu-gtk'{2,3} 'libindicator-gtk'{2,3} 'vala')
options=('!emptydirs')
-source=(bzr+lp:libappindicator#revision=$_bzrrev
- no-host.patch)
-sha512sums=('SKIP'
-
'cfc9481ad26712063f9d1bfdd1f94327f579c0c58385cec8adb4e5f12398ef2eb4427a62e6580cda75434d967623235940562f826a909501ee52eef8135703fa')
+source=(bzr+lp:libappindicator#revision=$_bzrrev)
+sha512sums=('SKIP')
validpgpkeys=('6FC05581A37D71FCECE165DB5BE41E162CD6358E') # Charles Kerr
<[email protected]>
prepare() {
(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
./autogen.sh
)
Deleted: no-host.patch
===================================================================
--- no-host.patch 2022-11-07 21:39:24 UTC (rev 1345872)
+++ no-host.patch 2022-11-07 22:07:04 UTC (rev 1345873)
@@ -1,65 +0,0 @@
-=== 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,
-
