Mon Jun 13 19:04:06 UTC 2011

9 files changed, 83 insertions, 42 deletions

diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index 7da66f7f9..880792b3d 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 119552 2011-04-12 06:10:02Z bisson $
+# $Id: PKGBUILD 127301 2011-06-12 14:10:02Z bisson $
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
@@ -6,8 +6,8 @@
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=bitlbee
-pkgver=3.0.2
-pkgrel=3
+pkgver=3.0.3
+pkgrel=1
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 arch=('i686' 'x86_64')
 url='http://www.bitlbee.org/'
@@ -17,7 +17,7 @@ optdepends=('xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
 	'xinetd'
 	'rc.d')
-sha1sums=('59113b1dc440ebd775e6cf324d1cfb698fb20cfc'
+sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff'
           '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
           'be09d29af3853825778331df451f16ca9e452d03')
 
diff --git a/extra/bochs/PKGBUILD b/extra/bochs/PKGBUILD
index 7106ce9d9..859c5d737 100644
--- a/extra/bochs/PKGBUILD
+++ b/extra/bochs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94642 2010-10-09 04:04:21Z kevin $
+# $Id: PKGBUILD 127306 2011-06-13 00:31:34Z kevin $
 #Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 
 pkgname=bochs
-pkgver=2.4.5
+pkgver=2.4.6
 pkgrel=1
 pkgdesc="A portable x86 PC emulation software package"
 arch=('i686' 'x86_64')
@@ -11,16 +11,21 @@ license=('LGPL')
 url="http://bochs.sourceforge.net/"
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
 2.4.5-fetchcode.patch)
-depends=('gcc-libs' 'libxpm')
+depends=('gcc-libs' 'libxrandr')
+# 'libxpm')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/2.4.5-fetchcode.patch
+  #patch -Np0 -i ${srcdir}/2.4.5-fetchcode.patch
   ./configure --prefix=/usr --enable-vbe --without-wx --enable-cpu-level=6 \
               --enable-fpu --enable-3dnow 
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make prefix=${pkgdir}/usr install
   install -D -m 644 .bochsrc ${pkgdir}/etc/bochsrc-sample.txt
 }
-sha256sums=('b948622a364c2e7da4221a6a4640ba2efa68422e1411ac377c69d37f46f67616'
+sha256sums=('689dcc5fccfd70c8340a54986f0cb9c2824009ed602718802868333da9ac53b9'
             '3dba808614da7d0fa1a3d6ddaceabf027a873d1f45fb90ec43b8dce876baa8ff')
diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD
index 87c4af8a6..702e3e05f 100644
--- a/extra/celestia/PKGBUILD
+++ b/extra/celestia/PKGBUILD
@@ -1,34 +1,38 @@
-# $Id: PKGBUILD 63841 2010-01-18 21:47:42Z ibiru $
+# $Id: PKGBUILD 127269 2011-06-12 08:43:30Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=celestia
-pkgver=1.6.0
-pkgrel=2
+pkgver=1.6.1
+pkgrel=1
 pkgdesc="Real-time space simulation"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.shatters.net/celestia/"
-depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg>=8')
+depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz
-	celestia-1.5.1-gcc44.patch libpng14.patch)
-md5sums=('9b96a8e7666ab5a26f032b9d605e023d'
-         '0c606dbd3a641afb1b0725428db854c8'
-         '829c0860659272a9f55aedf096ee4216')
+	celestia-1.5.1-gcc44.patch celestia-1.6.1-gentoo.patch)
+sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
+          '5ab2769e239a89468bb8ffb5740cbeec6018143c'
+          'aebf894630fdba4c4d429622f5e2b8da56d8b61e')
 
 build() {
     cd ${srcdir}/${pkgname}-${pkgver}
 
     # build patch
-    patch -Np0 < ${srcdir}/celestia-1.5.1-gcc44.patch || return 1
-    patch -Np1 -i ${srcdir}/libpng14.patch || return 1
+    patch -Np0 < ${srcdir}/celestia-1.5.1-gcc44.patch
+    patch -Np0 -i ${srcdir}/celestia-1.6.1-gentoo.patch
 
     ./configure --prefix=/usr \
                 --with-lua=/usr \
 		--datadir=/usr/share \
                 --with-gtk
-    make || return 1
-    make DESTDIR=${pkgdir} install || return 1
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    make DESTDIR=${pkgdir} install
 }
 
