[arch-commits] Commit in krusader/repos (3 files)

[Andrea Scarpino]

    Date: Sunday, April 12, 2009 @ 06:17:39
  Author: andrea
Revision: 35319

Merged revisions 30488,35318 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/krusader/trunk

........
  r30488 | andrea | 2009-03-20 20:07:58 +0100 (Fri, 20 Mar 2009) | 1 line
  
  upgpkg: krusader 2.0.0beta2-1
........
  r35318 | andrea | 2009-04-12 12:17:18 +0200 (Sun, 12 Apr 2009) | 1 line
  
  upgpkg: krusader 2.0.0-1
........

Added:
  krusader/repos/extra-i686/fix_qt5.patch
    (from rev 35318, krusader/trunk/fix_qt5.patch)
Modified:
  krusader/repos/extra-i686/	(properties)
  krusader/repos/extra-i686/PKGBUILD

---------------+
 PKGBUILD      |   29 +++++++++++++++--------------
 fix_qt5.patch |    9 +++++++++
 2 files changed, 24 insertions(+), 14 deletions(-)


Property changes on: krusader/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /krusader/trunk:1-6594
   + /krusader/trunk:1-35318

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-12 10:17:18 UTC (rev 35318)
+++ extra-i686/PKGBUILD	2009-04-12 10:17:39 UTC (rev 35319)
@@ -1,24 +1,25 @@
 # $Id$
-# Maintainer: Alexander Baldeck <alexander at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
 
-# NOTE: pacman -Rd kdebindings before compilation.
-
 pkgname=krusader
-pkgver=1.90.0
+pkgver=2.0.0
 pkgrel=1
-pkgdesc="Alternative file manager for KDE resembling Midnight Commander"
-arch=(i686 x86_64)
-depends=(kdelibs3)
+pkgdesc="An alternative file manager for KDE resembling Midnight Commander"
+url="http://krusader.sourceforge.net/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('kdelibs')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-url="http://krusader.sourceforge.net/"
-md5sums=('0bcf8f4d03484dae0390ffafa953ac40')
+md5sums=('f80f500a136d549739ad5d4bcab7fa5f')
 
 build() {
-  [ -z "${QTDIR}" ] && . /etc/profile.d/qt3.sh
-  [ -z "${KDEDIR}" ] && . /etc/profile.d/kde3.sh
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/kde --without-arts
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install
 }

Copied: krusader/repos/extra-i686/fix_qt5.patch (from rev 35318, krusader/trunk/fix_qt5.patch)
===================================================================
--- extra-i686/fix_qt5.patch	                        (rev 0)
+++ extra-i686/fix_qt5.patch	2009-04-12 10:17:39 UTC (rev 35319)
@@ -0,0 +1,9 @@
+--- krusader-2.0.0-beta2/krusader/ActionMan/actionproperty.ui~	2009-02-23 14:41:17.000000000 +0100
++++ krusader-2.0.0-beta2/krusader/ActionMan/actionproperty.ui	2009-02-23 14:41:22.000000000 +0100
+@@ -1,6 +1,5 @@
+ <ui version="4.0" >
+  <class>ActionProperty</class>
+- <extends>QWidget</extends>
+  <widget class="QWidget" name="ActionProperty" >
+   <property name="geometry" >
+    <rect>