summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/fyre/PKGBUILD28
-rw-r--r--extra/fyre/fyre.install10
-rw-r--r--extra/gnet/PKGBUILD21
-rw-r--r--extra/gnome-shell/PKGBUILD14
-rw-r--r--extra/gnome-shell/shell-xfixes-cursor_missing_free.patch22
-rw-r--r--extra/gnome-shell/st-private_fix_memory_leak.patch40
-rw-r--r--extra/gnuplot/PKGBUILD12
-rw-r--r--extra/kdeaccessibility/PKGBUILD8
-rw-r--r--extra/kdeadmin/PKGBUILD10
-rw-r--r--extra/kdeartwork/PKGBUILD10
-rw-r--r--extra/kdebase-runtime/PKGBUILD9
-rw-r--r--extra/kdebase-workspace/PKGBUILD26
-rw-r--r--extra/kdebase-workspace/kdebase-workspace.install2
-rw-r--r--extra/kdebase-workspace/nm-09.patch34
-rw-r--r--extra/kdebase/PKGBUILD8
-rw-r--r--extra/kdebindings/PKGBUILD10
-rw-r--r--extra/kdeedu/PKGBUILD10
-rw-r--r--extra/kdegames/PKGBUILD8
-rw-r--r--extra/kdegraphics/PKGBUILD8
-rw-r--r--extra/kdelibs/PKGBUILD6
-rw-r--r--extra/kdemultimedia/PKGBUILD17
-rw-r--r--extra/kdenetwork/PKGBUILD8
-rw-r--r--extra/kdepimlibs/PKGBUILD9
-rw-r--r--extra/kdeplasma-addons/PKGBUILD8
-rw-r--r--extra/kdesdk/PKGBUILD8
-rw-r--r--extra/kdetoys/PKGBUILD8
-rw-r--r--extra/kdeutils/PKGBUILD8
-rw-r--r--extra/kdewebdev/PKGBUILD8
-rw-r--r--extra/keytouch-editor/PKGBUILD23
-rw-r--r--extra/keytouch-editor/keytouch-editor.install6
-rw-r--r--extra/libidn/PKGBUILD6
-rw-r--r--extra/libmygpo-qt/PKGBUILD29
-rw-r--r--extra/mhash/PKGBUILD23
-rw-r--r--extra/msmtp/PKGBUILD16
-rw-r--r--extra/msmtp/msmtp.install6
-rw-r--r--extra/nautilus/PKGBUILD6
-rw-r--r--extra/netcdf/PKGBUILD14
-rw-r--r--extra/oxygen-icons/PKGBUILD38
-rw-r--r--extra/pyqt/PKGBUILD77
-rw-r--r--extra/quota-tools/PKGBUILD36
-rw-r--r--extra/r/PKGBUILD8
-rw-r--r--extra/r/r.desktop3
-rw-r--r--extra/rxvt-unicode/PKGBUILD27
-rw-r--r--extra/rxvt-unicode/rxvt-unicode.desktop2
-rw-r--r--extra/sip/PKGBUILD54
-rw-r--r--extra/squid/PKGBUILD68
-rw-r--r--extra/squid/squid-3.1.11-unused.patch296
-rw-r--r--extra/squid/squid.conf.d2
-rw-r--r--extra/squid/squid.install4
-rw-r--r--extra/texmacs/PKGBUILD6
-rw-r--r--extra/wxmaxima/PKGBUILD4
51 files changed, 859 insertions, 265 deletions
diff --git a/extra/fyre/PKGBUILD b/extra/fyre/PKGBUILD
index c838a74e9..c9bd6dbaf 100644
--- a/extra/fyre/PKGBUILD
+++ b/extra/fyre/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 18314 2008-11-04 04:33:02Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
+# $Id: PKGBUILD 122717 2011-05-06 07:59:29Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=fyre
pkgver=1.0.1
-pkgrel=3
+pkgrel=4
pkgdesc="Rendering of the Peter de Jong map"
arch=("i686" "x86_64" 'mips64el')
url="http://fyre.navi.cx/"
license=('GPL')
-depends=('openexr>=1.6' 'libglade' 'gnet' 'shared-mime-info')
-install=${pkgname}.install
+depends=('openexr' 'libglade' 'gnet' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
+install=fyre.install
source=(http://flapjack.navi.cx/releases/fyre/fyre-${pkgver}.tar.gz)
md5sums=('44d5830c527325c1ee6fa6ea92b4ba03')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr || return 1
- make || return 1
- make prefix=${pkgdir}/usr install || return 1
- rm ${pkgdir}/usr/share/mime/{XMLnamespaces,globs,magic,aliases,subclasses} || return 1
- rm ${pkgdir}/usr/share/mime/{generic-icons,globs2,icons,treemagic,types} || return 1
- rm ${pkgdir}/usr/share/mime/mime.cache || return 1
- rm ${pkgdir}/usr/share/icons/hicolor/icon-theme.cache || return 1
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make update_xdgmime=/bin/false update_fdodesktop=/bin/false gtk_update_icon_cache=/bin/false \
+ prefix="${pkgdir}/usr" install
}
diff --git a/extra/fyre/fyre.install b/extra/fyre/fyre.install
index 0f4a73633..388efbb11 100644
--- a/extra/fyre/fyre.install
+++ b/extra/fyre/fyre.install
@@ -1,11 +1,13 @@
post_install() {
- usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
}
post_upgrade() {
- usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1
+ post_install
}
-pre_remove() {
- usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1
+post_remove() {
+ post_install
}
diff --git a/extra/gnet/PKGBUILD b/extra/gnet/PKGBUILD
index 57d8c4268..74f641527 100644
--- a/extra/gnet/PKGBUILD
+++ b/extra/gnet/PKGBUILD
@@ -1,13 +1,12 @@
-# $Id: PKGBUILD 1327 2008-05-05 00:54:40Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# $Id: PKGBUILD 122722 2011-05-06 08:12:47Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=gnet
pkgver=2.0.8
-pkgrel=1
-pkgdesc="GNet is a simple network library"
+pkgrel=2
+pkgdesc="A simple network library"
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnetlibrary.org/"
+url="http://live.gnome.org/GNetLibrary"
license=('LGPL')
depends=('glib2')
options=('!libtool')
@@ -16,8 +15,12 @@ md5sums=('93327d2fca333d7e54ba2cf54e071165')
sha1sums=('74a33dd25cc594b874e3a5171795efd99e567387')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr
- make || return 1
- make DESTDIR=${startdir}/pkg install
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index cbef4fbb6..55bf202d5 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122633 2011-05-05 11:05:07Z ibiru $
+# $Id: PKGBUILD 122711 2011-05-06 07:06:52Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Flamelab <panosfilip@gmail.com
pkgname=gnome-shell
pkgver=3.0.1
-pkgrel=2
+pkgrel=3
pkgdesc="The next generation GNOME Shell"
arch=('i686' 'x86_64')
url="http://live.gnome.org/GnomeShell"
@@ -19,16 +19,22 @@ install=gnome-shell.install
groups=(gnome)
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
arch.patch
- network_fixes_up_to_5090a4ccce.patch)
+ network_fixes_up_to_5090a4ccce.patch
+ shell-xfixes-cursor_missing_free.patch
+ st-private_fix_memory_leak.patch)
sha256sums=('01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079'
'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db'
- '01bf41483d5d8935ed2dd6294ee04024f2d9bcb2ef13276b07331e485965c822')
+ '01bf41483d5d8935ed2dd6294ee04024f2d9bcb2ef13276b07331e485965c822'
+ 'c8b92768c869d0d77595da3466cc0dba3b6f067ea5fac048f32a918bbe98bbf6'
+ '8b80a0cec39c38a47521183a3030a782ab84bb6ea5e9cc58213589245288e718')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/arch.patch"
patch -Np1 -i "${srcdir}/network_fixes_up_to_5090a4ccce.patch"
+ patch -Np1 -i "${srcdir}/shell-xfixes-cursor_missing_free.patch"
+ patch -Np1 -i "${srcdir}/st-private_fix_memory_leak.patch"
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gnome-shell \
diff --git a/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch b/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch
new file mode 100644
index 000000000..6a66c9384
--- /dev/null
+++ b/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch
@@ -0,0 +1,22 @@
+From 88de26138a8b79d89884ff2eb6471c5a8e3b39ca Mon Sep 17 00:00:00 2001
+From: Maxim Ermilov <zaspire@rambler.ru>
+Date: Thu, 05 May 2011 10:06:05 +0000
+Subject: shell-xfixes-cursor: missing XFree
+
+memory returned by XFixesGetCursorImage should be freed after usage.
+https://bugzilla.gnome.org/show_bug.cgi?id=642652
+---
+diff --git a/src/shell-xfixes-cursor.c b/src/shell-xfixes-cursor.c
+index 14d2b59..334503d 100644
+--- a/src/shell-xfixes-cursor.c
++++ b/src/shell-xfixes-cursor.c
+@@ -254,6 +254,7 @@ xfixes_cursor_reset_image (ShellXFixesCursor *xfixes_cursor)
+ xfixes_cursor->cursor_hot_y = cursor_image->yhot;
+ g_signal_emit (xfixes_cursor, signals[CURSOR_CHANGED], 0);
+ }
++ XFree (cursor_image);
+ }
+
+ static void
+--
+cgit v0.9
diff --git a/extra/gnome-shell/st-private_fix_memory_leak.patch b/extra/gnome-shell/st-private_fix_memory_leak.patch
new file mode 100644
index 000000000..677a26531
--- /dev/null
+++ b/extra/gnome-shell/st-private_fix_memory_leak.patch
@@ -0,0 +1,40 @@
+From 72f9f482d6f1bcb53ea2bd1606818af1f33a5a8c Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 05 May 2011 19:21:58 +0000
+Subject: st-private: Fix memory leak
+
+==13810== 11,360 bytes in 1 blocks are definitely lost in loss record 18,574 of 18,765
+==13810== at 0x4005447: calloc (vg_replace_malloc.c:467)
+==13810== by 0x5191882: standard_calloc (gmem.c:107)
+==13810== by 0x51920A7: g_malloc0 (gmem.c:196)
+==13810== by 0x4056201: blur_pixels (st-private.c:466)
+==13810== by 0x40573B4: _st_create_shadow_cairo_pattern (st-private.c:710)
+==13810== by 0x4070746: st_theme_node_paint (st-theme-node-drawing.c:856)
+==13810== by 0x3FEFFFFF: ???
+
+https://bugzilla.gnome.org/show_bug.cgi?id=649497
+---
+diff --git a/src/st/st-private.c b/src/st/st-private.c
+index d0aa89b..51798a1 100644
+--- a/src/st/st-private.c
++++ b/src/st/st-private.c
+@@ -746,7 +746,7 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec,
+ (height_out - height_in) / 2.0);
+ cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
+
+- return dst_pattern;
++ goto out;
+ }
+
+ /* Read all the code from the cairo_pattern_set_matrix call
+@@ -784,6 +784,8 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec,
+
+ cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
+
++ out:
++ g_free (pixels_out);
+ return dst_pattern;
+ }
+
+--
+cgit v0.9
diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index 1d4568339..9f5b437c4 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 94793 2010-10-11 09:23:28Z ronald $
+# $Id: PKGBUILD 122810 2011-05-06 10:03:29Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: damir <damir@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=gnuplot
-pkgver=4.4.2
-pkgrel=2
+pkgver=4.4.3
+pkgrel=1
pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnuplot.info"
license=('custom')
-depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg')
-makedepends=('texinfo' 'emacs' 'texlive-core')
+depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua')
+makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
install=gnuplot.install
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('a4f0dd89f9b9334890464f687ddd9f50')
+sha1sums=('a4d315b9288739e3cbaa04d8ddda7861b4009bd4')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/kdeaccessibility/PKGBUILD b/extra/kdeaccessibility/PKGBUILD
index 2f4bf68dd..68f39e752 100644
--- a/extra/kdeaccessibility/PKGBUILD
+++ b/extra/kdeaccessibility/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118070 2011-04-05 10:08:11Z andrea $
+# $Id: PKGBUILD 121097 2011-04-29 00:27:46Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -10,16 +10,16 @@ pkgname=('kdeaccessibility-colorschemes'
'kdeaccessibility-kmag'
'kdeaccessibility-kmousetool'
'kdeaccessibility-kmouth')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://accessibility.kde.org'
license=('GPL' 'FDL')
groups=('kde' 'kdeaccessibility')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime'
- 'speech-dispatcher' 'docbook-xsl')
+ 'speech-dispatcher')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('5e8e92a312b2c995602a66cc775009839122053d')
+sha1sums=('8d4053defbf839fd428820d6d1659b6e46ab468a')
build() {
cd ${srcdir}
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
index 793f2570f..9b424bbde 100644
--- a/extra/kdeadmin/PKGBUILD
+++ b/extra/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118071 2011-04-05 10:08:14Z andrea $
+# $Id: PKGBUILD 122186 2011-05-02 17:58:19Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -7,17 +7,17 @@ pkgname=('kdeadmin-kcron'
'kdeadmin-ksystemlog'
'kdeadmin-kuser'
'kdeadmin-system-config-printer-kde')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeadmin')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python'
- 'system-config-printer-common' 'python2-qt' 'docbook-xsl')
+ 'system-config-printer-common' 'python2-pyqt')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
'syslog-path.patch')
-sha1sums=('33d756b1cef42d272b617bfba400e9116b34f311'
+sha1sums=('141e8e794ebd5341940d2d22986b7376a2abefbf'
'20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
build() {
@@ -70,7 +70,7 @@ package_kdeadmin-kuser() {
package_kdeadmin-system-config-printer-kde() {
pkgdesc='Configure local and remote Printers'
- depends=('kdebindings-python' 'system-config-printer-common' 'python2-qt')
+ depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt')
url="http://kde.org/applications/system/printerapplet/"
cd $srcdir/build/system-config-printer-kde
make DESTDIR=$pkgdir install
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index 558808cce..5716a1f04 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118072 2011-04-05 10:08:17Z andrea $
+# $Id: PKGBUILD 121099 2011-04-29 00:27:52Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -13,16 +13,16 @@ pkgname=('kdeartwork-aurorae'
'kdeartwork-styles'
'kdeartwork-wallpapers'
'kdeartwork-weatherwallpapers')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeartwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace'
- 'docbook-xsl' 'kdegraphics-libs')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen'
+ 'kdebase-workspace' 'kdegraphics-libs')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('2a264081e50f2d2d78d98080db8f013f3148f9b2')
+sha1sums=('084834ac3c654ea24257d9ed407c2384bf5aa110')
build() {
cd $srcdir
diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD
index eb2a01f1b..453768f5c 100644
--- a/extra/kdebase-runtime/PKGBUILD
+++ b/extra/kdebase-runtime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118064 2011-04-05 10:07:49Z andrea $
+# $Id: PKGBUILD 121092 2011-04-29 00:27:28Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdebase-runtime
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
pkgdesc="KDE Base Runtime Environment"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,14 +11,13 @@ url='http://www.kde.org'
license=('GPL' 'LGPL')
depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
'xorg-xauth' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib'
- 'docbook-xsl')
+makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib')
optdepends=('htdig: to build the search index in khelpcenter'
'rarian: needed by khelpcenter'
'gdb: drkonq crash handler')
install="${pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d939d78f82e8c9d1257552abac08e4da1ff28c51')
+sha1sums=('75cf1993b42cbada44b8c3ca2d5b99e6ac48594c')
build() {
cd "${srcdir}"
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 1cefcca08..f8a341783 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 118827 2011-04-08 07:49:14Z andrea $
+# $Id: PKGBUILD 122250 2011-05-03 10:29:38Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdebase-workspace
-pkgver=4.6.2
-pkgrel=2
+pkgver=4.6.3
+pkgrel=1
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -14,9 +14,10 @@ groups=('kde')
# not detected by namcap because libgl depends on it
# but nvidia providing libgl does not depend on libxdamage
depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate'
- 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx')
+ 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx'
+ 'xorg-xsetroot' 'libxcomposite' 'libxinerama')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'networkmanager' 'bluez'
- 'docbook-xsl' 'python2' 'kdebindings-python')
+ 'python2' 'kdebindings-python')
replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
install="${pkgname}.install"
@@ -24,12 +25,11 @@ backup=('usr/share/config/kdm/kdmrc'
'etc/pam.d/kde'
'etc/pam.d/kde-np'
'etc/pam.d/kscreensaver')
+options=('emptydirs')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
- 'fixpath.patch' 'terminate-server.patch'
- 'shutdown-fix.patch'
- 'sensors-fix.patch')
-sha1sums=('63efb68733f347d0b7d24a7a061c5a0e3f84dee7'
+ 'fixpath.patch' 'terminate-server.patch' 'nm-09.patch')
+sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6'
'8c2bdefb23a03b753b78d16944d03fa3939d2d99'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
'f7b38af38549242a240f1a90ab9964ca8a366129'
@@ -37,18 +37,14 @@ sha1sums=('63efb68733f347d0b7d24a7a061c5a0e3f84dee7'
'106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
'd7b5883f7e65c6839b1f65f94d58026673dd0226'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
- 'c18422cb964e51d2cfcca3907904a361d507c8e1'
- 'fd6bb3239705c23d38f51fb39048b05ed6e95703')
+ '91ed84f5bb99909cab1b5ca0779bbf5cf6c72d33')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
patch -p0 -i ${srcdir}/fixpath.patch
patch -p0 -i ${srcdir}/terminate-server.patch
- patch -Np1 -i ${srcdir}/shutdown-fix.patch
-
- # Already fixed upstream
- patch -Np1 -i ${srcdir}/sensors-fix.patch
+ patch -p1 -i ${srcdir}/nm-09.patch
cd ${srcdir}
mkdir build
diff --git a/extra/kdebase-workspace/kdebase-workspace.install b/extra/kdebase-workspace/kdebase-workspace.install
index 3a1b2404a..f7d6d305b 100644
--- a/extra/kdebase-workspace/kdebase-workspace.install
+++ b/extra/kdebase-workspace/kdebase-workspace.install
@@ -3,6 +3,7 @@ post_install() {
useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
chown -R 135:135 var/lib/kdm &>/dev/null
xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+ update-desktop-database -q
}
post_upgrade() {
@@ -10,6 +11,7 @@ post_upgrade() {
getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
chown -R 135:135 var/lib/kdm &>/dev/null
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
}
post_remove() {
diff --git a/extra/kdebase-workspace/nm-09.patch b/extra/kdebase-workspace/nm-09.patch
new file mode 100644
index 000000000..20ccd4d7d
--- /dev/null
+++ b/extra/kdebase-workspace/nm-09.patch
@@ -0,0 +1,34 @@
+--- kdebase-workspace-4.6.3/solid/CMakeLists.txt~ 2011-04-29 03:43:20.321994578 -0700
++++ kdebase-workspace-4.6.3/solid/CMakeLists.txt 2011-04-29 03:43:33.271995023 -0700
+@@ -17,7 +17,7 @@
+ add_subdirectory(networkmanager-0.6)
+ endif (NM_0_6)
+
+- macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.9.0" NM_0_7)
++ macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7)
+ if (NM_0_7)
+ message(STATUS "Will build networkmanager-0.7")
+ set(HAVE_NETWORKMANAGER TRUE)
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp~ 2011-04-29 03:32:33.838644845 -0700
++++ kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp 2011-04-29 03:40:52.308657544 -0700
+@@ -118,16 +118,16 @@
+ uint deviceType = devIface.deviceType();
+ NMNetworkInterface * createdInterface = 0;
+ switch ( deviceType ) {
+- case DEVICE_TYPE_802_3_ETHERNET:
++ case NM_DEVICE_TYPE_ETHERNET:
+ createdInterface = new NMWiredNetworkInterface(uni, this, 0); // these are deleted by the frontend manager
+ break;
+- case DEVICE_TYPE_802_11_WIRELESS:
++ case NM_DEVICE_TYPE_WIFI:
+ createdInterface = new NMWirelessNetworkInterface(uni, this, 0);
+ break;
+- case DEVICE_TYPE_GSM:
++ case 3:
+ createdInterface = new NMGsmNetworkInterface(uni, this, 0);
+ break;
+- case DEVICE_TYPE_CDMA:
++ case 4:
+ createdInterface = new NMCdmaNetworkInterface(uni, this, 0);
+ break;
+ /*
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index cc8c224bb..d337fc353 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118068 2011-04-05 10:08:03Z andrea $
+# $Id: PKGBUILD 121096 2011-04-29 00:27:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -13,15 +13,15 @@ pkgname=('kdebase-dolphin'
'kdebase-kwrite'
'kdebase-lib'
'kdebase-plasma')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdebase')
-makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4' 'docbook-xsl')
+makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('e9e46a6b4f5580996a1484da6d2ef17f418eec69')
+sha1sums=('69cfba74099cdce27f7f72725288f025979b41f3')
build() {
cd ${srcdir}
diff --git a/extra/kdebindings/PKGBUILD b/extra/kdebindings/PKGBUILD
index 7d28458d5..e98536d41 100644
--- a/extra/kdebindings/PKGBUILD
+++ b/extra/kdebindings/PKGBUILD
@@ -7,15 +7,15 @@ pkgname=('kdebindings-csharp'
'kdebindings-python'
'kdebindings-ruby'
'kdebindings-smoke')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'python2-qt' 'kdepim-runtime' 'mono'
- 'kdegraphics-okular' 'qwt' 'docbook-xsl' 'boost' 'qscintilla' 'ruby')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'python2-pyqt' 'kdepim-runtime' 'mono'
+ 'kdegraphics-okular' 'qwt' 'boost' 'qscintilla' 'ruby')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('eff4b5785b09958fffe4e23583f5af75c796aa9e')
+sha1sums=('4ecc6ac378c241472aa75680abfafd8d57672653')
build() {
export MONO_SHARED_DIR="${srcdir}/build/.mono"
@@ -46,7 +46,7 @@ package_kdebindings-csharp() {
package_kdebindings-python() {
pkgdesc='KDE bindings for python'
- depends=('kdepim-runtime' 'python2-qt' 'qscintilla')
+ depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
cd $srcdir/build/python
make DESTDIR=$pkgdir install
diff --git a/extra/kdeedu/PKGBUILD b/extra/kdeedu/PKGBUILD
index 72568ca06..e1c29b24b 100644
--- a/extra/kdeedu/PKGBUILD
+++ b/extra/kdeedu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 119955 2011-04-17 11:47:18Z andrea $
+# $Id: PKGBUILD 122727 2011-05-06 08:29:55Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -25,18 +25,18 @@ pkgname=('kdeedu-blinken'
'kdeedu-parley'
'kdeedu-rocs'
'kdeedu-step')
-pkgver=4.6.2
-pkgrel=2
+pkgver=4.6.3
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeedu')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd'
'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre'
- 'python2' 'docbook-xsl' 'avogadro')
+ 'python2' 'avogadro')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
'gpsd-2.96.patch')
-sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05'
+sha1sums=('4b27e6e1670760982dae13dc8c51c814c6853396'
'fd6b6b81945d951bb6ad0bb735df33c11bb2008e')
build() {
diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD
index 1ed6e3982..98641f782 100644
--- a/extra/kdegames/PKGBUILD
+++ b/extra/kdegames/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118073 2011-04-05 10:08:20Z andrea $
+# $Id: PKGBUILD 121100 2011-04-29 00:27:55Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -43,16 +43,16 @@ pkgname=('kdegames-bomber'
'kdegames-libkmahjongg'
'kdegames-lskat'
'kdegames-palapeli')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdegames')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'ggz-client-libs'
- 'twisted' 'kdebindings-python' 'docbook-xsl')
+ 'twisted' 'kdebindings-python')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('91ec7347488504931b4019182a3f2b91a60d8065')
+sha1sums=('472cb9541f389a8869a496f715d48587db568dda')
build() {
cd $srcdir
diff --git a/extra/kdegraphics/PKGBUILD b/extra/kdegraphics/PKGBUILD
index 49e209011..92daea8ae 100644
--- a/extra/kdegraphics/PKGBUILD
+++ b/extra/kdegraphics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118092 2011-04-05 12:11:35Z andrea $
+# $Id: PKGBUILD 121093 2011-04-29 00:27:32Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -12,7 +12,7 @@ pkgname=('kdegraphics-gwenview'
'kdegraphics-ksnapshot'
'kdegraphics-libs'
'kdegraphics-okular')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -20,9 +20,9 @@ license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdegraphics')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'sane' 'lcms'
'libxxf86vm' 'poppler-qt' 'libspectre' 'chmlib' 'djvulibre'
- 'ebook-tools' 'kdebase-runtime' 'docbook-xsl')
+ 'ebook-tools' 'kdebase-runtime')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('9c9f31c88c1c9e6dcaa7fb177847402d874ffc94')
+sha1sums=('c16dc9c55e7459418fa9887aa532ea0a269e7179')
build() {
cd ${srcdir}
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index ecb7fd3b8..26101a6f1 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118061 2011-04-05 10:07:38Z andrea $
+# $Id: PKGBUILD 122716 2011-05-06 07:29:37Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdelibs
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ replaces=('arts' 'kdelibs-experimental')
install='kdelibs.install'
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch')
-sha1sums=('b4794a9a69492ce4725abd9eb5d00d3a50e46603'
+sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
'd994f262356af5b9e4e9619646e471bd98c91efb')
diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD
index 8804a1139..35dbe4d09 100644
--- a/extra/kdemultimedia/PKGBUILD
+++ b/extra/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118074 2011-04-05 10:08:23Z andrea $
+# $Id: PKGBUILD 121101 2011-04-29 00:27:58Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -10,25 +10,20 @@ pkgname=('kdemultimedia-dragonplayer'
'kdemultimedia-kmix'
'kdemultimedia-kscd'
'kdemultimedia-mplayerthumbs')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdemultimedia')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'tunepimp'
- 'ffmpeg' 'mplayer' 'docbook-xsl' 'pulseaudio' 'libmusicbrainz3')
+ 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'mplayerthumbs.config'
- 'kmix-locale-pulseaudio.patch')
-sha1sums=('4447d26488e3b97c43580d86ad47cee77ff98578'
- 'ba016fa2563c14ffcba852c62506b66bfc6ee683'
- '5aa443ace9f4b1906c227664b4e50bace666cf99')
+ 'mplayerthumbs.config')
+sha1sums=('d5bde19156b65e9b56e0e6de800efc0efe117632'
+ 'ba016fa2563c14ffcba852c62506b66bfc6ee683')
build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- patch -Np0 -i ${srcdir}/kmix-locale-pulseaudio.patch
-
cd ${srcdir}
mkdir build
cd build
diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD
index 030f541d0..8163dfcac 100644
--- a/extra/kdenetwork/PKGBUILD
+++ b/extra/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118075 2011-04-05 10:08:27Z andrea $
+# $Id: PKGBUILD 121102 2011-04-29 00:28:01Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -10,7 +10,7 @@ pkgname=('kdenetwork-filesharing'
'kdenetwork-kppp'
'kdenetwork-krdc'
'kdenetwork-krfb')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -19,9 +19,9 @@ groups=('kde' 'kdenetwork')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
'ppp' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
- 'telepathy-qt4' 'docbook-xsl' 'libktorrent')
+ 'telepathy-qt4' 'libktorrent')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('6865c074b87a201b876d11b86a2f14aff5f45abb')
+sha1sums=('6f140dca442be815eda4fb79d51efd9e4588a1f1')
build() {
cd ${srcdir}
diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index a7310cd82..04520de5d 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 118062 2011-04-05 10:07:41Z andrea $
+# $Id: PKGBUILD 121090 2011-04-29 00:27:22Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdepimlibs
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
pkgdesc="KDE PIM Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL')
depends=('kdelibs' 'gpgme' 'akonadi' 'libical' )
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap'
- 'docbook-xsl')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
install='kdepimlibs.install'
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f3c78688203b90efabdd8961783e8f4d16d9c57c')
+sha1sums=('370b4e98ab9e1f8ba18d36630d5c8bbff8da4883')
build() {
cd ${srcdir}
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index a2dc49540..f28feb08a 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118076 2011-04-05 10:08:32Z andrea $
+# $Id: PKGBUILD 122728 2011-05-06 08:49:57Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -72,16 +72,16 @@ pkgname=('kdeplasma-addons-applets-bball'
'kdeplasma-addons-wallpapers-pattern'
'kdeplasma-addons-wallpapers-virus'
'kdeplasma-addons-wallpapers-weather')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL')
groups=('kde' 'kdeplasma-addons')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdegraphics-libs'
- 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'docbook-xsl' 'boost')
+ 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('f888908e937453c9799c6ad71c514a5227e13700')
+sha1sums=('7a43dcfebc0316e681b04d0958d89272620a11b7')
build() {
cd ${srcdir}
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index 6cf11bedb..26c56d65e 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118077 2011-04-05 10:08:34Z andrea $
+# $Id: PKGBUILD 121103 2011-04-29 00:28:04Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -23,17 +23,17 @@ pkgname=('kdesdk-cervisia'
'kdesdk-scripts'
'kdesdk-strigi-analyzer'
'kdesdk-umbrello')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdesdk')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'subversion'
- 'docbook-xsl' 'antlr2' 'kdebase-konqueror')
+ 'antlr2' 'kdebase-konqueror')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
'fix-python2-path.patch')
-sha1sums=('d246f5571aa772d4a4d0538456b142799c17c146'
+sha1sums=('6faecbd828fda6cf0aced642287d982d3541d746'
'd05ca0231869c484fd3861955d960a60aff7dcfb')
build() {
diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD
index 8362394c1..490da8856 100644
--- a/extra/kdetoys/PKGBUILD
+++ b/extra/kdetoys/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118078 2011-04-05 10:08:37Z andrea $
+# $Id: PKGBUILD 121104 2011-04-29 00:28:07Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -6,15 +6,15 @@ pkgbase=kdetoys
pkgname=('kdetoys-amor'
'kdetoys-kteatime'
'kdetoys-ktux')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdetoys')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'docbook-xsl')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('4619d2124abe0887ce5aca24f1333419f7cd88c5')
+sha1sums=('07eaf12ccabc9209bd5de6a3f0e4ff6c70fca8b0')
build() {
cd $srcdir
diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD
index b94b833fe..7fc6bb18b 100644
--- a/extra/kdeutils/PKGBUILD
+++ b/extra/kdeutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118079 2011-04-05 10:08:41Z andrea $
+# $Id: PKGBUILD 121105 2011-04-29 00:28:11Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -16,7 +16,7 @@ pkgname=('kdeutils-ark'
'kdeutils-printer-applet'
'kdeutils-superkaramba'
'kdeutils-sweeper')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -24,9 +24,9 @@ license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeutils')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
- 'docbook-xsl' 'qjson')
+ 'qjson')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('621d77f8f75bdd867316768f48ea257829f7def1')
+sha1sums=('1aa735c03689ef49b949278ee31d0d8e8536b7d6')
build() {
cd ${srcdir}
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index d58efe744..3da6dd566 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118080 2011-04-05 10:08:44Z andrea $
+# $Id: PKGBUILD 121106 2011-04-29 00:28:14Z andrea $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=kdewebdev
@@ -6,16 +6,16 @@ pkgname=('kdewebdev-kfilereplace'
'kdewebdev-kimagemapeditor'
'kdewebdev-klinkstatus'
'kdewebdev-kommander')
-pkgver=4.6.2
+pkgver=4.6.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdewebdev')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime'
- 'docbook-xsl' 'boost')
+ 'boost')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('80f709845fb871919fbb2c293d1cc8f40160509b')
+sha1sums=('39e72fbaf76ee1c685321c8c3a767c38e63bc2a9')
build() {
cd $srcdir
diff --git a/extra/keytouch-editor/PKGBUILD b/extra/keytouch-editor/PKGBUILD
index 3bb95b53b..e32eb7ff4 100644
--- a/extra/keytouch-editor/PKGBUILD
+++ b/extra/keytouch-editor/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 3507 2008-06-23 04:35:20Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: mouse256 & AndyRTR
+# $Id: PKGBUILD 122686 2011-05-06 05:33:49Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=keytouch-editor
pkgver=3.1.3
-pkgrel=1
+pkgrel=2
pkgdesc="An utility to create keyboard files for keytouch"
arch=('i686' 'x86_64' 'mips64el')
url="http://keytouch.sourceforge.net/"
@@ -16,10 +15,14 @@ md5sums=('046e0525d2b1275f1ec1b5140bd93565' 'def8cf803d7f25dd919b8ad090083bf1')
sha1sums=('a8c0b28bac4b1f9de3897e1a78dc14b4d994334e' 'c6b725267a628cfc93388044cfd72974f53debaf')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -p1 < ../keytouch-editor-3.1.3-glibc28.patch || return 1
- autoreconf || return 1
- ./configure --prefix=/usr || return 1
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 < ../keytouch-editor-3.1.3-glibc28.patch
+ autoreconf
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/keytouch-editor/keytouch-editor.install b/extra/keytouch-editor/keytouch-editor.install
index 8a684997a..e1f991f31 100644
--- a/extra/keytouch-editor/keytouch-editor.install
+++ b/extra/keytouch-editor/keytouch-editor.install
@@ -1,10 +1,6 @@
post_install() {
cat << EOF
==> To use keytouch-editor:
-You'll need to have either gksu (pacman -S gksu) or kdesu (pacman -S kdebase) installed.
+==> You'll need to have either gksu (pacman -S gksu) or kdesu (pacman -S kdebase-runtime) installed.
EOF
}
-
-post_upgrade() {
- post_install $1
-}
diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD
index ed1535009..67d89a5e1 100644
--- a/extra/libidn/PKGBUILD
+++ b/extra/libidn/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122517 2011-05-04 11:21:40Z ronald $
+# $Id: PKGBUILD 122805 2011-05-06 09:19:07Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Jan de Groot <jgc.archlinux.org>
# Contributor: Eric Johnson <eric.archlinux.org>
pkgname=libidn
-pkgver=1.21
+pkgver=1.22
pkgrel=1
pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications"
url="http://www.gnu.org/software/libidn/"
@@ -15,7 +15,7 @@ makedepends=('pkgconfig')
options=('!libtool')
source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
install=libidn.install
-sha1sums=('991d5d4e24118d7672d53ed692a8a6ab87212f8f')
+sha1sums=('8358e897c24d534438f6b5694c25e85889d860c3')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD
new file mode 100644
index 000000000..9a8fbea4d
--- /dev/null
+++ b/extra/libmygpo-qt/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 122697 2011-05-06 06:29:29Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libmygpo-qt
+pkgver=1.0.2
+pkgrel=1
+pkgdesc="A C++/Qt client library for gpodder.net"
+arch=('i686' 'x86_64')
+url="http://wiki.gpodder.org/wiki/Libmygpo-qt"
+license=('LGPL2.1')
+depends=('qjson')
+makedepends=('cmake')
+source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz")
+md5sums=('6f88444c82e9840638ec16e366457dd7')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}.${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package(){
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/mhash/PKGBUILD b/extra/mhash/PKGBUILD
index fdbdb2917..1fac0fedc 100644
--- a/extra/mhash/PKGBUILD
+++ b/extra/mhash/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 27643 2009-02-24 05:16:32Z eric $
-# Maintainer: gregor <gregor@archlinux.org>
+# $Id: PKGBUILD 122885 2011-05-07 03:21:34Z eric $
+# Contributor: gregor <gregor@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=mhash
pkgver=0.9.9.9
-pkgrel=1
-pkgdesc="A thread-safe hash library which provides a uniform interface to hash algorithms (MD5, SHA-1, HAVAL, etc"
+pkgrel=2
+pkgdesc="A thread-safe hash library which provides a uniform interface to hash algorithms (MD5, SHA1, HAVAL, etc)"
arch=('i686' 'x86_64' 'mips64el')
url="http://mhash.sourceforge.net/"
license=('LGPL')
depends=('glibc')
options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/mhash/$pkgname-$pkgver.tar.bz2)
+source=(http://downloads.sourceforge.net/sourceforge/mhash/${pkgname}-${pkgver}.tar.bz2)
md5sums=('f91c74f9ccab2b574a98be5bc31eb280')
build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr --enable-static || return 1
- make || return 1
- make prefix=$pkgdir/usr install || return 1
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --enable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index 5c36869ce..f02caf326 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108642 2011-02-02 03:35:19Z allan $
+# $Id: PKGBUILD 122860 2011-05-06 19:46:40Z eric $
# Maintainer: tobias <tobias@archlinux.org>
# Contributor: Ben Mazer <blm@groknil.org>
pkgname=msmtp
-pkgver=1.4.23
+pkgver=1.4.24
pkgrel=1
pkgdesc="A mini smtp client"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,20 +11,20 @@ license=('GPL3')
url="http://msmtp.sourceforge.net"
depends=('gnutls' 'libidn')
provides=('smtp-forwarder')
-source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2)
install=${pkgname}.install
-md5sums=('5fb7ae88186624cdb125d3efad3fdc16')
+source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('3ed704fbd3e7419cab5c65bb7928d9ba')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls
make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
# this can not be the default
- #install -Dm644 doc/msmtprc-system.example $startdir/pkg/etc/msmtprc
+ #install -Dm644 doc/msmtprc-system.example "${pkgdir}"/etc/msmtprc
}
diff --git a/extra/msmtp/msmtp.install b/extra/msmtp/msmtp.install
index ec2c1fb23..c4dd76476 100644
--- a/extra/msmtp/msmtp.install
+++ b/extra/msmtp/msmtp.install
@@ -1,9 +1,9 @@
-infodir=/usr/share/info
+infodir=usr/share/info
filelist=(msmtp.info)
post_install() {
for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
done
}
@@ -13,7 +13,7 @@ post_upgrade() {
pre_remove() {
for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
done
}
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index 48c33a70b..94cdc6efa 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 122655 2011-05-05 16:31:11Z ibiru $
+# $Id: PKGBUILD 122706 2011-05-06 06:57:16Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=nautilus
pkgver=3.0.1.1
-pkgrel=2
+pkgrel=3
pkgdesc="The GNOME shell and file manager"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gtk3' 'hicolor-icon-theme' 'gvfs' 'desktop-file-utils' 'gsettings-desktop-schemas' 'shared-mime-info' 'gnome-themes-standard')
+depends=('libexif' 'gnome-desktop' 'exempi' 'gtk3' 'hicolor-icon-theme' 'gvfs' 'desktop-file-utils' 'gsettings-desktop-schemas' 'shared-mime-info' 'gnome-icon-theme')
makedepends=('intltool' 'gobject-introspection')
replaces=('gnome-volume-manager')
url="http://www.gnome.org"
diff --git a/extra/netcdf/PKGBUILD b/extra/netcdf/PKGBUILD
index 05497fc53..8f5000dd1 100644
--- a/extra/netcdf/PKGBUILD
+++ b/extra/netcdf/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 94910 2010-10-12 12:58:13Z ronald $
+# $Id: PKGBUILD 122825 2011-05-06 11:10:26Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=netcdf
-pkgver=4.1.1
-pkgrel=3
+pkgver=4.1.2
+pkgrel=1
pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library"
arch=("i686" "x86_64" 'mips64el')
url="http://www.unidata.ucar.edu/downloads/netcdf/index.jsp"
-depends=('gcc-libs' 'hdf5' 'gcc-fortran')
-options=('force' '!libtool' '!makeflags')
+depends=('gcc-libs' 'hdf5' 'gcc-fortran' 'curl')
+options=('!libtool' '!makeflags')
license=('custom')
source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-${pkgver}.tar.gz)
-sha1sums=('6fece208825b978fc2240732f6f57927d71a0552')
+sha1sums=('ef42419b2afd99364e470813bc5b922a1a72a6de')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --enable-shared --enable-netcdf-4
+ ./configure --prefix=/usr --enable-shared --enable-netcdf-4 --enable-dap-netcdf
make
make check
}
diff --git a/extra/oxygen-icons/PKGBUILD b/extra/oxygen-icons/PKGBUILD
new file mode 100644
index 000000000..1440c6446
--- /dev/null
+++ b/extra/oxygen-icons/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 121091 2011-04-29 00:27:25Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=oxygen-icons
+pkgname=('oxygen-icons'
+ 'oxygen-icons-svg')
+pkgver=4.6.3
+pkgrel=1
+pkgdesc="The Oxygen Icon Theme"
+arch=('any')
+url='http://www.oxygen-icons.org/'
+license=('LGPL')
+makedepends=('pkgconfig' 'cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('9efaf92d516f716f3d36ff0e21c66384500e967d')
+
+build() {
+ cd $srcdir
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package_oxygen-icons() {
+ cd $srcdir/build
+ make DESTDIR=$pkgdir install
+}
+
+package_oxygen-icons-svg() {
+ pkgdesc="The Oxygen Icon Theme (Scalable Vector Graphics)"
+ cd $srcdir/${pkgbase}-${pkgver}
+ find scalable -type f ! -name '*.sh' -exec \
+ install -D -m644 "{}" "${pkgdir}/usr/share/icons/oxygen/{}" \;
+}
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
new file mode 100644
index 000000000..cedae286a
--- /dev/null
+++ b/extra/pyqt/PKGBUILD
@@ -0,0 +1,77 @@
+# $Id: PKGBUILD 122181 2011-05-02 17:31:08Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
+
+pkgbase=pyqt
+pkgname=('pyqt' 'python2-pyqt')
+pkgver=4.8.4
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro"
+license=('GPL')
+makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
+ 'python-opengl' 'qt-assistant-compat')
+source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
+md5sums=('97c5dc1042feb5b3fe20baabad055af1')
+
+build() {
+ cd "${srcdir}"
+ cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
+
+ cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+ python configure.py \
+ --confirm-license \
+ --qsci-api
+
+ # Thanks Gerardo for the rpath fix
+ find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+ make
+
+ ### Python2 version ###
+ cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
+ python2 configure.py \
+ --confirm-license \
+ -v /usr/share/sip \
+ --qsci-api
+
+ # Thanks Gerardo for the rpath fix
+ find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+ make
+}
+
+package_pyqt(){
+ pkgdesc="A set of Python bindings for the Qt toolkit"
+ depends=('qt' 'python-sip')
+ optdepends=('phonon: enable audio and video in PyQt applications'
+ 'qscintilla: QScintilla API'
+ 'qt-assistant-compat: add PyQt online help in Qt Assistant')
+ replaces=('python-qt')
+ provides=('python-qt')
+
+ cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+ # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python2-pyqt(){
+ pkgdesc="PyQt: A set of Python2 bindings for the Qt toolkit"
+ depends=('pyqt' 'python2-sip' 'dbus-python')
+ optdepends=('phonon: enable audio and video in PyQt applications'
+ 'python-opengl: enable OpenGL 3D graphics in PyQt applications'
+ 'qscintilla: QScintilla API'
+ 'qt-assistant-compat: add PyQt online help in Qt Assistant')
+ replaces=('python2-qt')
+ provides=('python2-qt')
+
+ cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
+ # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Provided by pyqt
+ rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
+ rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
+ rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
+}
diff --git a/extra/quota-tools/PKGBUILD b/extra/quota-tools/PKGBUILD
index 3d62ae767..4dd303717 100644
--- a/extra/quota-tools/PKGBUILD
+++ b/extra/quota-tools/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 23363 2009-01-08 00:26:14Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Judd <judd@archlinux.org>
+# $Id: PKGBUILD 122880 2011-05-07 02:23:54Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=quota-tools
pkgver=3.17
-pkgrel=1
+pkgrel=2
pkgdesc="Tools to manage kernel-level quotas in Linux"
arch=('i686' 'x86_64' 'mips64el')
url="http://sourceforge.net/projects/linuxquota/"
@@ -13,20 +12,23 @@ depends=('e2fsprogs' 'tcp_wrappers')
backup=('etc/warnquota.conf' 'etc/quotatab' 'etc/quotagrpadmins')
options=('!emptydirs')
source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz LICENSE)
-md5sums=('cb3e98a039c0cf98e7c1ad4b50a5bda7' 'dd792440e684043e4e4ef80963d0237b')
-sha1sums=('8dc04ea803a43496dfe275a8260757f558a2d762' '57297bdc9e638c500506169bbbe12eb89bcf7d07')
+md5sums=('cb3e98a039c0cf98e7c1ad4b50a5bda7'
+ 'dd792440e684043e4e4ef80963d0237b')
+sha1sums=('8dc04ea803a43496dfe275a8260757f558a2d762'
+ '57297bdc9e638c500506169bbbe12eb89bcf7d07')
build() {
- cd ${srcdir}/${pkgname}
- ./configure --prefix=/usr --sysconfdir=/etc || return 1
- make || return 1
- make ROOTDIR=${pkgdir} install || return 1
- install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+ cd "${srcdir}/${pkgname}"
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}"
+ make ROOTDIR="${pkgdir}" install
+ install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- # remove conflicts
- # glibc
- rm ${pkgdir}/usr/include/rpcsvc/rquota.h || return 1
- rm ${pkgdir}/usr/include/rpcsvc/rquota.x || return 1
- # man-pages
- rm ${pkgdir}/usr/share/man/man2/quotactl.2 || return 1
+# remove conflicts with glibc and man-pages
+ rm "${pkgdir}"/usr/include/rpcsvc/rquota.{h,x}
+ rm "${pkgdir}/usr/share/man/man2/quotactl.2"
}
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index e11458b3c..9461d374d 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111269 2011-02-25 16:10:57Z ronald $
+# $Id: PKGBUILD 122820 2011-05-06 10:48:44Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Contributor: K. Piche <kpiche@rogers.com>
pkgname=r
-pkgver=2.12.2
+pkgver=2.13.0
pkgrel=1
pkgdesc="R is a language and environment for statistical computing and graphics"
arch=('i686' 'x86_64' 'mips64el')
@@ -18,8 +18,8 @@ options=('!makeflags')
source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
'r.desktop'
'r.png')
-sha1sums=('dbdc46edbab2dbbdc115b7247f80da5fee3dd912'
- 'bcc0320d7cc49d56408edc756b50a0f9ba98fe43'
+sha1sums=('878510e8a5fa1ccd1e0c4af5866f5416f3c27469'
+ '13aa29219bcaa102e575de8c1c8e0833d233e836'
'a69a07ec363440efc18ce0a7f2af103375dea978')
build() {
diff --git a/extra/r/r.desktop b/extra/r/r.desktop
index a1b6b1254..68b49c447 100644
--- a/extra/r/r.desktop
+++ b/extra/r/r.desktop
@@ -7,6 +7,5 @@ Icon=/usr/share/pixmaps/r.png
DocPath=/usr/lib/R/doc/html/index.html
StartupNotify=true
Terminal=true
-TerminalOptions=
Type=Application
-Categories=Science;Math
+Categories=Education;Science;Math;
diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD
index 30fa7ea9e..07bf9746e 100644
--- a/extra/rxvt-unicode/PKGBUILD
+++ b/extra/rxvt-unicode/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 106127 2011-01-14 17:50:21Z angvp $
+# $Id: PKGBUILD 122865 2011-05-07 00:01:55Z eric $
# Maintainer: tobias <tobias@archlinux.org>
# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
pkgname=rxvt-unicode
-pkgver=9.10
+pkgver=9.11
pkgrel=1
pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
+url="http://software.schmorp.de/pkg/rxvt-unicode.html"
+license=('GPL')
depends=('gcc-libs' 'libxft' 'gdk-pixbuf2')
-makedepends=('ncurses' 'perl>=5.12.2' 'pkgconfig')
optdepends=('perl: lots of utilities' 'gtk2-perl: to use the urxvt-tabbed')
-url="http://software.schmorp.de/pkg/rxvt-unicode.html"
-license=("GPL")
source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
- ${pkgname}.desktop ${pkgname}.png popup-menu-hang.diff)
-md5sums=('a23aa40b31e843878b6f9c44768de430'
- '5bfefa1b41c2b81ca18f2ef847330543'
- '84328cada91751df07324d95f8be4d1b'
+ ${pkgname}.desktop popup-menu-hang.diff)
+md5sums=('1bed5bfeed026e0bfafa0e9e4f62aa37'
+ '3de6c13126a45bc3bc9f6bba077a1311'
'aead33ba3b08eeb251fb0c1427a4a024')
-sha1sums=('54c896a4885b8984b0dfa652269c3c34c4d75f2d'
- '79b7cacb7d6ce4a34f8a31a2e33475a8f7bf69cb'
- '9ff58d7b1d60838c51c9045bc0be342fac456790'
+sha1sums=('21d0fad9a6032dbcf2c43a85f288543c6bd5ab3d'
+ '962aebc88982dbeb62a7c4a051ff567e015f61a0'
'ec4013f4af3a45da928b75f40fbf6389070e7fdd')
build() {
@@ -51,9 +48,7 @@ package() {
# install the tabbing wrapper ( requires gtk2-perl! )
sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed
install -Dm 755 doc/rxvt-tabbed "${pkgdir}/usr/bin/urxvt-tabbed"
- # install freedesktop menu and icon ( icon from cvs checkout )
+ # install freedesktop menu
install -Dm644 ../${pkgname}.desktop \
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
- install -Dm644 ../${pkgname}.png \
- "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
}
diff --git a/extra/rxvt-unicode/rxvt-unicode.desktop b/extra/rxvt-unicode/rxvt-unicode.desktop
index 436e8d119..68d613dbd 100644
--- a/extra/rxvt-unicode/rxvt-unicode.desktop
+++ b/extra/rxvt-unicode/rxvt-unicode.desktop
@@ -4,7 +4,7 @@ Encoding=UTF-8
Name=rxvt-unicode
Comment=An Unicode capable rxvt clone
Exec=urxvt
-Icon=rxvt-unicode
+Icon=terminal
Terminal=false
Type=Application
Categories=Application;System;TerminalEmulator;
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
new file mode 100644
index 000000000..57a5f4fac
--- /dev/null
+++ b/extra/sip/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 122180 2011-05-02 17:30:24Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
+
+pkgbase=sip
+pkgname=('sip' 'python2-sip')
+pkgver=4.12.2
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.com/software/sip/"
+license=('custom:"sip"')
+makedepends=('python' 'python2')
+source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
+md5sums=('9df80f88e0e4022cdd8a8891c6c38048')
+
+build() {
+ cd "${srcdir}"
+ cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
+ make
+
+ ### Python2 version ###
+ cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+ python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
+ make
+}
+
+package_sip() {
+ pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
+ depends=('python')
+ replaces=('python-sip')
+ provides=('python-sip')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python2-sip() {
+ pkgdesc="A tool that makes it easy to create Python2 bindings for C and C++ libraries"
+ depends=('sip' 'python2')
+
+ cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ # Provided by sip
+ rm "${pkgdir}/usr/bin/sip"
+}
diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD
index 56171fb64..5475c3ecd 100644
--- a/extra/squid/PKGBUILD
+++ b/extra/squid/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79502 2010-05-04 00:58:56Z kevin $
+# $Id: PKGBUILD 122870 2011-05-07 00:40:13Z kevin $
# Maintainer: Kevin Piche <kevin@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=squid
-pkgver=2.7.STABLE9
+pkgver=3.1.12
pkgrel=1
pkgdesc="A full-featured Web proxy cache server."
arch=(i686 x86_64 'mips64el')
@@ -12,51 +12,55 @@ depends=('openssl' 'pam' 'cron' 'perl')
makedepends=('libcap>=2.16')
license=('GPL')
backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid)
-install=${pkgname}.install
-source=(http://www.squid-cache.org/Versions/v2/2.7/${pkgname}-${pkgver}.tar.bz2
- squid-makefiles.patch squid squid.conf.d squid.pam
- squid.cron fix-for-new-cap-headers.patch)
-md5sums=('3c6642c85470b1079207d43bba25a819'
- '082e53bb6e2c79bc44ac95c3d69145da'
- 'd213b0cc1db72b749bb8c88716fdab39'
- '81f9a446d143f42c6a3f30304e91c39f'
- '270977cdd9b47ef44c0c427ab9034777'
- '5e17df989e2a74e869790c066f61225b'
- '9b7586646c8a81730029798895a0eaca')
+install=squid.install
+source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2
+ squid squid.conf.d squid.pam squid.cron squid-3.1.11-unused.patch)
+md5sums=('3b4979e4b44f46d4e13f50326c537d89' 'd213b0cc1db72b749bb8c88716fdab39'
+ '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777'
+ '5e17df989e2a74e869790c066f61225b' '8e59089e4a8556fc18df51979f1cfbff')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/squid-makefiles.patch || return 1
+
+ # gcc 4.6 doesn't support -fhuge-objects.
+ sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
+ # fix compile errors with gcc 4.6
+ # http://bugs.squid-cache.org/show_bug.cgi?id=3178
+ patch -Np1 -i ${srcdir}/squid-3.1.11-unused.patch
+
+ # fix cache_dir, cache_dir size, and effective group.
+ sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in
+ sed '/^#cache_dir/ s/100/256/
+ /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre
./configure --prefix=/usr --datadir=/usr/share/squid \
--sysconfdir=/etc/squid --libexecdir=/usr/lib/squid \
- --localstatedir=/var --enable-auth="basic,digest,ntlm" \
- --enable-removal-policies="lru,heap" \
- --enable-digest-auth-helpers="password" \
- --enable-storeio="aufs,ufs,diskd,coss,null" \
+ --localstatedir=/var --with-logdir=/var/log/squid \
+ --enable-auth="basic,digest,ntlm" --enable-removal-policies="lru,heap" \
+ --enable-digest-auth-helpers="password" --enable-storeio="aufs,ufs,diskd" \
--enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \
--enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
- --enable-ntlm-auth-helpers="SMB,fakeauth,no_check" \
+ --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \
--enable-delay-pools --enable-arp-acl --enable-ssl --enable-snmp \
--enable-linux-netfilter --enable-ident-lookups \
--enable-useragent-log --enable-cache-digests --enable-referer-log \
- --enable-async-io --enable-truncate --enable-arp-acl \
- --enable-htcp --enable-carp --enable-epoll --with-maxfd=4096
- --with-large-files
+ --enable-arp-acl --enable-htcp --enable-carp --enable-epoll \
+ --with-filedescriptors=4096 --with-large-files --enable-arp-acl \
+ --with-default-user=proxy \
+ --enable-async-io --enable-truncate
#some versions have build problems with both async and truncate enabled:
-# --enable-async-io --enable-arp-acl \
-
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
- rm -rf ${pkgdir}/var
- mv ${pkgdir}/usr/bin/Run* ${pkgdir}/usr/lib/squid
- mkdir -p ${pkgdir}/var/cache/squid
- mkdir -p ${pkgdir}/var/log/squid
+# --enable-async-io
+
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
install -D -m755 ${srcdir}/squid ${pkgdir}/etc/rc.d/squid
install -D -m755 ${srcdir}/squid.cron ${pkgdir}/etc/cron.weekly/squid
install -D -m644 ${srcdir}/squid.conf.d ${pkgdir}/etc/conf.d/squid
install -D -m644 ${srcdir}/squid.pam ${pkgdir}/etc/pam.d/squid
- install -D -m644 ${pkgdir}/etc/squid/squid.conf \
- ${pkgdir}/etc/squid/squid.conf.default
}
# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/squid/squid-3.1.11-unused.patch b/extra/squid/squid-3.1.11-unused.patch
new file mode 100644
index 000000000..698ce5fe5
--- /dev/null
+++ b/extra/squid/squid-3.1.11-unused.patch
@@ -0,0 +1,296 @@
+diff -up squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c.unused squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c
+--- squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c.unused 2011-02-10 10:04:50.422205003 +0100
++++ squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c 2011-02-10 10:05:48.020204424 +0100
+@@ -219,7 +219,6 @@ main(int argc, char **argv)
+ int use_extension_dn = 0;
+ int strip_nt_domain = 0;
+ int strip_kerberos_realm = 0;
+- int err = 0;
+
+ setbuf(stdout, NULL);
+
+@@ -602,7 +601,6 @@ error:
+ tryagain = 1;
+ }
+ }
+- err = 0;
+ }
+ if (ld)
+ ldap_unbind(ld);
+diff -up squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c.unused squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c
+--- squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c.unused 2011-02-10 09:57:56.170205002 +0100
++++ squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 2011-02-10 09:58:39.039205002 +0100
+@@ -141,7 +141,6 @@ ntlmMakeChallenge(struct ntlm_challenge
+ {
+ static unsigned hash;
+ int r;
+- char *d;
+ int i;
+
+ debug("ntlmMakeChallenge: flg %08x\n", flags);
+@@ -158,7 +157,6 @@ ntlmMakeChallenge(struct ntlm_challenge
+ chal->flags = flags;
+ chal->unknown[6] = htole16(0x003a);
+
+- d = (char *) chal + 48;
+ i = 0;
+
+ if (authenticate_ntlm_domain != NULL)
+diff -up squid-3.1.11/src/auth/negotiate/auth_negotiate.cc.unused squid-3.1.11/src/auth/negotiate/auth_negotiate.cc
+--- squid-3.1.11/src/auth/negotiate/auth_negotiate.cc.unused 2011-02-10 07:57:04.293205769 +0100
++++ squid-3.1.11/src/auth/negotiate/auth_negotiate.cc 2011-02-10 07:58:22.643205463 +0100
+@@ -544,7 +544,6 @@ AuthNegotiateUserRequest::module_start(R
+ {
+ authenticateStateData *r = NULL;
+ static char buf[MAX_AUTHTOKEN_LEN];
+- negotiate_user_t *negotiate_user;
+ AuthUser *auth_user = user();
+
+ assert(data);
+@@ -552,8 +551,6 @@ AuthNegotiateUserRequest::module_start(R
+ assert(auth_user);
+ assert(auth_user->auth_type == AUTH_NEGOTIATE);
+
+- negotiate_user = dynamic_cast<negotiate_user_t *>(user());
+-
+ debugs(29, 8, "AuthNegotiateUserRequest::module_start: auth state is '" << auth_state << "'");
+
+ if (negotiateConfig.authenticate == NULL) {
+@@ -655,12 +652,10 @@ AuthNegotiateUserRequest::authenticate(H
+
+ /** \todo rename this!! */
+ AuthUser *local_auth_user;
+- negotiate_user_t *negotiate_user;
+
+ local_auth_user = user();
+ assert(local_auth_user);
+ assert(local_auth_user->auth_type == AUTH_NEGOTIATE);
+- negotiate_user = dynamic_cast<negotiate_user_t *>(local_auth_user);
+ assert (this);
+
+ /** Check that we are in the client side, where we can generate
+diff -up squid-3.1.11/src/auth/ntlm/auth_ntlm.cc.unused squid-3.1.11/src/auth/ntlm/auth_ntlm.cc
+--- squid-3.1.11/src/auth/ntlm/auth_ntlm.cc.unused 2011-02-10 08:07:21.181205066 +0100
++++ squid-3.1.11/src/auth/ntlm/auth_ntlm.cc 2011-02-10 08:08:52.188204812 +0100
+@@ -460,7 +460,6 @@ AuthNTLMUserRequest::module_start(RH * h
+ {
+ authenticateStateData *r = NULL;
+ static char buf[8192];
+- ntlm_user_t *ntlm_user;
+ AuthUser *auth_user = user();
+
+ assert(data);
+@@ -468,8 +467,6 @@ AuthNTLMUserRequest::module_start(RH * h
+ assert(auth_user);
+ assert(auth_user->auth_type == AUTH_NTLM);
+
+- ntlm_user = dynamic_cast<ntlm_user_t *>(user());
+-
+ debugs(29, 8, "AuthNTLMUserRequest::module_start: auth state is '" << auth_state << "'");
+
+ if (ntlmConfig.authenticate == NULL) {
+@@ -572,12 +569,10 @@ AuthNTLMUserRequest::authenticate(HttpRe
+
+ /* TODO: rename this!! */
+ AuthUser *local_auth_user;
+- ntlm_user_t *ntlm_user;
+
+ local_auth_user = user();
+ assert(local_auth_user);
+ assert(local_auth_user->auth_type == AUTH_NTLM);
+- ntlm_user = dynamic_cast<ntlm_user_t *>(local_auth_user);
+ assert (this);
+
+ /* Check that we are in the client side, where we can generate
+diff -up squid-3.1.11/src/auth/User.cc.unused squid-3.1.11/src/auth/User.cc
+--- squid-3.1.11/src/auth/User.cc.unused 2011-02-10 08:14:08.623207125 +0100
++++ squid-3.1.11/src/auth/User.cc 2011-02-10 08:14:52.305205340 +0100
+@@ -158,13 +158,11 @@ AuthUser::CachedACLsReset()
+ */
+ AuthUserHashPointer *usernamehash;
+ AuthUser *auth_user;
+- char const *username = NULL;
+ debugs(29, 3, "AuthUser::CachedACLsReset: Flushing the ACL caches for all users.");
+ hash_first(proxy_auth_username_cache);
+
+ while ((usernamehash = ((AuthUserHashPointer *) hash_next(proxy_auth_username_cache)))) {
+ auth_user = usernamehash->user();
+- username = auth_user->username();
+ /* free cached acl results */
+ aclCacheMatchFlush(&auth_user->proxy_match_cache);
+
+diff -up squid-3.1.11/src/client_side_reply.cc.unused squid-3.1.11/src/client_side_reply.cc
+--- squid-3.1.11/src/client_side_reply.cc.unused 2011-02-10 08:28:52.861205280 +0100
++++ squid-3.1.11/src/client_side_reply.cc 2011-02-10 08:37:22.530205334 +0100
+@@ -1056,14 +1056,6 @@ clientReplyContext::storeNotOKTransferDo
+ /* haven't found end of headers yet */
+ return 0;
+
+- int sending = SENDING_BODY;
+-
+- if (curReply->sline.status == HTTP_NO_CONTENT ||
+- curReply->sline.status == HTTP_NOT_MODIFIED ||
+- curReply->sline.status < HTTP_OK ||
+- http->request->method == METHOD_HEAD)
+- sending = SENDING_HDRSONLY;
+-
+ /*
+ * Figure out how much data we are supposed to send.
+ * If we are sending a body and we don't have a content-length,
+@@ -2028,13 +2020,10 @@ clientReplyContext::sendMoreData (StoreI
+
+ char *buf = next()->readBuffer.data;
+
+- char *body_buf = buf;
+-
+ if (buf != result.data) {
+ /* we've got to copy some data */
+ assert(result.length <= next()->readBuffer.length);
+ xmemcpy(buf, result.data, result.length);
+- body_buf = buf;
+ }
+
+ #if USE_ZPH_QOS
+diff -up squid-3.1.11/src/comm.cc.unused squid-3.1.11/src/comm.cc
+--- squid-3.1.11/src/comm.cc.unused 2011-02-10 08:20:37.942204904 +0100
++++ squid-3.1.11/src/comm.cc 2011-02-10 08:21:43.940205003 +0100
+@@ -706,7 +706,6 @@ comm_openex(int sock_type,
+ {
+ int new_socket;
+ fde *F = NULL;
+- int tos = 0;
+ struct addrinfo *AI = NULL;
+
+ PROF_start(comm_open);
+@@ -756,11 +755,6 @@ comm_openex(int sock_type,
+
+ debugs(50, 3, "comm_openex: Opened socket FD " << new_socket << " : family=" << AI->ai_family << ", type=" << AI->ai_socktype << ", protocol=" << AI->ai_protocol );
+
+- /* set TOS if needed */
+- if (TOS && comm_set_tos(new_socket, TOS) ) {
+- tos = TOS;
+- }
+-
+ if ( Ip::EnableIpv6&IPV6_SPECIAL_SPLITSTACK && addr.IsIPv6() )
+ comm_set_v6only(new_socket, 1);
+
+diff -up squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc.unused squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc
+--- squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc.unused 2011-02-10 09:42:07.029205002 +0100
++++ squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc 2011-02-10 09:42:37.171205594 +0100
+@@ -123,7 +123,6 @@ AIODiskIOStrategy::callback()
+ void *cbdata;
+ int callback_valid;
+ void *buf;
+- int filedescriptor;
+ async_queue_entry_t *aqe;
+ async_queue_entry_type_t type;
+
+@@ -148,7 +147,6 @@ AIODiskIOStrategy::callback()
+ /* Get the callback parameters */
+ freefunc = aqe->aq_e_free;
+ buf = aqe->aq_e_buf;
+- filedescriptor = aqe->aq_e_fd;
+ type = aqe->aq_e_type;
+ callback_valid = cbdataReferenceValidDone(aqe->aq_e_callback_data, &cbdata);
+ AIODiskFile * theFile = NULL;
+diff -up squid-3.1.11/src/dns_internal.cc.unused squid-3.1.11/src/dns_internal.cc
+--- squid-3.1.11/src/dns_internal.cc.unused 2011-02-10 09:15:50.096204636 +0100
++++ squid-3.1.11/src/dns_internal.cc 2011-02-10 09:16:39.951205440 +0100
+@@ -1360,8 +1360,6 @@ idnsInit(void)
+ CBDATA_INIT_TYPE(idns_query);
+
+ if (DnsSocketA < 0 && DnsSocketB < 0) {
+- int port;
+-
+ IpAddress addrA; // since we don't want to alter Config.Addrs.udp_* and dont have one of our own.
+
+ if (!Config.Addrs.udp_outgoing.IsNoAddr())
+@@ -1397,12 +1395,10 @@ idnsInit(void)
+ * statement. Doing so messes up the internal Debug::level
+ */
+ if (DnsSocketB >= 0) {
+- port = comm_local_port(DnsSocketB);
+ debugs(78, 1, "DNS Socket created at " << addrB << ", FD " << DnsSocketB);
+ commSetSelect(DnsSocketB, COMM_SELECT_READ, idnsRead, NULL, 0);
+ }
+ if (DnsSocketA >= 0) {
+- port = comm_local_port(DnsSocketA);
+ debugs(78, 1, "DNS Socket created at " << addrA << ", FD " << DnsSocketA);
+ commSetSelect(DnsSocketA, COMM_SELECT_READ, idnsRead, NULL, 0);
+ }
+diff -up squid-3.1.11/src/errorpage.cc.unused squid-3.1.11/src/errorpage.cc
+--- squid-3.1.11/src/errorpage.cc.unused 2011-02-10 08:42:44.965205002 +0100
++++ squid-3.1.11/src/errorpage.cc 2011-02-10 08:43:50.597205002 +0100
+@@ -515,7 +515,6 @@ int
+ ErrorState::Dump(MemBuf * mb)
+ {
+ MemBuf str;
+- const char *p = NULL; /* takes priority over mb if set */
+ char ntoabuf[MAX_IPSTRLEN];
+
+ str.reset();
+@@ -570,10 +569,6 @@ ErrorState::Dump(MemBuf * mb)
+ packerToMemInit(&pck, &str);
+ request->header.packInto(&pck);
+ packerClean(&pck);
+- } else if (request_hdrs) {
+- p = request_hdrs;
+- } else {
+- p = "[none]";
+ }
+
+ str.Printf("\r\n");
+diff -up squid-3.1.11/src/fqdncache.cc.unused squid-3.1.11/src/fqdncache.cc
+--- squid-3.1.11/src/fqdncache.cc.unused 2011-02-10 09:29:50.426205631 +0100
++++ squid-3.1.11/src/fqdncache.cc 2011-02-10 09:30:57.407204865 +0100
+@@ -497,10 +497,8 @@ fqdncacheHandleReply(void *data, char *r
+ fqdncacheHandleReply(void *data, rfc1035_rr * answers, int na, const char *error_message)
+ #endif
+ {
+- int n;
+ fqdncache_entry *f;
+ static_cast<generic_cbdata *>(data)->unwrap(&f);
+- n = ++FqdncacheStats.replies;
+ const int age = f->age();
+ statHistCount(&statCounter.dns.svc_time, age);
+ #if USE_DNSSERVERS
+diff -up squid-3.1.11/src/ftp.cc.unused squid-3.1.11/src/ftp.cc
+--- squid-3.1.11/src/ftp.cc.unused 2011-02-10 09:22:52.118205001 +0100
++++ squid-3.1.11/src/ftp.cc 2011-02-10 09:23:56.324205001 +0100
+@@ -2453,7 +2453,6 @@ ftpReadEPSV(FtpStateData* ftpState)
+ {
+ int code = ftpState->ctrl.replycode;
+ char h1, h2, h3, h4;
+- int n;
+ u_short port;
+ IpAddress ipa_remote;
+ int fd = ftpState->data.fd;
+@@ -2521,7 +2520,7 @@ ftpReadEPSV(FtpStateData* ftpState)
+
+ buf = ftpState->ctrl.last_reply + strcspn(ftpState->ctrl.last_reply, "(");
+
+- n = sscanf(buf, "(%c%c%c%hu%c)", &h1, &h2, &h3, &port, &h4);
++ sscanf(buf, "(%c%c%c%hu%c)", &h1, &h2, &h3, &port, &h4);
+
+ if (h1 != h2 || h1 != h3 || h1 != h4) {
+ debugs(9, DBG_IMPORTANT, "Invalid EPSV reply from " <<
+diff -up squid-3.1.11/src/neighbors.cc.unused squid-3.1.11/src/neighbors.cc
+--- squid-3.1.11/src/neighbors.cc.unused 2011-02-10 09:36:24.432205185 +0100
++++ squid-3.1.11/src/neighbors.cc 2011-02-10 09:36:51.359204616 +0100
+@@ -827,7 +827,6 @@ neighborsDigestSelect(HttpRequest * requ
+ peer *best_p = NULL;
+ #if USE_CACHE_DIGESTS
+
+- const cache_key *key;
+ int best_rtt = 0;
+ int choice_count = 0;
+ int ichoice_count = 0;
+@@ -838,8 +837,6 @@ neighborsDigestSelect(HttpRequest * requ
+ if (!request->flags.hierarchical)
+ return NULL;
+
+- key = storeKeyPublicByRequest(request);
+-
+ for (i = 0, p = first_ping; i++ < Config.npeers; p = p->next) {
+ lookup_t lookup;
+
diff --git a/extra/squid/squid.conf.d b/extra/squid/squid.conf.d
index b41916a1d..ea248b76c 100644
--- a/extra/squid/squid.conf.d
+++ b/extra/squid/squid.conf.d
@@ -1,4 +1,4 @@
#
# Parameters to be passed to squid
#
-SQUID_ARGS="-D -sYC"
+SQUID_ARGS="-sYC"
diff --git a/extra/squid/squid.install b/extra/squid/squid.install
index 85776358c..44c9130bf 100644
--- a/extra/squid/squid.install
+++ b/extra/squid/squid.install
@@ -9,9 +9,7 @@ post_install() {
chown proxy.proxy var/{cache,log}/squid
cat << EOF
-Release notes for version 2.7:
- http://www.squid-cache.org/Versions/v2/2.7/RELEASENOTES.html
-
+Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html
EOF
}
diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD
index 44f98e16c..ceec0f63c 100644
--- a/extra/texmacs/PKGBUILD
+++ b/extra/texmacs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108863 2011-02-04 14:42:17Z ronald $
+# $Id: PKGBUILD 122838 2011-05-06 11:44:16Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
pkgname=texmacs
-pkgver=1.0.7.9
+pkgver=1.0.7.10
pkgrel=1
pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one."
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2')
# do not remove texlive-core dependency, as it is needed!
optdepends=('transfig: convert images using fig2ps')
source=(ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${pkgver}-src.tar.gz)
-md5sums=('255d64ebdd900218c091667643f06e44')
+sha1sums=('12491496e68b62aa07369748770771a8c2378129')
build() {
cd ${srcdir}/TeXmacs-${pkgver}-src
diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD
index 4725d4d3e..91635e6e1 100644
--- a/extra/wxmaxima/PKGBUILD
+++ b/extra/wxmaxima/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Vinay S Shastry <vinayshastry@gmail.com>
pkgname=wxmaxima
-pkgver=0.8.6
+pkgver=11.04.0
pkgrel=1
pkgdesc="A wxWidgets GUI for the computer algebra system Maxima"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url="http://wxmaxima.sourceforge.net/"
license=('GPL2')
depends=('maxima' 'libxml2' 'wxgtk')
source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz)
-sha1sums=('124357c83672564ce7ee1bc20ff82c262adae52f')
+sha1sums=('eef566c6b135943fada0ce844ed4f370374c6392')
build() {
cd "${srcdir}/wxMaxima-${pkgver}"