[arch-commits] Commit in lib32-libappindicator/repos/multilib-x86_64 (4 files)
Antonio Rojas
arojas at archlinux.org
Tue Mar 17 12:35:51 UTC 2020
Date: Tuesday, March 17, 2020 @ 12:35:50
Author: arojas
Revision: 600159
archrelease: copy trunk to multilib-x86_64
Added:
lib32-libappindicator/repos/multilib-x86_64/PKGBUILD
(from rev 600158, lib32-libappindicator/trunk/PKGBUILD)
lib32-libappindicator/repos/multilib-x86_64/no-python.patch
(from rev 600158, lib32-libappindicator/trunk/no-python.patch)
Deleted:
lib32-libappindicator/repos/multilib-x86_64/PKGBUILD
lib32-libappindicator/repos/multilib-x86_64/no-python.patch
-----------------+
PKGBUILD | 162 +++++++++++++++++++++++++++---------------------------
no-python.patch | 146 ++++++++++++++++++++++++------------------------
2 files changed, 154 insertions(+), 154 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-17 12:22:22 UTC (rev 600158)
+++ PKGBUILD 2020-03-17 12:35:50 UTC (rev 600159)
@@ -1,81 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Manuel Hüsers <manuel.huesers at uni-ol.de>
-# Contributor: Jameson Pugh <imntreal at gmail.com>
-# Contributor: Swift Geek < swift geek ât gmail døt cøm>
-
-_pkgbase=libappindicator
-pkgbase=lib32-${_pkgbase}
-pkgname=("${pkgbase}-gtk"{2,3})
-pkgver=12.10.0
-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' '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}
- no-python.patch)
-sha512sums=('317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a'
- 'SKIP'
- '0fd8ad2afa6ef25b9d006fb7c7fbbf1acd9b5af282a0373720f4ddc39d28bd5a9ae24b01f02c320593a543b316e5634d3a38dda6801aa9eff76a0b2fbc627fe0')
-validpgpkeys=('6FC05581A37D71FCECE165DB5BE41E162CD6358E') # Charles Kerr <charles.kerr at canonical.com>
-
-prepare() {
- (cd ${_pkgbase}-${pkgver}
- patch -p1 < "${srcdir}/no-python.patch"
- sed -i 's/-Werror//' src/Makefile.am
- autoreconf -fi
- )
- cp -ra ${_pkgbase}-${pkgver}{,-gtk2}
-}
-
-build() {
- export CC='gcc -m32'
- export CXX='g++ -m32'
- export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
- export CFLAGS="${CFLAGS} -Wno-deprecated-declarations"
- export CSC='/usr/bin/mcs'
-
- msg2 'Building gtk3...'
- (cd ${_pkgbase}-${pkgver}
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libdir=/usr/lib32 \
- --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 \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libdir=/usr/lib32 \
- --with-gtk=2
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
- )
-}
-
-package_lib32-libappindicator-gtk2() {
- pkgdesc+=" (GTK+ 2 library)"
- depends=('lib32-libdbusmenu-gtk2' 'lib32-libindicator-gtk2')
-
- cd ${_pkgbase}-${pkgver}-gtk2
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/usr/{include,share}
-}
-
-package_lib32-libappindicator-gtk3() {
- pkgdesc+=" (GTK+ 3 library)"
- depends=('lib32-libdbusmenu-gtk3' 'lib32-libindicator-gtk3')
-
- cd ${_pkgbase}-${pkgver}
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/usr/{include,share}
-}
-
-# vim: ts=2 sw=2 et:
Copied: lib32-libappindicator/repos/multilib-x86_64/PKGBUILD (from rev 600158, lib32-libappindicator/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-17 12:35:50 UTC (rev 600159)
@@ -0,0 +1,81 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Manuel Hüsers <manuel.huesers at uni-ol.de>
+# Contributor: Jameson Pugh <imntreal at gmail.com>
+# Contributor: Swift Geek < swift geek ât gmail døt cøm>
+
+_pkgbase=libappindicator
+pkgbase=lib32-${_pkgbase}
+pkgname=("${pkgbase}-gtk"{2,3})
+pkgver=12.10.0
+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' '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}
+ no-python.patch)
+sha512sums=('317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a'
+ 'SKIP'
+ '0fd8ad2afa6ef25b9d006fb7c7fbbf1acd9b5af282a0373720f4ddc39d28bd5a9ae24b01f02c320593a543b316e5634d3a38dda6801aa9eff76a0b2fbc627fe0')
+validpgpkeys=('6FC05581A37D71FCECE165DB5BE41E162CD6358E') # Charles Kerr <charles.kerr at canonical.com>
+
+prepare() {
+ (cd ${_pkgbase}-${pkgver}
+ patch -p1 < "${srcdir}/no-python.patch"
+ sed -i 's/-Werror//' src/Makefile.am
+ autoreconf -fi
+ )
+ cp -ra ${_pkgbase}-${pkgver}{,-gtk2}
+}
+
+build() {
+ export CC='gcc -m32'
+ export CXX='g++ -m32'
+ export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+ export CFLAGS="${CFLAGS} -Wno-deprecated-declarations"
+ export CSC='/usr/bin/mcs'
+
+ msg2 'Building gtk3...'
+ (cd ${_pkgbase}-${pkgver}
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libdir=/usr/lib32 \
+ --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 \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libdir=/usr/lib32 \
+ --with-gtk=2
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+ )
+}
+
+package_lib32-libappindicator-gtk2() {
+ pkgdesc+=" (GTK+ 2 library)"
+ depends=('lib32-libdbusmenu-gtk2' 'lib32-libindicator-gtk2')
+
+ cd ${_pkgbase}-${pkgver}-gtk2
+ make DESTDIR="${pkgdir}" install
+ rm -rf "${pkgdir}"/usr/{include,share}
+}
+
+package_lib32-libappindicator-gtk3() {
+ pkgdesc+=" (GTK+ 3 library)"
+ depends=('lib32-libdbusmenu-gtk3' 'lib32-libindicator-gtk3')
+
+ cd ${_pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ rm -rf "${pkgdir}"/usr/{include,share}
+}
+
+# vim: ts=2 sw=2 et:
Deleted: no-python.patch
===================================================================
--- no-python.patch 2020-03-17 12:22:22 UTC (rev 600158)
+++ no-python.patch 2020-03-17 12:35:50 UTC (rev 600159)
@@ -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
Copied: lib32-libappindicator/repos/multilib-x86_64/no-python.patch (from rev 600158, lib32-libappindicator/trunk/no-python.patch)
===================================================================
--- no-python.patch (rev 0)
+++ no-python.patch 2020-03-17 12:35:50 UTC (rev 600159)
@@ -0,0 +1,73 @@
+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