[arch-commits] Commit in libappindicator/repos/community-x86_64 (4 files)
Allan McRae
allan at gemini.archlinux.org
Mon Apr 25 03:25:00 UTC 2022
Date: Monday, April 25, 2022 @ 03:25:00
Author: allan
Revision: 1189852
archrelease: copy trunk to community-x86_64
Added:
libappindicator/repos/community-x86_64/PKGBUILD
(from rev 1189851, libappindicator/trunk/PKGBUILD)
libappindicator/repos/community-x86_64/no-host.patch
(from rev 1189851, libappindicator/trunk/no-host.patch)
Deleted:
libappindicator/repos/community-x86_64/PKGBUILD
libappindicator/repos/community-x86_64/no-host.patch
---------------+
PKGBUILD | 160 ++++++++++++++++++++++++++++----------------------------
no-host.patch | 130 ++++++++++++++++++++++-----------------------
2 files changed, 145 insertions(+), 145 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-25 03:24:38 UTC (rev 1189851)
+++ PKGBUILD 2022-04-25 03:25:00 UTC (rev 1189852)
@@ -1,80 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Llewelyn Trahaearn <WoefulDerelict at GMail dot com>
-# Contributor: FadeMind <fademind at gmail dot com>
-# Contributor: Maxime Gauduin <alucryd at archlinux dot org>
-# Contributor: bitwave <aur at oomlu dot de>
-# Contributor: willemw <willemw12 at gmail dot com>
-# Contributor: Balló György <ballogyor+arch at gmail dot com>
-
-pkgbase=libappindicator
-pkgname=("${pkgbase}-gtk"{2,3})
-_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=('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')
-validpgpkeys=('6FC05581A37D71FCECE165DB5BE41E162CD6358E') # Charles Kerr <charles.kerr at canonical.com>
-
-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
- )
- cp -ra ${pkgbase}{,-gtk2}
-}
-
-build() {
- msg2 'Building gtk3...'
- (cd ${pkgbase}
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-gtk=3 \
- --enable-gtk-doc
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make -j1
- )
-
- msg2 'Building gtk2...'
- (cd ${pkgbase}-gtk2
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-gtk=2 \
- --disable-introspection
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make -j1
- )
-}
-
-package_libappindicator-gtk2() {
- pkgdesc+=' (GTK+ 2 library)'
- depends=('libdbusmenu-gtk2' 'libindicator-gtk2')
-
- cd ${pkgbase}-gtk2
- make DESTDIR="${pkgdir}" install
-}
-
-package_libappindicator-gtk3() {
- pkgdesc+=' (GTK+ 3 library)'
- depends=('libdbusmenu-gtk3' 'libindicator-gtk3')
-
- cd ${pkgbase}
- make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:
Copied: libappindicator/repos/community-x86_64/PKGBUILD (from rev 1189851, libappindicator/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-25 03:25:00 UTC (rev 1189852)
@@ -0,0 +1,80 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Llewelyn Trahaearn <WoefulDerelict at GMail dot com>
+# Contributor: FadeMind <fademind at gmail dot com>
+# Contributor: Maxime Gauduin <alucryd at archlinux dot org>
+# Contributor: bitwave <aur at oomlu dot de>
+# Contributor: willemw <willemw12 at gmail dot com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgbase=libappindicator
+pkgname=("${pkgbase}-gtk"{2,3})
+_bzrtag=12.10.0
+_bzrrev=296
+pkgver=${_bzrtag}.r${_bzrrev}
+pkgrel=2
+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=('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')
+validpgpkeys=('6FC05581A37D71FCECE165DB5BE41E162CD6358E') # Charles Kerr <charles.kerr at canonical.com>
+
+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
+ )
+ cp -ra ${pkgbase}{,-gtk2}
+}
+
+build() {
+ msg2 'Building gtk3...'
+ (cd ${pkgbase}
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-gtk=3 \
+ --enable-gtk-doc
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make -j1
+ )
+
+ msg2 'Building gtk2...'
+ (cd ${pkgbase}-gtk2
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-gtk=2 \
+ --disable-introspection
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make -j1
+ )
+}
+
+package_libappindicator-gtk2() {
+ pkgdesc+=' (GTK+ 2 library)'
+ depends=('libdbusmenu-gtk2' 'libindicator-gtk2')
+
+ cd ${pkgbase}-gtk2
+ make DESTDIR="${pkgdir}" install
+}
+
+package_libappindicator-gtk3() {
+ pkgdesc+=' (GTK+ 3 library)'
+ depends=('libdbusmenu-gtk3' 'libindicator-gtk3')
+
+ cd ${pkgbase}
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: no-host.patch
===================================================================
--- no-host.patch 2022-04-25 03:24:38 UTC (rev 1189851)
+++ no-host.patch 2022-04-25 03:25:00 UTC (rev 1189852)
@@ -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,
-
Copied: libappindicator/repos/community-x86_64/no-host.patch (from rev 1189851, libappindicator/trunk/no-host.patch)
===================================================================
--- no-host.patch (rev 0)
+++ no-host.patch 2022-04-25 03:25:00 UTC (rev 1189852)
@@ -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,
+
More information about the arch-commits
mailing list