ArchPOWER/packages
1
0
Fork 0
Code Issues 8 Pull Requests 1 Actions Packages Projects Releases 18 Wiki Activity

* sync libappindicator with main arch

Browse Source
This commit is contained in:
Alexander Baldeck 2020-03-30 11:06:47 +02:00
parent aa7b8c3945
commit 21d2a3d786
2 changed files with 81 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
libappindicator/PKGBUILD
View File

@ -8,39 +8,28 @@
# Contributor: Balló György <ballogyor+arch at gmail dot com>
pkgbase=libappindicator
pkgname=("${pkgbase}-gtk"{2,3} "${pkgbase}-sharp" "python2-${pkgbase}")
pkgname=("${pkgbase}-gtk"{2,3})
pkgver=12.10.0
pkgrel=13
pkgrel=14
pkgdesc='Allow applications to extend a menu via Ayatana indicators in Unity, KDE or Systray'
url='https://launchpad.net/libappindicator'
arch=(x86_64 powerpc64le)
license=('LGPL2.1' 'LGPL3')
makedepends=('dbus-glib' 'gobject-introspection' 'gtk-sharp-2'
'libdbusmenu-gtk'{2,3} 'libindicator-gtk'{2,3}
'mono' 'perl-xml-libxml' 'pygtk' 'vala' 'python2')
makedepends=('dbus-glib' 'gobject-introspection' 'libdbusmenu-gtk'{2,3} '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@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}/improved-plasma.patch"
patch -p1 -i ../incompatible_pointer_build_fix.patch # Build fix, Fedora patch
patch -p1 < "${srcdir}/no-python.patch"
sed -i 's/-Werror//' src/Makefile.am
autoreconf -fi
)
# python enabled variant
cp -ra ${pkgbase}-${pkgver}{,-py2}
# disable python for gtk2 + gtk3 variant
(cd ${pkgbase}-${pkgver}; patch -p1 < "${srcdir}/no-python.patch")
cp -ra ${pkgbase}-${pkgver}{,-gtk2}
}
@ -51,33 +40,20 @@ build() {
msg2 'Building gtk3...'
(cd ${pkgbase}-${pkgver}
./configure --prefix=/usr \
--build=${CHOST} \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-{gtk-doc-html,mono-test,static,tests} \
--with-gtk=3
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
)
msg2 'Building gtk2...'
(cd ${pkgbase}-${pkgver}-gtk2
./configure --prefix=/usr \
--build=${CHOST} \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-{gtk-doc-html,mono-test,static,tests} \
--with-gtk=2
make
)
msg2 'Building python2...'
(cd ${pkgbase}-${pkgver}-py2
./configure --prefix=/usr \
--build=${CHOST} \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-{gtk-doc-html,mono-test,static,tests} \
--with-gtk=2
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
)
}
@ -85,39 +61,18 @@ build() {
package_libappindicator-gtk2() {
pkgdesc+=' (GTK+ 2 library)'
depends=('libdbusmenu-gtk2' '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/share/gtk-doc
}
package_libappindicator-gtk3() {
pkgdesc+=' (GTK+ 3 library)'
depends=('libdbusmenu-gtk3' 'libindicator-gtk3')
provides=("${pkgbase}3")
conflicts=("${pkgbase}3")
cd ${pkgbase}-${pkgver}
make -j1 DESTDIR="${pkgdir}" install
make -j1 -C bindings/mono DESTDIR="${pkgdir}" uninstall
rm -rf "${pkgdir}"/usr/share/gtk-doc
}
package_libappindicator-sharp() {
depends=("${pkgbase}-gtk2" 'gtk-sharp-2')
cd ${pkgbase}-${pkgver}-gtk2
make -j1 -C bindings/mono DESTDIR="${pkgdir}" install
}
package_python2-libappindicator() {
depends=("${pkgbase}-gtk2" 'python2')
cd ${pkgbase}-${pkgver}-py2
make -j1 -C bindings/python DESTDIR="${pkgdir}" install
make DESTDIR="${pkgdir}" install
}
# vim: ts=2 sw=2 et:

146
libappindicator/no-python.patch
View File

@ -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@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
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@
-@USE_GTK3_FALSE@SUBDIRS = python vala $(am__append_1)
+@USE_GTK3_FALSE@SUBDIRS = vala $(am__append_1)
@USE_GTK3_TRUE@SUBDIRS = vala $(am__append_1)
all: all-recursive
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; }
-
-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"
-SUBDIRS = \
- python \
- vala
-endif
@@ -14358,7 +14358,7 @@ fi
# Files
###########################
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)
-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" ;;
-###########################
-# 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