Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/file-roller/PKGBUILD

10 files changed, 108 insertions, 41 deletions

diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD
index 9089bb698..11aed0c85 100644
--- a/extra/alsa-plugins/PKGBUILD
+++ b/extra/alsa-plugins/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 110785 2011-02-22 08:10:56Z heftig $
+# $Id: PKGBUILD 122044 2011-05-02 00:18:38Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel Ehlers <danielehlers@mindeye.net>
 
 pkgname=alsa-plugins
 pkgver=1.0.24
-pkgrel=1
+pkgrel=2
 pkgdesc="Extra alsa plugins"
 arch=(i686 x86_64 'mips64el')
 url="http://www.alsa-project.org"
@@ -30,4 +30,7 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
+
+  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
+  install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
 }
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index c956aab16..e94a2bde2 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 119825 2011-04-15 13:37:39Z ibiru $
+# $Id: PKGBUILD 121987 2011-05-01 07:40:14Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
 pkgver=3.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme'
+depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme'
          't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
 makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection')
 optdepends=('texlive-bin: DVI support')
diff --git a/extra/file-roller/PKGBUILD b/extra/file-roller/PKGBUILD
index d340971a2..0e4f9d9a6 100644
--- a/extra/file-roller/PKGBUILD
+++ b/extra/file-roller/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 120737 2011-04-26 09:07:12Z heftig $
+# $Id: PKGBUILD 122038 2011-05-01 20:05:25Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=file-roller
 pkgver=3.0.1
-pkgrel=1
-pkgdesc="Archive manipulator for GNOME2"
+pkgrel=2
+pkgdesc="Archive manipulator for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf')
+depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus')
 makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm')
 optdepends=('nautilus: nautilus shell extension'
             'unrar: the RAR uncompression program'
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index 50dafbad6..32cec1b97 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118020 2011-04-05 06:52:04Z heftig $
+# $Id: PKGBUILD 122004 2011-05-01 11:09:24Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -7,7 +7,7 @@
 
 pkgname=network-manager-applet
 pkgver=0.8.998
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,16 +15,17 @@ url="http://www.gnome.org/projects/NetworkManager/"
 depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3'
          'notification-daemon' 'libnotify' 'gnome-icon-theme'
          'mobile-broadband-provider-info' 'gconf')
-makedepends=('intltool' 'gnome-bluetooth')
+makedepends=('intltool' 'gnome-bluetooth' 'gtk-doc')
 optdepends=('gnome-bluetooth: for PAN/DUN support')
 options=('!libtool')
 install=network-manager-applet.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('0a16e2ae00312062d4cd140d811227b84ac69e7d9487f6a84810f3d461894a82')
+source=(ftp://ftp.archlinux.org/other/networkmanager/$pkgname-$pkgver-20110501.tar.xz)
+#source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('d83a489766b3f04c80444697f4aacbd6c8e53a9ea31d9a5348f165eb20504438')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
+  ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --libexecdir=/usr/lib/networkmanager \
diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD
index 5077cd032..219b95244 100644
--- a/extra/networkmanager-openconnect/PKGBUILD
+++ b/extra/networkmanager-openconnect/PKGBUILD
@@ -1,27 +1,33 @@
-# $Id: PKGBUILD 98215 2010-11-04 21:22:18Z ibiru $
+# $Id: PKGBUILD 122013 2011-05-01 11:25:47Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openconnect
-pkgver=0.8.2
+pkgver=0.8.998
 pkgrel=1
 pkgdesc="NetworkManager VPN integration for openconnect"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'openconnect>=2.26' 'dbus-glib')
