[arch-commits] Commit in galculator/trunk (PKGBUILD galculator.install)
Balló György
bgyorgy at nymeria.archlinux.org
Thu Jan 23 04:23:10 UTC 2014
Date: Thursday, January 23, 2014 @ 05:23:10
Author: bgyorgy
Revision: 104577
upgpkg: galculator 2.1.2-2
Adopt package, add GTK2 version (useful for LXDE and Xfce users)
Modified:
galculator/trunk/PKGBUILD
galculator/trunk/galculator.install
--------------------+
PKGBUILD | 38 +++++++++++++++++++++++++++++---------
galculator.install | 4 ++--
2 files changed, 31 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-01-23 03:44:13 UTC (rev 104576)
+++ PKGBUILD 2014-01-23 04:23:10 UTC (rev 104577)
@@ -1,16 +1,18 @@
# $Id$
-# Maintainer: Bartłomiej Piotrowski <barthalion at gmail.com>
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <barthalion at gmail.com>
# Contributor: SpepS <dreamspepser at yahoo dot it>
# Contributor: Alexander Fehr <pizzapunk gmail com>
-pkgname=galculator
+pkgbase=galculator
+pkgname=(galculator galculator-gtk2)
pkgver=2.1.2
-pkgrel=1
+pkgrel=2
pkgdesc='GTK+ based scientific calculator'
arch=('i686' 'x86_64')
url='http://galculator.sourceforge.net/'
license=('GPL')
-depends=('gtk3' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils')
+depends=('gtk3' 'gtk2')
makedepends=('intltool')
install=$pkgname.install
source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2)
@@ -17,15 +19,33 @@
sha256sums=('23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b')
build() {
+ # GTK3 version
+ cd $pkgname-$pkgver
+ [ -e gtk3 ] || mkdir gtk3
+ cd gtk3
+ ../configure --prefix=/usr
+ make
+
+ # GTK2 version
cd $srcdir/$pkgname-$pkgver
-
- LDFLAGS+=' -lm'
- ./configure --prefix=/usr
+ [ -e gtk2 ] || mkdir gtk2
+ cd gtk2
+ ../configure --prefix=/usr --disable-gtk3
make
}
-package() {
- cd $srcdir/$pkgname-$pkgver
+package_galculator() {
+ depends=('gtk3')
+ cd $pkgbase-$pkgver/gtk3
make DESTDIR="$pkgdir" install
}
+
+package_galculator-gtk2() {
+ pkgdesc+=' (GTK2 version)'
+ depends=('gtk2')
+ conflicts=('galculator')
+
+ cd $pkgbase-$pkgver/gtk2
+ make DESTDIR="$pkgdir" install
+}
Modified: galculator.install
===================================================================
--- galculator.install 2014-01-23 03:44:13 UTC (rev 104576)
+++ galculator.install 2014-01-23 04:23:10 UTC (rev 104577)
@@ -1,11 +1,11 @@
post_install() {
- update-desktop-database -q
- [[ -e /usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
post_upgrade() {
post_install
}
+
post_remove() {
post_install
}
More information about the arch-commits
mailing list