From 6e21e6fdadde0c9dbda54ecc501fdfdb2cbc1391 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Sun, 8 Jan 2012 16:01:26 +0000 Subject: [PATCH] updated on Sun Jan 8 16:01:26 UTC 2012 --- acoustid-fingerprinter/PKGBUILD | 10 +-- argouml/PKGBUILD | 12 +-- argouml/argo.sh | 2 +- arno-iptables-firewall/PKGBUILD | 4 +- byacc/PKGBUILD | 4 +- chrontel-wetab-rpm/PKGBUILD | 23 +++-- clementine-git/PKGBUILD | 21 ++++- clementine-git/clementine.install | 13 +++ gmime26/PKGBUILD | 37 ++++++++ google-earth/PKGBUILD | 2 +- gradiator/PKGBUILD | 19 +++++ gsmlib-git/PKGBUILD | 4 +- jpdfbookmarks/PKGBUILD | 9 +- jpdfbookmarks/jpdfbookmarks.install | 8 +- lib32-qt3/PKGBUILD | 7 +- linux-bfs/PKGBUILD | 14 +-- linux-bfs/config | 3 +- linux-bfs/config.x86_64 | 3 +- ...dd-reset-resume-quirk-for-several-webcams.patch | 99 ---------------------- mozplugger-chromium/PKGBUILD | 21 +++-- mozplugger/PKGBUILD | 4 +- neonview/PKGBUILD | 6 +- nuvola-bzr-stable/PKGBUILD | 4 +- ocaml-camomile/PKGBUILD | 8 +- pacsyu-git/PKGBUILD | 6 +- pan-git/PKGBUILD | 5 +- patator/PKGBUILD | 5 +- plymouth/PKGBUILD | 39 ++++----- plymouth/encrypt_hook.patch | 6 +- plymouth/plymouth.install | 4 +- ptxdist/PKGBUILD | 14 ++- ptxdist/ptxdist-python2.diff | 14 --- python2-msrplib/PKGBUILD | 4 +- ruby-fssm/PKGBUILD | 4 +- svgcleaner/PKGBUILD | 56 ++++++------ svgcleaner/svgcleaner.install | 14 +++ tinygettext-svn/PKGBUILD | 38 +++++++++ tpb-svn/PKGBUILD | 49 +++++++++++ warzone2100-beta/PKGBUILD | 4 +- xpyb/PKGBUILD | 12 ++- xzgv/PKGBUILD | 16 ++-- xzgv/xzgv-infoinstall.patch | 23 ----- xzgv/xzgv-ldflags.patch | 12 +++ yuuguu/PKGBUILD | 4 +- 44 files changed, 372 insertions(+), 294 deletions(-) create mode 100644 clementine-git/clementine.install create mode 100644 gmime26/PKGBUILD create mode 100644 gradiator/PKGBUILD delete mode 100644 linux-bfs/usb-add-reset-resume-quirk-for-several-webcams.patch delete mode 100644 ptxdist/ptxdist-python2.diff rewrite svgcleaner/PKGBUILD (95%) create mode 100644 svgcleaner/svgcleaner.install create mode 100644 tinygettext-svn/PKGBUILD create mode 100644 tpb-svn/PKGBUILD delete mode 100644 xzgv/xzgv-infoinstall.patch create mode 100644 xzgv/xzgv-ldflags.patch diff --git a/acoustid-fingerprinter/PKGBUILD b/acoustid-fingerprinter/PKGBUILD index aa33bda8e..1cde6142f 100644 --- a/acoustid-fingerprinter/PKGBUILD +++ b/acoustid-fingerprinter/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Wieland Hoffmann pkgname=acoustid-fingerprinter -pkgver=0.5 +pkgver=0.5.1 pkgrel=1 pkgdesc="Acoustid Fingerprinter is a cross-platform GUI application for submitting audio fingerprints generated by Chromaprint." arch=('x86_64' 'i686') @@ -8,14 +8,11 @@ url="http://acoustid.org/fingerprinter" license=('GPL2') depends=('ffmpeg' 'qt' 'chromaprint') makedepends=('cmake') -source=("https://github.com/downloads/lalinsky/$pkgname/$pkgname-$pkgver.tar.gz" - "contenttypeheader.diff::https://github.com/lalinsky/acoustid-fingerprinter/commit/7577c13c02bcbf4f82f6dff0ab083f2933c7e06d.diff") +source=("https://github.com/downloads/lalinsky/$pkgname/$pkgname-$pkgver.tar.gz") build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 < ../contenttypeheader.diff - cmake -DCMAKE_INSTALL_PREFIX=/usr . make } @@ -27,6 +24,5 @@ package() { } -md5sums=('0f9783093f43f0e7f6b2c86edfce03e0' - 'fb5d52c5fe6144134fd78fe062c1f7a5') +md5sums=('12f89892168b1774a48944b85edf13f0') # vim:set ts=2 sw=2 et: diff --git a/argouml/PKGBUILD b/argouml/PKGBUILD index d54452ea2..6b2792679 100644 --- a/argouml/PKGBUILD +++ b/argouml/PKGBUILD @@ -1,23 +1,25 @@ # $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ -# Maintainer : Ionut Biru +# Maintainer : Christoph Vigano +# Contributor : Ionut Biru # Contributor: Douglas Soares de Andrade # Contributor: Claudio Riva # Contributor: G_Syme pkgname=argouml _realname=ArgoUML -pkgver=0.32.2 +pkgver=0.34 pkgrel=1 pkgdesc="A UML design tool with cognitive support" arch=('any') license=('BSD') url="http://argouml.tigris.org/" -depends=('java-runtime' 'xdg-utils' 'hicolor-icon-theme') +depends=('java-environment' 'hicolor-icon-theme' 'bash') +optdepends=('xdg-utils: desktop & menu shortcut support') install=argouml.install source=(http://argouml-downloads.tigris.org/nonav/$pkgname-$pkgver/${_realname}-$pkgver.tar.gz argo.sh license.txt argouml.desktop argouml2.svg) -md5sums=('f1bf6b046fea6e57d43c06bbd1f487d0' - '8640699e0bf100141a1b20ca1bb09f6c' +md5sums=('440efea6096a00b8c19daab1ecddaf7c' + '3fef65ba00ce36d2143cb48a8009c802' '0ea0250f7fb6bafa3a48224e66ce7098' '7078b1a2eab169cc5ce342cd0e8cef35' '24b382bfe742e949c587efa93dfd0fdb') diff --git a/argouml/argo.sh b/argouml/argo.sh index 4dc967336..ffa049a81 100644 --- a/argouml/argo.sh +++ b/argouml/argo.sh @@ -1,3 +1,3 @@ #!/bin/bash -$(which java) -jar /usr/share/java/argouml/argouml.jar +"$JAVA_HOME/bin/java" -jar '/usr/share/java/argouml/argouml.jar' diff --git a/arno-iptables-firewall/PKGBUILD b/arno-iptables-firewall/PKGBUILD index 99300ab09..b3d73ac2b 100644 --- a/arno-iptables-firewall/PKGBUILD +++ b/arno-iptables-firewall/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Arto Puranen pkgname=arno-iptables-firewall -pkgver=2.0.0c +pkgver=2.0.1 pkgrel=1 pkgdesc="A secure stateful firewall for both single and multi-homed machine" arch=('any') @@ -30,7 +30,7 @@ backup=(etc/${pkgname}/firewall.conf source=(http://rocky.eld.leidenuniv.nl/${pkgname}/${pkgname}_${pkgver}.tar.gz \ ${pkgname}.script \ ${pkgname}.patch) -sha256sums=('7d93f42b3d98c573afaf4e03a5742da303b39500713967098695ca9d632d899f' +sha256sums=('241981d9eed22383687fba417d72be0824aff9c4a20dd50af8c1f526b5dd1f08' 'b8b2c3edaf3c2d4bf9ee617b01808bb8035c76f5eac5381c777f67c4ca6a1a20' '90ba06504b503fa34c78ebd8f2b83ee404f34580e47a8691318d9996171c62e3') diff --git a/byacc/PKGBUILD b/byacc/PKGBUILD index 8fd54c8bf..81095c6d4 100644 --- a/byacc/PKGBUILD +++ b/byacc/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Anton Bazhenov pkgname=byacc -pkgver=20110908 +pkgver=20111219 pkgrel=1 pkgdesc="A Berkeley reimplementation of the Unix parser generator Yacc" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('glibc') provides=('bison') conflicts=('bison' 'byacc-noconflict') source=(ftp://invisible-island.net/$pkgname/$pkgname.tar.gz) -md5sums=('5665ee1f2ca482d57eef9591a2fe4768') +md5sums=('c17542fd9df6e392d495a64f883e29f1') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/chrontel-wetab-rpm/PKGBUILD b/chrontel-wetab-rpm/PKGBUILD index 1b9848efb..d1068d8b1 100755 --- a/chrontel-wetab-rpm/PKGBUILD +++ b/chrontel-wetab-rpm/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Somebody +# Maintainer: Markus Unterwaditzer pkgname=chrontel-wetab-rpm pkgver=1.0_11203.1.4.2 pkgrel=1 @@ -6,29 +6,28 @@ pkgdesc="HDMI-drivers for the WeTab and similar devices, extracted from the sour url="http://update.tiitoo.com/source/packages/" depends=('qt') -arch=('x86_64') +arch=('x86_64' 'i686') license=('custom:publicdomain') makedepends=('rpmextract') install='chrontel.install' -_rpmname="chrontel-1.0-11203.1.4.2.wetab.src.rpm" +_rpmname="chrontel-${pkgver/_/-}.wetab.src.rpm" # according to the aur guidelines, it's not allowed to use a hyphen in a version number. So, replace it afterwards with a udnerscore _rpmextractname="chrontel-1.0" source=("Makefile" "http://update.tiitoo.com/source/packages/$_rpmname") noextract=($_rpmname) md5sums=('f30a85eab8eb05853f5a7abee11afa39' '20c65d65452e8f4bab2c26a4de63fa38') build() { - cd "${srcdir}" - rpmextract.sh "${_rpmname}" - tar xvjf "${_rpmextractname}.tar.bz2" - cp "Makefile" "${_rpmextractname}" - cd "${_rpmextractname}" + cd $srcdir + rpmextract.sh $_rpmname + tar xvjf $_rpmextractname.tar.bz2 + cp Makefile $_rpmextractname + cd $_rpmextractname make } package() { - cd "${pkgdir}" - mkdir -p usr/bin lib/firmware/chrontel - cp "${srcdir}/${_rpmextractname}/tiitoo-hdmi-daemon" "${pkgdir}/usr/bin" - cp "${srcdir}/${_rpmextractname}/resources/fw7036.bin" "${pkgdir}/lib/firmware/chrontel" + cd $srcdir/$_rpmextractname + install -Dm755 tiitoo-hdmi-daemon $pkgdir/usr/bin/tiitoo-hdmi-daemon + install -Dm755 resources/fw7036.bin $pkgdir/lib/firmware/chrontel/fw7036.bin } diff --git a/clementine-git/PKGBUILD b/clementine-git/PKGBUILD index 718bd83df..8932fe1d7 100644 --- a/clementine-git/PKGBUILD +++ b/clementine-git/PKGBUILD @@ -5,23 +5,35 @@ pkgname=clementine-git _realname=clementine-player -pkgver=20111117 +pkgver=20120108 pkgrel=1 pkgdesc="A modern music player and library organiser and a port of Amarok 1.4, with some features rewritten to take advantage of Qt4." arch=('i686' 'x86_64') url="http://code.google.com/p/clementine-player/" license=('GPL') -depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' 'libspotify' 'python2-pyqt' 'qjson' 'protobuf' 'libcdio') +depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' + 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' + 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl') optdepends=('gstreamer0.10-base-plugins: for more open formats' 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' 'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries' - 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') + 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries' + ) makedepends=('git' 'boost' 'cmake' 'mesa') +# Uncomment next lines to enable more features +#makedepends=(${makedepends} 'libspotify' 'libgpod' 'libimobiledevice') +#optdepends=(${optdepends} + #'libspotify: for Spotify support' + #'libgpod: for iPode support' + #'libimobiledevice: for iPhone and iPod Touch support' + #) + provides=('clementine') conflicts=('clementine' 'clementine-svn') replaces=('clementine' 'clementine-svn') source=() sha512sums=() +install=clementine.install _gitroot="https://code.google.com/p/${_realname}" _gitname=${_realname} @@ -44,7 +56,8 @@ build() { git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" cd "${srcdir}/${_gitname}-build" - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DBUILDBOT_REVISION=${pkgver} + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DBUILDBOT_REVISION=${pkgver} \ + -DENABLE_REMOTE=ON make } diff --git a/clementine-git/clementine.install b/clementine-git/clementine.install new file mode 100644 index 000000000..2f0338d8a --- /dev/null +++ b/clementine-git/clementine.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + + +post_remove() { + post_install $1 +} diff --git a/gmime26/PKGBUILD b/gmime26/PKGBUILD new file mode 100644 index 000000000..a3ea8b41f --- /dev/null +++ b/gmime26/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Jan de Groot +# Contributor: Ben +# Contributor: Frederic Bezies +# Will be useful for building pan until gmime 2.6 is officially proposed + +pkgname=gmime26 +_pkgname=gmime +pkgver=2.6.3 +pkgrel=1 +pkgdesc="Core mime parsing library" +arch=('i686' 'x86_64') +license=('GPL') +url="http://spruce.sourceforge.net/gmime/" +depends=('glib2' 'zlib') +makedepends=('gtk-sharp-2' 'pkgconfig') +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz) +sha256sums=('6284fde1c73a1944d1a3529ab792bb7984633f619c8f74eb7fe2dfb0fd7c030b') + +build() { + # get rid of that .wapi errors in fakeroot + export MONO_SHARED_DIR="$srcdir/weird" + mkdir -p "$MONO_SHARED_DIR" + + cd "$srcdir/$_pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # These are gmime alternatives for the same shareutils tools + mv "$pkgdir/usr/bin/uuencode" "$pkgdir/usr/bin/guuencode" + mv "$pkgdir/usr/bin/uudecode" "$pkgdir/usr/bin/guudecode" +} diff --git a/google-earth/PKGBUILD b/google-earth/PKGBUILD index 2a1fe93dd..6eea8c82f 100644 --- a/google-earth/PKGBUILD +++ b/google-earth/PKGBUILD @@ -58,7 +58,7 @@ package() { if [[ `lspci | grep VGA` == *Intel* ]]; then msg2 "Installing the Intel-intended LibGL library file" cd "$pkgdir/$_instdir" - curl -C - https://launchpadlibrarian.net/7037027/libGL.so.1 -o libGL.so.1 + curl -C - -O https://launchpadlibrarian.net/7037027/libGL.so.1 fi msg2 "Removing the Debian-intended cron job" diff --git a/gradiator/PKGBUILD b/gradiator/PKGBUILD new file mode 100644 index 000000000..42536736c --- /dev/null +++ b/gradiator/PKGBUILD @@ -0,0 +1,19 @@ +# Maintainer: Massimiliano Torromeo + +pkgname=gradiator +pkgver=12.01.2 +pkgrel=1 +pkgdesc="CSS3 gradient generator" +arch=(any) +url="http://gradient.inatorapp.com/" +license=('GPL') +depends=("pywebkitgtk") +makedepends=("python-distutils-extra") +source=(http://ppa.launchpad.net/cooperjona/gradiator/ubuntu/pool/main/g/gradiator/gradiator_$pkgver.tar.gz) + +build() { + cd "$srcdir/quickly_trunk" + python2 setup.py install --root="$pkgdir" --prefix=/usr +} + +md5sums=('931ea15cbe357cb8e346f7d980808734') diff --git a/gsmlib-git/PKGBUILD b/gsmlib-git/PKGBUILD index 9b1679df2..c528a1159 100644 --- a/gsmlib-git/PKGBUILD +++ b/gsmlib-git/PKGBUILD @@ -27,11 +27,11 @@ build() { msg 'GIT checkout done or server timeout.' cd ${_builddir} - msg 'Startig configure' + msg 'Starting configure' ./configure - msg 'Startig make' + msg 'Starting make' make } diff --git a/jpdfbookmarks/PKGBUILD b/jpdfbookmarks/PKGBUILD index d59c29420..a4b0dcc68 100644 --- a/jpdfbookmarks/PKGBUILD +++ b/jpdfbookmarks/PKGBUILD @@ -1,7 +1,8 @@ +# Contributor: Luca Bennati # Maintainer: Luca Bennati pkgname=jpdfbookmarks -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 _pkgreal="${pkgname}-${pkgver}" pkgdesc="Java PDF bookmarks editor" @@ -11,9 +12,9 @@ license=('GPL3') depends=('java-environment' 'hicolor-icon-theme') install=jpdfbookmarks.install source=("http://downloads.sf.net/sourceforge/${pkgname}/${_pkgreal}.tar.gz" - jpdfbookmarks.desktop) -md5sums=('bfc30dc43045670e4e7af6cc66263d0b' - '0d3d8e406fde4f9cdcb410a241a309b9') + jpdfbookmarks.desktop) +md5sums=('035c9cb2f828891cf0bea37323968f7a' + '0d3d8e406fde4f9cdcb410a241a309b9') build() { true diff --git a/jpdfbookmarks/jpdfbookmarks.install b/jpdfbookmarks/jpdfbookmarks.install index 0f77debbd..537e439d0 100644 --- a/jpdfbookmarks/jpdfbookmarks.install +++ b/jpdfbookmarks/jpdfbookmarks.install @@ -1,13 +1,15 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + [[ -x /usr/bin/update-desktop-database ]] && /usr/bin/update-desktop-database -q + [[ -x /usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -f -t usr/share/icons/hicolor + [[ -x /usr/bin/update-mime-database ]] && update-mime-database usr/share/mime } post_upgrade() { - post_install $1 + post_install $1 } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install $1 } # vim:set ts=2 sw=2 et: diff --git a/lib32-qt3/PKGBUILD b/lib32-qt3/PKGBUILD index e81a8a61a..61e4cf3be 100644 --- a/lib32-qt3/PKGBUILD +++ b/lib32-qt3/PKGBUILD @@ -4,7 +4,6 @@ _pkgsourcename=qt3 pkgname=lib32-$_pkgsourcename pkgver=3.3.8 pkgrel=21 -_pkgrel=20 pkgdesc="The QT gui toolkit 32-bit libraries." arch=('x86_64') url="http://www.trolltech.com/products/qt/index.html" @@ -12,7 +11,7 @@ license=('GPL') groups=('lib32') depends=('lib32-libxmu' 'lib32-libxcursor' 'lib32-libxinerama' 'lib32-mesa' 'lib32-libxft' 'lib32-libxrandr' 'lib32-libmng') install=$pkgname.install -source=(http://mir.archlinux.fr/extra/os/i686/$_pkgsourcename-$pkgver-$_pkgrel-i686.pkg.tar.xz) +source=(http://mir.archlinux.fr/extra/os/i686/$_pkgsourcename-$pkgver-$pkgrel-i686.pkg.tar.xz) build() { cd $srcdir @@ -25,5 +24,5 @@ build() { install -d -m755 ${pkgdir}/etc/ld.so.conf.d/ echo "/opt/qt/lib32" > ${pkgdir}/etc/ld.so.conf.d/lib32-qt3.conf } -md5sums=('bc589f6450753051490a1bae81ba3948') -sha256sums=('0b206108fbcb175496612486c3dc91891e82163464eeef8aecf7a4423d72c5c5') +md5sums=('b505c4fd69a915fd1508d58c32ac4e10') +sha256sums=('43abd5940d34ad16b90544cad0074a46463f390b9cb1828e1638fd0af822c363') diff --git a/linux-bfs/PKGBUILD b/linux-bfs/PKGBUILD index 48cde18f5..69b774c68 100644 --- a/linux-bfs/PKGBUILD +++ b/linux-bfs/PKGBUILD @@ -52,16 +52,14 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.tar.xz" # standard config files for mkinitcpio ramdisk "${pkgname}.preset" 'change-default-console-loglevel.patch' - 'i915-fix-ghost-tv-output.patch' - 'usb-add-reset-resume-quirk-for-several-webcams.patch') + 'i915-fix-ghost-tv-output.patch') md5sums=('364066fa18767ec0ae5f4e4abcf9dc51' - '52a4972b75e5e083cadd1dfa3e034d79' - 'caa5cd741b48e62d535c6b41149a3903' + 'b0f39e0f830d8986caeea90bf55864e2' + 'ea24aee5987ad4c10a808b1dfc354768' '18d5f982d4d21446a32843f9eb766ff0' '19af8b861a9a46ddf9c480b57b728f3e' '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5' - '52d41fa61e80277ace2b994412a0c856') + '263725f20c0b9eb9c353040792d644e5') build() { cd "${srcdir}/linux-${_basekernel}" @@ -81,10 +79,6 @@ build() { # needed. patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" - # Add the USB_QUIRK_RESET_RESUME for several webcams - # FS#26528 - patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) diff --git a/linux-bfs/config b/linux-bfs/config index e25b352cc..a456339fd 100644 --- a/linux-bfs/config +++ b/linux-bfs/config @@ -1293,7 +1293,8 @@ CONFIG_EXTRA_FIRMWARE="" CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=y -CONFIG_CONNECTOR=m +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y CONFIG_MTD=m CONFIG_MTD_TESTS=m CONFIG_MTD_REDBOOT_PARTS=m diff --git a/linux-bfs/config.x86_64 b/linux-bfs/config.x86_64 index 1be6bbf3e..deefd0da4 100644 --- a/linux-bfs/config.x86_64 +++ b/linux-bfs/config.x86_64 @@ -1252,7 +1252,8 @@ CONFIG_SYS_HYPERVISOR=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=y -CONFIG_CONNECTOR=m +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y CONFIG_MTD=m CONFIG_MTD_TESTS=m CONFIG_MTD_REDBOOT_PARTS=m diff --git a/linux-bfs/usb-add-reset-resume-quirk-for-several-webcams.patch b/linux-bfs/usb-add-reset-resume-quirk-for-several-webcams.patch deleted file mode 100644 index 9e570dd3f..000000000 --- a/linux-bfs/usb-add-reset-resume-quirk-for-several-webcams.patch +++ /dev/null @@ -1,99 +0,0 @@ -commit 2394d67e446bf616a0885167d5f0d397bdacfdfc -Author: Oliver Neukum -Date: Tue Sep 13 08:42:21 2011 +0200 - - USB: add RESET_RESUME for webcams shown to be quirky - - The new runtime PM code has shown that many webcams suffer - from a race condition that may crash them upon resume. - Runtime PM is especially prone to show the problem because - it retains power to the cameras at all times. However - system suspension may also crash the devices and retain - power to the devices. - The only way to solve this problem without races is in - usbcore with the RESET_RESUME quirk. - - Signed-off-by: Oliver Neukum - Signed-off-by: stable - Signed-off-by: Greg Kroah-Hartman - -diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 81ce6a8..38f0510 100644 ---- a/drivers/usb/core/quirks.c -+++ b/drivers/usb/core/quirks.c -@@ -38,6 +38,24 @@ static const struct usb_device_id usb_quirk_list[] = { - /* Creative SB Audigy 2 NX */ - { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME }, - -+ /* Logitech Webcam C200 */ -+ { USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME }, -+ -+ /* Logitech Webcam C250 */ -+ { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, -+ -+ /* Logitech Webcam B/C500 */ -+ { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, -+ -+ /* Logitech Webcam Pro 9000 */ -+ { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME }, -+ -+ /* Logitech Webcam C310 */ -+ { USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME }, -+ -+ /* Logitech Webcam C270 */ -+ { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME }, -+ - /* Logitech Harmony 700-series */ - { USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT }, - -@@ -69,6 +87,9 @@ static const struct usb_device_id usb_quirk_list[] = { - { USB_DEVICE(0x06a3, 0x0006), .driver_info = - USB_QUIRK_CONFIG_INTF_STRINGS }, - -+ /* Guillemot Webcam Hercules Dualpix Exchange*/ -+ { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, -+ - /* M-Systems Flash Disk Pioneers */ - { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, - -commit 5b253d88cc6c65a23cefc457a5a4ef139913c5fc -Author: Jon Levell -Date: Thu Sep 29 20:42:52 2011 +0100 - - USB: add quirk for Logitech C300 web cam - - My webcam is a Logitech C300 and I get "chipmunk"ed squeaky sound. - The following trivial patch fixes it. - - Signed-off-by: Jon Levell - Cc: stable - Signed-off-by: Greg Kroah-Hartman - -diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 38f0510..d6a8d82 100644 ---- a/drivers/usb/core/quirks.c -+++ b/drivers/usb/core/quirks.c -@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = { - /* Logitech Webcam C250 */ - { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, - -+ /* Logitech Webcam C300 */ -+ { USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME }, -+ - /* Logitech Webcam B/C500 */ - { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, - -diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index d6a8d82..caa1991 100644 ---- a/drivers/usb/core/quirks.c -+++ b/drivers/usb/core/quirks.c -@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = { - /* Logitech Webcam B/C500 */ - { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, - -+ /* Logitech Webcam C600 */ -+ { USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME }, -+ - /* Logitech Webcam Pro 9000 */ - { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME }, - diff --git a/mozplugger-chromium/PKGBUILD b/mozplugger-chromium/PKGBUILD index e05861579..360fcadcd 100644 --- a/mozplugger-chromium/PKGBUILD +++ b/mozplugger-chromium/PKGBUILD @@ -1,30 +1,36 @@ # Maintainer: Alexander Rødseth -# Thanks to: Giuseppe Borzi +# Contributor: Giuseppe Borzi # Contributor: fs4000 # Contributor: Allan McRae # Contributor: Todd Musall pkgname=mozplugger-chromium -pkgver=1.14.3 -pkgrel=3 -pkgdesc="A Mozilla multimedia plugin for Chromium" +pkgver=1.14.4 +pkgrel=1 +pkgdesc="Mozilla multimedia plugin for Chromium" arch=('x86_64' 'i686') -url="http://mozplugger.mozdev.org" +url="http://mozplugger.mozdev.org/" license=('GPL') depends=('libx11') backup=('etc/mozpluggerrc') conflicts=('mozplugger') source=("http://mozplugger.mozdev.org/files/mozplugger-$pkgver.tar.gz") -md5sums=('ac2f916ac93c3b59dec2ebfc511d00a0') +sha256sums=('8343c4b107a18b05ef0bb789ab72e0276c979395fb56148fb531fa5c2319745a') build() { cd "mozplugger-$pkgver" + msg2 "Configuring..." ./configure --prefix="$pkgdir/usr" --exec-prefix="$pkgdir/usr/bin" \ --enable-always-xembed --sysconfdir="/etc" msg2 "Building..." make - msg2 "Packaging..." gzip mozplugger.7 +} + +package() { + cd "mozplugger-$pkgver" + + msg2 "Packaging..." install -Dm644 mozplugger.7.gz "$pkgdir/usr/share/man/man7/mozplugger.7.gz" install -Dm644 mozpluggerrc "$pkgdir/etc/mozpluggerrc" install -Dm644 mozplugger.so "$pkgdir/usr/lib/mozilla/plugins/mozplugger.so" @@ -32,4 +38,5 @@ build() { install -Dm755 mozplugger-helper "$pkgdir/usr/bin/mozplugger-helper" install -Dm755 mozplugger-linker "$pkgdir/usr/bin/mozplugger-linker" } + # vim:set ts=2 sw=2 et: diff --git a/mozplugger/PKGBUILD b/mozplugger/PKGBUILD index 8cca7250f..6a7f8926b 100644 --- a/mozplugger/PKGBUILD +++ b/mozplugger/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Todd Musall pkgname=mozplugger -pkgver=1.14.3 +pkgver=1.14.4 pkgrel=1 pkgdesc="A Mozilla & Firefox multimedia plugin." arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('m4' 'libx11') backup=('etc/mozpluggerrc') install=$pkgname.install source=(http://mozplugger.mozdev.org/files/$pkgname-$pkgver.tar.gz) -md5sums=('ac2f916ac93c3b59dec2ebfc511d00a0') +sha256sums=('8343c4b107a18b05ef0bb789ab72e0276c979395fb56148fb531fa5c2319745a') build() { cd $pkgname-$pkgver diff --git a/neonview/PKGBUILD b/neonview/PKGBUILD index a90db29b5..0a148fc37 100644 --- a/neonview/PKGBUILD +++ b/neonview/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jaroslav Lichtblau pkgname=neonview -pkgver=0.4.0 +pkgver=0.6.0a pkgrel=1 pkgdesc='Free, lightweight image viewer' arch=('i686' 'x86_64') @@ -9,9 +9,9 @@ url='http://www.tuxarena.com/neonview/' license=('GPL') depends=('desktop-file-utils' 'gtk2') install=$pkgname.install -source=(http://www.tuxarena.com/neonview/wp-content/uploads/2011/10/${pkgname}-${pkgver}-src.tar.gz \ +source=(http://www.tuxarena.com/neonview/wp-content/uploads/2011/12/${pkgname}-${pkgver}-src.tar.gz \ $pkgname.desktop) -sha256sums=('60e1cb444f02f34cafe18eb46010464c89d4c06e99b2f23c911f345fa03acf6e' +sha256sums=('86c3ce344d6a24cf718d2592887ef5c13655644632c6c3809730cb6018fe1dcb' 'b858e4e69883f1f675de69bdb22c271976ca64b5bf77a9f746629fada4a97ab8') build() { diff --git a/nuvola-bzr-stable/PKGBUILD b/nuvola-bzr-stable/PKGBUILD index c1626ba2d..2adf9613a 100644 --- a/nuvola-bzr-stable/PKGBUILD +++ b/nuvola-bzr-stable/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Alexandr Grigorcea # Contributor: xgdgsc pkgname=nuvola-bzr-stable -pkgver=1.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="Integrated Google Music, Grooveshark, 8tracks and Hype Machine player.Note:may require launchpad account" arch=(i686 x86_64) @@ -30,7 +30,7 @@ build() { bzr pull -d ${_bzrmod} msg "The local files are updated." else - bzr branch ${_bzrtrunk} -r tag:1.0 ${_bzrmod} + bzr branch ${_bzrtrunk} -r tag:1.0.1 ${_bzrmod} fi msg "BZR checkout done or server timeout" diff --git a/ocaml-camomile/PKGBUILD b/ocaml-camomile/PKGBUILD index 9cc33143d..3072e9f98 100644 --- a/ocaml-camomile/PKGBUILD +++ b/ocaml-camomile/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: Serge Ziryukin pkgname=ocaml-camomile -pkgver=0.8.3 +pkgver=0.8.4 pkgrel=1 pkgdesc="Comprehensive Unicode library for OCaml" arch=('i686' 'x86_64') -url="http://camomile.sf.net" +url="https://github.com/yoriyuki/Camomile" license=('LGPL') depends=('ocaml' 'ocaml-findlib>=1.2.3') install= -source=(http://downloads.sourceforge.net/${pkgname/ocaml-}/${pkgname/ocaml-/}-$pkgver.tar.bz2) -md5sums=('c6476bdb4138d222bc14396a82205034') +source=(https://github.com/downloads/yoriyuki/${pkgname/ocaml-}/${pkgname/ocaml-/}-$pkgver.tar.bz2) +md5sums=('389f1a7e5c2a634fbb3ea6f764d77bd3') options=(!strip !makeflags) build() { diff --git a/pacsyu-git/PKGBUILD b/pacsyu-git/PKGBUILD index 4e3b6d3de..44f92c956 100644 --- a/pacsyu-git/PKGBUILD +++ b/pacsyu-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alfonso Saavedra "Son Link" pkgname=pacsyu-git _pkgname=pacsyu -pkgver=20120106 +pkgver=20120108 pkgrel=1 pkgdesc="Update notifier based on python2 and GTK2" arch=(any) @@ -9,6 +9,7 @@ url="http://sonlinkblog.blogspot.com/p/pacsyu.html" license=('GPL3') groups=() depends=('vte' 'python2' 'pygtk' 'python-notify' 'sudo' 'cower-legacy') +optdepends=('cower: if you use Pacman 4') makedepends=('git') source=('pacsyu.desktop' 'sample.pacsyu') md5sums=('b778fd770f657ff517315e73a7f18081' @@ -44,6 +45,9 @@ package() { cp modules/* *.svg COPYING CHANGELOG README $pkgdir/usr/share/$_pkgname/ + mkdir -p $pkgdir/usr/share/icons/ + cp pacsyu.svg $pkgdir/usr/share/icons/ + sed -i "s/copyfile('/copyfile('\/usr\/share\/$_pkgname\//g" $pkgdir/usr/share/$_pkgname/config.py sed -i "s/gtk.gdk.pixbuf_new_from_file('/gtk.gdk.pixbuf_new_from_file('\/usr\/share\/icons\//g" $pkgdir/usr/bin/$_pkgname diff --git a/pan-git/PKGBUILD b/pan-git/PKGBUILD index 23b6256d6..9ac689749 100644 --- a/pan-git/PKGBUILD +++ b/pan-git/PKGBUILD @@ -3,14 +3,15 @@ pkgname=pan-git _gitname="pan2" -pkgver=20120101 +pkgver=20120108 pkgrel=1 pkgdesc="Pan is a Usenet newsreader that's good at both text and binaries. Testing repo by Heinrich Müeller." url="http://git.gnome.org/browse/pan2" _gitroot="git://git.gnome.org/pan2" arch=('i686' 'x86_64') license=('GPL') -depends=( 'autoconf' 'automake' 'gmime' 'gtkspell' 'gnome-common' 'gtk3') +depends=( 'autoconf' 'automake' 'gmime26' 'gtkspell' 'gnome-common' +'gtk3') makedepends=('git' 'intltool') conflicts=('pan' 'pan-gtk3') diff --git a/patator/PKGBUILD b/patator/PKGBUILD index 51c49c19f..964c26a60 100644 --- a/patator/PKGBUILD +++ b/patator/PKGBUILD @@ -2,7 +2,7 @@ pkgname=patator pkgver=0.3 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-purpose bruteforcer" arch=('any') url="http://code.google.com/p/patator/" @@ -21,6 +21,7 @@ optdepends=( 'pysnmp: SNMP' 'python2-ipy: NETx keywords' 'java-runtime: keystore files' + 'unzip: zip archives' ) source=("http://patator.googlecode.com/files/patator_v$pkgver.py") sha256sums=('04d67703d07d6304a50ace799e5784300b90ddaac6f446d3a216caa1d2e51e88') @@ -31,6 +32,7 @@ build() { package() { install -D -m 0755 "$srcdir/${pkgname}_v$pkgver.py" "$pkgdir/usr/bin/patator" + _modules=( 'ftp_login' 'ssh_login' @@ -53,7 +55,6 @@ package() { 'unzip_pass' 'keystore_pass' ) - for module in ${_modules[@]}; do ln -s /usr/bin/patator "$pkgdir/usr/bin/$module" done diff --git a/plymouth/PKGBUILD b/plymouth/PKGBUILD index d15abc8d3..530e0ed71 100644 --- a/plymouth/PKGBUILD +++ b/plymouth/PKGBUILD @@ -12,12 +12,12 @@ url="http://freedesktop.org/wiki/Software/Plymouth" license=('GPL') depends=('initscripts' 'libdrm' 'gtk2') options=('!libtool' '!emptydirs') -install=${pkgname}.install +install=$pkgname.install backup=('etc/plymouth/plymouthd.conf') -source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pkgver}.tar.bz2" +source=("http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.bz2" 'arch-logo.png' - "http://projects.archlinux.org/svntogit/packages.git/plain/cryptsetup/repos/core-${CARCH}/encrypt_hook" - "http://projects.archlinux.org/svntogit/packages.git/plain/cryptsetup/repos/core-${CARCH}/encrypt_install" + "http://projects.archlinux.org/svntogit/packages.git/plain/cryptsetup/repos/core-$CARCH/encrypt_hook" + "http://projects.archlinux.org/svntogit/packages.git/plain/cryptsetup/repos/core-$CARCH/encrypt_install" 'encrypt_hook.patch' 'encrypt_install.patch' 'plymouthd.conf' @@ -26,11 +26,11 @@ source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pk 'plymouth.initcpio_install' 'plymouth-update-initrd.patch' 'system-release') -sha1sums=(`wget ${source}.sha1sum -qO - | cut -d " " -f1` +sha1sums=(`wget $source.sha1sum -qO - | cut -d " " -f1` '3bc168dd06ff3e2790f26c131209a7fb4a5ccbd7' # arch-logo.png - '2d3dfa82eabe51f1addf7472f65a7588324e1c0a' # encrypt_hook + 'ecfdeb5c6484043f73afa1a1efd8186409de9b06' # encrypt_hook '2ddf6061162b481f343ce883083b6ab3b64342e0' # encrypt_install - '70e210bceb266b974fc6f313f0a460d21c29af7b' # encrypt_hook.patch + 'bf09aa9e90f1b08f99e655b6975bb957ae4c390b' # encrypt_hook.patch '08dc7cdc5873634042052014b5250d552158dc4e' # encrypt_install.patch '01235a179d8f991a37035c15cdcc0733b581afd4' # plymouthd.conf '60a55ff2cf417bafa07cf82abcf7680e5c046e52' # plymouth.functions @@ -45,8 +45,8 @@ build() { patch -p0 -i encrypt_hook.patch patch -p0 -i encrypt_install.patch - cd ${pkgname}-${pkgver} - patch -p0 -i "${srcdir}/plymouth-update-initrd.patch" + cd $pkgname-$pkgver + patch -p0 -i "$srcdir/plymouth-update-initrd.patch" sed -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \ -i src/libply-splash-graphics/ply-image.c @@ -66,16 +66,17 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install - install -Dm644 "${srcdir}/plymouth.initcpio_install" "${pkgdir}/lib/initcpio/install/plymouth" - install -Dm644 "${srcdir}/plymouth.initcpio_hook" "${pkgdir}/lib/initcpio/hooks/plymouth" - install -Dm644 "${srcdir}/encrypt_install" "${pkgdir}/lib/initcpio/install/plymouth-encrypt" - install -Dm644 "${srcdir}/encrypt_hook" "${pkgdir}/lib/initcpio/hooks/plymouth-encrypt" - install -Dm644 "${srcdir}/plymouth.functions" "${pkgdir}/etc/rc.d/functions.d/plymouth.functions" - install -Dm644 "${srcdir}/arch-logo.png" "${pkgdir}/usr/share/plymouth/arch-logo.png" - install -Dm644 "${srcdir}/system-release" "${pkgdir}/etc/system-release" - install -Dm644 "${srcdir}/plymouthd.conf" "${pkgdir}/etc/plymouth/plymouthd.conf" + cd "$srcdir" + install -Dm644 plymouth.initcpio_install "$pkgdir/lib/initcpio/install/plymouth" + cp encrypt_install "$pkgdir/lib/initcpio/install/plymouth-encrypt" + install -Dm644 plymouth.initcpio_hook "$pkgdir/lib/initcpio/hooks/plymouth" + cp encrypt_hook "$pkgdir/lib/initcpio/hooks/plymouth-encrypt" + install -Dm644 plymouth.functions "$pkgdir/etc/rc.d/functions.d/plymouth.functions" + install -Dm644 arch-logo.png "$pkgdir/usr/share/plymouth/arch-logo.png" + install -Dm644 plymouthd.conf "$pkgdir/etc/plymouth/plymouthd.conf" + cp system-release "$pkgdir/etc/" } \ No newline at end of file diff --git a/plymouth/encrypt_hook.patch b/plymouth/encrypt_hook.patch index fa26ccb0b..b8a31d0f0 100644 --- a/plymouth/encrypt_hook.patch +++ b/plymouth/encrypt_hook.patch @@ -1,14 +1,14 @@ --- encrypt_hook 2011-07-30 08:58:50.000000000 +0200 +++ encrypt_hook 2011-07-30 09:04:19.935861787 +0200 -@@ -69,10 +69,9 @@ +@@ -85,10 +85,9 @@ echo "" echo "A password is required to access the ${cryptname} volume:" - #loop until we get a real password -- while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; do +- while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do - sleep 2; - done -+ plymouth ask-for-password --prompt="Password for ${cryptname} volume" --dont-pause-progress --number-of-tries=5 --command="/sbin/cryptsetup luksOpen --key-file=- ${cryptdev} ${cryptname} ${CSQUIET}" ++ plymouth ask-for-password --prompt="Password for ${cryptname} volume" --dont-pause-progress --number-of-tries=5 --command="/sbin/cryptsetup luksOpen --key-file=- ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}" + sleep 2; + fi diff --git a/plymouth/plymouth.install b/plymouth/plymouth.install index 6d798519e..a0de2e862 100644 --- a/plymouth/plymouth.install +++ b/plymouth/plymouth.install @@ -6,7 +6,7 @@ cat < To rebuild initrd image: - # mkinitcpio -p kernel26 + # mkinitcpio -p linux 4. For more information please visit the Wiki page: https://wiki.archlinux.org/index.php/Plymouth diff --git a/ptxdist/PKGBUILD b/ptxdist/PKGBUILD index 9e6017904..e3aad53e5 100644 --- a/ptxdist/PKGBUILD +++ b/ptxdist/PKGBUILD @@ -2,27 +2,23 @@ # AUR Category: devel pkgname=ptxdist -pkgver=2011.12.0 -pkgrel=1 +pkgver=2012.01.0 +pkgrel=2 pkgdesc="Embedded Linux build system" arch=('i686' 'x86_64') url="http://www.ptxdist.org" license=('GPL') depends=('dialog' 'flex' 'bison') -source=("http://www.pengutronix.de/software/ptxdist/download/${pkgname}-${pkgver}.tar.bz2" - "ptxdist-python2.diff") -md5sums=('45118f57ab2e90d4f107cd6e58c3a559' - 'ca659d51ed1ee76cdb05bb275d3b7f7b') +source=("http://www.pengutronix.de/software/ptxdist/download/${pkgname}-${pkgver}.tar.bz2") +md5sums=('a19068e0c89a4c27e877b2a7766626d8') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/ptxdist-python2.diff - ./configure --prefix=/usr --with-python=python2 + ./configure --prefix=/usr --with-python=/usr/bin/python2 make } package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - ln -s /usr/bin/python2 ${pkgdir}/usr/lib/ptxdist-${pkgver}/bin/python } diff --git a/ptxdist/ptxdist-python2.diff b/ptxdist/ptxdist-python2.diff deleted file mode 100644 index 2f9615472..000000000 --- a/ptxdist/ptxdist-python2.diff +++ /dev/null @@ -1,14 +0,0 @@ -# HG changeset patch -# Parent 057a8d8aa7840a37aa9c9ca2471ba4e553335975 - -diff -r 057a8d8aa784 bin/ptxdist ---- a/bin/ptxdist Wed Jun 08 18:54:37 2011 +0200 -+++ b/bin/ptxdist Wed Jun 08 18:58:39 2011 +0200 -@@ -2,6 +2,7 @@ - - LANG=C - LC_ALL=POSIX -+export PATH=$(dirname $(readlink -f /usr/bin/ptxdist)):$PATH - - declare -a PTXDIST_ARGS_FULL - declare -a PTXDIST_ARGS_SECOND PTX_MAKE_ARGS diff --git a/python2-msrplib/PKGBUILD b/python2-msrplib/PKGBUILD index a83e65730..366a76ac7 100644 --- a/python2-msrplib/PKGBUILD +++ b/python2-msrplib/PKGBUILD @@ -3,7 +3,7 @@ _p=python-msrplib pkgname=python2-msrplib -pkgver=0.14.1 +pkgver=0.14.2 pkgrel=1 pkgdesc="A python client library for the MSRP client" license=('custom:MIT') @@ -11,7 +11,7 @@ arch=('any') url="http://download.ag-projects.com/SipClient" depends=('python2') source=("http://download.ag-projects.com/SipClient/$_p-$pkgver.tar.gz") -md5sums=('263dfacfea0642f4eb628c77c6517c46') +md5sums=('39cf13353e49acc10eced57568f4b2f4') build() { cd "$srcdir/$_p-$pkgver" diff --git a/ruby-fssm/PKGBUILD b/ruby-fssm/PKGBUILD index 24a27b6b7..fd8573d63 100644 --- a/ruby-fssm/PKGBUILD +++ b/ruby-fssm/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Danny Navarro pkgname=ruby-fssm -pkgver=0.2.7 +pkgver=0.2.8.1 pkgrel=1 pkgdesc="Filesystem event notification library" arch=("any") @@ -19,7 +19,7 @@ options=() install= source=("http://gems.rubyforge.org/gems/fssm-${pkgver}.gem" "LICENSE") noextract=("fssm-${pkgver}.gem") -md5sums=('fcc5dafc3b94c9240b7c4b0687516761' +md5sums=('4d96122417e4efcf2304a8a9c1df64a3' 'f0c03289bbc800619a76420fa7ff2334') build() { diff --git a/svgcleaner/PKGBUILD b/svgcleaner/PKGBUILD dissimilarity index 95% index f572b043e..247d922b0 100644 --- a/svgcleaner/PKGBUILD +++ b/svgcleaner/PKGBUILD @@ -1,24 +1,32 @@ -#Contributor: Mcder3 - -pkgname=svgcleaner -pkgver=0.2 -pkgdesc="svg cleaner is an application that cleans svg images from unnecessary data in batch mode." -pkgrel=2 -arch=(i686 x86_64) -url="http://qt-apps.org/content/show.php/SVG+Cleaner?content=147974&PHPSESSID=4f6139a137c5af919e6fc644af9fd5c3" -license=(GPL) -makedepends=('make' 'fakeroot') -depends=('qt' 'perl-xml-twig') -source=(http://qt-apps.org/CONTENT/content-files/147974-${pkgname}.zip) -md5sums=('409af69ac0250cc63a17ecf69a29edf3') - -build(){ - cd ${srcdir} - qmake -makefile - make || return 1 -} - -package() { - cd ${srcdir} - make INSTALL_ROOT="$pkgdir" install || return 1 -} \ No newline at end of file +# Maintainer: Mcder3 +# Contributor: N30N + +pkgname="svgcleaner" +pkgver=0.2 +pkgrel=3 +pkgdesc="An application that cleans svg images from unnecessary data in batch mode." +provides=("svg-cleaner") +arch=("i686" "x86_64") +url="https://launchpad.net/svg-cleaner" +license=("GPL3") +makedepends=("qt") +depends=("perl-xml-twig" "xdg-utils") +optdepends=("qt: for GUI") +source=("svgcleaner.install" \ +"http://qt-apps.org/CONTENT/content-files/147974-${pkgname}.zip") +md5sums=('810885f50b9792377a5a0b9335e232b8' + '409af69ac0250cc63a17ecf69a29edf3') +install="svgcleaner.install" + +build(){ +cd "${srcdir}" +qmake -config release +make +} + +package() { +cd "${srcdir}" +make INSTALL_ROOT="${pkgdir}" install +} + +# vim: set noet ff=unix: \ No newline at end of file diff --git a/svgcleaner/svgcleaner.install b/svgcleaner/svgcleaner.install new file mode 100644 index 000000000..b32b84d6c --- /dev/null +++ b/svgcleaner/svgcleaner.install @@ -0,0 +1,14 @@ +post_install() { +xdg-icon-resource forceupdate --theme hicolor &> /dev/null +update-desktop-database -q +} + +post_upgrade() { +post_install +} + +post_remove() { +post_install +} + +# vim: set noet ff=unix: diff --git a/tinygettext-svn/PKGBUILD b/tinygettext-svn/PKGBUILD new file mode 100644 index 000000000..07ffb10ba --- /dev/null +++ b/tinygettext-svn/PKGBUILD @@ -0,0 +1,38 @@ +# Contributor: ahmad200512@yandex.ru +pkgname=tinygettext-svn +pkgver=200 +pkgrel=1 +pkgdesc="A simple gettext replacement that works directly on .po files" +arch=('i686' 'x86_64') +url="http://code.google.com/p/tinygettext/" +license=('GPL2') +makedepends=('subversion' 'cmake') +provides=('tinygettext') +conflicts=('tinygettext') + +source=() +md5sums=() + +_svntrunk=http://tinygettext.googlecode.com/svn/trunk/ +_svnmod=tinygettext + +build() { + cd $srcdir + + if [ -d $_svnmod/.svn ]; then + (cd $_svnmod && svn up -r $pkgver) + else + svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod + fi + + msg "SVN checkout done or server timeout" + msg "Starting make..." + + cp -r $_svnmod $_svnmod-build + cd $_svnmod-build + + cmake -D CMAKE_INSTALL_PREFIX=/usr . + make || return 1 + make DESTDIR=${pkgdir} install || return 1 +} + diff --git a/tpb-svn/PKGBUILD b/tpb-svn/PKGBUILD new file mode 100644 index 000000000..ac10b6751 --- /dev/null +++ b/tpb-svn/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Max Roder + +pkgname='tpb-svn' +pkgver=319 +pkgrel=1 +pkgdesc='Access the special buttons on a ThinkPad-Laptop using xosd - SVN Version' +arch=('i686' 'x86_64') +url='http://savannah.nongnu.org/projects/tpb/' +license=('GPL') +depends=('xosd' 'glibc') +makedepends=('subversion') +backup=('etc/tpbrc') +provides=('tpb') +conflicts=('tpb') + +_svntrunk='svn://svn.savannah.nongnu.org/tpb/trunk' +_svnmod='tpb' + +build() { + cd ${srcdir} + + msg "Connecting to SVN server...." + + if [ -d ${_svnmod}/.svn ]; then + (cd ${_svnmod} && svn up -r $pkgver) + else + svn co ${_svntrunk} --config-dir ./ -r $pkgver ${_svnmod} + fi + + msg "SVN checkout done or server timeout" + msg "Starting build..." + + # Remove old source files first, if present + rm -rf ${_svnmod}-build + svn export ${_svnmod} ${_svnmod}-build + cd ${_svnmod}-build + + # Compile + ./configure --prefix=/usr --sysconfdir=/etc mandir=/usr/share/man || return 1 + make || return 1 +} + +package() { + #Remove .svn directories + rm -rf `find "$pkgdir" -type d -name ".svn"` + + cd "${srcdir}/${_svnmod}-build" + make DESTDIR=$pkgdir install || return 1 +} diff --git a/warzone2100-beta/PKGBUILD b/warzone2100-beta/PKGBUILD index adbf42321..8339a8c40 100644 --- a/warzone2100-beta/PKGBUILD +++ b/warzone2100-beta/PKGBUILD @@ -2,7 +2,7 @@ pkgname=warzone2100-beta _realname=warzone2100 -pkgver=master_20111026 +pkgver=master_20111204 pkgrel=1 pkgdesc="3D realtime strategy game on a future Earth - Development version" url="http://wz2100.net/" @@ -12,7 +12,7 @@ provides=('warzone2100') license=('GPL') depends=('gettext' 'physfs' 'quesoglc' 'openal' 'libvorbis' 'glew' 'qjson' 'libtheora' 'ttf-dejavu') source=("http://downloads.sourceforge.net/sourceforge/${_realname}/testing/${_realname}-${pkgver}.tar.gz") -md5sums=('d9d12e5f92614a479b892bdfa0f03bc1') +md5sums=('66d4b0a129fbe74e3a98f7437ac37a70') build() { cd "${_realname}-${pkgver}" diff --git a/xpyb/PKGBUILD b/xpyb/PKGBUILD index 4bcba31ad..fdc12da92 100644 --- a/xpyb/PKGBUILD +++ b/xpyb/PKGBUILD @@ -1,22 +1,26 @@ # Contributor: Jan de Groot # Contributer: Piotr Husiatyński +# Maintainer: Stefan Husmann pkgname=xpyb pkgver=1.2 -pkgrel=3 +pkgrel=4 pkgdesc="X Python Binding, based on the XCB library" url=http://xcb.freedesktop.org/ arch=('i686' 'x86_64') license=('custom:public') -depends=(python2 libxcb) +depends=('python2' 'libxcb') options=(!libtool) source=(http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2) -md5sums=(953cd851d7ad3e59577062ca53c77f3d) +md5sums=('953cd851d7ad3e59577062ca53c77f3d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + PYTHON=python2 ./configure --prefix=/usr make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/xzgv/PKGBUILD b/xzgv/PKGBUILD index ccb347174..82dc5b5e4 100644 --- a/xzgv/PKGBUILD +++ b/xzgv/PKGBUILD @@ -10,20 +10,22 @@ arch=('i686' 'x86_64') url="http://sourceforge.net/projects/xzgv/" license=('GPL') depends=('gtk2') +optdepends=('xterm: open help files') install=$pkgname.install source=(http://downloads.sourceforge.net/sourceforge/xzgv/${pkgname}-${pkgver}.tar.gz - xzgv-infoinstall.patch - xzgv.desktop) + xzgv.desktop + xzgv-ldflags.patch) md5sums=('d6452ebd4911d986fa1176086afb6e33' - '5578f2d2521f060fec127cc07f69b578' - 'fa2c04aa696e23e28f2dec0ef89f5493') + 'fa2c04aa696e23e28f2dec0ef89f5493' + 'ac77492f25a6b4927d2efca966f5e03c') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/xzgv-infoinstall.patch" - unset LDFLAGS + patch -Np1 -i "$srcdir/xzgv-ldflags.patch" + make all + make info } package() { @@ -34,7 +36,7 @@ package() { INFODIR="$pkgdir/usr/share/info" \ install - #install desktop file and icon + # Install desktop file and icon install -Dm644 "$srcdir/xzgv.desktop" "$pkgdir/usr/share/applications/xzgv.desktop" install -Dm644 src/icon-64.xpm "$pkgdir/usr/share/pixmaps/xzgv.xpm" } diff --git a/xzgv/xzgv-infoinstall.patch b/xzgv/xzgv-infoinstall.patch deleted file mode 100644 index e137742b3..000000000 --- a/xzgv/xzgv-infoinstall.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur xzgv-0.9.1-old/Makefile xzgv-0.9.1/Makefile ---- xzgv-0.9.1-old/Makefile 2009-05-01 07:58:36.000000000 +1000 -+++ xzgv-0.9.1/Makefile 2009-08-06 23:58:04.000000000 +1000 -@@ -23,7 +23,7 @@ - - - --all: src man -+all: src man info - - src: xzgv - -diff -Naur xzgv-0.9.1-old/doc/Makefile xzgv-0.9.1/doc/Makefile ---- xzgv-0.9.1-old/doc/Makefile 2007-12-24 06:49:03.000000000 +1000 -+++ xzgv-0.9.1/doc/Makefile 2009-08-07 00:01:20.000000000 +1000 -@@ -39,7 +39,6 @@ - install: installdirs - install xzgv.1 $(MANDIR) - install -m 644 xzgv.info.gz $(INFODIR) -- install-info --infodir=$(INFODIR) xzgv.info.gz - - uninstall: - $(RM) $(MANDIR)/xzgv.1 diff --git a/xzgv/xzgv-ldflags.patch b/xzgv/xzgv-ldflags.patch new file mode 100644 index 000000000..a21b70d94 --- /dev/null +++ b/xzgv/xzgv-ldflags.patch @@ -0,0 +1,12 @@ +diff -Naur xzgv-0.9.1.orig/src/Makefile xzgv-0.9.1/src/Makefile +--- xzgv-0.9.1.orig/src/Makefile 2007-12-23 21:47:25.000000000 +0100 ++++ xzgv-0.9.1/src/Makefile 2012-01-08 14:06:34.888056998 +0100 +@@ -10,7 +10,7 @@ + include ../config.mk + + CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` +-LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` ++LDFLAGS+=-lm `pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` `pkg-config --libs x11` + + all: xzgv + diff --git a/yuuguu/PKGBUILD b/yuuguu/PKGBUILD index 21c48bfcb..f59bc8ba5 100644 --- a/yuuguu/PKGBUILD +++ b/yuuguu/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: neolith pkgname=yuuguu -pkgver=5555 +pkgver=5626 pkgrel=1 pkgdesc="Yuuguu offers cross network instant messaging, instant screen sharing, real time collaboration, web conferencing and remote support." arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ md5sums=('4f6b28c43a199fc9b5eaff339e0b5fed' 'ece9ab1401b19617be2ab0352c992a18') _architect='i386' [ "$CARCH" = "x86_64" ] && _architect='amd64' -[ "$CARCH" = "x86_64" ] && md5sums[0]='d10f3315528b9d1576192156b6dd4615' +[ "$CARCH" = "x86_64" ] && md5sums[0]='5a44cbc20cf35df06602a54537564ef2' source=("yuuguu-latest-${_architect}.rpm::http://www.yuuguu.com/downloads/yuuguu-latest-${_architect}.rpm" 'patch-yuuguu') -- 2.11.4.GIT