[arch-commits] Commit in galculator/repos (8 files)

Balló György bgyorgy at nymeria.archlinux.org
Thu Jan 23 04:23:17 UTC 2014


    Date: Thursday, January 23, 2014 @ 05:23:17
  Author: bgyorgy
Revision: 104578

archrelease: copy trunk to community-i686, community-x86_64

Added:
  galculator/repos/community-i686/PKGBUILD
    (from rev 104577, galculator/trunk/PKGBUILD)
  galculator/repos/community-i686/galculator.install
    (from rev 104577, galculator/trunk/galculator.install)
  galculator/repos/community-x86_64/PKGBUILD
    (from rev 104577, galculator/trunk/PKGBUILD)
  galculator/repos/community-x86_64/galculator.install
    (from rev 104577, galculator/trunk/galculator.install)
Deleted:
  galculator/repos/community-i686/PKGBUILD
  galculator/repos/community-i686/galculator.install
  galculator/repos/community-x86_64/PKGBUILD
  galculator/repos/community-x86_64/galculator.install

-------------------------------------+
 /PKGBUILD                           |  102 ++++++++++++++++++++++++++++++++++
 /galculator.install                 |   22 +++++++
 community-i686/PKGBUILD             |   31 ----------
 community-i686/galculator.install   |   11 ---
 community-x86_64/PKGBUILD           |   31 ----------
 community-x86_64/galculator.install |   11 ---
 6 files changed, 124 insertions(+), 84 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-01-23 04:23:10 UTC (rev 104577)
+++ community-i686/PKGBUILD	2014-01-23 04:23:17 UTC (rev 104578)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer:  Bartłomiej Piotrowski <barthalion at gmail.com>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-
-pkgname=galculator
-pkgver=2.1.2
-pkgrel=1
-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')
-makedepends=('intltool')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2)
-sha256sums=('23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  LDFLAGS+=' -lm'
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}

Copied: galculator/repos/community-i686/PKGBUILD (from rev 104577, galculator/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-01-23 04:23:17 UTC (rev 104578)
@@ -0,0 +1,51 @@
+# $Id$
+# 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>
+
+pkgbase=galculator
+pkgname=(galculator galculator-gtk2)
+pkgver=2.1.2
+pkgrel=2
+pkgdesc='GTK+ based scientific calculator'
+arch=('i686' 'x86_64')
+url='http://galculator.sourceforge.net/'
+license=('GPL')
+depends=('gtk3' 'gtk2')
+makedepends=('intltool')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2)
+sha256sums=('23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b')
+
+build() {
+  # GTK3 version
+  cd $pkgname-$pkgver
+  [ -e gtk3 ] || mkdir gtk3
+  cd gtk3
+  ../configure --prefix=/usr
+  make
+
+  # GTK2 version
+  cd $srcdir/$pkgname-$pkgver
+  [ -e gtk2 ] || mkdir gtk2
+  cd gtk2
+  ../configure --prefix=/usr --disable-gtk3
+  make
+}
+
+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
+}

Deleted: community-i686/galculator.install
===================================================================
--- community-i686/galculator.install	2014-01-23 04:23:10 UTC (rev 104577)
+++ community-i686/galculator.install	2014-01-23 04:23:17 UTC (rev 104578)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  [[ -e /usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache
-}
-
-post_upgrade() {
-  post_install
-}
-post_remove() {
-  post_install
-}

Copied: galculator/repos/community-i686/galculator.install (from rev 104577, galculator/trunk/galculator.install)
===================================================================
--- community-i686/galculator.install	                        (rev 0)
+++ community-i686/galculator.install	2014-01-23 04:23:17 UTC (rev 104578)
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-01-23 04:23:10 UTC (rev 104577)
+++ community-x86_64/PKGBUILD	2014-01-23 04:23:17 UTC (rev 104578)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer:  Bartłomiej Piotrowski <barthalion at gmail.com>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-
-pkgname=galculator
-pkgver=2.1.2
-pkgrel=1
-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')
-makedepends=('intltool')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2)
-sha256sums=('23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  LDFLAGS+=' -lm'
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}

Copied: galculator/repos/community-x86_64/PKGBUILD (from rev 104577, galculator/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-01-23 04:23:17 UTC (rev 104578)
@@ -0,0 +1,51 @@
+# $Id$
+# 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>
+
+pkgbase=galculator
+pkgname=(galculator galculator-gtk2)
+pkgver=2.1.2
+pkgrel=2
+pkgdesc='GTK+ based scientific calculator'
+arch=('i686' 'x86_64')
+url='http://galculator.sourceforge.net/'
+license=('GPL')
+depends=('gtk3' 'gtk2')
+makedepends=('intltool')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2)
+sha256sums=('23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b')
+
+build() {
+  # GTK3 version
+  cd $pkgname-$pkgver
+  [ -e gtk3 ] || mkdir gtk3
+  cd gtk3
+  ../configure --prefix=/usr
+  make
+
+  # GTK2 version
+  cd $srcdir/$pkgname-$pkgver
+  [ -e gtk2 ] || mkdir gtk2
+  cd gtk2
+  ../configure --prefix=/usr --disable-gtk3
+  make
+}
+
+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
+}

Deleted: community-x86_64/galculator.install
===================================================================
--- community-x86_64/galculator.install	2014-01-23 04:23:10 UTC (rev 104577)
+++ community-x86_64/galculator.install	2014-01-23 04:23:17 UTC (rev 104578)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  [[ -e /usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache
-}
-
-post_upgrade() {
-  post_install
-}
-post_remove() {
-  post_install
-}

Copied: galculator/repos/community-x86_64/galculator.install (from rev 104577, galculator/trunk/galculator.install)
===================================================================
--- community-x86_64/galculator.install	                        (rev 0)
+++ community-x86_64/galculator.install	2014-01-23 04:23:17 UTC (rev 104578)
@@ -0,0 +1,11 @@
+post_install() {
+  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