Thu Oct 24 00:55:58 PDT 2013

9 files changed, 48 insertions, 102 deletions

diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD
index 8b8ec9477..522204000 100644
--- a/libre/doublecmd-libre/PKGBUILD
+++ b/libre/doublecmd-libre/PKGBUILD
@@ -1,5 +1,5 @@
 # vim:set ft=sh:
-# $Id: PKGBUILD 97498 2013-09-22 18:08:53Z idevolder $
+# $Id: PKGBUILD 99027 2013-10-22 19:14:23Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: (sirocco AT ngs.ru)
 
@@ -8,7 +8,7 @@ pkgbase=doublecmd-libre
 pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt')
 pkgver=0.5.7
 _helpver=0.5.5
-pkgrel=1
+pkgrel=2
 url="http://doublecmd.sourceforge.net/"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -50,7 +50,7 @@ build() {
 package_doublecmd-libre-gtk2() {
 	pkgdesc="twin-panel (commander-style) file manager (GTK), with unar recommendation"
 	depends=('gtk2')
-	conflicts=('doublecmd-gtk2' 'doublecmd-gtk2-libre')
+	conflicts=('doublecmd-qt' 'doublecmd-gtk2' 'doublecmd-gtk2-libre')
 	replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre')
 	provides=("doublecmd-gtk2=${pkgver}")
 	cd "$srcdir/$_pkgbase-gtk"
@@ -65,7 +65,7 @@ package_doublecmd-libre-gtk2() {
 package_doublecmd-libre-qt() {
 	pkgdesc="twin-panel (commander-style) file manager (QT), with unar recommendation"
 	depends=('qt4pas')
-	conflicts=('doublecmd-qt' 'doublecmd-qt-libre')
+	conflicts=('doublecmd-gtk2' 'doublecmd-qt' 'doublecmd-qt-libre')
 	replaces=('doublecmd-qt' 'doublecmd-qt-libre')
 	provides=("doublecmd-qt=${pkgver}")
 	cd "$srcdir/$_pkgbase-qt"
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 14fc3f383..41f637a99 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgname=firefox-noscript
 pkgname=icecat-noscript
 pkgver=2.6.8.3
-pkgrel=1
+pkgrel=1.1
 pkgdesc="plugin for icecat which disables script"
 arch=('any')
 url="http://noscript.net/"
@@ -23,7 +23,7 @@ package() {
 
   cd $srcdir
   local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
-  local dstdir=$pkgdir/usr/lib/icecat/extensions/${emid}
+  local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid}
   install -d $dstdir
 #  sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>7.*</em:maxVersion>#' install.rdf
   cp -R * $dstdir
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 6727d45a5..3d2655917 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,20 +1,20 @@
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
 # Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
-_pgo=true
+_pgo=false
 
 pkgname=icecat
 pkgver=24.0
-pkgrel=1
+pkgrel=2
 pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.'
 arch=(i686 x86_64 mips64el)
 license=(MPL GPL LGPL)
@@ -170,7 +170,7 @@ package() {
   ln -sf /usr/share/hunspell            $pkgdir/usr/lib/$pkgname/dictionaries
   ln -sf /usr/share/hyphen              $pkgdir/usr/lib/$pkgname/hyphenation
 
-  rm -rf $pkgdir/usr/lib/$pkgname/{searchplugins,plugins}
+  rm -rf $pkgdir/usr/lib/$pkgname/browser/{searchplugins,plugins}
   ln -sf /usr/lib/mozilla/plugins       $pkgdir/usr/lib/$pkgname/browser/plugins
   ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/browser/searchplugins
 
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 1dec5dcc9..ab0f3fb57 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,11 +1,11 @@
 # vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 188692 2013-06-18 04:04:38Z allan $
+# $Id: PKGBUILD 197027 2013-10-21 14:05:24Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pacman
 pkgver=4.1.2
-pkgrel=1
+pkgrel=4
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -19,8 +19,6 @@ provides=('pacman-contrib')
 conflicts=('pacman-contrib')
 replaces=('pacman-contrib')
 backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
-options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
         pacman.conf.i686
         pacman.conf.x86_64
@@ -31,7 +29,7 @@ md5sums=('063c8b0ff6bdf903dc235445525627cd'
          '688feb0a552f42643a76f72e7198bfe4'
          '765858b55d2112d948932fc645ea538b'
          '9e0c64937ef751ae4273fa4d73381484'
-         '7984963d89784d26b5c50218e2138467')
+         'f0f310df411f943dbc4e2dd376c88662')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf
index a4e7ceada..758d7d029 100644
--- a/libre/pacman/makepkg.conf
+++ b/libre/pacman/makepkg.conf
@@ -67,7 +67,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
+# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -80,7 +80,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign)
 #-- upx:        Compress binary executable files using UPX
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #
-OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
diff --git a/libre/pacman/pacman.install b/libre/pacman/pacman.install
deleted file mode 100644
index 5dc55c0c2..000000000
--- a/libre/pacman/pacman.install
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-    # one time stuff for md5sum issue with older pacman versions
-    if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then
-        _resetbackups
-    fi
-    if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then
-        _warnupgrade
-    fi
-    if [ ! -f "etc/pacman.d/gnupg/pubring.gpg" ] || [ "$(vercmp $2 4.0.3-2)" -lt 0 ]; then
-        _check_pubring
-    fi
-}
-
-post_install() {
-    _check_pubring
-}
-
-_check_pubring() {
-    echo " >>> Run  \`pacman-key --init; pacman-key --populate archlinux\`"
-    echo " >>> And  \`pacman-key --populate parabola\`"
-    echo " >>> to import the data required by pacman for package verification."
-    echo " >>> See: https://www.archlinux.org/news/having-pacman-verify-packages"
-}
-
-_warnupgrade() {
-    echo ">>> The pacman database format has changed as of pacman 3.5.0."
-    echo ">>> You will need to run \`pacman-db-upgrade\` as root."
-    echo ">>>"
-}
-
-_resetbackups() {
-    echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset"
-    echo ">>> you are able to remove all NoUpgrade lines of already protected"
-    echo ">>> files from pacman.conf."
-    echo ">>>"
-
-    # path variables
-    pacconf="/etc/pacman.conf"
-    dbpath="/var/lib/pacman/local"
-
-    # get a list of NoUpgrade files from the user's pacman.conf
-    echo ">>> Retrieving pacman.conf NoUpgrade list..."
-    config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2)
-    # add the standard list of files, even if they are already above
-    config="$config \
-    etc/passwd etc/group etc/shadow etc/sudoers \
-    etc/fstab etc/raidtab etc/ld.so.conf \
-    etc/rc.conf etc/rc.local \
-    etc/modprobe.conf etc/modules.conf \
-    etc/lilo.conf boot/grub/menu.lst"
-
-    # blank md5sum for use in sed expression
-    zeroes='00000000000000000000000000000000'
-
-    for file in $config; do
-        echo ">>> -> finding owner of /$file..."
-        line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null)
-        # if file is owned by a package, go find its incorrectly stored sum
-        if [ ! -z "$line" ]; then
-            # get the name and version of the package owning file
-            name=$(echo $line | awk '{print $5}')
-            version=$(echo $line | awk '{print $6}')
-            # set the path to the backup array holding the md5sum
-            path="$dbpath/$name-$version/files"
-            # run a sed on the path to reset the line containing $file
-            # NOTE: literal tab characters in sed expression after $file
-            echo ">>> -> resetting sum of /$file..."
-            sed -i "s#$file [0-9a-fA-F]*#$file  $zeroes#" $path
-        else
-            echo ">>> -> $file is unowned."
-        fi
-    done
-}
diff --git a/libre/psi/PKGBUILD b/libre/psi/PKGBUILD
index 16c9e2b78..e37c37f05 100644
--- a/libre/psi/PKGBUILD
+++ b/libre/psi/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 196956 2013-10-21 11:28:57Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=psi
 pkgver=0.15
-pkgrel=1.1
-pkgdesc='Instant messaging application designed for the Jabber IM, Parabola rebranded'
+pkgrel=2
+pkgdesc='Instant messaging application designed for the Jabber IM (Parabola rebranded)'
 url='http://psi-im.org/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,9 +17,13 @@ source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
 md5sums=('aea15f17cf93e7cea52f305523f761be'
          'a641b77517c82c6e1f254d5595a25113')
 
-build() {
+prepare() {
 	cd ${srcdir}/psi-${pkgver}
 	patch -p0 -i ${srcdir}/parabola.patch
+}
+
+build() {
+	cd ${srcdir}/psi-${pkgver}
 	./configure --prefix=/usr --release --no-separate-debug-info
 	make
 }
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index cab25d91e..e16042e95 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166672 2012-09-15 09:39:11Z heftig $
+# $Id: PKGBUILD 197193 2013-10-23 17:24:50Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -8,7 +8,7 @@
 
 pkgname=sdl-libre
 pkgver=1.2.15
-pkgrel=3
+pkgrel=4
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org"
@@ -17,7 +17,7 @@ provides=("sdl=${pkgver}")
 conflicts=('sdl')
 replaces=('sdl')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa' 'libpulse')
+makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu')
 optdepends=('alsa-lib: ALSA audio driver'
             'libpulse: PulseAudio audio driver')
 options=('!libtool')
@@ -26,21 +26,28 @@ source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
         sdl-1.2.14-disable-mmx.patch
         fix_joystick_misc_axes.diff
         libsdl-1.2.15-resizing.patch
+        sdl_x11sym.patch
         libre.patch)
 md5sums=('9d96df8417572a2afb781a7c4c811a85'
          '04d8c179f125e04bcd4c9d60e013c2d7'
          'e5c16b7611f62c7cb25f0534eff68852'
          '687586a108b597a2a6b73070c1d37e51'
          '3dd50347d8856160a9cbd7f80383a1f8'
+         '148b285bccee9d21bb96db807363b962'
          '5c665f72b8a2adc97a91f6db6f2da79a')
 
-build() {
+prepare() {
   cd SDL-$pkgver
   patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
   patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
   patch -Np1 -i ../fix_joystick_misc_axes.diff
   patch -Np1 -i ../libsdl-1.2.15-resizing.patch
+  patch -Np0 -i ../sdl_x11sym.patch
   patch -Np0 -i ../libre.patch
+}
+
+build() {
+  cd SDL-$pkgver
   ./configure --prefix=/usr --disable-nasm --enable-alsa \
               --with-x --disable-rpath --disable-static
   make
diff --git a/libre/sdl-libre/sdl_x11sym.patch b/libre/sdl-libre/sdl_x11sym.patch
new file mode 100644
index 000000000..9aaa2353b
--- /dev/null
+++ b/libre/sdl-libre/sdl_x11sym.patch
@@ -0,0 +1,12 @@
+--- src/video/x11/SDL_x11sym.h-orig	2013-07-16 23:56:46.718523385 -0600
++++ src/video/x11/SDL_x11sym.h	2013-07-16 23:58:27.025186485 -0600
+@@ -165,7 +165,8 @@
+  */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
+-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+