Sat Apr 30 22:33:37 UTC 2011

7 files changed, 126 insertions, 63 deletions

diff --git a/testing/claws-mail-extra-plugins/PKGBUILD b/testing/claws-mail-extra-plugins/PKGBUILD
index b1110e3ed..1b6a58831 100644
--- a/testing/claws-mail-extra-plugins/PKGBUILD
+++ b/testing/claws-mail-extra-plugins/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 119030 2011-04-10 14:07:06Z andyrtr $
+# $Id: PKGBUILD 121174 2011-04-29 06:49:28Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Mildred <mildred593 at online dot fr>
 
 pkgname=claws-mail-extra-plugins
 pkgver=3.7.9
-pkgrel=2
+pkgrel=3
 pkgdesc="Extra plugins for claws-mail"
 url="http://www.claws-mail.org/plugins.php?branch=EXT"
 license=('GPL3')
@@ -30,11 +30,11 @@ conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
            'sylpheed-claws-extra-plugins' 'claws-tnef-plugin'
            'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
 replaces=('sylpheed-claws-extra-plugins')
-options=('!libtool')
+options=('!libtool' '!strip')
 source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2
         claws-mail-notification-0.26-libnotify-0.7.patch)
 md5sums=('3d1ebc48f686ab10702380c776b5d5d0'
-         'b76e1cdbff7af46d6594c34646c06fd0')
+         'a02be84594ebd28b18811ccc358509be')
 
 build() {
   cd "$srcdir/claws-mail-extra-plugins-$pkgver"
@@ -47,7 +47,7 @@ build() {
       cd $dir
 
       [[ $dir == notification_plugin-* ]] &&
-        patch -Np0 -i "$srcdir/claws-mail-notification-0.26-libnotify-0.7.patch"
+        patch -Np2 -i "$srcdir/claws-mail-notification-0.26-libnotify-0.7.patch"
 
       ./configure --prefix=/usr --disable-static
       make
diff --git a/testing/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch b/testing/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch
index 6159d139c..efc06a472 100644
--- a/testing/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch
+++ b/testing/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch
@@ -1,50 +1,25 @@
---- src/notification_popup.c
-+++ src/notification_popup.c
-@@ -339,7 +339,16 @@
+diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c
+--- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c	2009-04-26 03:05:05.000000000 +0200
++++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c	2010-11-12 13:39:02.363909583 +0100
+@@ -339,7 +339,7 @@
      break;
    }
  
-+#ifdef NOTIFY_CHECK_VERSION
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+-  ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
 +  ppopup->notification = notify_notification_new(summary, utf8_str, NULL);
-+#else
-   ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
-+#endif
-+#else
-+  ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
-+#endif
-+
    g_free(utf8_str);
    if(ppopup->notification == NULL) {
      debug_print("Notification Plugin: Failed to create a new "
---- src/notification_trayicon.c
-+++ src/notification_trayicon.c
-@@ -61,6 +61,10 @@
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- typedef struct {
-   gint count;
-   gint num_mail;
-@@ -601,8 +605,17 @@
+diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c
+--- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c	2010-03-25 09:56:34.000000000 +0100
++++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c	2010-11-12 13:38:30.809340907 +0100
+@@ -589,8 +589,7 @@
    summary  = notification_trayicon_popup_assemble_summary();
    utf8_str = notification_trayicon_popup_assemble_body(msginfo);
  
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+-  popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL);
+-  notify_notification_attach_to_status_icon(popup.notification, trayicon);
 +  popup.notification = notify_notification_new(summary, utf8_str, NULL);
-+#else
-   popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL);
-+#endif
-+
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+  /* notify_notification_attach_to_status_icon function was removed */
-+#else
-   notify_notification_attach_to_status_icon(popup.notification, trayicon);
-+#endif
  
    g_free(summary);
    g_free(utf8_str);
diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD
index deda6ad62..356a98037 100644
--- a/testing/glib-networking/PKGBUILD
+++ b/testing/glib-networking/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 120846 2011-04-26 21:09:53Z ibiru $
+# $Id: PKGBUILD 121199 2011-04-29 10:51:43Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=glib-networking
 pkgver=2.28.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates')
-makedepends=('intltool' 'gsettings-desktop-schemas')
+depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas')
+makedepends=('intltool')
 options=('!libtool')
 install=glib-networking.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*.*}/$pkgname-${pkgver}.tar.bz2)
diff --git a/testing/libgcrypt/PKGBUILD b/testing/libgcrypt/PKGBUILD
new file mode 100644
index 000000000..2ccdf36fd
--- /dev/null
+++ b/testing/libgcrypt/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 121250 2011-04-29 21:23:37Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=libgcrypt
+pkgver=1.4.6
+pkgrel=3
+pkgdesc="a general purpose crypto library based on the code used"
+arch=(i686 x86_64)
+url="http://www.gnupg.org"
+license=('LGPL')
+depends=('libgpg-error>=1.9')
+options=('!libtool' '!emptydirs')
+install=$pkgname.install
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+	#ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2
+)
+md5sums=('dbf99425a4fe9217c84ce3a35d938634')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+	--disable-static \
+	--disable-padlock-support
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  # Move dynamic libraries to /lib
+  install -d -m755 "${pkgdir}"/lib/
+  mv "${pkgdir}"/usr/lib/libgcrypt.so* "${pkgdir}"/lib/
+  ln -sf /lib/libgcrypt.so "${pkgdir}"/usr/lib/libgcrypt.so
+}
diff --git a/testing/libgcrypt/libgcrypt.install b/testing/libgcrypt/libgcrypt.install
new file mode 100644
index 000000000..83e0dcb27
--- /dev/null
+++ b/testing/libgcrypt/libgcrypt.install
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(gcrypt.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD
index 6ffa54f19..93e6e6e42 100644
--- a/testing/mesa/PKGBUILD
+++ b/testing/mesa/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 119610 2011-04-12 16:23:12Z andyrtr $
+# $Id: PKGBUILD 121126 2011-04-29 05:00:59Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
-pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri')
+pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri')
 
 _git=true
 #_git=false
 
 if [ "${_git}" = "true" ]; then
-    pkgver=7.10.99.git20110412
+    pkgver=7.10.99.git20110429
   else
     pkgver=7.10.2
 fi
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 
-             'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake')
+             'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake' 'llvm')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch)
 if [ "${_git}" = "true" ]; then
