Thu Jun 9 22:46:45 UTC 2011

6 files changed, 29 insertions, 51 deletions

diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index 3aec09748..70605b513 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 43081 2011-03-23 22:18:26Z spupykin $
+# $Id: PKGBUILD 48949 2011-06-08 09:13:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Adam (byte/jra) <j_adam@web.de>
 
 pkgname=lazarus
 pkgver=0.9.30
-pkgrel=1
+pkgrel=2
 pkgdesc='Delphi-like IDE for FreePascal'
 url='http://www.lazarus.freepascal.org/'
 license=('GPL2' 'MPL' 'custom:LGPL')
@@ -18,6 +18,10 @@ md5sums=('5ece11700df569ebb518ccca37d93f1d')
 build() {
   cd $srcdir/${pkgname}
   make FPC=/usr/bin/fpc clean bigide
+}
+
+package() {
+  cd $srcdir/${pkgname}
 
   # skip the 'make install' mess completely and do everything manually
   mkdir -p $pkgdir/usr/lib/lazarus $pkgdir/usr/bin $pkgdir/usr/share/man/man1 $pkgdir/usr/share/doc
diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index bb99a60fa..b333bc372 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 47014 2011-05-14 04:04:32Z jconder $
+# $Id: PKGBUILD 48954 2011-06-08 10:33:59Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 pkgbase='packagekit'
 pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python')
-pkgver=0.6.14
-pkgrel=2
+pkgver=0.6.15
+pkgrel=1
 pkgdesc="A system designed to make installation and updates of packages easier."
 arch=('i686' 'x86_64')
 url="http://www.packagekit.org"
@@ -12,17 +12,12 @@ makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
              'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt'
 	     'shared-mime-info' 'sqlite3' 'udev')
 options=('!libtool')
