[arch-commits] Commit in lib32-libappindicator/trunk (4 files)
Balló György
bgyorgy at archlinux.org
Tue Mar 17 11:55:37 UTC 2020
Date: Tuesday, March 17, 2020 @ 11:55:37
Author: bgyorgy
Revision: 600155
upgpkg: lib32-libappindicator 12.10.0-11: Fix build, remove obsoleted patch (FS#59652), remove obsoleted mono bindings
Modified:
lib32-libappindicator/trunk/PKGBUILD
lib32-libappindicator/trunk/no-python.patch
Deleted:
lib32-libappindicator/trunk/improved-plasma.patch
lib32-libappindicator/trunk/incompatible_pointer_build_fix.patch
--------------------------------------+
PKGBUILD | 46 ++--------
improved-plasma.patch | 59 -------------
incompatible_pointer_build_fix.patch | 12 --
no-python.patch | 144 +++++++++++++++------------------
4 files changed, 79 insertions(+), 182 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-17 11:47:07 UTC (rev 600154)
+++ PKGBUILD 2020-03-17 11:55:37 UTC (rev 600155)
@@ -5,35 +5,27 @@
_pkgbase=libappindicator
pkgbase=lib32-${_pkgbase}
-pkgname=("${pkgbase}-gtk"{2,3} "${pkgbase}-sharp")
+pkgname=("${pkgbase}-gtk"{2,3})
pkgver=12.10.0
-pkgrel=10
+pkgrel=11
pkgdesc='Allow applications to extend a menu via Ayatana indicators in Unity, KDE or Systray (32-bit)'
url='https://launchpad.net/libappindicator'
arch=('x86_64')
license=('LGPL2.1' 'GPL3')
-makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'gtk-sharp-2'
- 'lib32-libdbusmenu-gtk'{2,3} 'lib32-libindicator-gtk'{2,3}
- 'mono' 'perl-xml-libxml' 'pygtk' 'vala' 'pkg-config')
+makedepends=('dbus-glib' 'gobject-introspection' 'lib32-libdbusmenu-gtk'{2,3} 'lib32-libindicator-gtk'{2,3} 'vala')
options=('!emptydirs')
source=(http://launchpad.net/${_pkgbase}/${pkgver%.*}/${pkgver}/+download/${_pkgbase}-${pkgver}.tar.gz{,.asc}
- improved-plasma.patch
- no-python.patch
- incompatible_pointer_build_fix.patch)
+ no-python.patch)
sha512sums=('317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a'
'SKIP'
- 'e2930b9942b800a7a14faf4c27d59073c166e24bb1675f8604a0b5ac3fbd101f3642f7221bc8f5219231c8f021a2a8c4aa203f971ea5f2f9225be83d807cb80e'
- '891f5097c607770428460fe902214c70fb2a11de9fe1e6d6109ea859b22eda3d7057cab4c5b5444de5f6f3149348c186034dcde8f95c77800bcbd8abcdf7277b'
- 'bda93822c43dbc153202e7cd1e4b5c5fde5ca1ec35a1314bee37707f9cf4483c52ba79d3c808592f5e62470d45dc6a7b8eb5cfe60295a8e5446128b0643e36c5')
+ '0fd8ad2afa6ef25b9d006fb7c7fbbf1acd9b5af282a0373720f4ddc39d28bd5a9ae24b01f02c320593a543b316e5634d3a38dda6801aa9eff76a0b2fbc627fe0')
validpgpkeys=('6FC05581A37D71FCECE165DB5BE41E162CD6358E') # Charles Kerr <charles.kerr at canonical.com>
prepare() {
(cd ${_pkgbase}-${pkgver}
- sed 's|/cli/|/mono/|' -i bindings/mono/{appindicator-sharp-0.1.pc.in,Makefile.in}
- sed 's/example //g' -i Makefile.in
patch -p1 < "${srcdir}/no-python.patch"
- patch -p1 < "${srcdir}/improved-plasma.patch"
- patch -p1 -i ../incompatible_pointer_build_fix.patch # Build fix, Fedora patch
+ sed -i 's/-Werror//' src/Makefile.am
+ autoreconf -fi
)
cp -ra ${_pkgbase}-${pkgver}{,-gtk2}
}
@@ -50,9 +42,9 @@
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
- --disable-{gtk-doc-html,mono-test,static,tests} \
--libdir=/usr/lib32 \
--with-gtk=3
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
)
@@ -61,9 +53,9 @@
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
- --disable-{gtk-doc-html,mono-test,static,tests} \
--libdir=/usr/lib32 \
--with-gtk=2
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
)
}
@@ -71,12 +63,9 @@
package_lib32-libappindicator-gtk2() {
pkgdesc+=" (GTK+ 2 library)"
depends=('lib32-libdbusmenu-gtk2' 'lib32-libindicator-gtk2')
- provides=("${pkgbase}")
- conflicts=("${pkgbase}")
cd ${_pkgbase}-${pkgver}-gtk2
- make -j1 DESTDIR="${pkgdir}" install
- make -j1 -C 'bindings/mono' DESTDIR="${pkgdir}" uninstall
+ make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}"/usr/{include,share}
}
@@ -83,23 +72,10 @@
package_lib32-libappindicator-gtk3() {
pkgdesc+=" (GTK+ 3 library)"
depends=('lib32-libdbusmenu-gtk3' 'lib32-libindicator-gtk3')
- provides=("${pkgbase}3")
- conflicts=("${pkgbase}3")
cd ${_pkgbase}-${pkgver}
- make -j1 DESTDIR="${pkgdir}" install
- make -j1 -C 'bindings/mono' DESTDIR="${pkgdir}" uninstall
+ make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}"/usr/{include,share}
}
-package_lib32-libappindicator-sharp() {
- depends=("${pkgbase}-gtk2" 'gtk-sharp-2')
-
- cd ${_pkgbase}-${pkgver}-gtk2
- make -j1 -C 'bindings/mono' DESTDIR="${pkgdir}" install
- mv "${pkgdir}/usr/lib/mono/appindicator-sharp" "${pkgdir}/usr/lib32/mono/"
- mv "${pkgdir}/usr/lib/mono/gac" "${pkgdir}/usr/lib32/mono/"
- rm -rf "${pkgdir}"/usr/{include,share,lib}
-}
-
# vim: ts=2 sw=2 et:
Deleted: improved-plasma.patch
===================================================================
--- improved-plasma.patch 2020-03-17 11:47:07 UTC (rev 600154)
+++ improved-plasma.patch 2020-03-17 11:55:37 UTC (rev 600155)
@@ -1,59 +0,0 @@
-From c38d64aa3c12bea271d331b6c52a1130ca758a69 Mon Sep 17 00:00:00 2001
-From: Sebastian Krzyszkowiak <dos at dosowisko.net>
-Date: Sun, 12 Jul 2015 16:25:07 +0200
-Subject: [PATCH] Add support for Activate method for improved Plasma 5 user
- experience
-
----
- src/app-indicator.c | 3 ++-
- src/gen-notification-item.xml.c | 4 ++++
- src/notification-item.xml | 4 ++++
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/app-indicator.c b/src/app-indicator.c
-index 2e98b48..14be69f 100644
---- a/src/app-indicator.c
-+++ b/src/app-indicator.c
-@@ -1082,7 +1082,8 @@ bus_method_call (GDBusConnection * connection, const gchar * sender,
- delta = ABS(delta);
- g_signal_emit(app, signals[SCROLL_EVENT], 0, delta, direction);
-
-- } else if (g_strcmp0(method, "SecondaryActivate") == 0 ||
-+ } else if (g_strcmp0(method, "Activate") == 0 ||
-+ g_strcmp0(method, "SecondaryActivate") == 0 ||
- g_strcmp0(method, "XAyatanaSecondaryActivate") == 0) {
- GtkWidget *menuitem = priv->sec_activate_target;
-
-diff --git a/src/gen-notification-item.xml.c b/src/gen-notification-item.xml.c
-index 0bc6ab2..18a288b 100644
---- a/src/gen-notification-item.xml.c
-+++ b/src/gen-notification-item.xml.c
-@@ -25,6 +25,10 @@ const char * _notification_item =
- " <arg type=\"i\" name=\"delta\" direction=\"in\" />\n"
- " <arg type=\"s\" name=\"orientation\" direction=\"in\" />\n"
- " </method>\n"
-+" <method name=\"Activate\">\n"
-+" <arg type=\"i\" name=\"x\" direction=\"in\" />\n"
-+" <arg type=\"i\" name=\"y\" direction=\"in\" />\n"
-+" </method>\n"
- " <method name=\"SecondaryActivate\">\n"
- " <arg type=\"i\" name=\"x\" direction=\"in\" />\n"
- " <arg type=\"i\" name=\"y\" direction=\"in\" />\n"
-diff --git a/src/notification-item.xml b/src/notification-item.xml
-index c93afd7..72d36eb 100644
---- a/src/notification-item.xml
-+++ b/src/notification-item.xml
-@@ -24,6 +24,10 @@
- <arg type="i" name="delta" direction="in" />
- <arg type="s" name="orientation" direction="in" />
- </method>
-+ <method name="Activate">
-+ <arg type="i" name="x" direction="in" />
-+ <arg type="i" name="y" direction="in" />
-+ </method>
- <method name="SecondaryActivate">
- <arg type="i" name="x" direction="in" />
- <arg type="i" name="y" direction="in" />
---
-2.4.5
-
Deleted: incompatible_pointer_build_fix.patch
===================================================================
--- incompatible_pointer_build_fix.patch 2020-03-17 11:47:07 UTC (rev 600154)
+++ incompatible_pointer_build_fix.patch 2020-03-17 11:55:37 UTC (rev 600155)
@@ -1,12 +0,0 @@
-diff -up libappindicator-12.10.0/src/app-indicator.c.build_fix libappindicator-12.10.0/src/app-indicator.c
---- libappindicator-12.10.0/src/app-indicator.c.build_fix 2018-04-10 14:43:57.134400594 +0200
-+++ libappindicator-12.10.0/src/app-indicator.c 2018-04-10 14:45:34.655448722 +0200
-@@ -2196,7 +2196,7 @@ app_indicator_set_secondary_activate_tar
-
- g_return_if_fail (GTK_IS_WIDGET (menuitem));
-
-- priv->sec_activate_target = g_object_ref(G_OBJECT(menuitem));
-+ priv->sec_activate_target = g_object_ref(menuitem);
- priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
- g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self);
- }
Modified: no-python.patch
===================================================================
--- no-python.patch 2020-03-17 11:47:07 UTC (rev 600154)
+++ no-python.patch 2020-03-17 11:55:37 UTC (rev 600155)
@@ -1,81 +1,73 @@
-diff -rupN badv2/bindings/Makefile.am good/bindings/Makefile.am
---- badv2/bindings/Makefile.am 2012-07-11 19:28:34.000000000 +0200
-+++ good/bindings/Makefile.am 2012-12-15 11:26:57.000000000 +0100
-@@ -3,7 +3,6 @@ SUBDIRS = \
+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 = \
+-else
+-SUBDIRS = \
- python \
- vala
- endif
+- vala
+-endif
-diff -rupN badv2/bindings/Makefile.in good/bindings/Makefile.in
---- badv2/bindings/Makefile.in 2012-07-11 19:29:07.000000000 +0200
-+++ good/bindings/Makefile.in 2012-12-15 11:27:45.000000000 +0100
-@@ -93,7 +93,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
- distdir
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = python vala mono
-+DIST_SUBDIRS = vala mono
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- am__relativize = \
- dir0=`pwd`; \
-@@ -301,7 +301,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-- at USE_GTK3_FALSE@SUBDIRS = python vala $(am__append_1)
-+ at USE_GTK3_FALSE@SUBDIRS = vala $(am__append_1)
- @USE_GTK3_TRUE at SUBDIRS = vala $(am__append_1)
- all: all-recursive
+ 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)
-diff -rupN badv2/configure good/configure
---- badv2/configure 2012-07-11 19:29:06.000000000 +0200
-+++ good/configure 2012-12-15 11:28:15.000000000 +0100
-@@ -13904,17 +13904,17 @@ save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <Python.h>
-+include <Python.h>
- _ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
--$as_echo "found" >&6; }
+-###########################
+-# Python
+-###########################
-
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
--$as_echo "not found" >&6; }
--as_fn_error $? "could not find Python headers" "$LINENO" 5
--fi
-+#if ac_fn_c_try_cpp "$LINENO"; then :
-+# { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-+#$as_echo "found" >&6; }
-+#
-+#else
-+# { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-+#$as_echo "not found" >&6; }
-+#as_fn_error $? "could not find Python headers" "$LINENO" 5
-+#fi
- rm -f conftest.err conftest.i conftest.$ac_ext
- CPPFLAGS="$save_CPPFLAGS"
-
-@@ -14358,7 +14358,7 @@ fi
- # Files
- ###########################
-
--ac_config_files="$ac_config_files Makefile 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 example/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml"
-+ac_config_files="$ac_config_files Makefile src/Makefile src/appindicator-0.1.pc src/appindicator3-0.1.pc bindings/Makefile bindings/vala/Makefile bindings/vala/examples/Makefile tests/Makefile example/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml"
-
-
- if test "x$has_mono" = "xtrue" ; then
-@@ -15437,8 +15437,6 @@ do
- "src/appindicator-0.1.pc") CONFIG_FILES="$CONFIG_FILES src/appindicator-0.1.pc" ;;
- "src/appindicator3-0.1.pc") CONFIG_FILES="$CONFIG_FILES src/appindicator3-0.1.pc" ;;
- "bindings/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/Makefile" ;;
-- "bindings/python/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/python/Makefile" ;;
-- "bindings/python/appindicator.override") CONFIG_FILES="$CONFIG_FILES bindings/python/appindicator.override" ;;
- "bindings/vala/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/vala/Makefile" ;;
- "bindings/vala/examples/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/vala/examples/Makefile" ;;
- "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+-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