-makedepends=('intltool' 'gtk2' 'libglade' 'gconf' 'libgnome-keyring')
+depends=("networkmanager>=${pkgver}" 'openconnect' 'dbus-glib' 'gconf' 'libgnome-keyring')
+makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.8/NetworkManager-openconnect-${pkgver}.tar.bz2)
-sha256sums=('6ef8ff1a14e112baf7d90cc1c19163c7895b56b60629641086540bacb8babb4f')
+source=(ftp://ftp.archlinux.org/other/networkmanager/NetworkManager-openconnect-${pkgver}-20110501.tar.xz)
+#source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.8/NetworkManager-openconnect-${pkgver}.tar.bz2)
+sha256sums=('7f18ce15d985037c1bcf7208555182c296ab1a42a4dc33f78e5ceeb3492cdba5')
 
 build() {
   cd "${srcdir}/NetworkManager-openconnect-${pkgver}"
+  ./autogen.sh
   ./configure --prefix=/usr \
   	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/networkmanager \
 	--disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/NetworkManager-openconnect-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index dca1a2365..e9e534238 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 119010 2011-04-10 13:15:03Z ibiru $
+# $Id: PKGBUILD 122001 2011-05-01 11:08:27Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 # Contributor: Tor Krill <tor@krill.nu>
@@ -7,13 +7,13 @@
 
 pkgname=networkmanager
 pkgver=0.8.998
-pkgrel=2
+pkgrel=3
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
 depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
+makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc')
 optdepends=('modemmanager: for modem management service'
             'dhclient: alternative DHCP/DHCPv6 client'
             'iptables: Connection sharing'
@@ -22,9 +22,10 @@ optdepends=('modemmanager: for modem management service'
 options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
+#http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
+source=(ftp://ftp.archlinux.org/other/networkmanager/NetworkManager-${pkgver}-20110501.tar.xz
         NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('239271e7cd93272776bb9297bfc5214ab910d3d9a7c1862b2625b90719014a82'
+sha256sums=('f9362e5db1f700df927c5ce5a4089e67270a0ce8ca9ab1c5384ae93d2d8ec0e2'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553')
 
@@ -33,6 +34,7 @@ build() {
 
   patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
 
+  ./autogen.sh
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD
index 5e6cbc87a..1caa4732f 100644
--- a/extra/openconnect/PKGBUILD
+++ b/extra/openconnect/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 118392 2011-04-06 14:48:01Z ibiru $
+# $Id: PKGBUILD 121998 2011-05-01 11:06:29Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=openconnect
-pkgver=2.26
+pkgver=3.02
 pkgrel=1
 epoch=1
 pkgdesc="Open client for Cisco AnyConnect VPN"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.infradead.org/openconnect.html"
-depends=('libxml2' 'openssl')
-makedepends=('gconf' 'gtk2')
+depends=('libxml2' 'openssl' 'libproxy')
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e3c7605fed128efe39c2eb9400af6765')
+md5sums=('c12688474f432a6d590958cc1c1ff076')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -24,6 +23,7 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" LIBDIR=/usr/lib install-lib
 
   install  -Dm0644 openconnect.8 "${pkgdir}"/usr/share/man/man8/openconnect.8
 }
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index 806359df7..96f18be9f 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121225 2011-04-29 15:13:05Z bisson $
+# $Id: PKGBUILD 122020 2011-05-01 17:05:22Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -6,7 +6,7 @@
 
 pkgname=slim
 pkgver=1.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc='Desktop-independent graphical login manager for X11'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://slim.berlios.de/'
@@ -18,6 +18,7 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'pam.d'
         'logrotate'
         'gcc44.patch'
+	'ptr_pam.patch'
         'no-host.patch'
         'restart.patch'
         'sigterm.patch'
@@ -27,6 +28,7 @@ sha1sums=('e421d5487732c8317f8f591906661e014b036358'
           'a0e991ef0ac5120465a3be014a26e70ba073b6ae'
           'b969cc902c1d9915a5609141a652c77b2732407b'
           '51121d451116c768d0fc027ff1ea70aaaef036e7'
+          '640668c984a13593a1bfba8d3b503c005d5f401e'
           'b86eddd083fb9f6259e46c735f55ebe76c655bd3'
           '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435'
           '0b35048723c527fb824c5e0f9b9064f751871785'
@@ -38,11 +40,12 @@ build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	sed -i -e 's/png12/png14/g' Makefile
-	patch -p1 -i ../gcc44.patch
-	patch -p1 -i ../no-host.patch # do not set PAM host
-	patch -p1 -i ../restart.patch # restart X server if killed
-	patch -p1 -i ../sigterm.patch # do not wait for user input when SIGTERM'd
-	patch -p1 -i ../tty-slowness.patch # fix sluggish TTY after slim start
+	patch -p1 -i ../gcc44.patch   # FS#14815: lacks include for gcc-4.4
+	patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM
+	patch -p1 -i ../no-host.patch # cf patch: do not set PAM host
+	patch -p1 -i ../restart.patch # cf patch: restart X server if killed
+	patch -p1 -i ../sigterm.patch # FS#23984: do not wait for input when SIGTERM'd
+	patch -p1 -i ../tty-slowness.patch # FS#18313: fix sluggish TTY after slim start
 
 	make USE_PAM=1
 }
diff --git a/extra/slim/ptr_pam.patch b/extra/slim/ptr_pam.patch
new file mode 100644
index 000000000..3a3fbcdb7
--- /dev/null
+++ b/extra/slim/ptr_pam.patch
@@ -0,0 +1,52 @@
+diff -aur old/app.cpp new/app.cpp
+--- old/app.cpp	2010-07-08 07:04:10.000000000 +0200
++++ new/app.cpp	2011-05-01 18:30:52.933844872 +0200
+@@ -43,8 +43,8 @@
+     Panel* panel = *static_cast<Panel**>(appdata_ptr);
+     int result = PAM_SUCCESS;
+     for (int i=0; i<num_msg; i++){
+-        resp[i]->resp=0;
+-        resp[i]->resp_retcode=0;
++        (*resp)[i].resp=0;
++        (*resp)[i].resp_retcode=0;
+         switch(msg[i]->msg_style){
+             case PAM_PROMPT_ECHO_ON:
+                 // We assume PAM is asking for the username
+@@ -53,13 +53,13 @@
+                     case Panel::Suspend:
+                     case Panel::Halt:
+                     case Panel::Reboot:
+-                        resp[i]->resp=strdup("root");
++                        (*resp)[i].resp=strdup("root");
+                         break;
+ 
+                     case Panel::Console:
+                     case Panel::Exit:
+                     case Panel::Login:
+-                        resp[i]->resp=strdup(panel->GetName().c_str());
++                        (*resp)[i].resp=strdup(panel->GetName().c_str());
+                         break;
+                 }
+                 break;
+@@ -75,7 +75,7 @@
+ 
+                     default:
+                         panel->EventHandler(Panel::Get_Passwd);
+-                        resp[i]->resp=strdup(panel->GetPasswd().c_str());
++                        (*resp)[i].resp=strdup(panel->GetPasswd().c_str());
+                         break;
+                 }
+                 break;
+@@ -91,9 +91,9 @@
+     }
+     if (result!=PAM_SUCCESS){
+         for (int i=0; i<num_msg; i++){
+-            if (resp[i]->resp==0) continue;
+-            free(resp[i]->resp);
+-            resp[i]->resp=0;
++            if ((*resp)[i].resp==0) continue;
++            free((*resp)[i].resp);
++            (*resp)[i].resp=0;
+         };
+         free(*resp);
+         *resp=0;
diff --git a/extra/sound-juicer/PKGBUILD b/extra/sound-juicer/PKGBUILD
index 491a676b8..131310350 100644
--- a/extra/sound-juicer/PKGBUILD
+++ b/extra/sound-juicer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118432 2011-04-06 20:04:46Z ibiru $
+# $Id: PKGBUILD 121992 2011-05-01 07:56:32Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributer: Ben <contrasutra@myrealbox.com>
 
@@ -12,11 +12,11 @@ depends=('libmusicbrainz3' 'libgnome-media-profiles' 'gstreamer0.10-base-plugins
 makedepends=('intltool' 'gnome-doc-utils>=0.20.0' 'pkgconfig' 'gnome-common' 'gtk-doc')
 options=(!emptydirs)
 #source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-20110501.tar.xz)
 groups=('gnome-extra')
 install=sound-juicer.install
 url="http://www.burtonini.com/blog/computers/sound-juicer"
-sha256sums=('09fd7ebaa24b20a98be82bc10a9733f2e8d45bb31fb95a12535672d85272d8c2')
+sha256sums=('e4312ebf75c8798dd3f7a9d2d9ee7291b593bd68c7b0559742b91ca7a52674fe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"