Wed Apr 13 04:53:33 UTC 2011

9 files changed, 252 insertions, 21 deletions

diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD
index ea82388ee..5c07b6f2a 100644
--- a/testing/gedit/PKGBUILD
+++ b/testing/gedit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 117796 2011-04-04 17:57:21Z heftig $
+# $Id: PKGBUILD 119639 2011-04-12 22:52:16Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a3a14d2f239f43f043743bc526f89c84bfb1ce55096b7629f905947948959f5e')
+sha256sums=('5a362f05325f4d47e31e5e9d3689a37d4a597e218965be9a39a193c847beaa87')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/testing/kdeplasma-applets-networkmanagement/PKGBUILD b/testing/kdeplasma-applets-networkmanagement/PKGBUILD
index abfa541da..debe03a2f 100644
--- a/testing/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/testing/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
 
 pkgname=kdeplasma-applets-networkmanagement
-pkgver=git20110407
-_commit=a2d35d4ec55fe6a5db209974a928482c662ac830
+pkgver=git20110412
+_commit=cbce07ca5b353cd2aadca260db856f595210afc9
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64')
@@ -14,12 +14,16 @@ depends=('kdebase-workspace' 'networkmanager')
 makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info')
 optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
 install=${pkgname}.install
-#source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-source=('ftp://ftp.archlinux.org/other/kde/networkmanagement-nm09.tar.bz2')
-md5sums=('a853338f79bc75837e343c3820d1bb39')
+source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}"
+        'networkmanager09.patch')
+md5sums=('501bbca6cf410c8b9df7af97da6a321d'
+         'abb1c19a36653d85594b16ef60daca89')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}/networkmanagement"
+  patch -Np1 -i "${srcdir}/networkmanager09.patch"
+
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../networkmanagement \
diff --git a/testing/kdeplasma-applets-networkmanagement/networkmanager09.patch b/testing/kdeplasma-applets-networkmanagement/networkmanager09.patch
new file mode 100644
index 000000000..d209fc7d8
--- /dev/null
+++ b/testing/kdeplasma-applets-networkmanagement/networkmanager09.patch
@@ -0,0 +1,49 @@
+From 76001a795ed8f88d1aee317d71b7ae76384549d5 Mon Sep 17 00:00:00 2001
+From: Andrea Scarpino <andrea@archlinux.org>
+Date: Tue, 12 Apr 2011 11:22:06 +0200
+Subject: [PATCH] build with Network Manager 0.9
+
+---
+ backends/NetworkManager/nmdbussettingsservice.cpp |    3 +++
+ backends/NetworkManager/settings/gsmdbus.cpp      |    4 ++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/backends/NetworkManager/nmdbussettingsservice.cpp b/backends/NetworkManager/nmdbussettingsservice.cpp
+index 65e654e..035e7b0 100644
+--- a/backends/NetworkManager/nmdbussettingsservice.cpp
++++ b/backends/NetworkManager/nmdbussettingsservice.cpp
+@@ -57,6 +57,9 @@ public:
+     QHash<QUuid, QDBusObjectPath> uuidToPath;
+ };
+ 
++#define NM_DBUS_SERVICE_USER_SETTINGS     "org.freedesktop.NetworkManagerUserSettings"
++#define NM_DBUS_SERVICE_SYSTEM_SETTINGS   "org.freedesktop.NetworkManagerSystemSettings"
++
+ const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String(NM_DBUS_SERVICE_USER_SETTINGS);
+ const QString NMDBusSettingsService::SERVICE_SYSTEM_SETTINGS = QLatin1String(NM_DBUS_SERVICE_SYSTEM_SETTINGS);
+ 
+diff --git a/backends/NetworkManager/settings/gsmdbus.cpp b/backends/NetworkManager/settings/gsmdbus.cpp
+index 9912df6..eedf1ea 100644
+--- a/backends/NetworkManager/settings/gsmdbus.cpp
++++ b/backends/NetworkManager/settings/gsmdbus.cpp
+@@ -35,7 +35,7 @@ void GsmDbus::fromMap(const QVariantMap & map)
+   if (map.contains(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE))) {
+     setting->setNetworktype(map.value(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE)).value<int>());
+   } else {
+-      setting->setNetworktype(NM_GSM_NETWORK_ANY);
++      setting->setNetworktype(NM_SETTING_GSM_NETWORK_TYPE_ANY);
+   }
+   if (map.contains("band")) {
+     setting->setBand(map.value("band").value<int>());
+@@ -62,7 +62,7 @@ QVariantMap GsmDbus::toMap()
+       map.insert("apn", setting->apn());
+   if (!setting->networkid().isEmpty())
+       map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), setting->networkid());
+-  if (setting->networktype() != NM_GSM_NETWORK_ANY) {
++  if (setting->networktype() != NM_SETTING_GSM_NETWORK_TYPE_ANY) {
+       map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), setting->networktype());
+   }
+ 
+-- 
+1.7.4.4
+
diff --git a/testing/kismet/PKGBUILD b/testing/kismet/PKGBUILD
new file mode 100644
index 000000000..3333a8e22
--- /dev/null
+++ b/testing/kismet/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 119587 2011-04-12 15:18:27Z angvp $
+# Contributer: Jason Chu <jason@archlinux.org>
+# Maintainer: Juergen Hoetzel <jason@archlinux.org>
+
+pkgname=kismet
+pkgver=2011_03_R2
+_realver="${pkgver//_/-}"
+pkgrel=1
+pkgdesc="802.11b sniffing software"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gmp' 'imagemagick' 'libpcap>=1.0.0' 'ncurses' 'dbus' 'libjpeg>=7')
+optdepends=(perl-libwww)
+url="http://www.kismetwireless.net/"
+backup=('etc/kismet.conf' 'etc/kismet_drone.conf')
+options=('!makeflags')
+source=(http://www.kismetwireless.net/code/kismet-${pkgver//_/-}.tar.gz)
+md5sums=('8bf077e8111e6dc8c12cadefdf40aadd')
+
+build() {
+   cd "$srcdir/kismet-$_realver"
+
+   ./configure --prefix=/usr \
+               --sysconfdir=/etc \
+               --localstatedir=/var 
+
+   make dep
+   make 
+   sed -i 's/prism2/wlanng/g' conf/kismet.conf
+   make DESTDIR="$pkgdir" install
+
+   chown root:root "$pkgdir"/usr/share/man/man{1,5}/*
+
+   install -D -m 644 "$srcdir/kismet-$_realver/README" "$pkgdir/usr/share/kismet/README"
+
+   # Fix the *.conf unexpanded ${prefix} problems
+   sed -i 's%\${prefix}%/usr%' "$pkgdir"/etc/*.conf 
+}
diff --git a/testing/kismet/kismet-2008-05-R1-infinite-loop.diff b/testing/kismet/kismet-2008-05-R1-infinite-loop.diff
new file mode 100644
index 000000000..f8417943e
--- /dev/null
+++ b/testing/kismet/kismet-2008-05-R1-infinite-loop.diff
@@ -0,0 +1,20 @@
+--- gpsmap.cc
++++ gpsmap.cc
+@@ -874,7 +874,7 @@
+ 
+                 // Break up the path to the gpsxml file and form a path based on that
+                 unsigned int lastslash = 0;
+-                for (unsigned int x = origxmlfile.find('/'); x != string::npos;
++                for (string::size_type x = origxmlfile.find('/'); x != string::npos;
+                      lastslash = x, x = origxmlfile.find('/', lastslash+1)) {
+                     // We don't actually need to do anything...
+                 }
+@@ -882,7 +882,7 @@
+                 comp = origxmlfile.substr(0, lastslash);
+ 
+                 lastslash = 0;
+-                for (unsigned int x = orignetfile.find('/'); x != string::npos;
++                for (string::size_type x = orignetfile.find('/'); x != string::npos;
+                      lastslash = x, x = orignetfile.find('/', lastslash+1)) {
+                     // We don't actually need to do anything...
+                 }
diff --git a/testing/kismet/kismet-build.patch b/testing/kismet/kismet-build.patch
new file mode 100644
index 000000000..9935ca4fa
--- /dev/null
+++ b/testing/kismet/kismet-build.patch
@@ -0,0 +1,11 @@
+--- macaddr.h.orig	2009-07-08 02:29:38.000000000 -0400
++++ macaddr.h	2009-07-08 02:37:54.000000000 -0400
+@@ -73,7 +73,7 @@
+ 			longmac |= (uint64_t) bs_in[5] << ((MAC_LEN - 5 - 1) * 8);
+ 
+             // If it has a mask component, get that
+-            char *in_mask = strchr(in, '/');
++            const char *in_mask = strchr(in, '/');
+             if (in_mask != NULL) {
+                 longmask = 0;
+ 
diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD
index 5b4bd68c4..6ffa54f19 100644
--- a/testing/mesa/PKGBUILD
+++ b/testing/mesa/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 119075 2011-04-10 20:11:41Z ibiru $
+# $Id: PKGBUILD 119610 2011-04-12 16:23:12Z 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')
 
-#_git=true
-_git=false
+_git=true
+#_git=false
 
 if [ "${_git}" = "true" ]; then
-    pkgver=7.10.0.git20110215
+    pkgver=7.10.99.git20110412
   else
     pkgver=7.10.2
 fi
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.23' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.3.5' 'libxt>=1.0.8' 
+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')
 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.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866
-	source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2')
+	# 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')
   else
 	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
 )
@@ -30,7 +30,7 @@ fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
          '3ec78f340f9387abd7a37b195e764cbf'
          '67c87b77cc2236b52a3b47dad3fbb5d4'
-         'f5de82852f1243f42cc004039e10b771')
+         '56d8862d1155f7e8054f9aa7f93ebebc')
 
 build() {
 if [ "${_git}" = "true" ]; then
@@ -40,10 +40,12 @@ if [ "${_git}" = "true" ]; then
     cd "${srcdir}/Mesa-${pkgver}" 
 fi
 
+if [ "${_git}" != "true" ]; then
 #backport from master to fix gnome-shell shader
 #https://bugs.freedesktop.org/show_bug.cgi?id=35714
 patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch"
 patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
+fi
 
 if [ "${_git}" = "true" ]; then
     ./autogen.sh --prefix=/usr \
@@ -83,7 +85,7 @@ fi
 }
 
 package_libgl() {
-  depends=('libdrm>=2.4.22' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1')
+  depends=('libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
 
 if [ "${_git}" = "true" ]; then
@@ -145,7 +147,6 @@ if [ "${_git}" = "true" ]; then
     cd "${srcdir}/Mesa-${pkgver}" 
 fi
   install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/egl"
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   install -m755 -d "${pkgdir}/usr/include"
   install -m755 -d "${pkgdir}/usr/include/"
@@ -155,7 +156,10 @@ fi
   install -m755 -d "${pkgdir}/usr/share/doc"
   install -m755 -d "${pkgdir}/usr/share/doc/libegl"
   bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/"
+if [ "${_git}" != "true" ]; then
+  install -m755 -d "${pkgdir}/usr/lib/egl"
   bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/"
+fi
   bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/"
   bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/"
   bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/"
@@ -165,7 +169,7 @@ fi
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
 }
 package_mesa() {
-  depends=('libgl' 'libx11>=1.3.5' 'libxt>=1.0.8' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.22' 'glproto>=1.4.12')
+  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')
   pkgdesc="Mesa 3-D graphics libraries and include files"
 
diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD
new file mode 100644
index 000000000..3a3002598
--- /dev/null
+++ b/testing/sqlite3/PKGBUILD
@@ -0,0 +1,72 @@
+# $Id: PKGBUILD 119626 2011-04-12 20:36:36Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgbase="sqlite3"
+pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
+_amalgamationver=3070600
+_amalgamationver2=${_amalgamationver/00/}
+pkgver=${_amalgamationver2//0/.}
+pkgrel=1
+pkgdesc="A C library that implements an SQL database engine"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://www.sqlite.org/"
+makedepends=('tcl' 'readline>=6.0.00')
+source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
+	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
+	http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip
+	license.txt)
+options=('!libtool' '!emptydirs')
+md5sums=('8e1764574dbddb6be675c79bcfcc304d'
+         '1c9b9da6f98f1da2d8958254662c393c'
+         'c1cdbc5544034d9012e421e75a5e4890')
+
+build() {
+  export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
+
+  # build sqlite
+  cd "$srcdir"/sqlite-autoconf-$_amalgamationver
+  ./configure --prefix=/usr \
+	--disable-static
+  make
+  
+  # build the tcl extension    
+  cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea
+  ./configure --prefix=/usr \
+	--with-system-sqlite
+  make
+
+}
+
+package_sqlite3() {
+ 
+ pkgdesc="A C library that implements an SQL database engine"
+ depends=('readline>=6.0.00')
+ conflicts=('sqlite')
+ replaces=('sqlite')
+ 
+  cd ${srcdir}/sqlite-autoconf-$_amalgamationver
+  make DESTDIR=${pkgdir} install
+  
+  # license
+  install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
+}
+
+package_sqlite3-tcl() {
+ 
+ pkgdesc="sqlite3 Tcl Extension Architecture (TEA)"
+ depends=('sqlite3>=3.7.5')
+
+  cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
+  make DESTDIR=${pkgdir} install
+}
+
+package_sqlite3-doc() {
+ pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
+ #arch=('any') - not yet supported
+
+  cd ${srcdir}/sqlite-doc-${_amalgamationver}
+  mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
+  cp -R *  ${pkgdir}/usr/share/doc/${pkgbase}/
+}
diff --git a/testing/sqlite3/license.txt b/testing/sqlite3/license.txt
new file mode 100644
index 000000000..118c5d5e6
--- /dev/null
+++ b/testing/sqlite3/license.txt
@@ -0,0 +1,33 @@
+SQLite Copyright
+SQLite is in the
+Public Domain 
+
+
+All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. 
+
+The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. 
+
+All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. 
+Obtaining An Explicit License To Use SQLite
+
+Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: 
+You are using SQLite in a jurisdiction that does not recognize the public domain. 
+You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. 
+You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. 
+Your legal department tells you that you have to purchase a license. 
+
+If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. 
+Contributed Code
+
+In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: 
+The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. 
+
+We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to:
+Hwaci
+6200 Maple Cove Lane
+Charlotte, NC 28269
+USA 
+
+A template copyright release is available in PDF or HTML. You can use this release to make future changes.
+
+see http://www.sqlite.org/copyright.html
\ No newline at end of file