-	# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f05751aa2af1a8ec83c2d110385aab1b7e735238
-	source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-f05751aa2af1a8ec83c2d110385aab1b7e735238.tar.bz2')
+	# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0
+	source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0.tar.bz2')
   else
 	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
 )
@@ -30,7 +30,7 @@ fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
          '3ec78f340f9387abd7a37b195e764cbf'
          '67c87b77cc2236b52a3b47dad3fbb5d4'
-         '56d8862d1155f7e8054f9aa7f93ebebc')
+         '8d1a895110a6d3b7c51b3521f794bae2')
 
 build() {
 if [ "${_git}" = "true" ]; then
@@ -50,19 +50,27 @@ fi
 if [ "${_git}" = "true" ]; then
     ./autogen.sh --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --enable-gallium-radeon \
+    --enable-gallium-r300 \
     --enable-gallium-r600 \
     --enable-gallium-nouveau \
+    --enable-gallium-llvm \
+    --enable-gallium-egl \
     --enable-gallium-swrast \
     --enable-glx-tls \
     --with-driver=dri \
     --enable-xcb \
-    --with-state-trackers=dri,glx \
+    --with-state-trackers=dri,glx,egl \
     --disable-glut \
     --enable-gles1 \
     --enable-gles2 \
-    --enable-egl \
-    --disable-gallium-egl
+    --enable-egl 
+    #    --enable-gallium-svga \
+
+    # --enable-texture-float (enable floating-point textures and renderbuffers) - http://www.phoronix.com/scan.php?page=news_item&px=OTMzMg
+    #The source code to implement ARB_texture_float extension is included and can be toggled on at compile time only by those who purchased a license from SGI, or are in a country where the patent does not apply.
+
+    #--enable-shared-dricore - http://bugs.gentoo.org/show_bug.cgi?id=357177
+    
   else
     ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
@@ -142,7 +150,8 @@ package_libegl() {
   pkgdesc="Mesa libEGL libraries and headers"
 
 if [ "${_git}" = "true" ]; then
-    cd ${srcdir}/mesa-*   
+    cd ${srcdir}/mesa-*  
+    make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install
   else
     cd "${srcdir}/Mesa-${pkgver}" 
 fi
@@ -168,6 +177,7 @@ fi
   install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
 }
+
 package_mesa() {
   depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.25' 'glproto>=1.4.12')
   optdepends=('opengl-man-pages: for the OpenGL API man pages')
@@ -346,3 +356,21 @@ if [ "${_git}" = "true" ]; then
 fi
 }
 
+#package_llvm-dri() {
+#  depends=("libgl=${pkgver}")
+#  pkgdesc="Mesa common LLVM support"
+
+#if [ "${_git}" = "true" ]; then
+#    cd ${srcdir}/mesa-*/src/gallium
+#  else
+#    cd "${srcdir}/Mesa-${pkgver}/src/gallium"
+#fi
+
+  # gallium llvmpipe
+#if [ "${_git}" = "true" ]; then
+#    make -C drivers/llvmpipe DESTDIR="${pkgdir}" install
+#    #make -C targets/dri-swrast DESTDIR="${pkgdir}" install
+#  else
+#    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+#fi
+#}
diff --git a/testing/tzdata/PKGBUILD b/testing/tzdata/PKGBUILD
index c4f0f1267..b09c6c637 100644
--- a/testing/tzdata/PKGBUILD
+++ b/testing/tzdata/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 120332 2011-04-22 11:15:12Z andyrtr $
+# $Id: PKGBUILD 121182 2011-04-29 06:58:28Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=tzdata
-pkgver=2011f
+pkgver=2011g
 pkgrel=1
-_tzcode=2011e
-_tzdata=2011f
+_tzcode=2011g
+_tzdata=2011g
 pkgdesc="Sources for time zone and daylight saving time data"
 arch=('i686' 'x86_64')
 url="http://www.twinsun.com/tz/tz-link.htm"
@@ -17,8 +17,8 @@ options=('!emptydirs')
 source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \
         ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \
         Makefile.patch)
-md5sums=('fbfc05dbf9ebcfe7c4bba18549870173'
-         'cc8136284ae1e6c720a18e0f080242e0'
+md5sums=('ecb564279b28c5b184421c525d997d6c'
+         'a068c27e7e426fdb12ab0c88506df20d'
          'a64ed97d1fc03c66ee8612c0d9f40507')
 
 build() {