summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/dnsmasq/PKGBUILD11
-rw-r--r--extra/libvncserver/PKGBUILD11
-rw-r--r--extra/linux_logo/PKGBUILD10
-rw-r--r--extra/strigi/PKGBUILD13
-rw-r--r--extra/strigi/libstreamanalyzer_pdf.patch27
-rw-r--r--extra/telepathy-salut/PKGBUILD6
-rw-r--r--extra/vim/PKGBUILD72
7 files changed, 87 insertions, 63 deletions
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index 2f965ee0e..8594df43b 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 137814 2011-09-11 16:06:30Z dreisner $
+# $Id: PKGBUILD 140772 2011-10-19 01:14:39Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Paul Mattal <paul@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=dnsmasq
-pkgver=2.58
-pkgrel=2
+pkgver=2.59
+pkgrel=1
pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
arch=('i686' 'x86_64')
license=('GPL')
-depends=('glibc' 'bash' 'dbus-core')
+depends=('glibc' 'dbus-core')
makedepends=('libcap>=2.16')
install=$pkgname.install
backup=('etc/dnsmasq.conf'
@@ -19,7 +19,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
'dnsmasq.confd'
'rc.dnsmasq'
'dnsmasq.service')
-md5sums=('14c5c81debb324adc261db971730f4c6'
+md5sums=('29d43f182ecad06d64b3598c02380a80'
'66479e99123faeab83ebaed709ef95b5'
'818c122ea4d81868a75afad109411170'
'f329d86f8ba1cd85f9b6ee59e0ce3791')
@@ -38,7 +38,6 @@ package() {
make PREFIX=/usr DESTDIR="$pkgdir" install
- install -dm755 "$pkgdir"/var/{db,lib/misc}
install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq
install -Dm644 "$srcdir"/dnsmasq.confd "$pkgdir/etc/conf.d/dnsmasq"
diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD
index 4db546071..11f2ff735 100644
--- a/extra/libvncserver/PKGBUILD
+++ b/extra/libvncserver/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 135798 2011-08-18 15:04:30Z andyrtr $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 140764 2011-10-18 19:48:49Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libvncserver
-pkgver=0.9.8
-pkgrel=4
+pkgver=0.9.8.1
+pkgrel=1
pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
arch=('i686' 'x86_64')
url="http://libvncserver.sourceforge.net/"
@@ -12,7 +13,7 @@ license=('GPL')
depends=('libjpeg' 'gnutls' 'libgcrypt')
options=('!libtool')
source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz")
-md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3')
+md5sums=('51e972bd26c098b0b8d4687af6afbeb1')
build() {
cd "${srcdir}/LibVNCServer-${pkgver}"
diff --git a/extra/linux_logo/PKGBUILD b/extra/linux_logo/PKGBUILD
index f6476dc9e..30fab1149 100644
--- a/extra/linux_logo/PKGBUILD
+++ b/extra/linux_logo/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 84817 2010-07-04 16:35:24Z eric $
-# Maintainer: Damir Perisa <damir@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+# $Id: PKGBUILD 140770 2011-10-19 00:51:32Z eric $
+# Maintainer: Eric BĂ©langer <eric@archlinux.org>
pkgname=linux_logo
-pkgver=5.10
+pkgver=5.11
pkgrel=1
pkgdesc="Text-based logo and system information program"
arch=('i686' 'x86_64')
@@ -11,8 +10,7 @@ url="http://www.deater.net/weave/vmwprod/linux_logo"
license=('GPL')
depends=('glibc')
source=(http://www.deater.net/weave/vmwprod/linux_logo/${pkgname}-${pkgver}.tar.gz)
-md5sums=('30d635841ba2cf630b040fadbf95377d')
-sha1sums=('0ba27d563b938fd802e424c8c116e1ea3c19aab4')
+sha1sums=('bd22808f165574cb3bc98c579aa48c0acab65f39')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index 73aa4c242..d94f628a3 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139891 2011-10-05 19:06:59Z andrea $
+# $Id: PKGBUILD 140761 2011-10-18 19:07:53Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=strigi
pkgver=0.7.6
-pkgrel=1
+pkgrel=2
pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
arch=('i686' 'x86_64')
url="http://www.vandenoever.info/software/strigi/"
@@ -14,10 +14,15 @@ makedepends=('qt' 'cmake' 'pkg-config' 'boost')
optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file'
'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK')
#source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('41cddd39e4ae3f590d82c859a14e9261')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+ 'libstreamanalyzer_pdf.patch')
+md5sums=('41cddd39e4ae3f590d82c859a14e9261'
+ '3e722a93cf5c6238e625ca58463afac2')
build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}/libstreamanalyzer
+ patch -p1 -i "${srcdir}"/libstreamanalyzer_pdf.patch
+
cd "${srcdir}"
mkdir build
cd build
diff --git a/extra/strigi/libstreamanalyzer_pdf.patch b/extra/strigi/libstreamanalyzer_pdf.patch
new file mode 100644
index 000000000..6871d67fa
--- /dev/null
+++ b/extra/strigi/libstreamanalyzer_pdf.patch
@@ -0,0 +1,27 @@
+commit 23d5ce636b7897dc3f233a5293f3164dac50566d
+Author: Jos van den Oever <jos@vandenoever.info>
+Date: Sun Jul 31 12:32:44 2011 +0200
+
+ Revert patch that breaks parsing of PDF files.
+ The offending patch was 672c8b7b3cb4400bc505421f4cc70cf742ed9df0.
+
+diff --git a/lib/pdf/pdfparser.cpp b/lib/pdf/pdfparser.cpp
+index c27f691..df2f7e5 100644
+--- a/lib/pdf/pdfparser.cpp
++++ b/lib/pdf/pdfparser.cpp
+@@ -34,12 +34,13 @@ StreamStatus
+ PdfParser::read(int32_t min, int32_t max) {
+ int32_t off = (int32_t)(pos-start);
+ int32_t d = (int32_t)(stream->position() - bufferStart);
+- bufferStart += off;
++ min += d;
++ if (max > 0) max += d;
+ stream->reset(bufferStart);
+ int32_t n = stream->read(start, min, max);
+ // printf("objstart %i %i\n", d, n);
+ if (n < min) return stream->status();
+- pos = start;
++ pos = start + off;
+ end = start + n;
+ return Ok;
+ }
diff --git a/extra/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD
index 5fce245ed..4de770ea2 100644
--- a/extra/telepathy-salut/PKGBUILD
+++ b/extra/telepathy-salut/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140181 2011-10-08 12:18:04Z ibiru $
+# $Id: PKGBUILD 140754 2011-10-18 17:03:04Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Daniel Balieiro <daniel@balieiro.com>
pkgname=telepathy-salut
-pkgver=0.5.2
+pkgver=0.6.0
pkgrel=1
pkgdesc="A link-local XMPP connection manager for Telepathy"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-glib' 'avahi' 'libsoup')
makedepends=('libxslt' 'python2' 'xmldiff')
install=telepathy-salut.install
source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b7bbea8fde1168f4ebd73460491e7dbc')
+md5sums=('a0df48e6c2e137a928f8f39655b8dc26')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 3976d4666..4de38ffec 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 139129 2011-09-30 05:59:05Z eric $
+# $Id: PKGBUILD 140768 2011-10-18 23:20:38Z eric $
# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Maintainer: tobias [ tobias at archlinux org ]
# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,55 +6,53 @@
pkgbase=vim
pkgname=('vim' 'gvim' 'vim-runtime')
_topver=7.3
-_patchlevel=322
+_patchlevel=338
+__hgrev=f530aef0d959
+_versiondir="vim${_topver//./}"
pkgver=${_topver}.${_patchlevel}
-__hgrev=5e84f6567623
pkgrel=1
arch=('i686' 'x86_64')
license=('custom:vim')
url="http://www.vim.org"
-makedepends=('gawk' 'gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2'
- 'mercurial' 'rsync')
-source=(pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
+makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2')
+source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz
+ pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
vimrc archlinux.vim gvim.desktop)
-md5sums=('6e7adfbd5d26c1d161030ec203a7f243'
+md5sums=('fc83d6580fd8441793fccfd26487aadb'
+ '6e7adfbd5d26c1d161030ec203a7f243'
'e57777374891063b9ca48a1fe392ac05'
'10353a61aadc3f276692d0e17db1478e'
'd90413bd21f400313a785bb4010120cd')
-__hgroot='http://vim.googlecode.com/hg/'
-__hgrepo='vim'
-__hgbranch='default'
+# source PKGBUILD && mksource
+mksource() {
-_versiondir="vim${_topver//./}"
+ [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1)
-##### Build #####
+ __hgroot='http://vim.googlecode.com/hg/'
+ __hgrepo='vim'
+ __hgbranch='default'
-build() {
- cd "${srcdir}"
-
- msg2 'Checking out source from Mercurial...'
-
- if [[ -d ${__hgrepo} ]]; then
- cd ${__hgrepo}
- hg pull -b ${__hgbranch}|| warning 'hg pull failed!'
- hg update -r ${__hgrev}
- else
- hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo}
- cd ${__hgrepo}
- fi
+ hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo}
+ pushd ${__hgrepo}
if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then
- warning 'You are not building the latest revision!'
- warning "Consider updating __hgrev to $(hg id -r ${__hgbranch})."
- sleep 10
+ printf 'You are not building the latest revision!\n'
+ printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n"
fi
+ popd
- cd ..
- rm -rf vim-build gvim-build
- rsync -a --exclude='.hg/' ${__hgrepo}/ vim-build
+ 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}
+}
+
+build() {
+ cd "${srcdir}"
- msg2 'Patching...'
+ 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|' \
@@ -66,8 +64,6 @@ build() {
vim-build/src/configure.in
(cd vim-build/src && autoconf)
- msg2 'Building...'
-
cp -a vim-build gvim-build
cd "${srcdir}"/vim-build
@@ -93,8 +89,6 @@ build() {
make
}
-##### Packaging #####
-
package_vim() {
pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm')
@@ -118,7 +112,7 @@ package_vim() {
rm -r "${pkgdir}"/usr/share/vim
# license
- install -Dm644 "${srcdir}"/vim/runtime/doc/uganda.txt \
+ install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
}
@@ -152,7 +146,7 @@ package_gvim() {
install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
# license
- install -Dm644 "${srcdir}"/vim/runtime/doc/uganda.txt \
+ install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
}
@@ -189,7 +183,7 @@ package_vim-runtime() {
"${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim
# rgb.txt file
- install -Dm644 "${srcdir}"/vim/runtime/rgb.txt \
+ install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \
"${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt
# license