From 8b3a0b83eb5ad9bcff19b466bcd72c18fdf466ce Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 5 Feb 2014 03:38:19 +0000 Subject: Wed Feb 5 03:36:49 UTC 2014 --- extra/apache/PKGBUILD | 10 +- extra/enscript/PKGBUILD | 32 ++++++ extra/enscript/enscript.install | 15 +++ extra/gdk-pixbuf2/PKGBUILD | 6 +- extra/gnome-robots/PKGBUILD | 6 +- extra/graphviz/PKGBUILD | 38 +++---- extra/graphviz/dotty.patch | 21 ---- extra/graphviz/yyerror0.patch | 53 --------- extra/graphviz/yyerror1.patch | 26 ----- extra/kdebase-workspace/PKGBUILD | 6 +- extra/libchamplain/PKGBUILD | 8 +- extra/mesa/PKGBUILD | 15 ++- extra/nspr/PKGBUILD | 8 +- extra/python-geoip/PKGBUILD | 16 +-- extra/sqlite/PKGBUILD | 14 +-- extra/vim/PKGBUILD | 227 --------------------------------------- extra/vim/archlinux.vim | 26 ----- extra/vim/gvim.desktop | 63 ----------- extra/vim/gvim.install | 11 -- extra/vim/vimrc | 16 --- extra/wildmidi/PKGBUILD | 23 ++-- 21 files changed, 118 insertions(+), 522 deletions(-) create mode 100644 extra/enscript/PKGBUILD create mode 100644 extra/enscript/enscript.install delete mode 100644 extra/graphviz/dotty.patch delete mode 100644 extra/graphviz/yyerror0.patch delete mode 100644 extra/graphviz/yyerror1.patch delete mode 100644 extra/vim/PKGBUILD delete mode 100644 extra/vim/archlinux.vim delete mode 100644 extra/vim/gvim.desktop delete mode 100644 extra/vim/gvim.install delete mode 100644 extra/vim/vimrc (limited to 'extra') diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index 32752d3fa..6370959a4 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197860 2013-10-30 11:18:54Z allan $ +# $Id: PKGBUILD 205426 2014-02-04 16:28:18Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=apache -pkgver=2.2.25 +pkgver=2.2.26 pkgrel=1 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') @@ -14,13 +14,13 @@ backup=(etc/httpd/conf/httpd.conf etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf + etc/conf.d/apache etc/logrotate.d/httpd) depends=('openssl' 'zlib' 'apr-util' 'pcre' 'systemd') optdepends=('lynx: apachectl status') install=apache.install _itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01 -source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 - http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2.asc +source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc} ${_itkurl}/02-rename-prefork-to-itk.patch ${_itkurl}/03-add-mpm-to-build-system.patch ${_itkurl}/04-correct-output-makefile-location.patch @@ -37,7 +37,7 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 httpd.logrotate httpd.service arch.layout) -md5sums=('9ebe3070c0bb4311f21a0cd0e34f0045' +md5sums=('254eda547f8d624604e4bf403241e617' 'SKIP' 'f1d9d41360908ceb2374da55ae99197a' 'cdfa04985a0efa850976aef01c2a0c40' diff --git a/extra/enscript/PKGBUILD b/extra/enscript/PKGBUILD new file mode 100644 index 000000000..d24620f96 --- /dev/null +++ b/extra/enscript/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 189649 2013-07-04 03:34:44Z eric $ +# Maintainer: Paul Mattal +# Contributor: Tom Newsom + +pkgname=enscript +pkgver=1.6.6 +pkgrel=1 +pkgdesc="Convert ASCII files to PostScript suitable for printing" +arch=('i686' 'x86_64') +url="http://git.savannah.gnu.org/cgit/enscript.git" +license=('GPL3') +depends=('glibc') +backup=('etc/enscript/enscript.cfg') +install=enscript.install +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('3acc242b829adacabcaf28533f049afd') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc/enscript + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/enscript/enscript.install b/extra/enscript/enscript.install new file mode 100644 index 000000000..18ffbe910 --- /dev/null +++ b/extra/enscript/enscript.install @@ -0,0 +1,15 @@ +infodir=usr/share/info + +post_install() { + [[ -x usr/bin/install-info ]] || return 0 + install-info "$infodir/enscript.info.gz" "$infodir/dir" 2> /dev/null +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 + install-info --delete "$infodir/enscript.info.gz" "$infodir/dir" 2> /dev/null +} diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index 639bc0216..4b62b0f44 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 204045 2014-01-14 15:48:56Z heftig $ +# $Id: PKGBUILD 205063 2014-02-04 00:48:48Z heftig $ # Maintainer: Ionut Biru pkgname=gdk-pixbuf2 -pkgver=2.30.3 +pkgver=2.30.4 pkgrel=1 pkgdesc="An image loading library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11' 'jasper') makedepends=('gtk-doc' 'gobject-introspection') install=gdk-pixbuf2.install source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('c229c53f59573eab9410b53690a4b9db770312c80a4d84ecd6295aa894574494') +sha256sums=('a13bbad0d804829b260bc901dc7d284d330c534489fc1666c126fa4555bbb051') build() { cd gdk-pixbuf-$pkgver diff --git a/extra/gnome-robots/PKGBUILD b/extra/gnome-robots/PKGBUILD index 3005b14eb..ff69e7b70 100644 --- a/extra/gnome-robots/PKGBUILD +++ b/extra/gnome-robots/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198027 2013-10-30 12:21:25Z allan $ +# $Id: PKGBUILD 205062 2014-02-04 00:47:45Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=gnome-robots -pkgver=3.10.0 +pkgver=3.10.2 pkgrel=1 pkgdesc="Avoid the robots and make them crash into each other" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ install=gnome-robots.install url="https://live.gnome.org/Robots" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('600a5b81bf0b47cbe942cd3902a947df2e9e2a2a72f4b2a7248e60b1621b987e') +sha256sums=('7d568e2fc21c86ad53e95689b9fb9dc079c2ad260a955bbaf17f2cf740f45713') build() { cd $pkgname-$pkgver diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 884b8cec1..a2e97e5cf 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 203404 2014-01-10 04:16:47Z bisson $ +# $Id: PKGBUILD 205075 2014-02-04 11:31:25Z heftig $ # Maintainer: Gaetan Bisson # Contributor: kevin # Contributor: John Proctor pkgname=graphviz -pkgver=2.34.0 -pkgrel=3 +pkgver=2.36.0 +pkgrel=2 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('CPL') arch=('i686' 'x86_64') depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts') -makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4') +makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4' 'gtk2') optdepends=('mono: sharp bindings' 'guile: guile bindings' 'lua51: lua bindings' @@ -21,30 +21,16 @@ optdepends=('mono: sharp bindings' 'python2: python bindings' 'r: r bindings' 'tcl: tcl bindings' - 'qt4: gvedit') -source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" - 'yyerror0.patch' - 'yyerror1.patch' - 'dotty.patch') -sha1sums=('5a0c00bebe7f4c7a04523db21f40966dc9f0d441' - '7a6fe4f532974d9ca173b1aba9927bdeb5f80be9' - '6d76a230ee6c11bcd610ebe56f98e96ecef6217d' - '31bc9f505c8b6470289a0d6ec31c237765cba239') + 'qt4: gvedit' + 'gtk2: gtk output plugin') +source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz") +sha1sums=('a41e9f1cbcc9a24651e14dd15a4cda3d912d7d19') install=install -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../yyerror0.patch - patch -p1 -i ../yyerror1.patch - patch -p1 -i ../dotty.patch - sed \ - -e '/LIBPOSTFIX="64"/d' \ - -i configure -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" + export LIBPOSTFIX=/ export PYTHON=python2 export LUA=lua5.1 @@ -55,4 +41,10 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + + # Workaround symlink upgrade bug (fixed in pacman trunk) + # Also deduplicates the tcl libraries (upstream bug?) + # Might have been this commit: https://github.com/ellson/graphviz/commit/f11aead + rm -r "${pkgdir}/usr/lib/tcl8.6/graphviz" + ln -s ../graphviz/tcl "$pkgdir/usr/lib/tcl8.6/graphviz" } diff --git a/extra/graphviz/dotty.patch b/extra/graphviz/dotty.patch deleted file mode 100644 index 7c8ca1d7f..000000000 --- a/extra/graphviz/dotty.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur old/cmd/dotty/dotty_layout.lefty new/cmd/dotty/dotty_layout.lefty ---- old/cmd/dotty/dotty_layout.lefty 2013-09-06 15:07:52.000000000 -1000 -+++ new/cmd/dotty/dotty_layout.lefty 2013-10-22 15:23:50.153028328 -1000 -@@ -5,7 +5,7 @@ - local fd; - - if (~dotty.lservers[lserver] | tablesize (dotty.lservers[lserver]) == 0) { -- if (~((fd = openio ('pipe', lserver, 'r+', '%e -Txdot')) >= 0)) { -+ if (~((fd = openio ('pipe', lserver, 'r+', '%e -Txdot1.2')) >= 0)) { - dotty.message (0, concat ('cannot start ', lserver)); - return null; - } -@@ -438,6 +438,8 @@ - } - } else if (t[i] == 'I') { - i = i + 7; -+ } else if (t[i] == 't') { -+ i = i + 2; - } else { - dotty.message (0, concat ('draw language parser error: ', t[i])); - return null; diff --git a/extra/graphviz/yyerror0.patch b/extra/graphviz/yyerror0.patch deleted file mode 100644 index f8bb98373..000000000 --- a/extra/graphviz/yyerror0.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7aaddf52cd98589fb0c3ab72a393f8411838438a Mon Sep 17 00:00:00 2001 -From: "Emden R. Gansner" -Date: Fri, 4 Oct 2013 09:06:39 -0400 -Subject: [PATCH] Fix buffer overflow problem when reporting a syntax error - with a very long input line - ---- - lib/cgraph/scan.l | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l -index 3cfde0f..2efd203 100644 ---- a/lib/cgraph/scan.l -+++ b/lib/cgraph/scan.l -@@ -16,6 +16,7 @@ - %{ - #include - #include -+#include - #include - #define GRAPH_EOF_TOKEN '@' /* lex class must be defined below */ - /* this is a workaround for linux flex */ -@@ -191,13 +192,21 @@ ID ({NAME}|{NUMBER}) - %% - void yyerror(char *str) - { -+ unsigned char xbuf[BUFSIZ]; - char buf[BUFSIZ]; -- if (InputFile) -- sprintf(buf,"%s:%d: %s in line %d near '%s'\n",InputFile, line_num, -- str,line_num,yytext); -- else -- sprintf(buf," %s in line %d near '%s'\n", str,line_num,yytext); -- agerr(AGWARN,buf); -+ agxbuf xb; -+ -+ agxbinit(&xb, BUFSIZ, xbuf); -+ if (InputFile) { -+ agxbput (&xb, InputFile); -+ agxbput (&xb, ": "); -+ } -+ sprintf(buf," %s in line %d near '", str,line_num); -+ agxbput (&xb, buf); -+ agxbput (&xb, yytext); -+ agxbput (&xb,"'\n"); -+ agerr(AGWARN,agxbuse(&xb)); -+ agxbfree(&xb); - } - /* must be here to see flex's macro defns */ - void aglexeof() { unput(GRAPH_EOF_TOKEN); } --- -1.8.5.1 - diff --git a/extra/graphviz/yyerror1.patch b/extra/graphviz/yyerror1.patch deleted file mode 100644 index 4f1faf4df..000000000 --- a/extra/graphviz/yyerror1.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d266bb2b4154d11c27252b56d86963aef4434750 Mon Sep 17 00:00:00 2001 -From: "Emden R. Gansner" -Date: Tue, 7 Jan 2014 10:45:36 -0500 -Subject: [PATCH] Prevent possible buffer overflow in yyerror() - ---- - lib/cgraph/scan.l | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l -index 3efe1d5..212967c 100644 ---- a/lib/cgraph/scan.l -+++ b/lib/cgraph/scan.l -@@ -201,7 +201,8 @@ void yyerror(char *str) - agxbput (&xb, InputFile); - agxbput (&xb, ": "); - } -- sprintf(buf," %s in line %d near '", str,line_num); -+ agxbput (&xb, str); -+ sprintf(buf," in line %d near '", line_num); - agxbput (&xb, buf); - agxbput (&xb, yytext); - agxbput (&xb,"'\n"); --- -1.8.5.1 - diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 6d788363d..0d8520e20 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 203298 2014-01-07 18:06:19Z andrea $ +# $Id: PKGBUILD 205430 2014-02-04 18:28:47Z svenstaro $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.11.5 +pkgver=4.11.6 pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') @@ -28,7 +28,7 @@ backup=('usr/share/config/kdm/kdmrc') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('4292288f7636a082f95072c4188015c041b424d3' +sha1sums=('f1da23a472064307dcd244605a7004701982e5de' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD index 98b6a3f6d..1ada0ba03 100644 --- a/extra/libchamplain/PKGBUILD +++ b/extra/libchamplain/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198137 2013-10-30 13:00:52Z allan $ +# $Id: PKGBUILD 205428 2014-02-04 17:15:14Z heftig $ # Maintainer: Andreas Radke # Contributor: Michael Kanis pkgname=libchamplain -pkgver=0.12.5 -pkgrel=2 +pkgver=0.12.6 +pkgrel=1 pkgdesc="Gtk3 widget for displaying rasterized maps" url="http://projects.gnome.org/libchamplain/" license=('LGPL') @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite') makedepends=('gobject-introspection' 'gtk-doc' 'vala') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9c937d3775053a7d6b542aad36b16bbb07e02be3adb683ae57d7dcbe89634236') +sha256sums=('2400ff2f4b25e5441b3a7d988e8ff996c9d2107d0aca101fc22320969db22576') build() { cd $pkgname-$pkgver diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 5c6f44a14..ac0faa5f2 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 203530 2014-01-12 20:24:08Z foutrelis $ +# $Id: PKGBUILD 205069 2014-02-04 11:01:18Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgbase=mesa pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') -pkgver=10.0.2 +pkgver=10.0.3 pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' @@ -13,7 +13,7 @@ url="http://mesa3d.sourceforge.net" license=('custom') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 LICENSE) -md5sums=('8544c0ab3e438a08b5103421ea15b6d2' +md5sums=('5f9f463ef08129f6762106b434910adb' '5c65a0fe315dd347e09b1f2826a1df5a') build() { @@ -53,8 +53,7 @@ build() { package_ati-dri() { pkgdesc="Mesa drivers for AMD/ATI Radeon" - depends=('mesa-libgl' "mesa=${pkgver}") - optdepends=('libtxc_dxtn: S3 Texture Compressed support') + depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}") conflicts=('xf86-video-ati<6.9.0-6') install -m755 -d ${pkgdir}/usr/lib/vdpau/ @@ -72,8 +71,7 @@ package_ati-dri() { package_intel-dri() { pkgdesc="Mesa drivers for Intel" - optdepends=('libtxc_dxtn: S3 Texture Compressed support') - depends=('mesa-libgl' "mesa=${pkgver}") + depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}") install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ @@ -84,8 +82,7 @@ package_intel-dri() { package_nouveau-dri() { pkgdesc="Mesa drivers for Nouveau" - optdepends=('libtxc_dxtn: S3 Texture Compressed support') - depends=('mesa-libgl' "mesa=${pkgver}") + depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}") install -m755 -d ${pkgdir}/usr/lib/vdpau/ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index 487f3f74b..3bd171c72 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 199496 2013-11-13 14:59:50Z jgc $ +# $Id: PKGBUILD 205067 2014-02-04 10:50:56Z jgc $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=nspr -pkgver=4.10.2 +pkgver=4.10.3 pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) @@ -13,8 +13,8 @@ depends=('glibc') makedepends=('zip') options=('!emptydirs') source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz) -sha1sums=('650e4aa35d58624bc1083ed585c81c4af09cf23c') -md5sums=('f0d254da0b2b870d9a5fa094e879d4b8') +sha1sums=('afcb28ed2b159cb059141bdf5f2e001374a845cf') +md5sums=('bf298e874cf454a3c2f8fe7e671c5d2e') build() { cd $pkgname-$pkgver diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD index ed1d33500..0b269bbb2 100644 --- a/extra/python-geoip/PKGBUILD +++ b/extra/python-geoip/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 199014 2013-11-06 11:10:37Z jgc $ +# $Id: PKGBUILD 205071 2014-02-04 11:01:58Z jgc $ # Maintainer: Jan de Groot # Contributor: Angel Velasquez pkgname=('python2-geoip') pkgbase=python-geoip -pkgver=1.2.8 -pkgrel=3 +pkgver=1.2.9 +pkgrel=1 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library" arch=('i686' 'x86_64') -url="http://dev.maxmind.com/geoip/legacy/downloadable#Python-10" +url="https://pypi.python.org/pypi/GeoIP/" license=('LGPL') depends=('python2' 'geoip') -source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.tar.gz) -sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73') +source=(https://pypi.python.org/packages/source/G/GeoIP/GeoIP-${pkgver}.tar.gz) +md5sums=('367a083a13c442309eeb47fa061bd262') build() { - cd "GeoIP-Python-$pkgver" + cd "GeoIP-$pkgver" python2 setup.py build } package_python2-geoip() { conflicts=('python-geoip<1.2.8') - cd "GeoIP-Python-$pkgver" + cd "GeoIP-$pkgver" python2 setup.py install --root="$pkgdir" -O1 } diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index f704fec82..bb0b919a3 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 201374 2013-12-09 21:50:07Z andyrtr $ +# $Id: PKGBUILD 205073 2014-02-04 11:27:00Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Tom Newsom pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc') -_amalgamationver=3080200 +_amalgamationver=3080300 _docver=${_amalgamationver} #_docver=3080001 -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64') @@ -15,12 +15,12 @@ license=('custom:Public Domain') url="http://www.sqlite.org/" makedepends=('tcl' 'readline') 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/2013/sqlite-autoconf-$_amalgamationver.tar.gz - http://www.sqlite.org/2013/sqlite-doc-${_docver}.zip + http://www.sqlite.org/2014/sqlite-autoconf-$_amalgamationver.tar.gz + http://www.sqlite.org/2014/sqlite-doc-${_docver}.zip license.txt) options=('!emptydirs') -sha1sums=('6033ef603ce221d367c665477514d972ef1dc90e' - 'b9cbd42d08b8c1ce96656a6b111e918bb515b605' +sha1sums=('c2a21d71d0c7dc3af71cf90f04dfd22ecfb280c2' + '199c977b948d3e6b9b0b165cb661275e0856d38e' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD deleted file mode 100644 index f58083a1f..000000000 --- a/extra/vim/PKGBUILD +++ /dev/null @@ -1,227 +0,0 @@ -# Maintainer: Thomas Dziedzic -# Contributor: Jan "heftig" Steffens -# Contributor: tobias [ tobias at archlinux org ] -# Contributor: Daniel J Griffiths - -pkgbase=vim -pkgname=('vim' 'gvim' 'vim-runtime') -_topver=7.4 -_patchlevel=135 -__hgrev=de28b1568fc2 -_versiondir="vim${_topver//./}" -pkgver=${_topver}.${_patchlevel} -pkgrel=2 -arch=('i686' 'x86_64') -license=('custom:vim') -url="http://www.vim.org" -makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') -source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" - "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" - 'vimrc' - 'archlinux.vim' - 'gvim.desktop') -md5sums=('be672ce2a929503412378c998fc3dc27' - 'SKIP' - 'b9d4dcb9d3ee2e151dc4be1e94934f6a' - '10353a61aadc3f276692d0e17db1478e' - 'd90413bd21f400313a785bb4010120cd') - -# source PKGBUILD && mksource -mksource() { - [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1) - - __hgroot='http://vim.googlecode.com/hg/' - __hgrepo='vim' - __hgbranch='default' - - hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo} - - pushd ${__hgrepo} - if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then - printf 'You are not building the latest revision!\n' - printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n" - fi - popd - - mv vim ${pkgname}-${pkgver} - find ${pkgname}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \; - rm ${pkgname}-${pkgver}/{.hgignore,.hgtags} - tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* - rm -r ${pkgname}-${pkgver} - - gpg --detach-sign ${pkgname}-${pkgver}.tar.xz - - scp ${pkgname}-${pkgver}.tar.xz nym:/srv/ftp/other/vim/ - scp ${pkgname}-${pkgver}.tar.xz.sig nym:/srv/ftp/other/vim/ -} - -build() { - cp -a ${pkgname}-${pkgver} vim-build - - # define the place for the global (g)vimrc file (set to /etc/vimrc) - sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h - sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h - - (cd vim-build/src && autoconf) - - cp -a vim-build gvim-build - - cd "${srcdir}"/vim-build - - ./configure \ - --prefix=/usr \ - --localstatedir=/var/lib/vim \ - --with-features=huge \ - --with-compiledby='Arch Linux' \ - --enable-gpm \ - --enable-acl \ - --with-x=no \ - --disable-gui \ - --enable-multibyte \ - --enable-cscope \ - --disable-netbeans \ - --enable-perlinterp \ - --disable-pythoninterp \ - --disable-python3interp \ - --disable-rubyinterp \ - --disable-luainterp - - make - - cd "${srcdir}"/gvim-build - - ./configure \ - --prefix=/usr \ - --localstatedir=/var/lib/vim \ - --with-features=huge \ - --with-compiledby='Arch Linux' \ - --enable-gpm \ - --enable-acl \ - --with-x=yes \ - --enable-gui=gtk2 \ - --enable-multibyte \ - --enable-cscope \ - --enable-netbeans \ - --enable-perlinterp \ - --enable-pythoninterp \ - --disable-python3interp \ - --enable-rubyinterp \ - --enable-luainterp - - make -} - -check() { - # disable tests because they seem to freeze - - cd "${srcdir}"/vim-build - - #make test - - cd "${srcdir}"/gvim-build - - #make test -} - -package_vim() { - pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' - depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm') - conflicts=('gvim') - - cd "${srcdir}"/vim-build - make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install - - # provided by (n)vi in core - rm "${pkgdir}"/usr/bin/{ex,view} - - # delete some manpages - find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ - while read _mandir; do - cd ${_mandir} - rm -f ex.1 view.1 # provided by (n)vi - rm -f evim.1 # this does not make sense if we have no GUI - done - - # Runtime provided by runtime package - rm -r "${pkgdir}"/usr/share/vim - - # license - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt -} - -package_gvim() { - pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' - depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt' - 'desktop-file-utils' 'gtk2' 'lua' 'python2') - provides=("vim=${pkgver}-${pkgrel}") - conflicts=('vim') - install=gvim.install - - cd "${srcdir}"/gvim-build - make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install - - # provided by (n)vi in core - rm "${pkgdir}"/usr/bin/{ex,view} - - # delete some manpages - find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ - while read _mandir; do - cd ${_mandir} - rm -f ex.1 view.1 # provided by (n)vi - done - - # Move the runtime for later packaging - mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install - - # freedesktop links - install -Dm644 "${srcdir}"/gvim.desktop \ - "${pkgdir}"/usr/share/applications/gvim.desktop - install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png - - # license - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt -} - -package_vim-runtime() { - pkgdesc='Runtime for vim and gvim' - depends=('perl' 'gawk') - backup=('etc/vimrc') - - # Install the runtime split from gvim - install -dm755 "${pkgdir}"/usr/share - mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim - - # Don't forget logtalk.dict - install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict - - # fix FS#17216 - sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ - "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim - - # patch filetype.vim for better handling of pacman related files - sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ - "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim - sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim - - # rc files - install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc - install -Dm644 "${srcdir}"/archlinux.vim \ - "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim - - # rgb.txt file - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \ - "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt - - # license - install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime - ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt -} - -# vim:set sw=2 sts=2 et: diff --git a/extra/vim/archlinux.vim b/extra/vim/archlinux.vim deleted file mode 100644 index 148bb930f..000000000 --- a/extra/vim/archlinux.vim +++ /dev/null @@ -1,26 +0,0 @@ -" The ArchLinux global vimrc - setting only a few sane defaults -" -" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org] -" -" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION -" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc - -" Normally we use vim-extensions. If you want true vi-compatibility -" remove change the following statements -set nocompatible " Use Vim defaults instead of 100% vi compatibility -set backspace=indent,eol,start " more powerful backspacing - -" Now we set some defaults for the editor -set history=50 " keep 50 lines of command line history -set ruler " show the cursor position all the time - -" Suffixes that get lower priority when doing tab completion for filenames. -" These are files we are not likely to want to edit or read. -set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc - - -if has('gui_running') - " Make shift-insert work like in Xterm - map - map! -endif diff --git a/extra/vim/gvim.desktop b/extra/vim/gvim.desktop deleted file mode 100644 index 675357da5..000000000 --- a/extra/vim/gvim.desktop +++ /dev/null @@ -1,63 +0,0 @@ -[Desktop Entry] -Name=Vi IMproved -Name[bg]=Vi Ðåäàêòîð -Name[ca]=Vi Millorat -Name[da]=Vi forbedret -Name[eo]=VIM -Name[et]=Täiustatud Vi (vim) -Name[fr]=Vi étendu (VIM) -Name[he]=רפושמ Vi -Name[hu]=Vi -Name[is]=Vi IMproved ritillinn -Name[it]=Vi iMproved -Name[no]=Vi IMproved (forbedret VI) -Name[pl]=Poprawiony VI (vim) -Name[ro]=VIM -Name[ru]=Улучшенный VI -Name[sk]=Vi IMpreved -Name[sl]=Izboljšani vi (vim) -Name[sv]=Förbättrad Vi -Name[zh_CN.GB2312]=改进的 Vi -Comment=Powerful text editor with scripting functions and macro recorder -Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè -Comment[ca]=Editor vi potent -Comment[cs]=Mocný textový editor vi -Comment[da]=En kraftig vi tekstbehandler -Comment[de]=Ein leistungsfähiger vi-Editor -Comment[el]=Πανίσχυρος διορθωτής vi -Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn -Comment[es]=Una versión mejorada del editor vi -Comment[et]=Võimas tekstiredaktor vi -Comment[fi]=Tehokas vi-tekstieditori -Comment[fr]=Éditeur vi puissant -Comment[gl]=Potente editor vi -Comment[he]=Vi המצועה בר ךרועה -Comment[hr]=Napredni vi uređivač -Comment[hu]=Vi szövegszerkesztő -Comment[is]=Öflug útgáfa vi ritilsins -Comment[it]=Un editor vi potenziato -Comment[ja]=強力なViエディタ -Comment[lt]=Galingas vi redaktorius -Comment[mk]=Моќен VI уредувач -Comment[nl]=Krachtige vi-editor -Comment[no]=En kraftig vi-redigerer -Comment[no_NY]=Kraftig vi-tekstredigeringsprogram -Comment[pl]=Edytor vi -Comment[pt]=Um poderoso editor de texto -Comment[ro]=Un editor de texte VI, puternic -Comment[ru]=Мощный текстовый редактор vi -Comment[sk]=Silný textový procesor vi -Comment[sl]=Zmogljivi urejevalnik vi -Comment[sr]=Moćni vi editor -Comment[sv]=En kraftfull texteditor -Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷ -Comment[tr]=Güçlü vi düzenleyicisi -Comment[uk]=Потужний редактор vi -Comment[zh_CN.GB2312]=功能强大的 vi 编辑器 -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=gvim -f %F -Icon=gvim -Type=Application -Terminal=false -X-XClassHintResName=VIM -Categories=Utility;TextEditor; diff --git a/extra/vim/gvim.install b/extra/vim/gvim.install deleted file mode 100644 index 2eaa60550..000000000 --- a/extra/vim/gvim.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/extra/vim/vimrc b/extra/vim/vimrc deleted file mode 100644 index 3642e25c9..000000000 --- a/extra/vim/vimrc +++ /dev/null @@ -1,16 +0,0 @@ -" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just -" /usr/share/vim/vimfiles/archlinux.vim) and sourced by the call to :runtime -" you can find below. If you wish to change any of those settings, you should -" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten -" everytime an upgrade of the vim packages is performed. It is recommended to -" make changes after sourcing archlinux.vim since it alters the value of the -" 'compatible' option. - -" This line should not be removed as it ensures that various options are -" properly set to work with the Vim-related packages. -runtime! archlinux.vim - -" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' -" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual -" and configure vim to your own liking! - diff --git a/extra/wildmidi/PKGBUILD b/extra/wildmidi/PKGBUILD index 76ae766f6..62324cf9d 100644 --- a/extra/wildmidi/PKGBUILD +++ b/extra/wildmidi/PKGBUILD @@ -3,25 +3,28 @@ # Contributor: Panagiotis Papadopoulos pkgname=wildmidi -pkgver=0.2.3.5 -pkgrel=2 +pkgver=0.3.2 +pkgrel=1 pkgdesc='Open Source MIDI Synthesizer' arch=('i686' 'x86_64') -url='http://wildmidi.sourceforge.net/' +url="http://www.mindwerks.net/projects/wildmidi/" license=('LGPL3') depends=('alsa-lib') -options=(!makeflags) -source=(http://sourceforge.net/projects/wildmidi/files/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('44583c95fd67761f8cd6275fd1c312f2') +makedepends=('cmake') +source=(https://github.com/psi29a/wildmidi/archive/wildmidi-${pkgver}.tar.gz) +md5sums=('9fda0b9d5290af9516e2da576103fab8') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + mkdir build +} - ./configure --prefix=/usr --disable-werror +build() { + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr ../$pkgname-$pkgname-$pkgver make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd build make DESTDIR="${pkgdir}" install } -- cgit v1.2.3-54-g00ecf