[arch-commits] Commit in qgit/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Thursday, May 22, 2008 @ 00:11:03
  Author: eric
Revision: 1861

Merged revisions 2-1860 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/qgit/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r1831 | tobias | 2008-05-21 16:31:01 -0400 (Wed, 21 May 2008) | 1 line
  
  upgpkg: qgit 2.1-1
........

Modified:
  qgit/repos/extra-x86_64/	(properties)
  qgit/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)


Property changes on: qgit/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /qgit/trunk:1
   + /qgit/trunk:1-1860

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-05-22 04:07:56 UTC (rev 1860)
+++ extra-x86_64/PKGBUILD	2008-05-22 04:11:03 UTC (rev 1861)
@@ -1,32 +1,27 @@
 # $Id$
 # Maintainer: Dan McGee <dan at archlinux.org>
 pkgname=qgit
-pkgver=1.5.7
-pkgrel=2
+pkgver=2.1
+pkgrel=1
 pkgdesc="A GIT GUI viewer built on Qt/C++"
 url="http://digilander.libero.it/mcostalba/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('qt3' 'git')
+depends=('qt' 'git>=1.5')
 makedepends=()
 backup=()
-source=(http://downloads.sourceforge.net/sourceforge/qgit/$pkgname-$pkgver.tar.bz2 qgit.desktop qgit.png)
+source=(http://downloads.sourceforge.net/sourceforge/qgit/$pkgname-$pkgver.tar.bz2
+        qgit.desktop qgit.png)
 options=(!makeflags !ccache) #makepkg3 options, ccache is a no-go
-md5sums=('2aa52a51e01ec0cde8522281d9ace2aa'
-         'ecb8b35e17163a7ec6893ffa71445c40'
+md5sums=('f22787c814fbe832d6da7c6a2436c3c0' 'ecb8b35e17163a7ec6893ffa71445c40' \
          '85138f44d577b03dfc738d3f27e04992')
 
 build() {
-  . /etc/profile.d/qt3.sh
-  cd $startdir/src/$pkgname-$pkgver
-  # added --with-qtdir so it is compilable with qt4 installed as well
-  # this package ONLY supports building with qt3 at the moment
-  ./configure --prefix=/usr --with-qtdir=/opt/qt
+  cd ${startdir}/src/${pkgname}
+  qmake qgit.pro
   make || return 1
-  make DESTDIR=$startdir/pkg install
 
-  #install freedesktop files
-  mkdir -p $startdir/pkg/usr/share/{applications,pixmaps}
-  install -m644 $startdir/src/qgit.desktop $startdir/pkg/usr/share/applications/
-  install -m644 $startdir/src/qgit.png $startdir/pkg/usr/share/pixmaps/
+  install -Dm755 bin/qgit ${startdir}/pkg/usr/bin/qgit
+  install -Dm644 ../qgit.desktop ${startdir}/pkg/usr/share/applications/qgit.desktop
+  install -Dm644 ../qgit.png ${startdir}/pkg/usr/share/pixmaps/qgit.png
 }