Thu Apr 26 00:01:31 UTC 2012

6 files changed, 81 insertions, 43 deletions

diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD
index 3ddf40c63..a45b90e11 100644
--- a/community/gource/PKGBUILD
+++ b/community/gource/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 64331 2012-02-11 23:21:51Z allan $
+# $Id: PKGBUILD 69832 2012-04-24 11:08:37Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
 pkgname=gource
-pkgver=0.37
-pkgrel=2
+pkgver=0.38
+pkgrel=1
 pkgdesc="software version control visualization"
 license=(GPL3)
 arch=(i686 x86_64)
 url=http://code.google.com/p/gource/
-depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew')
+depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew' 'boost-libs')
+makedepends=('boost' 'glm')
 source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('9c023429a8a495e6473d4c166788278a')
+md5sums=('6584241879dbb6dfaecc6ae6b58ad38c')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD
index e4c3a5440..e689d6f89 100644
--- a/community/lxpanel/PKGBUILD
+++ b/community/lxpanel/PKGBUILD
@@ -1,27 +1,26 @@
-# $Id: PKGBUILD 61193 2011-12-24 11:33:27Z bpiotrowski $
+# $Id: PKGBUILD 69844 2012-04-24 15:37:58Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=lxpanel
-pkgver=0.5.8
-pkgrel=2
+pkgver=0.5.9
+pkgrel=1
 pkgdesc="Panel of the LXDE Desktop"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
-depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data')
-source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz
-        battery.patch)
-optdepends=(pcmanfm)
+depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data' 'libwnck')
+makedepends=('wireless_tools')
+optdepends=('wireless_tools: netstat plugin')
+source=(http://ftp.de.debian.org/debian/pool/main/l/$pkgname/${pkgname}_${pkgver}.orig.tar.xz)
+md5sums=('c0b5864ea53113f4b1d4b8a46e9fb8ee')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	patch -Np1 -i "$srcdir/battery.patch"
-
-	./configure --sysconfdir=/etc --prefix=/usr 
+	CFLAGS+=" -lgmodule-2.0" ./configure --sysconfdir=/etc --prefix=/usr 
 	make
 }
 
@@ -29,7 +28,3 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums=('129fae75d1cd3983fd94542c573a70a1'
-         '5fadb4d5aca09c81138677e91f995d98')
-md5sums=('129fae75d1cd3983fd94542c573a70a1'
-         '5fadb4d5aca09c81138677e91f995d98')
diff --git a/community/midori/0001-Fix-libsoup-version-check-defines.patch b/community/midori/0001-Fix-libsoup-version-check-defines.patch
new file mode 100644
index 000000000..2debc92fe
--- /dev/null
+++ b/community/midori/0001-Fix-libsoup-version-check-defines.patch
@@ -0,0 +1,28 @@
+From c7c172f7ffc9316be5954c920654e1deb9f470b7 Mon Sep 17 00:00:00 2001
+From: Christian Dywan <christian@twotoasts.de>
+Date: Mon, 16 Apr 2012 17:17:23 +0000
+Subject: Fix libsoup version check #defines
+
+Fixes: https://bugs.launchpad.net/midori/+bug/983137
+---
+diff --git a/wscript b/wscript
+index db74324..c7a0c87 100644
+--- a/wscript
++++ b/wscript
+@@ -260,11 +260,11 @@ def configure (conf):
+     check_pkg ('libsoup-2.4', '2.27.90')
+     conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4'))
+     if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3):
+-        conf.define ('LIBSOUP_2_29_3', 1)
++        conf.define ('HAVE_LIBSOUP_2_29_3', 1)
+     if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91):
+-        conf.define ('LIBSOUP_2_29_91', 1)
++        conf.define ('HAVE_LIBSOUP_2_29_91', 1)
+     if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1):
+-        conf.define ('LIBSOUP_2_37_1', 1)
++        conf.define ('HAVE_LIBSOUP_2_37_1', 1)
+     check_pkg ('libxml-2.0', '2.6')
+     check_pkg ('sqlite3', '3.0', True, var='SQLITE')
+ 
+--
+cgit v0.9.0.3
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index 22da899e8..8e1242d7b 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,40 +1,52 @@
-# $Id: PKGBUILD 69383 2012-04-15 05:22:45Z bpiotrowski $
+# $Id: PKGBUILD 69842 2012-04-24 15:19:18Z bpiotrowski $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: rabyte <rabyte.at.gmail.dot.com>
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
+# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 
 pkgname=midori
 pkgver=0.4.5