diff --git a/extra/celestia/celestia-1.6.1-gentoo.patch b/extra/celestia/celestia-1.6.1-gentoo.patch
new file mode 100644
index 000000000..57fffe159
--- /dev/null
+++ b/extra/celestia/celestia-1.6.1-gentoo.patch
@@ -0,0 +1,23 @@
+--- src/celestia/Makefile.am	2011-06-07 19:15:51.502000147 +0200
++++ src/celestia/Makefile.am.new	2011-06-07 19:15:47.208000302 +0200
+@@ -15,6 +15,7 @@
+ if ENABLE_GTK
+ SUBDIRS += gtk
+ celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
++LIBS += $(GTK_LIBS)
+ endif
+ 
+ COMMONSOURCES = \
+
+Index: src/celengine/frametree.h
+===================================================================
+--- src/celengine/frametree.h	(revision 5163)
++++ src/celengine/frametree.h	(arbetskopia)
+@@ -14,6 +14,7 @@
+ #define _CELENGINE_FRAMETREE_H_
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class Star;
+ class Body;
diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD
index bd7af2998..88ea17960 100644
--- a/extra/fvwm/PKGBUILD
+++ b/extra/fvwm/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 122671 2011-05-06 03:51:25Z eric $
+# $Id: PKGBUILD 127312 2011-06-13 03:53:57Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fvwm
 pkgver=2.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A multiple large virtual desktop window manager originally derived from twm"
 arch=('i686' 'x86_64')
 url="http://www.fvwm.org"
 license=('GPL' 'custom')
 depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor')
 makedepends=('libxslt')
+provides=('fvwm-devel')
 conflicts=('fvwm-devel')
-options=('!emptydirs')
-source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/${pkgname}-${pkgver}.tar.bz2 fvwm2.desktop)
+replaces=('fvwm-devel')
+options=('!emptydirs' '!makeflags')
+source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop)
 md5sums=('fbbbed1bb41fa0878b17ee209947602d'
-         'e52a6ef25a936dcf3ad0e58f2e9ed0ea')
+         'a12c52729a74355838404ee2f5716e0c')
 sha1sums=('cf7165d40180b45409e604736066cf9fcc792e36'
-          'e0924164329e7eb14e0d6137d8ff18cf6230191c')
+          '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,10 +29,7 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/etc/fvwm"
-  install -D -m644 sample.fvwmrc/* "${pkgdir}/etc/fvwm"
-  rm -f "${pkgdir}"/etc/fvwm/Makefile*
-  install -D -m644 ../fvwm2.desktop "${pkgdir}/usr/share/xsessions/fvwm2.desktop"
+  install -D -m644 sample.fvwmrc/{decor_examples,DecorMwm,DecorWin95,new-features,system.*} "${pkgdir}/usr/share/doc/fvwm"
+  install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop"
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/fvwm/fvwm.desktop b/extra/fvwm/fvwm.desktop
new file mode 100644
index 000000000..e297a6109
--- /dev/null
+++ b/extra/fvwm/fvwm.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=FVWM
+Comment=The fvwm window manager
+Type=XSession
+Exec=/usr/bin/fvwm
+TryExec=/usr/bin/fvwm
diff --git a/extra/kile/PKGBUILD b/extra/kile/PKGBUILD
index 5e2987a07..46fe51c12 100644
--- a/extra/kile/PKGBUILD
+++ b/extra/kile/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 108891 2011-02-04 17:44:40Z ronald $
+# $Id: PKGBUILD 127274 2011-06-12 09:04:19Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=kile
-pkgver=2.1b5
+pkgver=2.1
 pkgrel=1
 pkgdesc="A user friendly TeX/LaTeX frontend for KDE."
 arch=("i686" "x86_64")
 license=('GPL2')
 url="http://kile.sourceforge.net/"
-depends=('kdelibs' 'texlive-core')
+depends=('kdebase-runtime' 'texlive-core')
 makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl')
 install=kile.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha1sums=('ee805e5210474d42344d690d24383adaad1d8842')
+sha1sums=('860ac96b68b6026f48b8a9c401c6024ba78e3cdf')
 
 build() {
   cd ${srcdir}
diff --git a/extra/kile/kile.install b/extra/kile/kile.install
index e70c054ec..9fe93eeac 100644
--- a/extra/kile/kile.install
+++ b/extra/kile/kile.install
@@ -1,5 +1,7 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+        update-mime-database usr/share/mime &> /dev/null
+        update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index a923b8f65..9f5a1c34a 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119004 2011-04-10 11:32:39Z eric $
+# $Id: PKGBUILD 127264 2011-06-12 08:13:43Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
-pkgver=3.5.1
-pkgrel=2
+pkgver=4.0.1.1
+pkgrel=1
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com"
@@ -12,11 +12,12 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
          'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
          'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
          'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
-	 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl')
+	 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' 
+	 'gstreamer0.10-ffmpeg' 'ffmpeg')
 makedepends=('pkg-config')
 install=miro.install
 source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('0f5c2a307e7040c9c2895ee9a2d1c3ff99d34e9e')
+sha1sums=('f6dbfb661bd642ccf60b38405c63182c7a9142df')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/linux"