-source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.bz2"
-        'alpm.patch')
-sha256sums=('2efe643be619b6d7db61ccad81261ac7a686cd0000ffd87f04baadec7857e7df'
-            '774016e27a60ea6588fa6f63363dfa290d7596b3dae29d0a829593ce2e46f38a')
+source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.bz2")
+sha256sums=('52b6d52721253d1b5cdc3b403f4fb366782a258c786d194594deaafbc153779b')
 
 build() {
   cd "$srcdir/PackageKit-$pkgver"
 
-  patch -Np1 -i "$srcdir/alpm.patch"
-  sed -i 's@cache/pacman/pkg@cache/pacman/pkg/@' 'backends/alpm/Makefile.in'
-
   sed -i 's@SUBDIRS = test@SUBDIRS =@' 'backends/Makefile.in'
   sed -i 's@python @python2 @' 'lib/python/packagekit/Makefile.in'
   sed -i 's@bin/python@bin/python2@' 'lib/python/packagekit/'*.py
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 8428d9f3e..4962430fc 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,6 +1,6 @@
-# $Id: PKGBUILD 48916 2011-06-07 16:02:27Z svenstaro $
+# $Id: PKGBUILD 48974 2011-06-09 02:24:35Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
-# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Dan Vratil <progdan@progdansoft.com>
 # Contributor: thotypous <matiasΘarchlinux-br·org>
@@ -11,13 +11,13 @@ pkgbase=qtcreator
 #pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin')
 pkgname=('qtcreator' 'qtcreator-todo-plugin')
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/products/developer-tools'
 license=('LGPL')
 depends=('qt>=4.7.3')
-makedepends=('git' 'qt-private-headers>=4.7.3')
+makedepends=('qt-private-headers>=4.7.3')
 options=('docs')
 source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz"
 	    'http://download.berlios.de/astyleplugin/ArtisticStylePlugin-0.6-src.zip'
@@ -28,8 +28,6 @@ md5sums=('4e02382db7b850f3a3b20c6a8707269e'
          '734a6f375e595de796f9802087845dfe'
          '2c3ffbd66845b37be9804f2966815a10')
 
-#_gitroot_todo="git://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin.git"
-
 build() {
   cd ${srcdir}
   mkdir build
@@ -43,7 +41,7 @@ build() {
   cd $srcdir/qt-creator-todo-plugin-qt-creator-todo-plugin
   sed -i "s|QTC_BUILD_DIR = .*|QTC_BUILD_DIR = ${srcdir}/build|g" todoplugin.pro
   sed -i "s|QTC_SOURCE_DIR = .*|QTC_SOURCE_DIR  = $srcdir/qt-creator-${pkgver}-src/|g" todoplugin.pro
-  sed -i "s|\"2.0.92\"|\"${pkgver}\"|g" todo.pluginspec
+  sed -i "s|\"2.1.81\"|\"${pkgver}\"|g" todo.pluginspec
   qmake
   make
   
@@ -59,7 +57,8 @@ package_qtcreator() {
               'cmake: for cmake project suppport'
               'openssh-askpass: for ssh support'
               'git: for git support'
-              'mercurial: for mercurial support')
+              'mercurial: for mercurial support'
+              'bzr: for bazaar support')
   
   cd ${srcdir}/build
 
diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD
index c69ddd790..af0593ccc 100644
--- a/community/solfege/PKGBUILD
+++ b/community/solfege/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 42458 2011-03-16 20:03:30Z schiv $
+# $Id: PKGBUILD 48966 2011-06-08 20:39:27Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: sickhate <sickhate@tux-linux.net>
 
 pkgname=solfege
-pkgver=3.18.7
+pkgver=3.18.8
 pkgrel=1
 pkgdesc="Music education and ear training software"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.solfege.org/"
 license=('GPL3')
 depends=('pygtk' 'libgtkhtml')
@@ -16,9 +16,9 @@ makedepends=('ghostscript' 'gnome-doc-utils' 'librsvg' 'libxslt'
 optdepends=('timidity++: Software MIDI support')
 changelog=$pkgname.changelog
 install=$pkgname.install
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-        solfege.desktop)
-md5sums=('c65df6e0eb7a724b8a81e41d23344e02'
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+        'solfege.desktop')
+md5sums=('5e166de37f223b79e78c656661828e5d'
          '22b89dcfd9e7c98ab238942139b8a970')
 
 build() {
diff --git a/community/solfege/solfege.changelog b/community/solfege/solfege.changelog
index 00b82a49e..a2c6f173b 100644
--- a/community/solfege/solfege.changelog
+++ b/community/solfege/solfege.changelog
@@ -1,19 +1,3 @@
-2011-03-17 Ray Rashif <schiv@archlinux.org>
-
-	* Version bump: 3.18.7
-	upstream release
-
-2010-10-13 Ray Rashif <schiv@archlinux.org>
-
-	* Version bump: 3.18.4
-	upstream release
-
-2010-10-10 Ray Rashif <schiv@archlinux.org>
-
-	* Version bump: 3.18.3
-	upstream release
-
-
 2010-10-02 Ray Rashif <schiv@archlinux.org>
 
 	* Version bump: 3.17.0
diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD
index 359ebf5f1..5ca8bca0f 100644
--- a/community/vtk/PKGBUILD
+++ b/community/vtk/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
 # Contributor: leepesjee <lpeschier at xs4all dot nl>
 # Contributor: Olivier Medoc
 # Contributor: ignotus
@@ -7,7 +8,7 @@
 
 pkgname=vtk
 pkgver=5.6.1
-pkgrel=6
+pkgrel=7
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org'
@@ -32,7 +33,7 @@ build() {
   # remove next time version bump
   sed -i '31 i#include <vtksys/cstddef>' Common/vtkPythonUtil.cxx
 
-  # fix for libpng 1.4
+  # fix for libpng 1.4 - remove next time version bump
   for _FILE in `grep -Rl "png_set_gray_1_2_4_to_8" *`
   do
     sed -i 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' ${_FILE}
@@ -72,9 +73,9 @@ build() {
     -DVTK_WRAP_JAVA:BOOL=ON \
     -DVTK_WRAP_PYTHON:BOOL=ON \
     -DVTK_WRAP_TCL:BOOL=ON \
-    -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${pkgdir}/usr" \
+    -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \
     -DVTK_USE_QT:BOOL=ON \
-    -DDESIRED_QT_VERSION:STRING=4 \
+    -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \
     -DVTK_USE_GUISUPPORT:BOOL=ON \
     -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
     -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
@@ -95,11 +96,6 @@ package() {
   mv -v ${pkgdir}/usr/lib/${pkgname}-${pkgver:0:3}/java/${pkgname}.jar \
     ${pkgdir}/usr/share/java/${pkgname}
 
-  # Move the qt-designer plugin to the appropriate location
-  install -dv ${pkgdir}/usr/lib/qt
-  mv -v ${pkgdir}/usr/plugins \
-    ${pkgdir}/usr/lib/qt
-
   # Install license
   install -dv ${pkgdir}/usr/share/licenses/${pkgname}
   install -m644 ${srcdir}/VTK/Copyright.txt \