-pkgrel=1
-pkgdesc="A lightweight web browser based on Gtk WebKit"
-arch=('i686' 'x86_64')
+pkgrel=2
+pkgdesc="Lightweight web browser based on Gtk WebKit"
+arch=('x86_64' 'i686')
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
 license=('LGPL2.1')
 install=midori.install
 depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss')
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
 optdepends=('vala: for use in extensions')
-source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-md5sums=('14288197a1e2251b7c0803e1448daa0e')
+options=('!emptydirs')
+source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        0001-Fix-libsoup-version-check-defines.patch)
+sha256sums=('7b57cf3ebb56eef586351f2ae9f71ec9683aedff0b79a071b70b811d9876ff84'
+            '0095c23247c62b6a4b3ab4312f68b49e2d0974ce3fd701a2ce0114817c7bd399')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   
   # python2 
   export PYTHON=/usr/bin/python2
   sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
   
-  ./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \
-	--enable-addons \
-	--disable-hildon \
-	--enable-unique \
-	--enable-nls \
-	--enable-docs \
-	--enable-apidocs
+  # FS#29468
+  patch -Np1 -i "$srcdir"/0001-Fix-libsoup-version-check-defines.patch
+
+  ./configure \
+    --prefix=/usr \
+    --jobs=${MAKEFLAGS/-j/} \
+	  --enable-addons \
+	  --disable-hildon \
+	  --enable-unique \
+	  --enable-nls \
+	  --enable-docs \
+	  --enable-apidocs
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
index 983ddddfd..0025391bb 100644
--- a/community/mplayer2/PKGBUILD
+++ b/community/mplayer2/PKGBUILD
@@ -4,16 +4,16 @@
 
 pkgname=mplayer2
 pkgver=20120414
-pkgrel=3
+pkgrel=4
 pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.mplayer2.org/"
 install=$pkgname.install
 depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig'
-         'freetype2' 'jack' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss'
+         'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss'
          'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libtheora' 'libvdpau'
-         'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
+         'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
 makedepends=('mesa' 'unzip' 'yasm')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 provides=('mplayer')
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 5e10553d9..5713852c9 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69421 2012-04-16 09:40:51Z spupykin $
+# $Id: PKGBUILD 69838 2012-04-24 14:09:55Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
@@ -12,8 +12,8 @@ _user=http
 _group=http
 
 pkgname=nginx
-pkgver=1.0.15
-pkgrel=1
+pkgver=1.2.0
+pkgrel=2
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl')
@@ -34,7 +34,7 @@ backup=("etc/nginx/conf/fastcgi.conf"
         "etc/conf.d/nginx")
 source=("http://nginx.org/download/nginx-$pkgver.tar.gz"
         'nginx')
-md5sums=('17da4802209b83d9bebb0f0edd975dfc'
+md5sums=('a02ef93d65a7031a1ea3256ad5eba626'
          '0e8032d3ba26c3276e8c7c30588d375f')
 
 build() {
@@ -59,7 +59,9 @@ build() {
         --add-module=/usr/lib/passenger/ext/nginx \
         --conf-path=${_conf_path}/nginx.conf \
         --http-scgi-temp-path=${_tmp_path} \
-        --http-uwsgi-temp-path=${_tmp_path}
+        --http-uwsgi-temp-path=${_tmp_path} \
+        --with-pcre-jit \
+        --with-http_realip_module
         #--with-http_mp4_module \
         #--with-http_realip_module \
         #--with-http_addition_module \