[arch-commits] Commit in xapps/trunk (PKGBUILD)

[Eli Schwartz]

    Date: Thursday, February 1, 2018 @ 01:02:13
  Author: eschwartz
Revision: 288456

upgpkg: xapps 1.0.4-2

Revamp build.
Enable installation of gi overrides.
Remove broken scripts.

Modified:
  xapps/trunk/PKGBUILD	(contents, properties)

----------+
 PKGBUILD |   41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-31 23:16:23 UTC (rev 288455)
+++ PKGBUILD	2018-02-01 01:02:13 UTC (rev 288456)
@@ -1,31 +1,48 @@
 # $Id$
-# Maintainer: Alex Filgueira <alexfilgueira (at antergos.com)>
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Alex Filgueira <alexfilgueira (at antergos.com)>
 # Contributor: Nate Simon <aurpkg (at natesimon.net)>
 
 pkgname=xapps
 pkgver=1.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Common library for X-Apps project"
 arch=('x86_64')
-url='https://github.com/linuxmint/xapps'
+url="https://github.com/linuxmint/xapps"
 license=('GPL')
 depends=('libgnomekbd' 'python')
-makedepends=('gnome-common' 'gobject-introspection')
+makedepends=('gnome-common' 'gobject-introspection' 'python-gobject' 'python2-gobject')
 options=(!emptydirs)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/${pkgname}/archive/${pkgver}.tar.gz")
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
 sha256sums=('6578574561cb10b602c67669b0374b71d9cccd5d1c13c17d6a4b6ec2f8fe739a')
 
+prepare() {
+    cd "${srcdir}"/${pkgname}-${pkgver}
+
+    NOCONFIGURE=1 ./autogen.sh
+}
+
 build() {
-    cd ${pkgname}-${pkgver}
+    cd "${srcdir}"/${pkgname}-${pkgver}
+    mkdir -p build build-py2
 
-    ./autogen.sh --prefix=/usr \
-        --localstatedir=/var \
-        --libexecdir=/usr/lib/${pkgname}
+    cd build
+    ../configure --prefix=/usr \
+                 --localstatedir=/var \
+                 --libexecdir=/usr/lib/${pkgname}
     make
+
+    cd ../build-py2
+    PYTHON=python2 ../configure --prefix=/usr \
+                                --localstatedir=/var \
+                                --libexecdir=/usr/lib/${pkgname}
 }
 
 package(){
-    cd ${pkgname}-${pkgver}
-    make DESTDIR="$pkgdir" install
+    cd "${srcdir}"/${pkgname}-${pkgver}
+    make -C build DESTDIR="${pkgdir}" install
+    make -C build-py2/pygobject DESTDIR="${pkgdir}" install
+
+    # Not worth fixing out-of-tree builds properly as git master has migrated to meson
+    cp -Rv files/usr/share "${pkgdir}"/usr
 }
-


Property changes on: xapps/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property