diff options
author | Joshua I. Haase H. (xihh) <hahj87@gmail.com> | 2012-12-04 20:19:54 -0600 |
---|---|---|
committer | Joshua I. Haase H. (xihh) <hahj87@gmail.com> | 2012-12-04 20:19:54 -0600 |
commit | 5b773bfc871ccd0dc540942508e7480c1cd63df2 (patch) | |
tree | 432ab7299f728cd5f078cd3e2bfa4f92e8d43487 /community | |
parent | 0cb1158276158c1c2f4bef15c278ffcaf8859172 (diff) | |
parent | 1d3002e46bb10b50ac35a99b6d2e672cb2c4b2f9 (diff) |
Merge branch 'master' of gitpar:abslibre-mips64el
Conflicts:
extra/seahorse/PKGBUILD
Diffstat (limited to 'community')
754 files changed, 12937 insertions, 8981 deletions
diff --git a/community/abe/PKGBUILD b/community/abe/PKGBUILD index 9f646794f..82568c345 100644 --- a/community/abe/PKGBUILD +++ b/community/abe/PKGBUILD @@ -5,7 +5,7 @@ pkgname=abe pkgver=1.1 pkgrel=9 pkgdesc="A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://abe.sourceforge.net" license=('GPL') depends=('sdl_mixer') @@ -21,7 +21,7 @@ build() { patch -Np1 -i "$srcdir"/$pkgname.patch - ./configure --prefix=/usr + ./configure --prefix=/usr --host=$CHOST make } diff --git a/community/account-plugins/PKGBUILD b/community/account-plugins/PKGBUILD new file mode 100644 index 000000000..f49f30d5d --- /dev/null +++ b/community/account-plugins/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 79484 2012-11-06 04:10:50Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=account-plugins +pkgver=0.9 +pkgrel=1 +pkgdesc="Account configuration plugins for credentials preferences" +arch=('i686' 'x86_64' 'mips64el') +url="https://launchpad.net/online-accounts-account-plugins" +license=('GPL') +depends=('credentials-preferences' 'signon-keyring-extension' 'signon-plugin-oauth2') +makedepends=('gobject-introspection' 'vala' 'intltool') +optdepends=('python-gobject: for account-console tool') +options=('!libtool') +install=$pkgname.install +source=(https://launchpad.net/online-accounts-account-plugins/12.10/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('58deed9e3305877bb4db426a51451ec0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/community/dates/dates.install b/community/account-plugins/account-plugins.install index 2c455e952..2c455e952 100644 --- a/community/dates/dates.install +++ b/community/account-plugins/account-plugins.install diff --git a/community/acpi/PKGBUILD b/community/acpi/PKGBUILD index f4eb265c2..9ea5236c1 100644 --- a/community/acpi/PKGBUILD +++ b/community/acpi/PKGBUILD @@ -3,7 +3,7 @@ pkgname=acpi pkgver=1.6 -pkgrel=1 +pkgrel=1.1 pkgdesc="Linux ACPI client providing battery, AC power, and thermal readings" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/acpiclient" diff --git a/community/activity-log-manager/PKGBUILD b/community/activity-log-manager/PKGBUILD new file mode 100644 index 000000000..861adf798 --- /dev/null +++ b/community/activity-log-manager/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 79218 2012-11-01 09:45:30Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Ner0 + +pkgname=activity-log-manager +pkgver=0.9.4 +pkgrel=3 +pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist" +arch=('i686' 'x86_64' 'mips64el') +url="https://launchpad.net/activity-log-manager" +license=('GPL2') +depends=('gtk3' 'libgee' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('vala' 'intltool') +install=$pkgname.install +source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz + http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20121021.tar.gz + fix-crash.patch + config.vapi) +md5sums=('cf85aecdaa6c0188a53d659709e1f8cd' + '6167df74ce44659aa94a89f31ff4d351' + '1052dec3691826f01fa3d4fd84284ccc' + 'fecc5ac50dfcd79c4c8d54599760d225') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Fix docdir location + sed -i 's/almdocdir =.*/almdocdir = ${docdir}/' Makefile.{am,in} + + # Update language files + echo 'af ar ast be bg bn bs ca ca@valencia cs da de el eo es et eu fi fr gd gl he hi hr hu id it ja km ko ku lt lv mi ms my nb nl oc pl pt ro ru se si sk sl sr sv ta te ug uk uz vi zh_CN zh_HK zh_TW' >po/LINGUAS + rename $pkgname- '' ../po/$pkgname-*.po + mv -f -t po ../po/* + + # Fix crash with GTK+ 3.6 + # https://bugs.launchpad.net/activity-log-manager/+bug/1058037 + patch -Np1 -i "$srcdir/fix-crash.patch" + + # We need this file for build + mv "$srcdir/config.vapi" "$srcdir/$pkgname-$pkgver/src" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # We don't have Whoopsie on Arch Linux + rm -r "$pkgdir/etc" "$pkgdir"/usr/share/{applications/activity-log-manager-ccpanel.desktop,dbus-1,gnome-control-center,polkit-1} +} diff --git a/community/activity-log-manager/activity-log-manager.install b/community/activity-log-manager/activity-log-manager.install new file mode 100644 index 000000000..2c455e952 --- /dev/null +++ b/community/activity-log-manager/activity-log-manager.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/activity-log-manager/config.vapi b/community/activity-log-manager/config.vapi new file mode 100644 index 000000000..ee9823051 --- /dev/null +++ b/community/activity-log-manager/config.vapi @@ -0,0 +1,11 @@ +[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")] +namespace Config { + public const string GETTEXT_PACKAGE; + public const string SPRITE_DIR; + public const string BACKGROUND_DIR; + public const string PACKAGE_DATA_DIR; + public const string PACKAGE_LOCALE_DIR; + public const string PACKAGE_NAME; + public const string PACKAGE_VERSION; + public const string VERSION; +} diff --git a/community/activity-log-manager/fix-crash.patch b/community/activity-log-manager/fix-crash.patch new file mode 100644 index 000000000..92bb5683c --- /dev/null +++ b/community/activity-log-manager/fix-crash.patch @@ -0,0 +1,15 @@ +diff -Naur activity-log-manager-0.9.4.orig/src/alm.vala activity-log-manager-0.9.4/src/alm.vala +--- activity-log-manager-0.9.4.orig/src/alm.vala 2012-02-22 20:24:08.000000000 +0100 ++++ activity-log-manager-0.9.4/src/alm.vala 2012-11-01 09:33:15.466534392 +0100 +@@ -41,10 +41,7 @@ + static int main (string[] args) + { + Gtk.init (ref args); +- var alm = new Gtk.Application ("org.zeitgeist.Alm", +- ApplicationFlags.FLAGS_NONE); +- var window = new Main (); +- alm.add_window (window); ++ new Main (); + + Gtk.main (); + return 0; diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD index 380db3bd6..a5d24c2d0 100644 --- a/community/alex/PKGBUILD +++ b/community/alex/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 77336 2012-10-09 04:16:39Z tdziedzic $ +# $Id: PKGBUILD 79007 2012-10-29 02:24:24Z arodseth $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Philip Nilsson <pnilsson@nullref.se> pkgname=alex pkgver=3.0.2 -pkgrel=2 -pkgdesc='a lexical analyser generator for Haskell' +pkgrel=3 +pkgdesc='Lexical analyser generator for Haskell' arch=('i686' 'x86_64') url='http://hackage.haskell.org/package/alex' license=('custom:BSD3') depends=('gmp') -makedepends=('ghc=7.6.1-1' 'haskell-quickcheck=2.5-2') +makedepends=('ghc=7.6.1' 'haskell-quickcheck>=2') source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") md5sums=('b8f0d831b65d05e5f54ff08bd3d9d10d') diff --git a/community/allegro/PKGBUILD b/community/allegro/PKGBUILD index 22ee9154e..125d0d192 100644 --- a/community/allegro/PKGBUILD +++ b/community/allegro/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 73179 2012-07-03 10:15:07Z arodseth $ +# $Id: PKGBUILD 80364 2012-11-20 22:04:44Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: arjan <arjan@archlinux.org> pkgname=allegro -pkgver=5.0.7 +pkgver=5.0.8 pkgrel=1 -pkgdesc="Portable library mainly aimed at video game and multimedia programming" +pkgdesc='Portable library mainly aimed at video game and multimedia programming' arch=('x86_64' 'i686' 'mips64el') -url="http://alleg.sourceforge.net/" +url='http://alleg.sourceforge.net/' license=('custom') depends=('jack' 'libxpm' 'libxxf86dga' 'libgl' 'physfs' 'gtk2' 'libpulse') -makedepends=('cmake' 'mesa') +makedepends=('cmake' 'mesa' 'glu') source=("http://downloads.sourceforge.net/alleg/$pkgname-$pkgver.tar.gz") -sha256sums=('47f29e564d9a4babfbbf024f34fc8a04eea932a073af921d17caffbec0c3ad9b') +sha256sums=('272e77d0ca0cef7586d7207887f87bf271e1d0db5f8f208dc7dd9a5e3bb6140b') build() { cd "$srcdir" diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD index dcc6ef819..da160f09d 100644 --- a/community/almanah/PKGBUILD +++ b/community/almanah/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 69798 2012-04-23 09:46:12Z ibiru $ +# $Id: PKGBUILD 79128 2012-10-30 23:07:30Z heftig $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=almanah -pkgver=0.9.0 +pkgver=0.10.0 pkgrel=1 pkgdesc="Small GTK+ application to allow you to keep a diary of your life" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Almanah_Diary" license=('GPL') -depends=('evolution-data-server>=3.4.0' 'gtkspell3' 'libcryptui' 'xdg-utils') +depends=('evolution-data-server>=3.6.0' 'gtkspell3' 'libcryptui' 'xdg-utils') makedepends=('intltool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c8928c5beda9e7a54040ba5a87873ad8fad5feb5585546b0ab5e57d08c3aa7c6') +sha256sums=('fd213b53ca2a9832df868ee44ed7c446cd6b320651e2f2d10e0a0c98aa3bfced') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/alsa-tools/PKGBUILD b/community/alsa-tools/PKGBUILD deleted file mode 100644 index dbb3334a1..000000000 --- a/community/alsa-tools/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 62752 2012-01-25 20:12:30Z seblu $ -#Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> -#Contributor: Jochen Immend�rfer <jochen dot immendoerfer at gmail dot com> - -pkgname=alsa-tools -pkgver=1.0.25 -pkgrel=1 -pkgdesc='ALSA tools package' -arch=('i686' 'x86_64' 'mips64el') -url='http://alsa-project.org/' -license=('GPL2') -depends=('fltk' 'alsa-lib' 'gtk2') -options=('!libtool') -source=("ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2") -md5sums=('57bfec98a814d12e0f7ab379aaeccd87') - -build() { - for f in $(find "$srcdir/$pkgname-$pkgver" -type f -name configure ); do - [[ -x $f ]] || continue - cd "${f%/*}" - [[ qlo10k1 = ${PWD##*/} ]] && continue - [[ hwmixvolume = ${PWD##*/} ]] && continue - msg2 "Building ${PWD##*/}" - ./configure --prefix=/usr --x-libraries=/usr/lib - make - done -} - -package() { - for f in $(find "$srcdir/$pkgname-$pkgver" -type f -name configure ); do - [[ -x $f ]] || continue - cd "${f%/*}" - [[ qlo10k1 = ${PWD##*/} ]] && continue - [[ hwmixvolume = ${PWD##*/} ]] && continue - msg2 "Installing ${PWD##*/}" - make "DESTDIR=$pkgdir" install - done -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/apvlv/PKGBUILD b/community/apvlv/PKGBUILD index f08a71803..af84629fa 100644 --- a/community/apvlv/PKGBUILD +++ b/community/apvlv/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 64830 2012-02-18 15:59:14Z bpiotrowski $ +# $Id: PKGBUILD 79519 2012-11-06 16:27:50Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: tocer.deng <tocer.deng@gmail.com> pkgname=apvlv -pkgver=0.1.4 +pkgver=0.1.4.20121023 pkgrel=1 -pkgdesc="A PDF Viewer which behaves like Vim" +pkgdesc='A PDF Viewer which behaves like Vim' arch=('i686' 'x86_64' 'mips64el') url="http://naihe2010.github.com/apvlv/" license=('GPL') depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre') makedepends=('cmake' 'libwebkit') -source=("ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz") -md5sums=('5518b842715f1a9e7d3c8d2b7ed16342') +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) +md5sums=('f222fc4b09b15358eb4e7f996ba810d6') build() { - cd "$srcdir"/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver mkdir -p build cd build @@ -29,7 +29,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver/build + cd $srcdir/$pkgname-$pkgver/build - make DESTDIR="$pkgdir" install + make DESTDIR=$pkgdir/ install } diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index b2c813558..cbfb80cdd 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76063 2012-09-10 12:19:21Z bpiotrowski $ +# $Id: PKGBUILD 80774 2012-12-03 15:26:20Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.15.2 +pkgver=1.16.0 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ url='http://aria2.sourceforge.net/' license=('GPL') depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') -source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2") -md5sums=('211f1e5c1fd28b788e687cb2d851812a') +source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2) +md5sums=('0a8e1dbfe1725a02de8271589d622739') build() { cd $pkgname-$pkgver diff --git a/community/arm-elf-binutils/PKGBUILD b/community/arm-elf-binutils/PKGBUILD index 06b81f00e..d98a68cff 100644 --- a/community/arm-elf-binutils/PKGBUILD +++ b/community/arm-elf-binutils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 60835 2011-12-18 22:14:40Z spupykin $ +# $Id: PKGBUILD 79080 2012-10-30 09:53:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=arm-elf-binutils -pkgver=2.22 +pkgver=2.23 pkgrel=1 _xprefix=/usr pkgdesc="A set of programs to assemble and manipulate binary and object files" @@ -12,7 +12,7 @@ options=(!libtool) url="http://sources.redhat.com/binutils" depends=('glibc' 'zlib') source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz) -md5sums=('8b3ad7090e3989810943aa19103fdb83') +md5sums=('ed58f50d8920c3f1d9cb110d5c972c27') build() { cd $srcdir/binutils-${pkgver} diff --git a/community/armagetronad/PKGBUILD b/community/armagetronad/PKGBUILD index 3703a1448..3c30de49d 100644 --- a/community/armagetronad/PKGBUILD +++ b/community/armagetronad/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 70736 2012-05-16 00:12:56Z kkeen $ +# $Id: PKGBUILD 79394 2012-11-04 02:16:41Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Filippo 'JoeyrS' Civiletti <joeyrs@gmail.com> pkgname=armagetronad pkgver=0.2.8.3.2 -pkgrel=2 +pkgrel=3 pkgdesc='A Tron Clone in 3D.' arch=('i686' 'x86_64' 'mips64el') url='http://armagetronad.net/' license=('GPL') -depends=('sdl_image' 'libxml2' 'sdl_mixer' 'mesa' 'ftgl') +depends=('sdl_image' 'libxml2' 'sdl_mixer' 'ftgl') +optdepends=('python2: language updater') source=(http://downloads.sourceforge.net/sourceforge/armagetronad/armagetronad-$pkgver.src.tar.gz) md5sums=('f7796de4ef50bd33553e0a3f93fd67e6') diff --git a/community/astromenace/PKGBUILD b/community/astromenace/PKGBUILD index 3af5f1420..8ec2e0d1d 100644 --- a/community/astromenace/PKGBUILD +++ b/community/astromenace/PKGBUILD @@ -1,55 +1,42 @@ -# $Id: PKGBUILD 77621 2012-10-13 11:41:17Z allan $ +# $Id: PKGBUILD 78708 2012-10-23 00:34:23Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Ivan Bobrov <ibobrik at gmail dot com> # Contributor: Black_Mage <vleon1 at gmail dot com> pkgname=astromenace -pkgver=1.2.0 -pkgrel=6 -pkgdesc="Hardcore 3D space shooter with spaceship upgrade possibilities. English version" +pkgver=1.3.0 +pkgrel=1 +pkgdesc="Hardcore 3D space shooter with spaceship upgrade possibilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.viewizard.com/astromenace/index_linux.php" license=('GPL3') -depends=('sdl' 'freealut' 'libjpeg' 'libvorbis' 'glu') +depends=('sdl' 'freealut' 'libjpeg' 'libvorbis' 'glu' 'freetype2' 'libxinerama') makedepends=('cmake' 'mesa') -source=(http://downloads.sourceforge.net/openastromenace/openamenace-src-$pkgver.tar.bz2 - http://downloads.sourceforge.net/openastromenace/oamenace-data-$pkgver.tar.bz2 - http://downloads.sourceforge.net/openastromenace/oamenace-lang-en-$pkgver.tar.bz2 - astromenace.desktop - astromenace.png - astromenace.patch - astromenace.sh) -md5sums=('3c8e7013aa64fcde7ba8a7750df51ab8' - 'a8ad3495f8eac419ebcf93473008484d' - 'f137da529da1345a0243f22fb8bf4913' - '1edc9367564a6c639a2b8199adf26a08' - '1643d876d4e21cc0c6ceddc8e7c8ceed' - '8d23310a2bb9c96dd150d30ab39799a1' - '2d4504929a620709cd058657bba335b3') +source=(http://downloads.sourceforge.net/openastromenace/openastromenace-src-$pkgver.tar.bz2 + astromenace.desktop) +md5sums=('f48385106da687c12996d25852191e76' + '1edc9367564a6c639a2b8199adf26a08') build() { - cd $srcdir/OpenAstroMenaceSVN + cd $srcdir/AstroMenace - # Patch build and install the engine - patch -Np1 -i $srcdir/$pkgname.patch - cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr - sed -i 's/`sdl-config --libs`/-lSDL -lpthread/' CMakeFiles/AstroMenace.dir/link.txt + [[ -d build ]] && rm -r build + mkdir build && cd build + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDATADIR=/usr/share/astromenace make } package() { - cd $srcdir/OpenAstroMenaceSVN + cd $srcdir/AstroMenace - # Manually install the engine and data - install -Dm 755 AstroMenace $pkgdir/usr/bin/astromenace_bin - install -Dm 644 $srcdir/gamedata.vfs $pkgdir/usr/share/astromenace/gamedata.vfs - install -Dm 644 $srcdir/gamelang_en.vfs $pkgdir/usr/share/astromenace/gamelang_en.vfs - install -d $pkgdir/usr/share/astromenace/DATA/SCRIPT - install -m 644 $srcdir/DATA/SCRIPT/* $pkgdir/usr/share/astromenace/DATA/SCRIPT + build/AstroMenace --pack --rawdata=./RAW_VFS_DATA --dir=build - # Install .desktop, icon and bin + install -Dm755 build/AstroMenace $pkgdir/usr/bin/astromenace + install -Dm644 build/gamedata.vfs $pkgdir/usr/share/astromenace/gamedata.vfs + + install -Dm 644 astromenace_128.png $pkgdir/usr/share/pixmaps/astromenace.png install -Dm 644 $srcdir/astromenace.desktop $pkgdir/usr/share/applications/astromenace.desktop - install -Dm 644 $srcdir/astromenace.png $pkgdir/usr/share/pixmaps/astromenace.png - install -Dm 755 $srcdir/astromenace.sh $pkgdir/usr/bin/astromenace } diff --git a/community/atop/PKGBUILD b/community/atop/PKGBUILD index 3663de823..b0f8ccfde 100644 --- a/community/atop/PKGBUILD +++ b/community/atop/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 75922 2012-09-05 14:45:58Z spupykin $ +# $Id: PKGBUILD 79031 2012-10-29 09:19:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: John Gerritse <john.gerritse@gmail.com> pkgname=atop -pkgver=1.27_3 -pkgrel=3 +pkgver=2.0_1 +pkgrel=1 pkgdesc="A system and process level monitor." arch=(i686 x86_64 'mips64el') url="http://www.atoptool.nl/" license=('GPL') depends=('ncurses' 'sh' 'zlib') source=(http://www.atoptool.nl/download/atop-${pkgver/_/-}.tar.gz) -md5sums=('4a4e896ed6ec6979f80898d37938b8d9') +md5sums=('6867ea2211edaf8140b94130470d646b') build() { cd $srcdir/$pkgname-${pkgver/_/-} diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD index e40031472..1a350d92d 100644 --- a/community/audit/PKGBUILD +++ b/community/audit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74552 2012-07-30 13:59:54Z mtorromeo $ +# $Id: PKGBUILD 79970 2012-11-15 08:39:27Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Connor Behan <connor.behan@gmail.com> # Contributor: henning mueller <henning@orgizm.net> pkgname=audit pkgver=2.2.1 -pkgrel=2 +pkgrel=4 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' url=http://people.redhat.com/sgrubb/$pkgname arch=(i686 x86_64 mips64el) @@ -31,10 +31,6 @@ source=( auditd.service python2.patch ) -md5sums=('dc099fcb2f9242d47ecc35b46d71dfd1' - '5f86e87354d0c3b9b408a26daed7a906' - '67f6c51891120da038cb790693d8eba1' - '45a33c6bef84f8e1701cb0b5e187336b') build() { cd "$srcdir/$pkgname-$pkgver" @@ -59,5 +55,11 @@ package() { install -m755 "$srcdir/auditd.rc" etc/rc.d/auditd install -d var/log/audit rm -rf etc/rc.d/init.d etc/sysconfig - mv usr/sbin sbin + + sed -ri 's| /sbin| /usr/sbin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf } + +sha256sums=('9865ca89f5b975ccf25441ddf45a874448f2bba944005aa8cd5e3c3148713a63' + '1e374ff164667b6a11f84c825a39996b449dc712d573996907cd47f063bf0dd5' + '3c7179f40216b594675f26bb73884406c8ac91577b609dd1ab9837f889954007' + 'e60c031c6354f41938447c439eadee77127307687a2c487a54fab884eeafd9c2') diff --git a/community/audit/auditd.rc b/community/audit/auditd.rc index 69764aa73..13976341c 100755 --- a/community/audit/auditd.rc +++ b/community/audit/auditd.rc @@ -9,8 +9,8 @@ case "$1" in start) stat_busy "Starting auditd" [ -z "$PID" ] && { - /sbin/auditctl -R /etc/audit/audit.rules >/dev/null || stat_die - /sbin/auditd || stat_die + /usr/sbin/auditctl -R /etc/audit/audit.rules >/dev/null || stat_die + /usr/sbin/auditd || stat_die } add_daemon auditd stat_done diff --git a/community/audit/auditd.service b/community/audit/auditd.service index 199b0dcbe..208b5c38e 100644 --- a/community/audit/auditd.service +++ b/community/audit/auditd.service @@ -1,12 +1,10 @@ [Unit] -Description=Audit Daemon +Description=Security Auditing Service +After=syslog.target [Service] -ExecStartPre=/sbin/auditctl -R /etc/audit/audit.rules -ExecStart=/sbin/auditd -n -ExecStop=/bin/kill -15 $MAINPID -ExecReload=/bin/kill -HUP $MAINPID -Restart=always +ExecStart=/usr/sbin/auditd -n +ExecStartPost=/usr/sbin/auditctl -R /etc/audit/audit.rules [Install] -WantedBy=multi-user.target +WantedBy=multi-user.target
\ No newline at end of file diff --git a/community/avant-window-navigator/688_687.diff b/community/avant-window-navigator/688_687.diff new file mode 100644 index 000000000..34c5b8fa4 --- /dev/null +++ b/community/avant-window-navigator/688_687.diff @@ -0,0 +1,23 @@ +=== modified file 'libawn/awn-applet-simple.c' +--- libawn/awn-applet-simple.c 2010-01-10 14:43:43 +0000 ++++ libawn/awn-applet-simple.c 2010-04-11 21:08:28 +0000 +@@ -393,16 +393,16 @@ + GStrv states, + GStrv icon_names) + { +- gchar *applet_name; ++ gchar *applet_name=NULL; + + g_return_if_fail (AWN_IS_APPLET_SIMPLE (applet)); +- g_return_if_fail (applet_name); + g_return_if_fail (states); + g_return_if_fail (icon_names); + + g_object_get (applet, + "canonical-name",&applet_name, + NULL); ++ g_return_if_fail (applet_name); + applet->priv->last_set_icon = ICON_THEMED_MANY; + awn_themed_icon_set_size (AWN_THEMED_ICON (applet->priv->icon), + awn_applet_get_size (AWN_APPLET (applet))); + diff --git a/community/avant-window-navigator/821_820.diff b/community/avant-window-navigator/821_820.diff new file mode 100644 index 000000000..bd8c5b279 --- /dev/null +++ b/community/avant-window-navigator/821_820.diff @@ -0,0 +1,96 @@ +=== modified file 'awn-settings/awnClass.py' +--- awn-settings/awnClass.py 2010-08-24 00:21:51 +0000 ++++ awn-settings/awnClass.py 2011-02-13 23:43:42 +0000 +@@ -53,9 +53,13 @@ + import tempfile + import dbus + +-from bzrlib import branch +-from bzrlib.builtins import cmd_branch, cmd_pull +-from bzrlib.plugins.launchpad.lp_directory import LaunchpadDirectory ++try: ++ from bzrlib import branch ++ from bzrlib.builtins import cmd_branch, cmd_pull ++ from bzrlib.plugins.launchpad.lp_directory import LaunchpadDirectory ++ support_bzr = True ++except: ++ support_bzr = False + + defs.i18nize(globals()) + +@@ -127,8 +131,11 @@ + path: a url from a branch + return: the http format of a lp: format, or the same url + ''' +- directory = LaunchpadDirectory() +- return directory._resolve(path).replace("bzr+ssh","http") ++ if support_bzr == True: ++ directory = LaunchpadDirectory() ++ return directory._resolve(path).replace("bzr+ssh","http") ++ else: ++ return path + + def read_list(self, file_path): + ''' Read a flat file and return the content in a list +@@ -148,34 +155,44 @@ + path: the path of the branch + bzr_dir: the location of the futur tree. + ''' +- if os.path.exists(path): +- print ("Error, the path already exist") ++ if support_bzr == False: ++ print (_("Bzr support is not enable, try to install bzr")) + else: +- try: +- bzr_branch = cmd_branch() +- status = StringIO() +- status = bzr_branch._setup_outf() +- bzr_branch.run(from_location=self.lp_path_normalize(bzr_dir), to_location=path) +- except socket.gaierror: +- print 'Socket error, could not create branch.' ++ if os.path.exists(path): ++ print (_("Error, the path already exist")) ++ else: ++ try: ++ bzr_branch = cmd_branch() ++ status = StringIO() ++ status = bzr_branch._setup_outf() ++ bzr_branch.run(from_location=self.lp_path_normalize(bzr_dir), to_location=path) ++ except socket.gaierror: ++ print (_('Socket error, could not create branch.')) + + def update_branch(self, path): + ''' Update a local branch + path: Location of the branch + Return the output of the command + ''' +- bzr_pull = cmd_pull() +- status = StringIO() +- status = bzr_pull._setup_outf() +- bzr_pull.run(directory=path) ++ if support_bzr == False: ++ print (_("Bzr support is not enable, try to install bzr")) ++ else: ++ bzr_pull = cmd_pull() ++ status = StringIO() ++ status = bzr_pull._setup_outf() ++ bzr_pull.run(directory=path) + + def get_revision_from_path(self, path): + ''' Return the last revision number of the branch + specify with path parameter + ''' +- tree = branch.Branch.open(path) +- revision_number, revision_id = tree.last_revision_info() +- return revision_number ++ if support_bzr == False: ++ print (_("Bzr support is not enable, try to install bzr")) ++ return 0 ++ else: ++ tree = branch.Branch.open(path) ++ revision_number, revision_id = tree.last_revision_info() ++ return revision_number + + #Sources.list + def dict_from_sources_list(self, config=defs.HOME_CONFIG_DIR): + diff --git a/community/avant-window-navigator/824_823.diff b/community/avant-window-navigator/824_823.diff new file mode 100644 index 000000000..290b4ad6d --- /dev/null +++ b/community/avant-window-navigator/824_823.diff @@ -0,0 +1,40 @@ +=== modified file 'applets/taskmanager/task-manager.c' +--- applets/taskmanager/task-manager.c 2011-01-15 16:44:44 +0000 ++++ applets/taskmanager/task-manager.c 2011-03-12 21:42:33 +0000 +@@ -1611,11 +1611,6 @@ + g_debug ("%s: Window opened: %s",__func__,wnck_window_get_name (window)); + g_debug ("xid = %lu, pid = %d",wnck_window_get_xid (window),wnck_window_get_pid (window)); + #endif +- /* +- for some reason the skip tasklist property for the taskmanager toggles briefly +- off and on in certain circumstances. Nip this in the bud. +- TODO: Investigate wth this is happening... it bothers me. +- */ + // if ( wnck_window_get_pid (window) == getpid() || + if ( g_strcmp0 (wnck_window_get_name (window),"awn-applet")==0 ) + { +@@ -1626,11 +1621,6 @@ + */ + g_signal_connect (window, "state-changed", G_CALLBACK (on_window_state_changed), manager); + +- if (wnck_window_is_skip_tasklist (window)) +- { +- return; +- } +- + g_signal_connect (window, "state-changed", + G_CALLBACK (check_attention_requested), manager); + +@@ -1798,6 +1787,11 @@ + g_return_if_fail (TASK_IS_MANAGER (manager)); + g_return_if_fail (WNCK_IS_WINDOW (window)); + ++ if (wnck_window_is_skip_tasklist(window)) ++ { ++ return; ++ } ++ + _wnck_get_wmclass (wnck_window_get_xid (window), + &res_name, &class_name); + if (get_special_wait_from_window_data (res_name, + diff --git a/community/avant-window-navigator/PKGBUILD b/community/avant-window-navigator/PKGBUILD new file mode 100644 index 000000000..6d6bb256e --- /dev/null +++ b/community/avant-window-navigator/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 79700 2012-11-11 10:30:00Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Timm Preetz <timm@preetz.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=avant-window-navigator +pkgver=0.4.0 +pkgrel=13 +pkgdesc="Fully customisable dock-like window navigator for GNOME" +arch=('i686' 'x86_64' 'mips64el') +url="https://launchpad.net/awn" +license=('GPL') +depends=('libdesktop-agnostic' 'libwnck' 'libgtop' 'gconf' 'python2-dbus' 'pygtk' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('gtk-doc' 'vala' 'intltool') +options=('!libtool') +install=$pkgname.install +source=(http://launchpad.net/awn/0.4/$pkgver/+download/$pkgname-$pkgver.tar.gz + 688_687.diff + 821_820.diff + 824_823.diff) +md5sums=('03654b45dd95cbb83fa7e112bd00523c' + '6b05ccb539f811729820d5545eb50d6e' + '2cc0ecf9fccb6e559a98003715ebf6df' + 'd068c19503b7be1868bcce5dab003628') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Fix uninitialised pointer + # https://bugs.launchpad.net/awn/+bug/562499 + patch -Np0 -i "$srcdir/688_687.diff" + + # Remove bzr dependency + # https://bugs.launchpad.net/awn/+bug/707863 + patch -Np0 -i "$srcdir/821_820.diff" + + # Hide windows with skip taskbar state + # https://bugs.launchpad.net/awn/+bug/707863 + patch -Np0 -i "$srcdir/824_823.diff" + + # Python2 fix + sed -i 's@^#!.*python$@#!/usr/bin/python2@' awn-settings/{awnSettings.py.in,awnSettingsHelper.py} + sed -i 's/with ("python"/with ("python2"/' applet-activation/main.c + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-static \ + PYTHON=/usr/bin/python2 + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/awn.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas + rm -r "$pkgdir/etc" +} diff --git a/community/contacts/contacts.install b/community/avant-window-navigator/avant-window-navigator.install index f52f6a097..f5473a092 100644 --- a/community/contacts/contacts.install +++ b/community/avant-window-navigator/avant-window-navigator.install @@ -1,8 +1,7 @@ -pkgname=contacts +pkgname=awn post_install() { gconfpkg --install $pkgname - update-desktop-database -q xdg-icon-resource forceupdate } @@ -19,6 +18,5 @@ pre_remove() { } post_remove() { - update-desktop-database -q xdg-icon-resource forceupdate } diff --git a/community/avr-binutils/PKGBUILD b/community/avr-binutils/PKGBUILD index c5a99cd29..cb5a600a8 100644 --- a/community/avr-binutils/PKGBUILD +++ b/community/avr-binutils/PKGBUILD @@ -1,36 +1,43 @@ -# $Id: PKGBUILD 69306 2012-04-13 08:25:33Z schuay $ +# $Id: PKGBUILD 79838 2012-11-13 22:12:42Z schuay $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: danst0 <danst0@west.de> +# Build order: avr-binutils -> avr-gcc -> avr-libc + pkgname=avr-binutils -pkgver=2.22 -pkgrel=3 +pkgver=2.23 +pkgrel=2 _pkgname=binutils -_date=20120323 pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/binutils/" license=('GPL') -depends=('glibc>=2.15' 'zlib') +depends=('glibc>=2.16' 'zlib') provides=("binutils-avr=$pkgver") replaces=('binutils-avr') options=('!libtool' '!distcc' '!ccache') -source=(ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}_${_date}.tar.bz2) +source=("ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz" + "avr-size.patch") _builddir=binutils-build build() { - cd ${srcdir} + cd ${srcdir}/${_pkgname}-${pkgver} + + # See https://bugs.archlinux.org/task/32504 + patch -Np0 < ${srcdir}/avr-size.patch - config_guess=$(${_pkgname}/config.guess) + config_guess=$(./config.guess) + + cd ${srcdir} rm -rf ${_builddir} mkdir ${_builddir} && cd ${_builddir} [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" - ${srcdir}/${_pkgname}/configure \ + ${srcdir}/${_pkgname}-${pkgver}/configure \ --prefix=/usr \ --build=${config_guess} \ --disable-nls \ @@ -64,4 +71,5 @@ package() { done } -md5sums=('de2ac4298732827f8af706fc24020330') +md5sums=('ed58f50d8920c3f1d9cb110d5c972c27' + '573769ec1107d1bfed78680edd7ae63f') diff --git a/community/avr-binutils/avr-size.patch b/community/avr-binutils/avr-size.patch new file mode 100644 index 000000000..2e01c3d31 --- /dev/null +++ b/community/avr-binutils/avr-size.patch @@ -0,0 +1,432 @@ +AVR specific only +-------------------------------------------------------------------------------- +--- binutils/size.c 2007-08-06 13:56:14.000000000 -0600 ++++ binutils/size.c 2007-09-13 09:13:10.281250000 -0600 +@@ -35,10 +35,31 @@ + #include "getopt.h" + #include "bucomm.h" + +-#ifndef BSD_DEFAULT +-#define BSD_DEFAULT 1 ++typedef enum ++{ ++ format_sysv = 0, ++ format_bsd = 1, ++ format_avr = 2, ++} format_type_t; ++ ++ ++/* Set the default format. */ ++#define FORMAT_DEFAULT_SYSV 0 ++#define FORMAT_DEFAULT_BSD 1 ++#define FORMAT_DEFAULT_AVR 0 ++ ++#if FORMAT_DEFAULT_SYSV ++ #define FORMAT_DEFAULT format_sysv ++ #define FORMAT_NAME "sysv" ++#elif FORMAT_DEFAULT_BSD ++ #define FORMAT_DEFAULT format_bsd ++ #define FORMAT_NAME "berkeley" ++#elif FORMAT_DEFAULT_AVR ++ #define FORMAT_DEFAULT format_avr ++ #define FORMAT_NAME "avr" + #endif + ++ + /* Program options. */ + + static enum +@@ -47,9 +68,8 @@ static enum + } + radix = decimal; + +-/* 0 means use AT&T-style output. */ +-static int berkeley_format = BSD_DEFAULT; + ++format_type_t format = FORMAT_DEFAULT; + static int show_version = 0; + static int show_help = 0; + static int show_totals = 0; +@@ -63,6 +83,157 @@ static bfd_size_type total_textsize; + /* Program exit status. */ + static int return_code = 0; + ++ ++/* AVR Size specific stuff */ ++ ++#define AVR64 64UL ++#define AVR128 128UL ++#define AVR256 256UL ++#define AVR512 512UL ++#define AVR1K 1024UL ++#define AVR2K 2048UL ++#define AVR4K 4096UL ++#define AVR8K 8192UL ++#define AVR16K 16384UL ++#define AVR24K 24576UL ++#define AVR32K 32768UL ++#define AVR40K 40960UL ++#define AVR64K 65536UL ++#define AVR128K 131072UL ++#define AVR256K 262144UL ++ ++typedef struct ++{ ++ char *name; ++ long flash; ++ long ram; ++ long eeprom; ++} avr_device_t; ++ ++avr_device_t avr[] = ++{ ++ {"atmega2560", AVR256K, AVR8K, AVR4K}, ++ {"atmega2561", AVR256K, AVR8K, AVR4K}, ++ ++ {"at43usb320", AVR128K, 608UL, 0}, ++ {"at90can128", AVR128K, AVR4K, AVR4K}, ++ {"at90usb1286", AVR128K, AVR8K, AVR4K}, ++ {"at90usb1287", AVR128K, AVR8K, AVR4K}, ++ {"atmega128", AVR128K, AVR4K, AVR4K}, ++ {"atmega1280", AVR128K, AVR8K, AVR4K}, ++ {"atmega1281", AVR128K, AVR8K, AVR4K}, ++ {"atmega1284P", AVR128K, AVR16K, AVR4K}, ++ {"atmega103", AVR128K, 4000UL, AVR4K}, ++ {"atxmega128a1",AVR128K, AVR8K, AVR2K}, ++ ++ {"at90can64", AVR64K, AVR4K, AVR2K}, ++ {"at90usb646", AVR64K, AVR4K, AVR2K}, ++ {"at90usb647", AVR64K, AVR4K, AVR2K}, ++ {"atmega64", AVR64K, AVR4K, AVR2K}, ++ {"atmega640", AVR64K, AVR8K, AVR4K}, ++ {"atmega644", AVR64K, AVR4K, AVR2K}, ++ {"atmega644p", AVR64K, AVR4K, AVR2K}, ++ {"atmega645", AVR64K, AVR4K, AVR2K}, ++ {"atmega6450", AVR64K, AVR4K, AVR2K}, ++ {"atmega649", AVR64K, AVR4K, AVR2K}, ++ {"atmega6490", AVR64K, AVR4K, AVR2K}, ++ {"atxmega64a1", AVR64K, AVR4K, AVR2K}, ++ ++ {"atmega406", AVR40K, AVR512, AVR2K}, ++ ++ {"at90can32", AVR32K, AVR2K, AVR1K}, ++ {"at94k", AVR32K, AVR4K, 0}, ++ {"atmega32", AVR32K, AVR2K, AVR1K}, ++ {"atmega323", AVR32K, AVR2K, AVR1K}, ++ {"atmega324p", AVR32K, AVR2K, AVR1K}, ++ {"atmega325", AVR32K, AVR2K, AVR1K}, ++ {"atmega325p", AVR32K, AVR2K, AVR1K}, ++ {"atmega3250", AVR32K, AVR2K, AVR1K}, ++ {"atmega3250p", AVR32K, AVR2K, AVR1K}, ++ {"atmega328p", AVR32K, AVR2K, AVR1K}, ++ {"atmega329", AVR32K, AVR2K, AVR1K}, ++ {"atmega329p", AVR32K, AVR2K, AVR1K}, ++ {"atmega3290", AVR32K, AVR2K, AVR1K}, ++ {"atmega3290p", AVR32K, AVR2K, AVR1K}, ++ {"atmega32hvb", AVR32K, AVR2K, AVR1K}, ++ {"atmega32c1", AVR32K, AVR2K, AVR1K}, ++ {"atmega32m1", AVR32K, AVR2K, AVR1K}, ++ {"atmega32u4", AVR32K, 2560UL, AVR1K}, ++ ++ {"at43usb355", AVR24K, 1120, 0}, ++ ++ {"at76c711", AVR16K, AVR2K, 0}, ++ {"at90pwm216", AVR16K, AVR1K, AVR512}, ++ {"at90pwm316", AVR16K, AVR1K, AVR512}, ++ {"at90usb162", AVR16K, AVR512, AVR512}, ++ {"atmega16", AVR16K, AVR1K, AVR512}, ++ {"atmega161", AVR16K, AVR1K, AVR512}, ++ {"atmega162", AVR16K, AVR1K, AVR512}, ++ {"atmega163", AVR16K, AVR1K, AVR512}, ++ {"atmega164", AVR16K, AVR1K, AVR512}, ++ {"atmega164p", AVR16K, AVR1K, AVR512}, ++ {"atmega165", AVR16K, AVR1K, AVR512}, ++ {"atmega165p", AVR16K, AVR1K, AVR512}, ++ {"atmega168", AVR16K, AVR1K, AVR512}, ++ {"atmega168p", AVR16K, AVR1K, AVR512}, ++ {"atmega169", AVR16K, AVR1K, AVR512}, ++ {"atmega169p", AVR16K, AVR1K, AVR512}, ++ {"attiny167", AVR16K, AVR512, AVR512}, ++ {"atxmega16d4", AVR16K, AVR2K, AVR1K}, ++ ++ {"at90c8534", AVR8K, 352, AVR512}, ++ {"at90pwm1", AVR8K, AVR512, AVR512}, ++ {"at90pwm2", AVR8K, AVR512, AVR512}, ++ {"at90pwm2b", AVR8K, AVR512, AVR512}, ++ {"at90pwm3", AVR8K, AVR512, AVR512}, ++ {"at90pwm3b", AVR8K, AVR512, AVR512}, ++ {"at90s8515", AVR8K, AVR512, AVR512}, ++ {"at90s8535", AVR8K, AVR512, AVR512}, ++ {"at90usb82", AVR8K, AVR512, AVR512}, ++ {"atmega8", AVR8K, AVR1K, AVR512}, ++ {"atmega8515", AVR8K, AVR512, AVR512}, ++ {"atmega8535", AVR8K, AVR512, AVR512}, ++ {"atmega88", AVR8K, AVR1K, AVR512}, ++ {"atmega88p", AVR8K, AVR1K, AVR512}, ++ {"attiny84", AVR8K, AVR512, AVR512}, ++ {"attiny85", AVR8K, AVR512, AVR512}, ++ {"attiny861", AVR8K, AVR512, AVR512}, ++ {"attiny88", AVR8K, AVR256, AVR64}, ++ ++ {"at90s4414", AVR4K, 352, AVR256}, ++ {"at90s4433", AVR4K, AVR128, AVR256}, ++ {"at90s4434", AVR4K, 352, AVR256}, ++ {"atmega48", AVR4K, AVR512, AVR256}, ++ {"atmega48p", AVR4K, AVR512, AVR256}, ++ {"attiny43u", AVR4K, AVR256, AVR64}, ++ {"attiny44", AVR4K, AVR256, AVR256}, ++ {"attiny45", AVR4K, AVR256, AVR256}, ++ {"attiny461", AVR4K, AVR256, AVR256}, ++ {"attiny48", AVR4K, AVR256, AVR64}, ++ ++ {"at86rf401", AVR2K, 224, AVR128}, ++ {"at90s2313", AVR2K, AVR128, AVR128}, ++ {"at90s2323", AVR2K, AVR128, AVR128}, ++ {"at90s2333", AVR2K, 224, AVR128}, ++ {"at90s2343", AVR2K, AVR128, AVR128}, ++ {"attiny22", AVR2K, 224, AVR128}, ++ {"attiny2313", AVR2K, AVR128, AVR128}, ++ {"attiny24", AVR2K, AVR128, AVR128}, ++ {"attiny25", AVR2K, AVR128, AVR128}, ++ {"attiny26", AVR2K, AVR128, AVR128}, ++ {"attiny261", AVR2K, AVR128, AVR128}, ++ {"attiny28", AVR2K, 0, 0}, ++ ++ {"at90s1200", AVR1K, 0, AVR64}, ++ {"attiny11", AVR1K, 0, AVR64}, ++ {"attiny12", AVR1K, 0, AVR64}, ++ {"attiny13", AVR1K, AVR64, AVR64}, ++ {"attiny15", AVR1K, 0, AVR64}, ++}; ++ ++static char *avrmcu = NULL; ++ ++ + static char *target = NULL; + + /* Forward declarations. */ +@@ -78,7 +240,8 @@ usage (FILE *stream, int status) + fprintf (stream, _(" Displays the sizes of sections inside binary files\n")); + fprintf (stream, _(" If no input file(s) are specified, a.out is assumed\n")); + fprintf (stream, _(" The options are:\n\ +- -A|-B --format={sysv|berkeley} Select output style (default is %s)\n\ ++ -A|-B|-C --format={sysv|berkeley|avr} Select output style (default is %s)\n\ ++ --mcu=<avrmcu> MCU name for AVR format only\n\ + -o|-d|-x --radix={8|10|16} Display numbers in octal, decimal or hex\n\ + -t --totals Display the total sizes (Berkeley only)\n\ + --common Display total size for *COM* syms\n\ +@@ -87,11 +250,7 @@ usage (FILE *stream, int status) + -h --help Display this information\n\ + -v --version Display the program's version\n\ + \n"), +-#if BSD_DEFAULT +- "berkeley" +-#else +- "sysv" +-#endif ++FORMAT_NAME + ); + list_supported_targets (program_name, stream); + if (REPORT_BUGS_TO[0] && status == 0) +@@ -102,6 +261,7 @@ usage (FILE *stream, int status) + #define OPTION_FORMAT (200) + #define OPTION_RADIX (OPTION_FORMAT + 1) + #define OPTION_TARGET (OPTION_RADIX + 1) ++#define OPTION_MCU (OPTION_TARGET + 1) + + static struct option long_options[] = + { +@@ -109,6 +269,7 @@ static struct option long_options[] = + {"format", required_argument, 0, OPTION_FORMAT}, + {"radix", required_argument, 0, OPTION_RADIX}, + {"target", required_argument, 0, OPTION_TARGET}, ++ {"mcu", required_argument, 0, 203}, + {"totals", no_argument, &show_totals, 1}, + {"version", no_argument, &show_version, 1}, + {"help", no_argument, &show_help, 1}, +@@ -140,7 +301,7 @@ main (int argc, char **argv) + bfd_init (); + set_default_bfd_target (); + +- while ((c = getopt_long (argc, argv, "ABHhVvdfotx", long_options, ++ while ((c = getopt_long (argc, argv, "ABCHhVvdfotx", long_options, + (int *) 0)) != EOF) + switch (c) + { +@@ -149,11 +310,15 @@ main (int argc, char **argv) + { + case 'B': + case 'b': +- berkeley_format = 1; ++ format = format_bsd; + break; + case 'S': + case 's': +- berkeley_format = 0; ++ format = format_sysv; ++ break; ++ case 'A': ++ case 'a': ++ format = format_avr; + break; + default: + non_fatal (_("invalid argument to --format: %s"), optarg); +@@ -161,6 +326,10 @@ main (int argc, char **argv) + } + break; + ++ case OPTION_MCU: ++ avrmcu = optarg; ++ break; ++ + case OPTION_TARGET: + target = optarg; + break; +@@ -189,11 +358,14 @@ main (int argc, char **argv) + break; + + case 'A': +- berkeley_format = 0; ++ format = format_sysv; + break; + case 'B': +- berkeley_format = 1; ++ format = format_bsd; + break; ++ case 'C': ++ format = format_avr; ++ break; + case 'v': + case 'V': + show_version = 1; +@@ -239,7 +411,7 @@ main (int argc, char **argv) + for (; optind < argc;) + display_file (argv[optind++]); + +- if (show_totals && berkeley_format) ++ if (show_totals && format == format_bsd) + { + bfd_size_type total = total_textsize + total_datasize + total_bsssize; + +@@ -600,13 +772,117 @@ print_sysv_format (bfd *file) + printf ("\n\n"); + } + ++ ++static avr_device_t * ++avr_find_device (void) ++{ ++ unsigned int i; ++ if (avrmcu != NULL) ++ { ++ for (i = 0; i < sizeof(avr) / sizeof(avr[0]); i++) ++ { ++ if (strcmp(avr[i].name, avrmcu) == 0) ++ { ++ /* Match found */ ++ return (&avr[i]); ++ } ++ } ++ } ++ return (NULL); ++} ++ ++ ++ ++static void ++print_avr_format (bfd *file) ++{ ++ char *avr_name = "Unknown"; ++ int flashmax = 0; ++ int rammax = 0; ++ int eeprommax = 0; ++ asection *section; ++ bfd_size_type data_size = 0; ++ bfd_size_type text_size = 0; ++ bfd_size_type bss_size = 0; ++ bfd_size_type bootloader_size = 0; ++ bfd_size_type noinit_size = 0; ++ bfd_size_type eeprom_size = 0; ++ ++ avr_device_t *avrdevice = avr_find_device(); ++ if (avrdevice != NULL) ++ { ++ avr_name = avrdevice->name; ++ flashmax = avrdevice->flash; ++ rammax = avrdevice->ram; ++ eeprommax = avrdevice->eeprom; ++ } ++ ++ if ((section = bfd_get_section_by_name (file, ".data")) != NULL) ++ data_size = bfd_section_size (file, section); ++ if ((section = bfd_get_section_by_name (file, ".text")) != NULL) ++ text_size = bfd_section_size (file, section); ++ if ((section = bfd_get_section_by_name (file, ".bss")) != NULL) ++ bss_size = bfd_section_size (file, section); ++ if ((section = bfd_get_section_by_name (file, ".bootloader")) != NULL) ++ bootloader_size = bfd_section_size (file, section); ++ if ((section = bfd_get_section_by_name (file, ".noinit")) != NULL) ++ noinit_size = bfd_section_size (file, section); ++ if ((section = bfd_get_section_by_name (file, ".eeprom")) != NULL) ++ eeprom_size = bfd_section_size (file, section); ++ ++ bfd_size_type text = text_size + data_size + bootloader_size; ++ bfd_size_type data = data_size + bss_size + noinit_size; ++ bfd_size_type eeprom = eeprom_size; ++ ++ printf ("AVR Memory Usage\n" ++ "----------------\n" ++ "Device: %s\n\n", avr_name); ++ ++ /* Text size */ ++ printf ("Program:%8ld bytes", text); ++ if (flashmax > 0) ++ { ++ printf (" (%2.1f%% Full)", ((float)text / flashmax) * 100); ++ } ++ printf ("\n(.text + .data + .bootloader)\n\n"); ++ ++ /* Data size */ ++ printf ("Data: %8ld bytes", data); ++ if (rammax > 0) ++ { ++ printf (" (%2.1f%% Full)", ((float)data / rammax) * 100); ++ } ++ printf ("\n(.data + .bss + .noinit)\n\n"); ++ ++ /* EEPROM size */ ++ if (eeprom > 0) ++ { ++ printf ("EEPROM: %8ld bytes", eeprom); ++ if (eeprommax > 0) ++ { ++ printf (" (%2.1f%% Full)", ((float)eeprom / eeprommax) * 100); ++ } ++ printf ("\n(.eeprom)\n\n"); ++ } ++} ++ ++ + static void + print_sizes (bfd *file) + { + if (show_common) + calculate_common_size (file); +- if (berkeley_format) +- print_berkeley_format (file); +- else +- print_sysv_format (file); ++ switch (format) ++ { ++ case format_sysv: ++ print_sysv_format (file); ++ break; ++ case format_bsd: ++ print_berkeley_format (file); ++ break; ++ case format_avr: ++ default: ++ print_avr_format (file); ++ break; ++ } + } diff --git a/community/awn-extras-applets/PKGBUILD b/community/awn-extras-applets/PKGBUILD new file mode 100644 index 000000000..59fd1bcdd --- /dev/null +++ b/community/awn-extras-applets/PKGBUILD @@ -0,0 +1,86 @@ +# Maintainer: György Balló <ballogy@freestart.hu> +# Contributor: Biru Ionut <ionut@archlinux.ro> +# Contributor: Jonathan Liu <net147@hotmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=awn-extras-applets +_pkgname=awn-extras +pkgver=0.4.0 +pkgrel=14 +pkgdesc="Collection of applets for avant-window-navigator" +arch=('i686' 'x86_64') +url="https://launchpad.net/awn-extras" +license=('GPL') +depends=('avant-window-navigator' 'python2-notify' 'vte' 'gnome-menus' 'gnome-menus2' 'webkitgtk2') +makedepends=('intltool' 'vala') +optdepends=('python2-feedparser: comics, feeds, mail applets' + 'python2-rsvg: comics, cairo-clock, hardware-sensors applets' + 'gstreamer0.10-python: media-player, volume-control applets' + 'python2-dateutil: cairo-clock (optional), calendar applets' + 'python2-gdata: calendar applet' + 'python2-vobject: calendar applet' + 'python2-pyinotify: thinkhdaps applet (optional)' + 'python2-libgnome: stacks applet' + 'python2-gnomedesktop: stacks applet' + 'python2-wnck: slickswitcher applet' + 'fortune-mod: animal-farm applet' + 'upower: battery applet' + 'gnome-applets: cpufreq applet' + 'hddtemp: hardware-sensors applet (optional)' + 'lm_sensors: hardware-sensors applet (optional)') +options=('!libtool') +install=$pkgname.install +source=(http://launchpad.net/$_pkgname/0.4/$pkgver/+download/$_pkgname-$pkgver.tar.gz + awn-extras-libnotify0.7.patch + remove-settings-menu.patch + add-battery-upower-support.patch + fix-shinyswitcher-scrolling.patch + fix-weather-applet.patch + awn-extras-glib2.32.patch + check-dependencies.patch) +md5sums=('b559d68cd6ad295c961c20fcc5d9f9c0' + '2df8dfd8f0f1d458c09b56983c7d049f' + '52f8ce6a4eca862b0740e29a84db8ae5' + '26b56106b63b14ba3c99f1a2e96da05d' + '755c57dfbb65a314f247277918ec95ac' + 'bc22bb3e81aca0f651ae8acee1ce2f00' + '1cfcd1e5dc92c4c7c306472d42a21c2d' + '8f920c7dde987d66eef7d3739df1051d') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + patch -Np1 -i "$srcdir/awn-extras-libnotify0.7.patch" + patch -Np1 -i "$srcdir/remove-settings-menu.patch" + patch -Np0 -i "$srcdir/add-battery-upower-support.patch" + patch -Np0 -i "$srcdir/fix-shinyswitcher-scrolling.patch" + patch -Np1 -i "$srcdir/fix-weather-applet.patch" + patch -Np0 -i "$srcdir/awn-extras-glib2.32.patch" + patch -Np1 -i "$srcdir/check-dependencies.patch" + + # Python2 fix + find . -type f -name *.py | xargs sed -i 's@^#.*python$@#!/usr/bin/python2@' + sed -i 's/async(\"python \"/async(\"python2 \"/' applets/maintained/shiny-switcher/shinyswitcherapplet.c + + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-static \ + --disable-pymod-checks \ + --with-webkit \ + PYTHON=/usr/bin/python2 + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + + mkdir -p "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/awn-extras.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas + rm -r "$pkgdir"/etc + + # Remove bandwidth-monitor applet, because it's not compatible with latest netstat + rm -R "$pkgdir"/usr/share/avant-window-navigator/applets/bandwidth-monitor* + + # Remove pandora applet, because gtkmozembed is not available + rm -R "$pkgdir"/usr/share/avant-window-navigator/applets/pandora* +} diff --git a/community/awn-extras-applets/add-battery-upower-support.patch b/community/awn-extras-applets/add-battery-upower-support.patch new file mode 100644 index 000000000..0548df758 --- /dev/null +++ b/community/awn-extras-applets/add-battery-upower-support.patch @@ -0,0 +1,200 @@ +=== modified file 'applets/maintained/battery/battery.py' +--- applets/maintained/battery/battery.py 2010-08-12 19:00:37 +0000 ++++ applets/maintained/battery/battery.py 2010-09-12 22:24:21 +0000 +@@ -1,6 +1,6 @@ + #!/usr/bin/python + # Copyright (c) 2007 - 2008 Randal Barlow <im.tehk at gmail.com> +-# 2008 - 2009 onox <denkpadje@gmail.com> ++# 2008 - 2010 onox <denkpadje@gmail.com> + # + # This library is free software; you can redistribute it and/or + # modify it under the terms of the GNU Lesser General Public +@@ -223,11 +223,11 @@ + return + + charge_percentage = self.backend.get_capacity_percentage() +- +- charge_message = "Computer running on %s power" % ("AC", "battery")[self.backend.is_discharging()] ++ power_type = "AC" if self.backend.is_on_ac_power() else "battery" ++ charge_message = "Computer running on %s power" % power_type + + if self.backend.is_charged(): +- charge_message += "\nBattery charged" ++ charge_message += "\n" + "Battery charged" + icon = os.path.join(themes_dir, self.settings["theme"], "battery-charged.svg") + else: + is_charging = self.backend.is_charging() +@@ -343,6 +343,148 @@ + return self.get_remaining_capacity() <= self.get_warning_capacity() + + ++class UPowerBackend(AbstractBackend): ++ ++ """Backend that uses UPower via DBus. ++ ++ Reference: http://upower.freedesktop.org/docs/Device.html ++ ++ """ ++ ++ device_iface_name = "org.freedesktop.UPower.Device" ++ ++ devices = None ++ ++ def __init__(self): ++ self.__system_bus = dbus.SystemBus() ++ ++ self.udi = UPowerBackend.get_batteries().keys()[0] ++ self.__set_dbus_interface(self.udi) ++ ++ @staticmethod ++ def backend_useable(): ++ return dbus is not None and len(UPowerBackend.get_batteries()) > 0 ++ ++ @staticmethod ++ def get_batteries(): ++ udi_models = {} ++ ++ try: ++ system_bus = dbus.SystemBus() ++ ++ proxy = system_bus.get_object("org.freedesktop.UPower", "/org/freedesktop/UPower") ++ interface = dbus.Interface(proxy, "org.freedesktop.UPower") ++ ++ UPowerBackend.devices = list(interface.EnumerateDevices()) ++ ++ for udi in UPowerBackend.devices: ++ device_iface = UPowerBackend.__get_dbus_interface(system_bus, udi) ++ ++ # Type 2 is battery (1 is AC, 3 is UPS) ++ device_type = int(UPowerBackend.__get_property(device_iface, "Type")) ++ is_present = bool(UPowerBackend.__get_property(device_iface, "IsPresent")) ++ ++ if device_type == 2 and is_present: ++ udi_models[str(udi)] = str(UPowerBackend.__get_property(device_iface, "Model")) ++ except dbus.DBusException, e: ++ print e.message ++ finally: ++ return udi_models ++ ++ def set_active_udi(self, udi): ++ udi_models = UPowerBackend.get_batteries() ++ ++ assert udi in udi_models ++ ++ self.udi = udi ++ self.__set_dbus_interface(udi) ++ ++ @staticmethod ++ def __get_dbus_interface(system_bus, udi): ++ proxy = system_bus.get_object("org.freedesktop.UPower", udi) ++ return dbus.Interface(proxy, "org.freedesktop.DBus.Properties") ++ ++ def __set_dbus_interface(self, udi): ++ self.__battery = UPowerBackend.__get_dbus_interface(self.__system_bus, udi) ++ ++ @staticmethod ++ def __get_property(interface, property_name): ++ return interface.Get(UPowerBackend.device_iface_name, property_name) ++ ++ def get_active_udi(self): ++ return self.udi ++ ++ def is_present(self): ++ return bool(UPowerBackend.__get_property(self.__battery, "IsPresent")) ++ ++ def is_charging(self): ++ # State 1 is charging ++ return int(UPowerBackend.__get_property(self.__battery, "State")) == 1 ++ ++ def is_discharging(self): ++ # State 2 is discharging ++ return int(UPowerBackend.__get_property(self.__battery, "State")) == 2 ++ ++ def get_last_full_capacity(self): ++ # Measured in Wh ++ return int(UPowerBackend.__get_property(self.__battery, "EnergyFull")) ++ ++ def get_remaining_capacity(self): ++ # Measured in Wh ++ return int(UPowerBackend.__get_property(self.__battery, "Energy")) ++ ++ def get_charge_rate(self): ++ # Measured in W. Original value positive if being discharged, negative if being charged ++ return abs(int(UPowerBackend.__get_property(self.__battery, "EnergyRate"))) ++ ++ def get_capacity_percentage(self): ++ # Percentage in range 0 .. 100 ++ return int(UPowerBackend.__get_property(self.__battery, "Percentage")) ++ ++ def get_warning_capacity(self): ++ # Measured in Wh ++ return int(int(UPowerBackend.__get_property(self.__battery, "EnergyFullDesign")) * (warning_percentage / 100.)) ++ ++ def get_charge_time(self): ++ assert self.is_charging() ++ ++ # Charge time in seconds ++ time = int(UPowerBackend.__get_property(self.__battery, "TimeToFull")) ++ ++ if time == 0: ++ return super(UPowerBackend, self).get_charge_time() ++ ++ hours = time / 3600 ++ seconds = time % 3600 ++ return (hours, int(round(seconds / 60.0))) ++ ++ def get_remaining_time(self): ++ assert self.is_discharging() ++ ++ # Discharge time in seconds ++ time = int(UPowerBackend.__get_property(self.__battery, "TimeToEmpty")) ++ ++ if time == 0: ++ return super(UPowerBackend, self).get_discharge_time() ++ ++ hours = time / 3600 ++ seconds = time % 3600 ++ return (hours, int(round(seconds / 60.0))) ++ ++ def is_charged(self): ++ # State 4 is fully charged ++ return int(UPowerBackend.__get_property(self.__battery, "State")) == 4 ++ ++ def is_on_ac_power(self): ++ for udi in UPowerBackend.devices: ++ device_iface = UPowerBackend.__get_dbus_interface(self.__system_bus, udi) ++ ++ # Property "Online" only has a value for AC power device ++ if bool(UPowerBackend.__get_property(device_iface, "Online")): ++ return True ++ return False ++ ++ + class HalBackend(AbstractBackend): + + """Backend that uses HAL via DBus. +@@ -372,7 +514,7 @@ + return udi_models + except dbus.DBusException, e: + print e.message +- return {} ++ return udi_models + + def set_active_udi(self, udi): + udi_models = HalBackend.get_batteries() +@@ -416,8 +558,12 @@ + except dbus.DBusException: + return int(int(self.__hal_battery.GetProperty("battery.charge_level.design")) * (warning_percentage / 100.)) + +- +-backends = [HalBackend] ++ def is_on_ac_power(self): ++ # TODO Should check that _all_ batteries are not discharging ++ return not self.is_discharging() ++ ++ ++backends = [UPowerBackend, HalBackend] + + + if __name__ == "__main__": + diff --git a/community/awn-extras-applets/awn-extras-applets.install b/community/awn-extras-applets/awn-extras-applets.install new file mode 100644 index 000000000..9f04bf6a2 --- /dev/null +++ b/community/awn-extras-applets/awn-extras-applets.install @@ -0,0 +1,23 @@ +pkgname=awn-extras + +post_install() { + gconfpkg --install $pkgname + xdg-icon-resource forceupdate +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + + +pre_remove() { + gconfpkg --uninstall $pkgname +} + +post_remove() { + xdg-icon-resource forceupdate +} diff --git a/community/awn-extras-applets/awn-extras-glib2.32.patch b/community/awn-extras-applets/awn-extras-glib2.32.patch new file mode 100644 index 000000000..563d73b56 --- /dev/null +++ b/community/awn-extras-applets/awn-extras-glib2.32.patch @@ -0,0 +1,226 @@ +=== modified file 'applets/maintained/awnterm/keybinder.h' +--- applets/maintained/awnterm/keybinder.h 2009-12-04 15:32:54 +0000 ++++ applets/maintained/awnterm/keybinder.h 2012-04-28 13:17:10 +0000 +@@ -24,7 +24,7 @@ + #ifndef __AWN_KEY_BINDER_H__ + #define __AWN_KEY_BINDER_H__ + +-#include <glib/gtypes.h> ++#include <glib.h> + + G_BEGIN_DECLS + + +=== modified file 'applets/maintained/notification-daemon/daemon.h' +--- applets/maintained/notification-daemon/daemon.h 2009-11-18 20:13:53 +0000 ++++ applets/maintained/notification-daemon/daemon.h 2012-04-28 13:17:10 +0000 +@@ -31,8 +31,6 @@ + + #include <libawn/awn-applet.h> + #include <libawn/awn-applet-simple.h> +-#include <glib/gmacros.h> +-#include <glib/gerror.h> + + #include <libawn/awn-dialog.h> + #include <libawn/awn-cairo-utils.h> + +=== modified file 'applets/maintained/notification-daemon/engines.c' +--- applets/maintained/notification-daemon/engines.c 2010-04-10 17:06:17 +0000 ++++ applets/maintained/notification-daemon/engines.c 2012-04-28 13:17:10 +0000 +@@ -38,8 +38,7 @@ + + + #include <libawn/awn-applet.h> +-#include <glib/gmacros.h> +-#include <glib/gerror.h> ++#include <glib.h> + + #include <libawn/awn-dialog.h> + #include <libawn/awn-applet-simple.h> +@@ -50,7 +49,6 @@ + + #include <string.h> + #include <gtk/gtk.h> +-#include <glib.h> + #ifndef HAVE_GTK_URL_LABEL + #include <libsexy/sexy-url-label.h> + #endif + +=== modified file 'applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h' +--- applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h 2009-04-22 03:44:36 +0000 ++++ applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h 2012-04-28 13:17:10 +0000 +@@ -25,7 +25,7 @@ + //#include <libawn/awn-title.h> + #include <libawn/awn-tooltip.h> + +-#include <glib/gtypes.h> ++#include <glib.h> + #include <glibtop/cpu.h> + #include <gconf/gconf-client.h> + + +=== modified file 'applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c' +--- applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c 2010-04-01 14:25:40 +0000 ++++ applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c 2012-04-28 13:17:10 +0000 +@@ -43,13 +43,11 @@ + + + #include <libawn/awn-applet.h> +-#include <glib/gmacros.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include <gconf/gconf-value.h> + + #include <libawn/awn-dialog.h> + #include <libawn/awn-applet-simple.h> +-#include <glib.h> + #include <gtk/gtk.h> + + + +=== modified file 'applets/unmaintained/awnsystemmonitor/cpu_component.c' +--- applets/unmaintained/awnsystemmonitor/cpu_component.c 2009-08-27 20:20:33 +0000 ++++ applets/unmaintained/awnsystemmonitor/cpu_component.c 2012-04-28 13:17:10 +0000 +@@ -18,13 +18,11 @@ + */ + + #include <libawn/awn-applet.h> +-#include <glib/gmacros.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include <gconf/gconf-value.h> + + #include <libawn/awn-dialog.h> + #include <libawn/awn-applet-simple.h> +-#include <glib.h> + #include <gtk/gtk.h> + #include <gdk/gdk.h> + #include <string.h> + +=== modified file 'applets/unmaintained/awnsystemmonitor/cpumetergconf.c' +--- applets/unmaintained/awnsystemmonitor/cpumetergconf.c 2009-04-22 03:44:36 +0000 ++++ applets/unmaintained/awnsystemmonitor/cpumetergconf.c 2012-04-28 13:17:10 +0000 +@@ -20,13 +20,10 @@ + * Boston, MA 02111-1307, USA. + */ + #include <string.h> +-#include <glib/gmacros.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include <gconf/gconf-value.h> + + #include <libawn/awn-applet.h> +-#include <glib/gmacros.h> +-#include <glib/gerror.h> + #include <gconf/gconf-value.h> + + #include "cairo-utils.h" + +=== modified file 'applets/unmaintained/awnsystemmonitor/dashboard.h' +--- applets/unmaintained/awnsystemmonitor/dashboard.h 2009-04-22 03:44:36 +0000 ++++ applets/unmaintained/awnsystemmonitor/dashboard.h 2012-04-28 13:17:10 +0000 +@@ -23,13 +23,11 @@ + + + #include <libawn/awn-applet.h> +-#include <glib/gmacros.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include <gconf/gconf-value.h> + + #include <libawn/awn-dialog.h> + #include <libawn/awn-applet-simple.h> +-#include <glib.h> + #include <gtk/gtk.h> + + #include <glibtop/mem.h> + +=== modified file 'applets/unmaintained/awnsystemmonitor/date_time_component.c' +--- applets/unmaintained/awnsystemmonitor/date_time_component.c 2009-07-07 20:10:17 +0000 ++++ applets/unmaintained/awnsystemmonitor/date_time_component.c 2012-04-28 13:17:10 +0000 +@@ -19,13 +19,11 @@ + + + #include <libawn/awn-applet.h> +-#include <glib/gmacros.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include <gconf/gconf-value.h> + + #include <libawn/awn-dialog.h> + #include <libawn/awn-applet-simple.h> +-#include <glib.h> + #include <gtk/gtk.h> + #include <gdk/gdk.h> + #include <string.h> + +=== modified file 'applets/unmaintained/awnsystemmonitor/loadavg_component.c' +--- applets/unmaintained/awnsystemmonitor/loadavg_component.c 2009-07-07 20:10:17 +0000 ++++ applets/unmaintained/awnsystemmonitor/loadavg_component.c 2012-04-28 13:17:10 +0000 +@@ -19,13 +19,11 @@ + + #include <glibtop/loadavg.h> + #include <libawn/awn-applet.h> +-#include <glib/gmacros.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include <gconf/gconf-value.h> + + #include <libawn/awn-dialog.h> + #include <libawn/awn-applet-simple.h> +-#include <glib.h> + #include <gtk/gtk.h> + #include <gdk/gdk.h> + #include <string.h> + +=== modified file 'applets/unmaintained/awnsystemmonitor/sysmem_component.c' +--- applets/unmaintained/awnsystemmonitor/sysmem_component.c 2009-08-27 20:20:33 +0000 ++++ applets/unmaintained/awnsystemmonitor/sysmem_component.c 2012-04-28 13:17:10 +0000 +@@ -19,13 +19,11 @@ + + #include <glibtop/mem.h> + #include <libawn/awn-applet.h> +-#include <glib/gmacros.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include <gconf/gconf-value.h> + + #include <libawn/awn-dialog.h> + #include <libawn/awn-applet-simple.h> +-#include <glib.h> + #include <gtk/gtk.h> + #include <gdk/gdk.h> + #include <string.h> + +=== modified file 'applets/unmaintained/awnsystemmonitor/uptime_component.c' +--- applets/unmaintained/awnsystemmonitor/uptime_component.c 2009-07-07 20:10:17 +0000 ++++ applets/unmaintained/awnsystemmonitor/uptime_component.c 2012-04-28 13:17:10 +0000 +@@ -1,12 +1,10 @@ + + #include <libawn/awn-applet.h> +-#include <glib/gmacros.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include <gconf/gconf-value.h> + + #include <libawn/awn-dialog.h> + #include <libawn/awn-applet-simple.h> +-#include <glib.h> + + #include <glibtop/uptime.h> + #include <glibtop/cpu.h> + +=== modified file 'applets/unmaintained/main-menu/applet.c' +--- applets/unmaintained/main-menu/applet.c 2011-12-28 11:09:45 +0000 ++++ applets/unmaintained/main-menu/applet.c 2012-04-28 13:17:10 +0000 +@@ -23,8 +23,7 @@ + + #include <string.h> + +-#include <glib/gmacros.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include <glib/gi18n.h> + #include <gtk/gtk.h> + #include <libdesktop-agnostic/fdo.h> + diff --git a/community/awn-extras-applets/awn-extras-libnotify0.7.patch b/community/awn-extras-applets/awn-extras-libnotify0.7.patch new file mode 100644 index 000000000..c552e26f2 --- /dev/null +++ b/community/awn-extras-applets/awn-extras-libnotify0.7.patch @@ -0,0 +1,12 @@ +diff -Naur awn-extras-0.4.0.orig/applets/maintained/notification-daemon/daemon.c awn-extras-0.4.0/applets/maintained/notification-daemon/daemon.c +--- awn-extras-0.4.0.orig/applets/maintained/notification-daemon/daemon.c 2010-04-10 01:26:20.000000000 +0200 ++++ awn-extras-0.4.0/applets/maintained/notification-daemon/daemon.c 2011-12-16 00:23:45.488215715 +0100 +@@ -1487,7 +1487,7 @@ + if (fork() == 0) + { + notify_init("notify-send"); +- notify = notify_notification_new(summary, body, icon_str, NULL); ++ notify = notify_notification_new(summary, body, icon_str); + notify_notification_set_category(notify, type); + notify_notification_set_urgency(notify, urgency); + notify_notification_set_timeout(notify, expire_timeout); diff --git a/community/awn-extras-applets/check-dependencies.patch b/community/awn-extras-applets/check-dependencies.patch new file mode 100644 index 000000000..959d3a113 --- /dev/null +++ b/community/awn-extras-applets/check-dependencies.patch @@ -0,0 +1,71 @@ +diff -Naur awn-extras-0.4.0.orig/applets/maintained/comics/comics.py awn-extras-0.4.0/applets/maintained/comics/comics.py +--- awn-extras-0.4.0.orig/applets/maintained/comics/comics.py 2010-03-26 17:14:53.000000000 +0100 ++++ awn-extras-0.4.0/applets/maintained/comics/comics.py 2012-11-15 17:28:52.045595715 +0100 +@@ -30,7 +30,7 @@ + from awn.extras import _ + + # Import Comics! modules, but check dependencies first +-awn.check_dependencies(globals(), 'feedparser', 'pynotify') ++awn.check_dependencies(globals(), 'feedparser', 'pynotify', 'rsvg') + from pynotify import init as notify_init, Notification + + import comics_manage +diff -Naur awn-extras-0.4.0.orig/applets/maintained/media-player/media_player.py awn-extras-0.4.0/applets/maintained/media-player/media_player.py +--- awn-extras-0.4.0.orig/applets/maintained/media-player/media_player.py 2010-01-06 00:01:33.000000000 +0100 ++++ awn-extras-0.4.0/applets/maintained/media-player/media_player.py 2012-11-15 17:28:54.925659573 +0100 +@@ -17,13 +17,15 @@ + import os + import sys + ++import awn ++awn.check_dependencies(globals(), 'pygst') ++ + import pygst + pygst.require("0.10") + import gst + import gtk + import gobject + +-import awn + from desktopagnostic import config + + +diff -Naur awn-extras-0.4.0.orig/applets/maintained/slickswitcher/slickswitcher.py awn-extras-0.4.0/applets/maintained/slickswitcher/slickswitcher.py +--- awn-extras-0.4.0.orig/applets/maintained/slickswitcher/slickswitcher.py 2010-04-08 14:31:25.000000000 +0200 ++++ awn-extras-0.4.0/applets/maintained/slickswitcher/slickswitcher.py 2012-11-15 17:31:32.025809983 +0100 +@@ -25,6 +25,9 @@ + import gobject + + import cairo ++ ++awn.check_dependencies(globals(), 'wnck') ++ + import drawing, switch, settings + from os.path import exists, isdir + import os +diff -Naur awn-extras-0.4.0.orig/applets/maintained/volume-control/volume-control.py awn-extras-0.4.0/applets/maintained/volume-control/volume-control.py +--- awn-extras-0.4.0.orig/applets/maintained/volume-control/volume-control.py 2010-01-06 00:01:34.000000000 +0100 ++++ awn-extras-0.4.0/applets/maintained/volume-control/volume-control.py 2012-11-15 17:28:26.368359913 +0100 +@@ -30,6 +30,9 @@ + + from awn.extras import awnlib, __version__ + ++import awn ++awn.check_dependencies(globals(), 'pygst') ++ + import pygst + pygst.require("0.10") + import gst +diff -Naur awn-extras-0.4.0.orig/applets/unmaintained/stacks/stacks_applet.py awn-extras-0.4.0/applets/unmaintained/stacks/stacks_applet.py +--- awn-extras-0.4.0.orig/applets/unmaintained/stacks/stacks_applet.py 2009-11-16 00:31:16.000000000 +0100 ++++ awn-extras-0.4.0/applets/unmaintained/stacks/stacks_applet.py 2012-11-15 17:28:41.778701431 +0100 +@@ -25,6 +25,9 @@ + import pango + import awn + import cairo ++ ++awn.check_dependencies(globals(), 'gnome.ui', 'gnomedesktop') ++ + import gnome.ui + import gnomedesktop + import time diff --git a/community/awn-extras-applets/fix-shinyswitcher-scrolling.patch b/community/awn-extras-applets/fix-shinyswitcher-scrolling.patch new file mode 100644 index 000000000..69dcae9c1 --- /dev/null +++ b/community/awn-extras-applets/fix-shinyswitcher-scrolling.patch @@ -0,0 +1,96 @@ +=== modified file 'applets/maintained/shiny-switcher/shinyswitcherapplet.c' +--- applets/maintained/shiny-switcher/shinyswitcherapplet.c 2010-09-12 16:15:07 +0000 ++++ applets/maintained/shiny-switcher/shinyswitcherapplet.c 2010-11-02 13:52:43 +0000 +@@ -769,7 +769,7 @@ + + + static gboolean +-_scroll_event(GtkWidget *widget, GdkEventMotion *event, AwnShinySwitcher *shinyswitcher) ++_scroll_event(GtkWidget *widget, GdkEventScroll *event, AwnShinySwitcher *shinyswitcher) + { + AwnShinySwitcherPrivate * priv = GET_PRIVATE (shinyswitcher); + WnckWorkspace *cur_space = wnck_screen_get_active_workspace(priv->wnck_screen); +@@ -779,7 +779,7 @@ + { + if (event->type == GDK_SCROLL) + { +- WnckMotionDirection direction1, direction2; ++ WnckMotionDirection left, right, up, down; + + switch (priv->mousewheel) + { +@@ -787,8 +787,10 @@ + case 1: + + case 3: +- direction1 = WNCK_MOTION_LEFT; +- direction2 = WNCK_MOTION_RIGHT; ++ left = WNCK_MOTION_LEFT; ++ right = WNCK_MOTION_RIGHT; ++ up = WNCK_MOTION_UP; ++ down = WNCK_MOTION_DOWN; + break; + + case 2: +@@ -796,22 +798,52 @@ + case 4: + + default: +- direction1 = WNCK_MOTION_RIGHT; +- direction2 = WNCK_MOTION_LEFT; +- ++ left = WNCK_MOTION_RIGHT; ++ right = WNCK_MOTION_LEFT; ++ up = WNCK_MOTION_DOWN; ++ down = WNCK_MOTION_UP; + } + +- if (event->state & GDK_SHIFT_MASK) ++ if ( (event->direction == GDK_SCROLL_UP) || ++ (event->direction == GDK_SCROLL_LEFT) ) + { +- new_space = wnck_workspace_get_neighbor(cur_space, WNCK_MOTION_RIGHT); ++ new_space = wnck_workspace_get_neighbor(cur_space, left); ++ if (new_space == NULL) ++ { ++ new_space = wnck_workspace_get_neighbor(cur_space, up); ++ if (new_space) ++ { ++ for (cur_space = new_space; cur_space; ) ++ { ++ cur_space = wnck_workspace_get_neighbor(cur_space, right); ++ if (cur_space) ++ { ++ new_space = cur_space; ++ } ++ } ++ } ++ } + } + else + { +- new_space = wnck_workspace_get_neighbor(cur_space, WNCK_MOTION_LEFT); +- ++ new_space = wnck_workspace_get_neighbor(cur_space, right); ++ if (!new_space) ++ { ++ new_space = wnck_workspace_get_neighbor(cur_space, down); ++ if (new_space) ++ { ++ for (cur_space = new_space; cur_space; ) ++ { ++ cur_space = wnck_workspace_get_neighbor(cur_space, left); ++ if (cur_space) ++ { ++ new_space = cur_space; ++ } ++ } ++ } ++ } + } + } +- + if (new_space) + { + wnck_workspace_activate(new_space, event->time); /* FIXME */ + diff --git a/community/awn-extras-applets/fix-weather-applet.patch b/community/awn-extras-applets/fix-weather-applet.patch new file mode 100644 index 000000000..889c0f641 --- /dev/null +++ b/community/awn-extras-applets/fix-weather-applet.patch @@ -0,0 +1,48 @@ +diff -Naur awn-extras-0.4.0.orig/applets/maintained/weather/weather.py awn-extras-0.4.0/applets/maintained/weather/weather.py +--- awn-extras-0.4.0.orig/applets/maintained/weather/weather.py 2012-03-07 00:20:03.094411287 +0100 ++++ awn-extras-0.4.0/applets/maintained/weather/weather.py 2010-03-21 13:58:03.000000000 +0100 +@@ -570,7 +570,7 @@ + + class NetworkHandler(ThreadQueue): + +- __ws_key = "&prod=xoap&par=1048871467&key=12daac2f3a67cb39&link=xoap" ++ __ws_key = "&prod=xml&par=1287722164&key=e11ec82daa20d876" + + def dict_from_xml(self, rootNode, keys, paths): + """Given an XML node, iterate over keys and paths, grabbing the +@@ -590,7 +590,7 @@ + @async_method + @network_exception + def get_locations(self, text): +- url = "http://xoap.weather.com/search/search?where=" + urllib2.quote(text) ++ url = "http://xml.weather.com/search/search?where=" + urllib2.quote(text) + with closing(urllib2.urlopen(url)) as usock: + with unlink_xml(usock) as xmldoc: + locations_list = [] +@@ -604,7 +604,7 @@ + @with_overlays + @network_exception + def get_conditions(self, location_code): +- url = "http://xoap.weather.com/weather/local/" + location_code + "?cc=*" + self.__ws_key ++ url = "http://xml.weather.com/weather/local/" + location_code + "?cc=*" + self.__ws_key + with closing(urllib2.urlopen(url)) as usock: + with unlink_xml(usock) as xmldoc: + names = ['CITY', 'SUNRISE', 'SUNSET', 'DESCRIPTION', 'CODE', 'TEMP', 'FEELSLIKE', 'BAR', 'BARDESC', 'WINDSPEED', 'WINDGUST', 'WINDDIR', 'HUMIDITY', 'MOONPHASE'] +@@ -619,7 +619,7 @@ + def get_weather_map(self, location_code): + map_url = "http://www.weather.com/outlook/travel/businesstraveler/map/%s" % location_code + with closing(urllib2.urlopen(map_url)) as usock: +- mapExp = """<IMG NAME="mapImg" SRC="([^\"]+)" WIDTH=([0-9]+) HEIGHT=([0-9]+) BORDER""" ++ mapExp = """<img name="mapImg" src="([^\"]+)" width="([0-9]+)" height="([0-9]+)" border""" + result = re.findall(mapExp, usock.read()) + if not result or len(result) != 1: + raise NetworkException("Couldn't parse weather map") +@@ -635,7 +635,7 @@ + @with_overlays + @network_exception + def get_forecast(self, location_code): +- url = "http://xoap.weather.com/weather/local/" + location_code + "?dayf=5" + self.__ws_key ++ url = "http://xml.weather.com/weather/local/" + location_code + "?dayf=5" + self.__ws_key + with closing(urllib2.urlopen(url)) as usock: + with unlink_xml(usock) as xmldoc: + try: diff --git a/community/awn-extras-applets/remove-settings-menu.patch b/community/awn-extras-applets/remove-settings-menu.patch new file mode 100644 index 000000000..60eeda1d5 --- /dev/null +++ b/community/awn-extras-applets/remove-settings-menu.patch @@ -0,0 +1,229 @@ +diff -Naur awn-extras-0.4.0.orig/applets/maintained/cairo-menu/gnome-menu-builder.c awn-extras-0.4.0/applets/maintained/cairo-menu/gnome-menu-builder.c +--- awn-extras-0.4.0.orig/applets/maintained/cairo-menu/gnome-menu-builder.c 2010-04-10 01:26:19.000000000 +0200 ++++ awn-extras-0.4.0/applets/maintained/cairo-menu/gnome-menu-builder.c 2011-12-16 20:34:22.612913317 +0100 +@@ -34,7 +34,6 @@ + #include "cairo-menu-applet.h" + + GMenuTree * main_menu_tree = NULL; +-GMenuTree * settings_menu_tree = NULL; + + GtkWidget * menu_build (MenuInstance * instance); + static GtkWidget * submenu_build (MenuInstance * instance); +@@ -749,19 +748,10 @@ + gmenu_tree_remove_monitor (main_menu_tree,(GMenuTreeChangedFunc)_submenu_modified_cb,instance); + } + +-static void +-_remove_settings_submenu_cb(MenuInstance * instance,GObject *where_the_object_was) +-{ +- g_debug ("%s",__func__); +- GMenuTreeDirectory *main_root; +- gmenu_tree_remove_monitor (settings_menu_tree,(GMenuTreeChangedFunc)_submenu_modified_cb,instance); +-} +- + static GtkWidget * + submenu_build (MenuInstance * instance) + { + GMenuTreeDirectory *main_root; +- GMenuTreeDirectory *settings_root; + GtkWidget * menu = NULL; + /* + if the menu is set then clear any menu items (except for places or recent) +@@ -771,10 +761,6 @@ + { + main_menu_tree = gmenu_tree_lookup("applications.menu", GMENU_TREE_FLAGS_NONE); + } +- if (!settings_menu_tree) +- { +- settings_menu_tree = gmenu_tree_lookup("settings.menu", GMENU_TREE_FLAGS_NONE); +- } + g_assert (main_menu_tree); + /* + get_places_menu() and get_recent_menu() are +@@ -808,7 +794,6 @@ + main_root = gmenu_tree_get_root_directory(main_menu_tree); + g_assert (gmenu_tree_item_get_type( (GMenuTreeItem*)main_root) == GMENU_TREE_ITEM_DIRECTORY); + g_assert (main_root); +- settings_root = gmenu_tree_get_root_directory(settings_menu_tree); + if ( menu_dir = find_menu_dir (instance,main_root) ) + { + /* if instance->menu then we're refreshing in a monitor callback*/ +@@ -817,22 +802,11 @@ + menu = fill_er_up(instance,menu_dir,instance->menu); + g_object_weak_ref (G_OBJECT(menu), (GWeakNotify)_remove_main_submenu_cb,instance); + } +- else if ( settings_root && (menu_dir = find_menu_dir (instance,settings_root)) ) +- { +- gmenu_tree_remove_monitor (main_menu_tree,(GMenuTreeChangedFunc)_submenu_modified_cb,instance); +- gmenu_tree_add_monitor (main_menu_tree,(GMenuTreeChangedFunc)_submenu_modified_cb,instance); +- menu = fill_er_up(instance,menu_dir,instance->menu); +- g_object_weak_ref (G_OBJECT(menu), (GWeakNotify)_remove_settings_submenu_cb,instance); +- } + if (menu_dir) + { + gmenu_tree_item_unref(menu_dir); + } + gmenu_tree_item_unref(main_root); +- if (settings_root) +- { +- gmenu_tree_item_unref(settings_root); +- } + } + return instance->menu = menu; + } +@@ -862,10 +836,6 @@ + { + main_menu_tree = gmenu_tree_lookup("applications.menu", GMENU_TREE_FLAGS_NONE); + } +- if (!settings_menu_tree) +- { +- settings_menu_tree = gmenu_tree_lookup("settings.menu", GMENU_TREE_FLAGS_NONE); +- } + + if (main_menu_tree) + { +@@ -884,44 +854,6 @@ + menu_item = gtk_separator_menu_item_new (); + gtk_menu_shell_append(GTK_MENU_SHELL(instance->menu),menu_item); + } +- if (settings_menu_tree) +- { +- root = gmenu_tree_get_root_directory(settings_menu_tree); +- gmenu_tree_remove_monitor (settings_menu_tree,(GMenuTreeChangedFunc)_menu_modified_cb,instance); +- gmenu_tree_add_monitor (settings_menu_tree,(GMenuTreeChangedFunc)_menu_modified_cb,instance); +- if (!instance->menu) +- { +- g_debug ("%s: No applications menu????",__func__); +- instance->menu = fill_er_up(instance,root,instance->menu); +- } +- else +- { +- sub_menu = fill_er_up (instance, root,instance->menu); +-#if 0 +- sub_menu = fill_er_up(instance,root,NULL); +- c = g_malloc0 (sizeof(CallbackContainer)); +- c->icon_name = g_strdup(gmenu_tree_directory_get_icon (root)); +- image = get_gtk_image (c->icon_name); +- txt = gmenu_tree_entry_get_name((GMenuTreeEntry*)root); +- menu_item = cairo_menu_item_new_with_label (txt?txt:"unknown"); +- gtk_menu_item_set_submenu (GTK_MENU_ITEM(menu_item),sub_menu); +- if (image) +- { +- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),image); +- } +- gtk_menu_shell_append(GTK_MENU_SHELL(instance->menu),menu_item); +- c->file_path = g_strdup(gmenu_tree_directory_get_desktop_file_path (root)); +- c->display_name = g_strdup ("Settings"); +- drop_data = g_strdup_printf("cairo_menu_item_dir:///@@@%s@@@%s@@@%s\n",c->file_path,c->display_name,c->icon_name); +- cairo_menu_item_set_source (AWN_CAIRO_MENU_ITEM(menu_item),drop_data); +- g_free (drop_data); +- c->instance = instance; +- g_signal_connect (menu_item, "button-press-event",G_CALLBACK(_button_press_dir),c); +- g_object_weak_ref (G_OBJECT(menu_item),(GWeakNotify)_free_callback_container,c); +-#endif +- } +- gmenu_tree_item_unref(root); +- } + + /*TODO Check to make sure it is needed. Should not be displayed if + all flags are of the NO persuasion.*/ +diff -Naur awn-extras-0.4.0.orig/applets/maintained/yama/yama.py awn-extras-0.4.0/applets/maintained/yama/yama.py +--- awn-extras-0.4.0.orig/applets/maintained/yama/yama.py 2010-03-31 16:21:24.000000000 +0200 ++++ awn-extras-0.4.0/applets/maintained/yama/yama.py 2011-12-16 20:37:48.243326388 +0100 +@@ -113,7 +113,6 @@ + + def build_menu(self): + self.applications_items = [] +- self.settings_items = [] + self.session_items = [] + + """ Applications """ +@@ -126,11 +125,6 @@ + """ Places """ + self.create_places_submenu(self.menu) + +- """ System """ +- tree = gmenu.lookup_tree("settings.menu") +- self.append_directory(tree.root, self.menu, item_list=self.settings_items) +- tree.add_monitor(self.menu_changed_cb, self.settings_items) +- + """ Session actions """ + if dbus is not None: + self.append_session_actions(self.menu) +@@ -227,7 +221,7 @@ + for i in xrange(len(items)): + items.pop().destroy() + +- index = len(self.applications_items) + 2 if items is self.settings_items else 0 # + 2 = separator + Places ++ index = len(self.applications_items) + 0 + self.append_directory(tree.root, self.menu, index=index, item_list=items) + # Refresh menu to re-initialize the widget + self.menu.show_all() +diff -Naur awn-extras-0.4.0.orig/applets/unmaintained/main-menu/applet.c awn-extras-0.4.0/applets/unmaintained/main-menu/applet.c +--- awn-extras-0.4.0.orig/applets/unmaintained/main-menu/applet.c 2009-10-27 20:45:03.000000000 +0100 ++++ awn-extras-0.4.0/applets/unmaintained/main-menu/applet.c 2011-12-16 20:27:28.792248015 +0100 +@@ -43,7 +43,6 @@ + GMenuTree *tree; + GMenuTreeDirectory *root; + GMenuTreeDirectory *apps; +- GMenuTreeDirectory *settings; + + } Menu; + +@@ -243,8 +242,6 @@ + { + GMenuTreeDirectory *temp= menu->root; + menu->root = gmenu_tree_item_get_parent (GMENU_TREE_ITEM (temp)); +- if (menu->root == menu->settings) +- menu->root = gmenu_tree_get_root_directory (menu->tree); + populate (menu); + } + +@@ -299,8 +296,6 @@ + if (app->root == GMENU_TREE_DIRECTORY(gmenu_tree_get_root_directory ((GMenuTree*)app->apps))) + { + list = g_slist_copy (apps); +- sets = g_slist_copy (gmenu_tree_directory_get_contents (app->settings)); +- list = g_slist_concat (list, sets); + list = g_slist_sort (list, (GCompareFunc)_compare); + } + else +@@ -419,13 +414,6 @@ + g_warning ("Unable to find applications.menu"); + return FALSE; + } +- app->settings = gmenu_tree_get_root_directory ( +- gmenu_tree_lookup ("settings.menu", GMENU_TREE_FLAGS_NONE)); +- if (!app->settings) +- { +- g_warning ("Unable to find settings.menu"); +- return FALSE; +- } + app->tree = (GMenuTree*)app->apps; + + app->menu = awn_applet_create_default_menu (app->applet); +diff -Naur awn-extras-0.4.0.orig/applets/unmaintained/MiMenu/menus.py awn-extras-0.4.0/applets/unmaintained/MiMenu/menus.py +--- awn-extras-0.4.0.orig/applets/unmaintained/MiMenu/menus.py 2009-08-14 14:29:59.000000000 +0200 ++++ awn-extras-0.4.0/applets/unmaintained/MiMenu/menus.py 2011-12-16 20:30:42.060104523 +0100 +@@ -12,8 +12,6 @@ + class MenuDateStore: + MENUCORE = gmenu.lookup_tree('applications.menu') + MENUROOT = MENUCORE.get_root_directory() +- SYSTEMMENUCORE = gmenu.lookup_tree('settings.menu') +- SYSTEMMENUROOT = SYSTEMMENUCORE.get_root_directory() + PATH = [] + + +diff -Naur awn-extras-0.4.0.orig/applets/unmaintained/MiMenu/mimenu.py awn-extras-0.4.0/applets/unmaintained/MiMenu/mimenu.py +--- awn-extras-0.4.0.orig/applets/unmaintained/MiMenu/mimenu.py 2009-10-27 20:45:47.000000000 +0100 ++++ awn-extras-0.4.0/applets/unmaintained/MiMenu/mimenu.py 2011-12-16 20:30:35.897158422 +0100 +@@ -69,8 +69,7 @@ + tree1.set_headers_visible (0) + tree1.append_column(column1) + tree1.append_column(column2) +- lst1,self.objlist1 = menus.get_menus(menus.data.MENUROOT, +- root2=menus.data.SYSTEMMENUROOT) ++ lst1,self.objlist1 = menus.get_menus(menus.data.MENUROOT) + model = menus.set_model(tree1,lst1,self.theme,self.location_icon) + tree1.connect('cursor_changed', self.treeclick, + tree1,self.objlist1,False) diff --git a/community/bind-geodns/127.0.0.zone b/community/bind-geodns/127.0.0.zone deleted file mode 100644 index 509c311f6..000000000 --- a/community/bind-geodns/127.0.0.zone +++ /dev/null @@ -1,11 +0,0 @@ -$ORIGIN 0.0.127.in-addr.arpa. - -@ 1D IN SOA localhost. root.localhost. ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS localhost. -1 1D IN PTR localhost. diff --git a/community/bind-geodns/PKGBUILD b/community/bind-geodns/PKGBUILD deleted file mode 100644 index af38472d5..000000000 --- a/community/bind-geodns/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 72130 2012-06-08 23:51:33Z dreisner $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=bind-geodns -pkgver=9.4.1 -_pkgver=9.4.1-P1 -pkgrel=6 -pkgdesc="bind named server with geoip patch can return ip depending on requester location" -arch=(i686 x86_64 'mips64el') -url="http://www.caraytech.com/geodns/" -license=('custom:ISC') -backup=(etc/named.conf etc/logrotate.d/named etc/conf.d/named) -depends=('openssl' 'geoip') -provides=('dns-server' 'bind' 'dnsutils') -conflicts=('bind' 'dnsutils') -options=('!libtool') -install=bind.install -source=(ftp://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz - bind.so_bsdcompat.diff \ - named.conf \ - localhost.zone \ - 127.0.0.zone - named \ - root.hint \ - named.logrotate \ - named.conf.d \ - http://www.caraytech.com/geodns/bind-9.4.1-geodns-patch.tar.gz) -md5sums=('44e0514e6105ddaa235394045d9aeb0c' - '447d58721cfee0e1e377b46f7d50b327' - 'f26d015142fa0a8226b42bbf9d490aa4' - 'ab5beef0b41eb6376c7f1f4ee233172b' - 'bdbdfe4990b0903984306dd14f98b951' - '94f8ae2b337a4207fda88cb64f79f302' - '8c212c0260d708f15f75d3adc71f0149' - '91b3463a181561deb845acc122713a2a' - '475fde63600d7d95980de991f02d6b6d' - 'd3d515bdef525f9a31787b36a105e690') - -build() { - export MAKEFLAGS="-j1" - cd $srcdir/bind-${_pkgver} - patch -Np0 -i $srcdir/bind.so_bsdcompat.diff - patch -Np1 -i $srcdir/bind-9.4.1-geodns-patch/patch.diff - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-libtool --enable-shared --disable-threads \ - --with-openssl=yes --disable-linux-caps --without-libxml2 - make LDFLAGS=-lGeoIP - make DESTDIR=$pkgdir install - install -D -m755 ../named $pkgdir/etc/rc.d/named - install -D -m640 ../named.conf $pkgdir/etc/named.conf - install -D -m600 ../127.0.0.zone $pkgdir/var/named/127.0.0.zone - install -D -m600 ../localhost.zone $pkgdir/var/named/localhost.zone - - #grabbed from ftp://ftp.rs.internic.net/domain/named.root - install -D -m600 ../root.hint $pkgdir/var/named/root.hint - install -D -m600 ../named.logrotate $pkgdir/etc/logrotate.d/named - install -D -m644 ../named.conf.d $pkgdir/etc/conf.d/named - install -D -m644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/LICENSE - - # adjust ownerships (our named user will be uid/gid 40/40) - chmod 700 $pkgdir/var/named - chown root:40 $pkgdir/etc/named.conf - chown -R 40:40 $pkgdir/var/named - - mv $pkgdir/usr/man $pkgdir/usr/share/ - - # avoid conflict with filesystem>=2012.06 - rmdir "$pkgdir/var/run" -} diff --git a/community/bind-geodns/bind.install b/community/bind-geodns/bind.install deleted file mode 100644 index 39ae9f202..000000000 --- a/community/bind-geodns/bind.install +++ /dev/null @@ -1,28 +0,0 @@ -post_install() { - getent group named >/dev/null || usr/sbin/groupadd -g 40 named - getent passwd named >/dev/null || usr/sbin/useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named - usr/bin/passwd -l named &>/dev/null - - [ -f var/log/named.log ] || : >var/log/named.log - chown named.named var/log/named.log - # create an rndc.key if it doesn't already exist - if [ ! -s etc/rndc.key ]; then - usr/sbin/rndc-confgen -b 256 | head -n 5 >>etc/rndc.key - chown root.named etc/rndc.key - chmod 640 etc/rndc.key - fi -} - -post_upgrade() { - post_install $1 - # old versions of this package didn't have a named user - chown -R named:named var/named - # old versions of this package didn't set permissions correct - chown root:named etc/named.conf - chmod 640 etc/named.conf -} - -pre_remove() { - usr/sbin/userdel named &>/dev/null - usr/sbin/groupdel named &>/dev/null -} diff --git a/community/bind-geodns/bind.so_bsdcompat.diff b/community/bind-geodns/bind.so_bsdcompat.diff deleted file mode 100644 index 5d78031b7..000000000 --- a/community/bind-geodns/bind.so_bsdcompat.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./lib/isc/unix/socket.c.orig 2005-11-03 17:08:42.000000000 -0600 -+++ ./lib/isc/unix/socket.c 2006-02-18 13:09:15.000000000 -0600 -@@ -245,6 +245,8 @@ - - #define SOCK_DEAD(s) ((s)->references == 0) - -+#undef SO_BSDCOMPAT -+ - static void - manager_log(isc_socketmgr_t *sockmgr, - isc_logcategory_t *category, isc_logmodule_t *module, int level, diff --git a/community/bind-geodns/localhost.zone b/community/bind-geodns/localhost.zone deleted file mode 100644 index e3ff9641c..000000000 --- a/community/bind-geodns/localhost.zone +++ /dev/null @@ -1,10 +0,0 @@ -$ORIGIN localhost. -@ 1D IN SOA @ root ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS @ - 1D IN A 127.0.0.1 diff --git a/community/bind-geodns/named.conf b/community/bind-geodns/named.conf deleted file mode 100644 index 862134326..000000000 --- a/community/bind-geodns/named.conf +++ /dev/null @@ -1,58 +0,0 @@ -// -// /etc/named.conf -// - -options { - directory "/var/named"; - pid-file "/var/run/named/named.pid"; - auth-nxdomain yes; - datasize default; - allow-recursion { 127.0.0.1; }; -// Uncomment these to enable IPv6 connections support -// IPv4 will still work -// listen-on { none; }; -// listen-on-v6 { any; }; -}; - -zone "localhost" IN { - type master; - file "localhost.zone"; - allow-update { none; }; - allow-transfer { any; }; -}; - -zone "0.0.127.in-addr.arpa" IN { - type master; - file "127.0.0.zone"; - allow-update { none; }; - allow-transfer { any; }; -}; - -zone "." IN { - type hint; - file "root.hint"; -}; - -//zone "example.org" IN { -// type slave; -// file "example.zone"; -// masters { -// 192.168.1.100; -// }; -// allow-query { any; }; -// allow-transfer { any; }; -//}; - -logging { - channel xfer-log { - file "/var/log/named.log"; - print-category yes; - print-severity yes; - print-time yes; - severity info; - }; - category xfer-in { xfer-log; }; - category xfer-out { xfer-log; }; - category notify { xfer-log; }; -}; - diff --git a/community/bind-geodns/named.conf.d b/community/bind-geodns/named.conf.d deleted file mode 100644 index aecbd2307..000000000 --- a/community/bind-geodns/named.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to BIND -# -NAMED_ARGS="-u named" diff --git a/community/bind-geodns/named.logrotate b/community/bind-geodns/named.logrotate deleted file mode 100644 index ef1a2d032..000000000 --- a/community/bind-geodns/named.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/named.log { - missingok - postrotate - /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/community/bind-geodns/root.hint b/community/bind-geodns/root.hint deleted file mode 100644 index 4ed4c0b3a..000000000 --- a/community/bind-geodns/root.hint +++ /dev/null @@ -1,80 +0,0 @@ -; This file holds the information on root name servers needed to -; initialize cache of Internet domain name servers -; (e.g. reference this file in the "cache . <file>" -; configuration file of BIND domain name servers). -; -; This file is made available by InterNIC -; under anonymous FTP as -; file /domain/named.root -; on server FTP.INTERNIC.NET -; -OR- RS.INTERNIC.NET -; -; last update: Nov 01, 2007 -; related version of root zone: 2007110100 -; -; -; formerly NS.INTERNIC.NET -; -. 3600000 IN NS A.ROOT-SERVERS.NET. -A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 -; -; formerly NS1.ISI.EDU -; -. 3600000 NS B.ROOT-SERVERS.NET. -B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 -; -; formerly C.PSI.NET -; -. 3600000 NS C.ROOT-SERVERS.NET. -C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 -; -; formerly TERP.UMD.EDU -; -. 3600000 NS D.ROOT-SERVERS.NET. -D.ROOT-SERVERS.NET. 3600000 A 128.8.10.90 -; -; formerly NS.NASA.GOV -; -. 3600000 NS E.ROOT-SERVERS.NET. -E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 -; -; formerly NS.ISC.ORG -; -. 3600000 NS F.ROOT-SERVERS.NET. -F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 -; -; formerly NS.NIC.DDN.MIL -; -. 3600000 NS G.ROOT-SERVERS.NET. -G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 -; -; formerly AOS.ARL.ARMY.MIL -; -. 3600000 NS H.ROOT-SERVERS.NET. -H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53 -; -; formerly NIC.NORDU.NET -; -. 3600000 NS I.ROOT-SERVERS.NET. -I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 -; -; operated by VeriSign, Inc. -; -. 3600000 NS J.ROOT-SERVERS.NET. -J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 -; -; operated by RIPE NCC -; -. 3600000 NS K.ROOT-SERVERS.NET. -K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 -; -; operated by ICANN -; -. 3600000 NS L.ROOT-SERVERS.NET. -L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 -; -; operated by WIDE -; -. 3600000 NS M.ROOT-SERVERS.NET. -M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 -; End of File diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index 78ef8f840..54a22ddfe 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76448 2012-09-18 16:21:17Z tredaelli $ +# $Id: PKGBUILD 78662 2012-10-22 14:00:29Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: shahid <helllamer@gmail.com> pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.7.0 +pkgver=0.7.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.bitcoin.org/" @@ -13,7 +13,7 @@ conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git') replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git') license=('MIT') source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz) -sha256sums=('4b7a44fec28cbd9194a1303dd65bba8f13aa2facd4e06e4a3d1df6d66bc1deb5') +sha256sums=('431d28cedc76999131fcb34fd7fac2be72e8fa0d0817f1af025569cb3dff7c55') build() { cd "$srcdir/$pkgbase-$pkgver-linux/src" diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD deleted file mode 100644 index 79bbbdae8..000000000 --- a/community/blender/PKGBUILD +++ /dev/null @@ -1,104 +0,0 @@ -# $Id: PKGBUILD 70565 2012-05-11 20:09:37Z svenstaro $ -# Contributor: John Sowiak <john@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -# Apparently, the blender guys refuse to release source tarballs for -# intermediate releases that deal mainly with binaries but incorporate tiny -# minor changes from svn. Since I'm sick and tired of the urges of users that -# look for release numbers only, we make a messy PKGBUILD that can checkout svn -# release if necessary. - -#_svn=true -_svn=false - -pkgname=blender -pkgver=2.63a -pkgrel=1 -epoch=4 -pkgdesc="A fully integrated 3D graphics creation suite" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.blender.org" -depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' - 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' - 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' - 'openimageio' 'libsndfile' 'jack') -makedepends=('cmake' 'boost' 'cuda-toolkit') -optdepends=('cuda-toolkit: cycles renderer cuda support') -options=(!strip) -install=blender.install -if [ $_svn = false ]; then - source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) - md5sums=('31a60b3ce5466d965cb7e2648995e092') -else - source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) - md5sums=('7579d1139d0d6025df8afcfca64a65c4') -fi - -# source PKGBUILD && mksource -mksource() { - [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) - _svnver=38016 - _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" - _svnmod="$pkgname-$pkgver" - mkdir ${pkgname}-$pkgver - pushd ${pkgname}-$pkgver - svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod - find . -depth -type d -name .svn -exec rm -rf {} \; - tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* - popd -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - mkdir build - cd build - - [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF" - - cmake .. \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_BUILD_TYPE:STRING=Release \ - -DWITH_INSTALL_PORTABLE:BOOL=OFF \ - -DWITH_PYTHON_INSTALL:BOOL=OFF \ - -DWITH_OPENCOLLADA:BOOL=ON \ - -DOPENIMAGEIO_ROOT_DIR:STRING=/usr \ - -DWITH_GAMEENGINE:BOOL=ON \ - -DWITH_JACK:BOOL=ON \ - -DWITH_PLAYER:BOOL=ON \ - -DWITH_BUILTIN_GLEW:BOOL=OFF \ - -DWITH_CODEC_FFMPEG:BOOL=ON \ - -DWITH_CODEC_SNDFILE:BOOL=ON \ - -DWITH_CYCLES:BOOL=ON \ - -DWITH_CYCLES_CUDA_BINARIES:BOOL=ON \ - -DCUDA_TOOLKIT_ROOT_DIR:STRING=/opt/cuda-toolkit/ \ - -DWITH_FFTW3:BOOL=ON \ - -DWITH_MOD_OCEANSIM:BOOL=ON \ - -DPYTHON_VERSION:STRING=3.2 \ - -DPYTHON_LIBPATH:STRING=/usr/lib \ - -DPYTHON_LIBRARY:STRING=python3.2mu \ - -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \ - $ENABLESSE2 - - make $MAKEFLAGS - -# cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ -# "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ -# cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi -# chmod 755 bmake - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver/build" - make DESTDIR="${pkgdir}" install - python -m compileall "${pkgdir}/usr/share/blender" - -# install plugins -# install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} -# cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ -# "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ -# cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ -# "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ -} diff --git a/community/bless/PKGBUILD b/community/bless/PKGBUILD index 813a3fe4d..e1d7f26fa 100644 --- a/community/bless/PKGBUILD +++ b/community/bless/PKGBUILD @@ -6,7 +6,7 @@ pkgname=bless pkgver=0.6.0 pkgrel=3 pkgdesc="A high-quality, full-featured hex editor" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://home.gna.org/bless/" license=('GPL') depends=('gtk-sharp-2>=2.8') diff --git a/community/blobby2/PKGBUILD b/community/blobby2/PKGBUILD index e3b435dff..79beb15dd 100644 --- a/community/blobby2/PKGBUILD +++ b/community/blobby2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 77257 2012-10-08 12:01:38Z svenstaro $ +# $Id: PKGBUILD 79399 2012-11-04 04:36:25Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=blobby2 -pkgver=1.0rc2 +pkgver=1.0rc3 arch=('x86_64' 'i686' 'mips64el') pkgrel=1 pkgdesc="A beach ball game with blobs of goo" @@ -14,7 +14,7 @@ makedepends=('cmake' 'boost' 'mesa' 'zip') source=(http://downloads.sourceforge.net/blobby/$pkgname-linux-$pkgver.tar.gz $pkgname.desktop $pkgname.png) -md5sums=('6a508bb292e8eebe41653da173a37a02' +md5sums=('c4b7d3133e99806dc8b60a59da296906' 'ab05bed794ee78db693fd3036393275a' 'c1bc427b41a0a3facd771ac83c7fb412') diff --git a/community/blobwars/PKGBUILD b/community/blobwars/PKGBUILD new file mode 100644 index 000000000..06e581659 --- /dev/null +++ b/community/blobwars/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 57879 2011-11-04 08:01:07Z lcarlier $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: geekitus + +pkgname=blobwars +pkgver=1.19 +pkgrel=4 +pkgdesc="Platform action game featuring a blob wih lot of weapons" +arch=('i686' 'x86_64' 'mips64el') +url="http://sourceforge.net/projects/blobwars" +license=('GPL') +makedepends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'sdl_net') +install=$pkgname.install +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('87e8aaa114b6e4742ea6ee28e7a7f984') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # fix building with gcc 4.6 + sed -i -e 's/-Werror/-Werror -Wno-error=unused-result/g' makefile + + RELEASE=1 make +} + +package() { + depends=('hicolor-icon-theme' 'sdl_image' 'sdl_mixer' 'sdl_ttf' 'sdl_net' 'blobwars-data>=1.19') + + cd "${srcdir}/${pkgname}-${pkgver}" + + make PREFIX="${pkgdir}/usr" BINDIR="${pkgdir}/usr/bin/" install + + # We remove data files (See blobwars-data) + rm -r "${pkgdir}/usr/share/games" + + chmod a+r "${pkgdir}/usr/share/applications/${pkgname}.desktop" + chmod a+r -R "${pkgdir}/usr/share/icons/hicolor/" + install -dm755 "${pkgdir}/usr/share/pixmaps" + install -m644 icons/blobwars.png "${pkgdir}/usr/share/pixmaps/" +} diff --git a/community/blobwars/blobwars.install b/community/blobwars/blobwars.install new file mode 100644 index 000000000..b711352cb --- /dev/null +++ b/community/blobwars/blobwars.install @@ -0,0 +1,11 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/brise/PKGBUILD b/community/brise/PKGBUILD new file mode 100644 index 000000000..08a24307e --- /dev/null +++ b/community/brise/PKGBUILD @@ -0,0 +1,27 @@ +# $Id$ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: GONG Chen <chen dot sst at gmail dot com> + +pkgname=brise +pkgver=0.13 +pkgrel=2 +pkgdesc="Rime schema repository" +arch=('i686' 'x86_64') +url="http://code.google.com/p/rimeime/" +license=('GPL3') +depends=() +makedepends=('cmake' 'librime>=0.9.3') +provides=('librime-data') +conflicts=('librime<0.9.3' 'ibus-rime<0.9.3') +source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz") + +build() { + cd "${srcdir}/$pkgname" + make +} + +package() { + cd "${srcdir}/$pkgname" + make DESTDIR="$pkgdir" install +} +md5sums=('2346866c7a10e3f7f210a551083b31ac') diff --git a/community/calf/PKGBUILD b/community/calf/PKGBUILD index 63a320e47..9e0919b60 100644 --- a/community/calf/PKGBUILD +++ b/community/calf/PKGBUILD @@ -1,35 +1,34 @@ -# $Id: PKGBUILD 77743 2012-10-14 09:43:37Z arodseth $ +# $Id: PKGBUILD 79299 2012-11-02 14:14:33Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ray Rashif <schiv@archlinux.org> pkgname=calf pkgver=0.0.19 -_rc=8 -pkgrel=1 +pkgrel=3 pkgdesc='LV2/DSSI/LADSPA plug-ins suite and standalone JACK host' arch=('i686' 'x86_64' 'mips64el') url='http://calf.sf.net/' license=('LGPL') depends=('libglade' 'fftw' 'lash' 'dssi' 'fluidsynth' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('lv2core' 'ladspa' 'dssi') -source=("http://downloads.sf.net/$pkgname/$pkgname-$pkgver-rc$_rc.tar.gz") +source=("http://downloads.sf.net/$pkgname/$pkgname-$pkgver.tar.gz") install=calf.install options=('!libtool') -sha256sums=('57cb536a24a7b9df890dc665fd75c2f4d307859e55f3b25015c73cdc726a56b5') +sha256sums=('1106e7e27bcd18d47fc58c952a4dbf6c7a763272e13b2b94cee6f1b2fb922cec') build() { - cd $srcdir/$pkgname-$pkgver-rc$_rc if [ "$CARCH" != "mips64el" ]; then confflags="--enable-sse" else confflags="" fi + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --enable-experimental ${confflags} make } package() { - cd $srcdir/$pkgname-$pkgver-rc$_rc + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/canorus/0006-Add-lz-and-lpthread-to-linker-flags.patch b/community/canorus/0006-Add-lz-and-lpthread-to-linker-flags.patch new file mode 100644 index 000000000..05317541d --- /dev/null +++ b/community/canorus/0006-Add-lz-and-lpthread-to-linker-flags.patch @@ -0,0 +1,11 @@ +--- canorus-0.7.R1002.orig/src/CMakeLists.txt 2009-03-27 05:25:52.000000000 -0500 ++++ canorus-0.7.R1002/src/CMakeLists.txt 2012-11-15 06:26:41.884594717 -0500 +@@ -600,7 +600,7 @@ + # command. Never remove that line :-) + # Add ${QT_QTTEST_LIBRARY} below to add the Qt Test library as well + # Add ${POPPLERQT4_LIBRARY} ${POPPLER_LIBRARY} to reactivate poppler libraries +-TARGET_LINK_LIBRARIES(canorus ${QT_LIBRARIES} ${RUBY_LIBRARY} ${PYTHON_LIBRARY} ) ++TARGET_LINK_LIBRARIES(canorus ${QT_LIBRARIES} ${RUBY_LIBRARY} ${PYTHON_LIBRARY} -lz -lpthread) + + ############################ + # RtMIDI Library additions # diff --git a/community/canorus/PKGBUILD b/community/canorus/PKGBUILD index 184290b1e..c2a37de26 100644 --- a/community/canorus/PKGBUILD +++ b/community/canorus/PKGBUILD @@ -14,11 +14,14 @@ license=('GPL') depends=('qt' 'alsa-lib' 'python2' 'swig') makedepends=('cmake') options=('strip') -source=(http://download.berlios.de/$pkgname/$pkgname\_$pkgver\_source.tar.bz2) -md5sums=('5575b7c54633056a463177579a390318') +source=(http://download.berlios.de/$pkgname/$pkgname\_$pkgver\_source.tar.bz2 + 0006-Add-lz-and-lpthread-to-linker-flags.patch) +md5sums=('5575b7c54633056a463177579a390318' + '99e545a1da44006bc5e436728edfda15') build() { cd $srcdir/$pkgname-$pkgver + patch -Np1 -i ${srcdir}/0006-Add-lz-and-lpthread-to-linker-flags.patch export QTDIR=/usr cmake . -DCMAKE_INSTALL_PREFIX=$pkgdir/usr \ -DDEFAULT_DATA_DIR="/usr/share/canorus" \ diff --git a/community/catalyst-dkms/3.5-do_mmap.patch b/community/catalyst-dkms/3.5-do_mmap.patch deleted file mode 100644 index 04248eb7b..000000000 --- a/community/catalyst-dkms/3.5-do_mmap.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200 -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200 -@@ -2106,6 +2106,12 @@ - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) -+# define NO_DO_MMAP -+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f) -+# define do_munmap(a,b,c) vm_munmap(b, c) -+#endif -+ - unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval( - KCL_IO_FILE_Handle file, - unsigned long addr, -@@ -2117,10 +2123,13 @@ - - flags = MAP_SHARED; - prot = PROT_READ|PROT_WRITE; -- -+#ifdef NO_DO_MMAP -+ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff); -+#else - down_write(¤t->mm->mmap_sem); - vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff); - up_write(¤t->mm->mmap_sem); -+#endif - if (IS_ERR(vaddr)) - return 0; - else -@@ -2131,7 +2140,9 @@ - { - int retcode = 0; - -+#ifndef NO_DO_MMAP - down_write(¤t->mm->mmap_sem); -+#endif - #ifdef FGL_LINUX_RHEL_MUNMAP_API - retcode = do_munmap(current->mm, - addr, -@@ -2142,7 +2153,9 @@ - addr, - len); - #endif -+#ifndef NO_DO_MMAP - up_write(¤t->mm->mmap_sem); -+#endif - return retcode; - } - diff --git a/community/catalyst-dkms/PKGBUILD b/community/catalyst-dkms/PKGBUILD deleted file mode 100644 index d48e8f2cd..000000000 --- a/community/catalyst-dkms/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 77694 2012-10-13 14:52:56Z lcarlier $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero -# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert - -pkgname=catalyst-dkms -pkgver=12.9 -pkgrel=1 -pkgdesc="AMD proprietary gpu kernel driver" -arch=('i686' 'x86_64') -url="http://www.amd.com" -license=('custom') -depends=('dkms') -optdepends=('linux-headers: build the module against Arch kernel' - 'linux-lts-headers: build the module against LTS Arch kernel') -replaces=('catalyst-lts-dkms') # useless -source=(#http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip - https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz - dkms.conf) -md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b' - '972049dc247a74a7162f2227078abcb0') -install=catalyst.install - -package() { - depends=(${depends[@]} "catalyst-utils=${pkgver}") - - cd ${srcdir} - - if [ "${CARCH}" = "x86_64" ]; then - _archdir=x86_64 - else - _archdir=x86 - fi - - #sh ./amd-driver-installer*.run --extract fglrx-install - - #cd fglrx-install - #patch -Np1 -i ../3.5-do_mmap.patch - - install -dm755 "${pkgdir}/usr/lib/modprobe.d" - install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}" - cp -r lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" - cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" - cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" - sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf" - - echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf" - - # license - install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" -} diff --git a/community/catalyst-dkms/catalyst.install b/community/catalyst-dkms/catalyst.install deleted file mode 100644 index 655468646..000000000 --- a/community/catalyst-dkms/catalyst.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - dkms install -m fglrx -v $1 -} - -pre_upgrade() { - local curver=$2 - # $2 is unset due to a bug. Query current version using pacman as fallback - [ -n "$curver" ] || curver=$(pacman -Qi catalyst-dkms | awk '/^Version/{print $3}') - pre_remove $curver -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - dkms remove -m fglrx -v $1 --all -} diff --git a/community/catalyst-dkms/dkms.conf b/community/catalyst-dkms/dkms.conf deleted file mode 100644 index 8d312da4f..000000000 --- a/community/catalyst-dkms/dkms.conf +++ /dev/null @@ -1,7 +0,0 @@ -PACKAGE_NAME="fglrx" -PACKAGE_VERSION="@VERSION@" -CLEAN="rm -f *.*o" -BUILT_MODULE_NAME[0]="fglrx" -MAKE[0]="sh make.sh --nohints --uname_r=$kernelver --norootcheck" -DEST_MODULE_LOCATION[0]="/extramodules" -AUTOINSTALL="yes" diff --git a/community/catalyst-lts-dkms/PKGBUILD b/community/catalyst-lts-dkms/PKGBUILD deleted file mode 100644 index 2c0683df7..000000000 --- a/community/catalyst-lts-dkms/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 76980 2012-10-02 21:28:25Z lcarlier $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero -# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert - -pkgname=catalyst-lts-dkms -pkgver=12.8 -pkgrel=0.1 -pkgdesc="AMD proprietary gpu kernel driver" -arch=('i686' 'x86_64') -url="http://www.amd.com" -license=('custom') -depends=('linux-lts' 'linux-lts-headers' 'dkms') -source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip - dkms.conf) -md5sums=('41c5478322b13be6909eeb46412a3aa0' - '98d42443e84e91674ba79f0e6c38c572') -install=catalyst.install - -package() { - depends=(${depends[@]} "catalyst-utils=${pkgver}") - - cd ${srcdir} - - if [ "${CARCH}" = "x86_64" ]; then - _archdir=x86_64 - else - _archdir=x86 - fi - - sh ./amd-driver-installer*.run --extract fglrx-install - - cd fglrx-install - - install -dm755 "${pkgdir}/usr/lib/modprobe.d" - install -dm755 "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}" - cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/" - cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/" - cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/" - sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/dkms.conf" - - echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst-lts.conf" - - # license - install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" -} diff --git a/community/catalyst-lts-dkms/catalyst.install b/community/catalyst-lts-dkms/catalyst.install deleted file mode 100644 index 021f3fc54..000000000 --- a/community/catalyst-lts-dkms/catalyst.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() -{ - dkms add -m fglrx-lts -v $1 - dkms build -m fglrx-lts -v $1 - dkms install -m fglrx-lts -v $1 -} - -pre_upgrade() -{ - dkms remove -m fglrx-lts -v $1 --all -} - -post_upgrade() -{ - dkms add -m fglrx-lts -v $1 - dkms build -m fglrx-lts -v $1 - dkms install -m fglrx-lts -v $1 -} - -pre_remove() -{ - dkms remove -m fglrx-lts -v $1 --all -} - diff --git a/community/catalyst-lts-dkms/dkms.conf b/community/catalyst-lts-dkms/dkms.conf deleted file mode 100644 index 64f81f832..000000000 --- a/community/catalyst-lts-dkms/dkms.conf +++ /dev/null @@ -1,7 +0,0 @@ -PACKAGE_NAME="fglrx-lts" -PACKAGE_VERSION="@VERSION@" -CLEAN="rm -f *.*o" -BUILT_MODULE_NAME[0]="fglrx" -MAKE[0]="sh make.sh --nohints --uname_r=$kernelver --norootcheck" -DEST_MODULE_LOCATION[0]="/extramodules" -AUTOINSTALL="yes" diff --git a/community/ccrypt/PKGBUILD b/community/ccrypt/PKGBUILD index f765d7f77..74c9de428 100644 --- a/community/ccrypt/PKGBUILD +++ b/community/ccrypt/PKGBUILD @@ -1,28 +1,30 @@ -# $Id: PKGBUILD 64159 2012-02-09 16:27:49Z ttopper $ +# $Id: PKGBUILD 79357 2012-11-03 16:20:57Z ttopper $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=ccrypt -pkgver=1.9 -pkgrel=2 -pkgdesc="A command-line utility for encrypting and decrypting files and streams" +pkgver=1.10 +pkgrel=1 +pkgdesc='A command-line utility for encrypting and decrypting files and streams' arch=('i686' 'x86_64' 'mips64el') url="http://ccrypt.sourceforge.net" license=('GPL2') depends=('glibc') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('c3f78019d7a166dd66f1d4b1390c62c2') +sha1sums=('95d4e524abb146946fe6af9d53ed0e5e294b34e2') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --mandir=/usr/share/man make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}/" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD deleted file mode 100644 index b3d15d3ea..000000000 --- a/community/cdfs/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 74190 2012-07-22 19:39:07Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> - -pkgname=cdfs -pkgver=2.6.27 -pkgrel=23 -pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files." -arch=(i686 x86_64 'mips64el') -url="http://www.elis.UGent.be/~ronsse/cdfs/" -license=('GPL') -makedepends=('linux-headers') -install=cdfs.install -source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$pkgname-$pkgver.tar.bz2" - "cdfs-3.0.patch" - "cdfs-3.2.patch" - "cdfs-3.4.patch") -md5sums=('ac64c014a90e3c488394832ea29605b3' - 'aba7da94a9dcbb8a93ea423cb6958fef' - 'e934407b3460257a301822ffc4ab3933' - '9215e7bdac728bd2f889fb525e543454') - -build() { - _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` - depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`") - _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-ARCH/version` - - cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/cdfs-3.0.patch - patch -p1 <$srcdir/cdfs-3.2.patch - patch -p1 <$srcdir/cdfs-3.4.patch - make KDIR=/usr/lib/modules/${_kernverfull}/build - install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko - sed -i "s|extramodules-.*-ARCH|extramodules-3.${_kernver}-ARCH|" $startdir/cdfs.install -} diff --git a/community/cdfs/cdfs-3.0.patch b/community/cdfs/cdfs-3.0.patch deleted file mode 100644 index 20194b848..000000000 --- a/community/cdfs/cdfs-3.0.patch +++ /dev/null @@ -1,274 +0,0 @@ -diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c ---- cdfs-2.6.27/cddata.c 2009-12-21 17:04:03.000000000 +0300 -+++ cdfs-2.6.27.my/cddata.c 2011-07-24 21:18:44.000000000 +0400 -@@ -83,7 +83,7 @@ - #else - .mmap = generic_file_readonly_mmap, - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) -- .sendfile = generic_file_sendfile -+// .sendfile = generic_file_sendfile - #else - .splice_read = generic_file_splice_read - #endif -diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c ---- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300 -+++ cdfs-2.6.27.my/root.c 2011-07-25 13:16:59.000000000 +0400 -@@ -32,19 +30,14 @@ - * Added code to transform /proc/cdfs into a sequential synthetic file. * - *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ - -- - #include <linux/seq_file.h> -- --#ifndef OLD_KERNEL - #include <linux/statfs.h> --#endif -+#include <linux/sched.h> - - extern struct seq_operations cdfs_operations; - extern struct _track_info *dummy_track_p; - --#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) - struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); --#endif - /*============================================================================* - * cdfs_open() * - * Description: * -@@ -115,15 +108,8 @@ - - /********************************************************************/ - --#ifdef OLD_KERNEL --static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){ -- kdev_t dev = sb->s_dev; -- int i, j, t; -- struct cdrom_tochdr hdr; --#else - static int cdfs_fill_super(struct super_block *sb, void *data, int silent){ - int i, t; --#endif - struct cdrom_tocentry entry; - int no_audio=0, no_data=0; - cd * this_cd; -@@ -131,24 +117,13 @@ - - PRINT("cdfs_mount\n"); - --#ifdef OLD_KERNEL -- MOD_INC_USE_COUNT; -- -- set_blocksize(dev, CD_FRAMESIZE); // voor bread met ide-cd --#else - sb_set_blocksize(sb, CD_FRAMESIZE); // voor bread met ide-cd --#endif - - sb->s_blocksize = CD_FRAMESIZE; - sb->s_blocksize_bits = 11; - - if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){ --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; -- return NULL; --#else - return -ENOMEM; --#endif - } - - this_cd->mode = MODE; -@@ -160,13 +135,8 @@ - - // Initialize cache for maximum sector size - if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) { --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; -- return NULL; --#else - kfree(cdfs_info(sb)); - return -ENOMEM; --#endif - } - - // Cache is still invalid -@@ -183,23 +153,13 @@ - if (this_cd->toc_scsi){ - if (cdfs_toc_read_full(sb)){ - printk("TOC read failed\n"); --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; -- return NULL; --#else - goto invalid; --#endif - } - } else { - //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){ - if (cdfs_toc_read(sb)){ - printk("cdfs_toc_read failed\n"); --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; -- return NULL; --#else - goto invalid; --#endif - } - } - -@@ -365,11 +325,7 @@ - sb->s_flags |= MS_RDONLY; - sb->s_op = &cdfs_ops; - /* always get inode status */ --#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) - retinode=cdfs_iget(sb, 0); --#else -- retinode=iget(sb, 0); --#endif - if ( IS_ERR(retinode) ) - return PTR_ERR(retinode); - -@@ -379,16 +335,12 @@ - - cdfs_proc_cd = this_cd; - --#ifdef OLD_KERNEL -- return sb; --#else - return 0; - - invalid: - kfree(this_cd->cache); - kfree(cdfs_info(sb)); - return -EINVAL; --#endif - } - - /************************************************************************/ -@@ -410,27 +362,12 @@ - // Remove /proc entry - cdfs_proc_cd = NULL; - kfree(cdfs_info(sb)); -- --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; --#endif -- - } - - /************************************************************************/ - --#ifdef OLD_KERNEL --static int cdfs_statfs(struct super_block *sb, struct statfs *buf) { -- cd * this_cd = cdfs_info(sb); --#else --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) - static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) { - cd * this_cd = cdfs_info(d->d_sb); --#else --static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) { -- cd * this_cd = cdfs_info(sb); --#endif --#endif - PRINT("rmfs_statfs\n"); - - buf->f_type = CDFS_MAGIC; -@@ -460,11 +397,7 @@ - - /************************************************************************/ - --#ifdef OLD_KERNEL --static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){ --#else - static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){ --#endif - struct inode * inode; - int i; - cd * this_cd = cdfs_info(dir->i_sb); -@@ -480,15 +413,9 @@ - /* Use goto and read inode with iget()/cdfs_iget() */ - /* Thanks to David Howells for patch and Master class in his mail */ - found: --#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) - inode = cdfs_iget(dir->i_sb, i); - if (IS_ERR(inode)) - return ERR_CAST(inode); --#else -- inode = iget(dir->i_sb, i); -- if (!inode) -- return ERR_PTR(-ENOMEM); --#endif - d_add(dentry, inode); - return NULL; - } -@@ -529,12 +456,8 @@ - i->i_fop = &cdfs_dir_operations; - } else { /* file */ - i->i_size = this_cd->track[i->i_ino].size; --#ifdef OLD_KERNEL -- i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time; --#else - i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time; - i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0; --#endif - i->i_mode = this_cd->mode; - if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) { - i->i_fop = &cdfs_cddata_file_operations; -@@ -587,33 +510,21 @@ - /******************************************************************/ - - static struct super_operations cdfs_ops = { --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) -- .read_inode = cdfs_read_inode, --#endif - .put_super = cdfs_umount, - .statfs = cdfs_statfs - }; - --#ifdef OLD_KERNEL --static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount); --#else --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) --static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { -- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt); --#else --static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { -- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super); --#endif --} -+//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { -+// return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt); -+//} - - static struct file_system_type cdfs_fs_type = { - .owner = THIS_MODULE, - .name = "cdfs", -- .get_sb = cdfs_get_sb, -+// .get_sb = cdfs_get_sb, - .kill_sb = kill_block_super, - .fs_flags = FS_REQUIRES_DEV - }; --#endif - - /******************************************************/ - -@@ -621,10 +532,6 @@ - MODULE_DESCRIPTION("CDfs: a CD filesystem"); - MODULE_LICENSE("GPL"); - --#ifdef OLD_KERNEL --EXPORT_NO_SYMBOLS; --#endif -- - /******************************************************************/ - - static int __init cdfs_init(void) { -@@ -676,11 +583,7 @@ - - if (!options) return; - --#ifdef OLD_KERNEL -- for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) { --#else - while ((this_char = strsep(&options,",")) != NULL) { --#endif - - if (!strcmp(this_char,"single")) - this_cd->single=TRUE; diff --git a/community/cdfs/cdfs-3.2.patch b/community/cdfs/cdfs-3.2.patch deleted file mode 100644 index d3300bdbc..000000000 --- a/community/cdfs/cdfs-3.2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c ---- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300 -+++ cdfs-2.6.27.my/root.c 2012-01-18 11:23:03.000000000 +0400 -@@ -517,7 +517,7 @@ - - i->i_uid = this_cd->uid; - i->i_gid = this_cd->gid; -- i->i_nlink = 1; -+ i->__i_nlink = 1; - i->i_op = &cdfs_inode_operations; - i->i_fop = NULL; - i->i_data.a_ops = NULL; diff --git a/community/cdfs/cdfs-3.4.patch b/community/cdfs/cdfs-3.4.patch deleted file mode 100644 index 5c2cb9b24..000000000 --- a/community/cdfs/cdfs-3.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c ---- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300 -+++ cdfs-2.6.27.my/root.c 2012-06-15 17:09:27.000000000 +0400 -@@ -375,7 +375,7 @@ - - PRINT("retinode = %ld\n", retinode->i_ino); - -- sb->s_root = d_alloc_root(retinode); -+ sb->s_root = d_make_root(retinode); - - cdfs_proc_cd = this_cd; - diff --git a/community/cdfs/cdfs.install b/community/cdfs/cdfs.install deleted file mode 100644 index 6be46f6d5..000000000 --- a/community/cdfs/cdfs.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.4-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.4-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.4-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD index a46301651..365250991 100644 --- a/community/cdrtools/PKGBUILD +++ b/community/cdrtools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 76416 2012-09-17 14:33:56Z stativ $ +# $Id: PKGBUILD 80792 2012-12-03 18:56:26Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=cdrtools -pkgver=3.01a08 -pkgrel=2 +pkgver=3.01a09 +pkgrel=1 pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning" arch=('i686' 'x86_64' 'mips64el') url="http://cdrecord.berlios.de/private/cdrecord.html" @@ -13,8 +13,8 @@ provides=('cdrkit') options=(!makeflags) backup=('etc/default/cdrecord' 'etc/default/rscsi') install=cdrtools.install -source=(ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.gz) -md5sums=('bed40540ef0dfc41d4b6e62c70012a01') +source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.gz) +md5sums=('8d9fed38ce2705d6d227da65bfd93d48') build() { cd "$srcdir"/cdrtools-${pkgver%%a*} diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 8fd4dd440..b9e0a61fa 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 77052 2012-10-04 03:54:27Z svenstaro $ +# $Id: PKGBUILD 79010 2012-10-29 03:17:07Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> -pkgname=cegui +pkgbase=cegui +pkgname=('cegui' 'cegui-docs') pkgver=0.7.7 -pkgrel=1 +pkgrel=3 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64' 'mips64el') url="http://crayzedsgui.sourceforge.net" @@ -34,14 +35,20 @@ build() { make } -package() { +package_cegui() { cd $srcdir/CEGUI-${pkgver} make DESTDIR=${pkgdir} install + install -Dm644 doc/COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} + +package_cegui-docs() { + pkgdesc="Documentation for cegui" + depends=() + + cd $srcdir/CEGUI-${pkgver} + cd doc/doxygen && doxygen cd .. && make DESTDIR=${pkgdir} install-html - - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } - diff --git a/community/celt/PKGBUILD b/community/celt/PKGBUILD deleted file mode 100644 index 3eec5da5a..000000000 --- a/community/celt/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Lauri Niskanen <ape@ape3000.com> -# Contributor: Ray Rashif <schivmeister@gmail.com> - -pkgname=celt -pkgver=0.11.1 -pkgrel=4 -pkgdesc='Low-latency audio communication codec' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.celt-codec.org' -license=('BSD') -depends=('libogg') -options=('!libtool') -source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('94fe4acd241da8702c295bcd13a555e6') - -build() { - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr \ - --enable-custom-modes - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install - - install -D -m644 COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/BSD -} diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index 2b594e3d4..b1660d650 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71264 2012-05-26 07:35:52Z spupykin $ +# $Id: PKGBUILD 80035 2012-11-15 15:53:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Current Maintainer: Patrick Palka <patrick@parcs.ath.cx> # Previous Maintainer: Loui Chang <louipc.ist at gmail com> @@ -6,7 +6,7 @@ # Development: http://closure.ath.cx/aur-dev pkgname=cgit -pkgver=0.9.0.3 +pkgver=0.9.1 _gitver=1.7.4 pkgrel=1 pkgdesc="A web interface for git written in plain C" @@ -16,12 +16,11 @@ license=('GPL') depends=('openssl') makedepends=('git' 'zlib' 'curl' 'asciidoc') install=cgit.install -# "http://www.kernel.org/pub/software/scm/git/git-${_gitver}.tar.bz2" -source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2" - "http://arch.p5n.pp.ru/~sergej/dl/2011/git-${_gitver}.tar.bz2" +source=("http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz" + "git-${_gitver}.tar.gz::https://github.com/git/git/archive/v${_gitver}.tar.gz" "apache.example.conf") -md5sums=('3d5481bf8a507694108f0996b8bde235' - 'fa24dc1ef0b663327ea0fe1981365b39' +md5sums=('ed1a1ccccdcbf55ddd6a9de29bca6edf' + 'c63cc7ca8a4bbf97c8802f354511223e' 'bd5696bea0654bfcf98f249b1a36737d') build() { diff --git a/community/cgminer/PKGBUILD b/community/cgminer/PKGBUILD new file mode 100644 index 000000000..94189bc76 --- /dev/null +++ b/community/cgminer/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 80749 2012-12-02 10:11:57Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: monson <holymonson@gmail.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: David Manouchehri <david@davidmanouchehri.com> + +pkgname=cgminer +pkgver=2.9.6 +_build= +pkgrel=1 +pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer." +url='http://forum.bitcoin.org/index.php?topic=28402.0' +license=('GPL3') +arch=('i686' 'x86_64') +depends=('curl' 'libcl') +makedepends=('opencl-headers') +optdepends=('opencl-nvidia: OpenCL implementation for NVIDIA' + 'opencl-catalyst: OpenCL implementation for AMD') +source=("http://ck.kolivas.org/apps/cgminer/$pkgname-$pkgver.tar.bz2" + "$pkgname.conf.d" + "$pkgname" + "$pkgname.service") +backup=("etc/conf.d/$pkgname" "etc/$pkgname.conf") + +[ $CARCH == 'x86_64' ] && makedepends+=('yasm') + +build() { + cd "$srcdir" + cd $pkgname-$pkgver${_build} + + # Use in-tree jansson since it is not compatible with jansson 2.0 + #sed -e 's/^AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)$/request_jansson=true/' -i configure.ac + + # Here you may want to use custom CFLAGS + #export CFLAGS="-O2 -march=native -mtune=native -msse2" + + ./configure --prefix=/usr --enable-cpumining + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver${_build} + + make DESTDIR="$pkgdir" install + + install -Dm755 "$srcdir"/$pkgname "$pkgdir"/etc/rc.d/$pkgname + install -Dm644 "$srcdir"/$pkgname.service "$pkgdir"/usr/lib/systemd/system/$pkgname.service + install -Dm644 "$srcdir"/$pkgname.conf.d "$pkgdir"/etc/conf.d/$pkgname + sed 's#/usr/local/bin#/usr/bin#g' example.conf > $pkgname.conf + install -Dm644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf +} +md5sums=('add25d92f771c5b505cdac3f1ceebf97' + 'fe4a243fabe24608f5c05e40f0f118f6' + 'ee39698273671fee0e98d4af16014c36' + 'c2bb974adf92cc234fbf0136ebcb355d') diff --git a/community/cgminer/cgminer b/community/cgminer/cgminer new file mode 100644 index 000000000..9081e8e77 --- /dev/null +++ b/community/cgminer/cgminer @@ -0,0 +1,51 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +DAEMON=cgminer + +# stupid patch var +export HOME=/root + +[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON + +if [ -r $CGMINER_CONF ]; then + ARGS="--config $CGMINER_CONF $CGMINER_ARGS" +else + ARGS="--url $CGMINER_PROTOCOL://$CGMINER_IP:$CGMINER_PORT --user $CGMINER_USER --pass $CGMINER_PASS $CGMINER_ARGS" +fi + +PID=$(get_pid $DAEMON) + +case "$1" in + start) + stat_busy "Starting $DAEMON" + [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null & + if [ $? = 0 ]; then + add_daemon $DAEMON + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping $DAEMON" + [ -n "$PID" ] && kill $PID &>/dev/null + if [ $? = 0 ]; then + rm_daemon $DAEMON + stat_done + else + stat_fail + exit 1 + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/community/cgminer/cgminer.conf.d b/community/cgminer/cgminer.conf.d new file mode 100644 index 000000000..88ec535d6 --- /dev/null +++ b/community/cgminer/cgminer.conf.d @@ -0,0 +1,11 @@ +# Use JSON-format configuration. (recommended) +CGMINER_CONF="/etc/cgminer.conf" + +# Uncommend this if you prefer simple command-line arguments. +#CGMINER_CONF="" +#CGMINER_PROTOCOL="http" +#CGMINER_IP="127.0.0.1" +#CGMINER_PORT="8332" +#CGMINER_USER="username" +#CGMINER_PASS="password" +CGMINER_ARGS="--syslog" diff --git a/community/cgminer/cgminer.service b/community/cgminer/cgminer.service new file mode 100644 index 000000000..9d6595047 --- /dev/null +++ b/community/cgminer/cgminer.service @@ -0,0 +1,8 @@ +[Unit] +Description=Multi-threaded multi-pool CPU and GPU miner for bitcoin + +[Service] +ExecStart=/usr/bin/cgminer -T --config /etc/cgminer.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index 703fa5616..a6b13afe9 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,34 +1,35 @@ -# $Id: PKGBUILD 78574 2012-10-21 09:16:19Z lcarlier $ +# $Id: PKGBUILD 80747 2012-12-01 21:09:55Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=1.99.13 -pkgrel=2 +pkgver=1.99.15 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" license=('GPL') -depends=('xulrunner>=13.0' 'chmlib' 'desktop-file-utils') +depends=('xulrunner>=17.0' 'chmlib' 'desktop-file-utils') makedepends=('python2') -source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver +#source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver +source=(https://github.com/jungleji/chmsee/archive/b2a3c2ad32bfe9db067665ea1928d7e130d1b5e7.zip chmsee) install=chmsee.install -md5sums=('6ea077c593bdadaafb278cce9165fba2' +md5sums=('87a7adef3a120bae2f9b963596ddb593' '242a9390bc943cc38237fa71137fb26c') build() { - cd ${srcdir}/jungleji-chmsee-*/src + cd ${srcdir}/chmsee-*/src cp Makefile.arch Makefile - sed -i -e 's/15.*/16.*/g' ../application.ini + #sed -i -e 's/15.*/17.*/g' ../application.ini - make + make -j1 } package() { - cd ${srcdir}/jungleji-chmsee-* + cd ${srcdir}/chmsee-* install -d ${pkgdir}/usr/share/chmsee cp -a * ${pkgdir}/usr/share/chmsee diff --git a/community/choqok/PKGBUILD b/community/choqok/PKGBUILD index b79664f00..0f2ac3b0b 100644 --- a/community/choqok/PKGBUILD +++ b/community/choqok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72717 2012-06-21 07:02:11Z andrea $ +# $Id: PKGBUILD 80665 2012-11-28 22:07:33Z plewis $ # Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Emanuele Rossi <newdna1510@yahoo.it> @@ -6,7 +6,7 @@ pkgname=choqok pkgver=1.3 -pkgrel=2 +pkgrel=4 pkgdesc="A Twitter/identi.ca/laconica client for KDE" url='http://choqok.gnufolks.org/' license=('GPL') @@ -31,4 +31,7 @@ build() { package() { cd "${srcdir}"/build make DESTDIR="${pkgdir}" install + + # This is already installed by kdepimlibs >= 4.9.80 + rm "${pkgdir}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake } diff --git a/community/chromaprint/PKGBUILD b/community/chromaprint/PKGBUILD deleted file mode 100644 index 64a17ac0a..000000000 --- a/community/chromaprint/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 75942 2012-09-06 00:10:52Z bisson $ -# Contributor: Wieland Hoffmann <the_mineo@web.de> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=chromaprint -pkgver=0.7 -pkgrel=1 -pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' -url='http://acoustid.org/chromaprint/' -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -depends=('ffmpeg') -makedepends=('cmake') -source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON . - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/chromaprint/ffmpeg.patch b/community/chromaprint/ffmpeg.patch deleted file mode 100644 index 7c0b86d77..000000000 --- a/community/chromaprint/ffmpeg.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur old/examples/fpcalc.c new/examples/fpcalc.c ---- old/examples/fpcalc.c 2011-12-22 22:11:23.000000000 +1100 -+++ new/examples/fpcalc.c 2012-06-04 10:44:30.596604910 +1000 -@@ -28,7 +28,7 @@ - #endif - int16_t *buffer; - -- if (av_open_input_file(&format_ctx, file_name, NULL, 0, NULL) != 0) { -+ if (avformat_open_input(&format_ctx, file_name, NULL, NULL) != 0) { - fprintf(stderr, "ERROR: couldn't open the file\n"); - goto done; - } -@@ -71,9 +71,9 @@ - goto done; - } - -- if (codec_ctx->sample_fmt != SAMPLE_FMT_S16) { -+ if (codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) { - #ifdef HAVE_AV_AUDIO_CONVERT -- convert_ctx = av_audio_convert_alloc(SAMPLE_FMT_S16, codec_ctx->channels, -+ convert_ctx = av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codec_ctx->channels, - codec_ctx->sample_fmt, codec_ctx->channels, NULL, 0); - if (!convert_ctx) { - fprintf(stderr, "ERROR: couldn't create sample format converter\n"); -@@ -133,7 +133,7 @@ - if (convert_ctx) { - const void *ibuf[6] = { buffer1 }; - void *obuf[6] = { buffer2 }; -- int istride[6] = { av_get_bits_per_sample_format(codec_ctx->sample_fmt) / 8 }; -+ int istride[6] = { av_get_bytes_per_sample(codec_ctx->sample_fmt) }; - int ostride[6] = { 2 }; - int len = buffer_size / istride[0]; - if (av_audio_convert(convert_ctx, obuf, ostride, ibuf, istride, len) < 0) { diff --git a/community/chrpath/PKGBUILD b/community/chrpath/PKGBUILD index 6aebf2278..e608fc320 100644 --- a/community/chrpath/PKGBUILD +++ b/community/chrpath/PKGBUILD @@ -4,7 +4,7 @@ pkgname=chrpath pkgver=0.13 -pkgrel=3.1 +pkgrel=3.2 pkgdesc="Change or delete the rpath or runpath in ELF files" arch=('i686' 'x86_64' 'mips64el') url="http://directory.fsf.org/project/chrpath/" diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index d8ae0e53b..c1bfcb752 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 69800 2012-04-23 09:46:22Z ibiru $ +# $Id: PKGBUILD 79595 2012-11-08 15:28:22Z heftig $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=clanlib pkgver=2.3.6 -pkgrel=2 +pkgrel=3 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64' 'mips64el') url="http://clanlib.org/" license=('zlib') -depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite') +depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite') makedepends=('doxygen' 'graphviz') options=('!libtool') source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz) diff --git a/community/clewn/PKGBUILD b/community/clewn/PKGBUILD index b3314f4e3..318c9764d 100644 --- a/community/clewn/PKGBUILD +++ b/community/clewn/PKGBUILD @@ -4,7 +4,7 @@ pkgname=clewn pkgver=1.15 -pkgrel=5 +pkgrel=5.1 pkgdesc="gdb support for vim" arch=('i686' 'x86_64' 'mips64el') url="http://clewn.sourceforge.net" diff --git a/community/clucene/PKGBUILD b/community/clucene/PKGBUILD deleted file mode 100644 index 57834619c..000000000 --- a/community/clucene/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 62283 2012-01-19 00:04:00Z arodseth $ -# Maintainer: Alexander Rødseth -# Contributor: Alois Nespor <alois.nespor@gmail.com> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -pkgname=clucene -pkgver=2.3.3.4 -pkgrel=3 -pkgdesc="C++ port of the high-performance text search engine Lucene" -arch=('i686' 'x86_64' 'mips64el') -url="http://clucene.sourceforge.net/" -license=('APACHE' 'LGPL') -depends=('gcc-libs' 'zlib' 'boost-libs') -makedepends=('cmake' 'boost') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.gz") -sha256sums=('ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab') - -build() { - cd "$srcdir" - - sed 's:core:core -lclucene-shared:' \ - -i "$pkgname-core-$pkgver/src/core/libclucene-core.pc.cmake" - - mkdir build - cd build - cmake "../$pkgname-core-$pkgver" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_ASCII_MODE=OFF \ - -DENABLE_PACKAGING=OFF \ - -DDISABLE_MULTITHREADING=OFF - make -} - -package() { - cd "$srcdir/build" - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD index 970c7d3c5..dff70a68f 100644 --- a/community/cmus/PKGBUILD +++ b/community/cmus/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 74995 2012-08-11 10:00:29Z bpiotrowski $ +# $Id: PKGBUILD 79561 2012-11-07 13:48:29Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=cmus -pkgver=2.4.3 -pkgrel=3 -pkgdesc="A very feature-rich ncurses-based music player" +pkgver=2.5.0 +pkgrel=1 +pkgdesc='Very feature-rich ncurses-based music player' arch=('i686' 'x86_64' 'mips64el') url="http://cmus.sourceforge.net/" license=('GPL') depends=('ncurses') -makedepends=('libao' 'libmpcdec' 'ffmpeg-compat' 'flac' 'libmad' 'faad2' 'libmodplug' +makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' 'libvorbis' 'libpulse' 'wavpack' 'libmp4v2') optdepends=('alsa-lib: for ALSA output plugin support' 'libao: for AO output plugin support' 'libpulse: for PulseAudio output plugin support' - 'ffmpeg-compat: for ffmpeg input plugin support' + 'ffmpeg: for ffmpeg input plugin support' 'libmodplug: for modplug input plugin support' 'faad2: for input AAC plugin support' 'libmad: for mp3 input plugin support' @@ -25,17 +25,18 @@ optdepends=('alsa-lib: for ALSA output plugin support' 'libvorbis: for vorbis input plugin support' 'flac: for flac input plugin support' 'libmp4v2: for mp4 input plugin support') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2") -sha1sums=('ba63a417b0df42fa9a4850dd8b922a95a426f7f5') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2) +sha1sums=('244975a5ff642567acb047f6bd518e4a3271c25b') build() { - cd "$srcdir/$pkgname-v$pkgver" + cd $srcdir/$pkgname-v$pkgver ./configure prefix=/usr make } package() { - cd "$srcdir/$pkgname-v$pkgver" - make DESTDIR="$pkgdir" install - install -D -m 644 contrib/_cmus "$pkgdir/usr/share/zsh/site-functions/_cmus" + cd $srcdir/$pkgname-v$pkgver + make DESTDIR=$pkgdir install + + install -Dm 644 contrib/_cmus $pkgdir/usr/share/zsh/site-functions/_cmus } diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 61ec563ef..935e23d64 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73395 2012-07-07 05:48:11Z foutrelis $ +# $Id: PKGBUILD 80640 2012-11-28 06:12:39Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd -pkgver=5.1.0 -pkgrel=5 +pkgver=5.2.0 +pkgrel=1 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,6 @@ optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins' 'libdbi: dbi plugin' 'libesmtp: notify_email plugin' 'libgcrypt: encryption and authentication for network plugin' - 'iptables: iptables plugin' 'libmemcached: memcachec plugin' 'libmysqlclient: mysql plugin' 'iproute2: netlink plugin' @@ -32,20 +31,18 @@ optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins' 'xmms: xmms plugin' 'yajl: curl_json plugin') -makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'iptables' 'libmemcached' +makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached' 'libmysqlclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping' 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors' 'libvirt' 'libxml2' 'xmms' 'yajl') -depends=('libltdl') +depends=('libltdl' 'iptables') source=("${url}files/${pkgname}-${pkgver}.tar.gz" - 'rtnl_dump_filter.patch' 'libperl.patch' 'service' 'rc.d') -sha1sums=('55f17b17a10710641a9bf4e8c5332cef661cafcd' - 'c92b8dacff0a71f2cc8645c2e350ff9bdc1cbd5f' +sha1sums=('b56832913cbdc06ee370f89a57ed3c25ed16a88b' '245c098d121a4a05594553583310953b3a2f6461' 'b56907f532b9174e1b6995aadb518228d7464d3b' '0f441718d5519cb043b1130e5a1d0379078adbcc') @@ -57,7 +54,6 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../rtnl_dump_filter.patch patch -p1 -i ../libperl.patch autoconf diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index fc32adb31..d6ebde28b 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 77533 2012-10-11 21:23:35Z dwallace $ +#$Id: PKGBUILD 79133 2012-10-31 00:23:46Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.8 -pkgrel=1 +pkgver=1.9 +pkgrel=2 pkgdesc="Wireless LAN network manager" url="http://connman.net/" arch=('i686' 'x86_64' 'mips64el') @@ -19,9 +19,6 @@ source=('connmand-daemon' "http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'allow_group_network.diff') -md5sums=('88ece7cbf1d0d289545ce4f8553fdab8' - '689468f92a1dcb2c0e30d7d00410ad87' - 'a8d22ee089fb0ed725130d16ad393047') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -43,4 +40,8 @@ package(){ make DESTDIR="${pkgdir}" install install -Dm755 "$srcdir"/connmand-daemon "$pkgdir"/etc/rc.d/connmand + install -Dm755 "$srcdir/$pkgname-$pkgver/client/${pkgname}ctl" "$pkgdir/usr/sbin/${pkgname}ctl" } +md5sums=('88ece7cbf1d0d289545ce4f8553fdab8' + '8196824f400719dd172222a355ad9592' + 'a8d22ee089fb0ed725130d16ad393047') diff --git a/community/contacts/0001-Fix-Makefile-whitespace.patch b/community/contacts/0001-Fix-Makefile-whitespace.patch deleted file mode 100644 index 3c6e3b5f9..000000000 --- a/community/contacts/0001-Fix-Makefile-whitespace.patch +++ /dev/null @@ -1,19 +0,0 @@ -From d69e65a87e58059fb7876987b4369d932ac35e17 Mon Sep 17 00:00:00 2001 -From: Joshua Lock <josh@linux.intel.com> -Date: Wed, 15 Dec 2010 14:06:44 +0000 -Subject: Fix Makefile whitespace for the new improved strict make 3.82 - -Signed-off-by: Joshua Lock <josh@linux.intel.com> ---- -diff --git a/Makefile.am b/Makefile.am -index 7c36d37..0a24f3d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT) - MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing - - snapshot: -- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` -+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` --- -cgit v0.9.0.2 diff --git a/community/contacts/PKGBUILD b/community/contacts/PKGBUILD deleted file mode 100644 index f0c26da9e..000000000 --- a/community/contacts/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 69724 2012-04-23 09:06:34Z ibiru $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=contacts -pkgver=0.12 -pkgrel=6 -pkgdesc="Small, lightweight GTK+ address book app" -arch=('i686' 'x86_64' 'mips64el') -url="http://pimlico-project.org/contacts.html" -license=('GPL') -depends=('gtk2' 'evolution-data-server' 'desktop-file-utils' 'xdg-utils') -makedepends=('intltool') -install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 - 0001-Fix-Makefile-whitespace.patch) -sha256sums=('0993f34819b92e09ab64e8a90231afc3178a19a4a99cf02c3050f51a44850782' - 'f6e3879c1aacbb62e481d9c1c33679ae12f986a26a96b112ec4d7f5f3358efbf') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/0001-Fix-Makefile-whitespace.patch" - - autoreconf -fi - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-schemas-install --disable-gnome-vfs \ - --with-gconf-schema-file-dir=/usr/share/gconf/schemas - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index d5f6fabb6..2bcb05f3e 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73175 2012-07-03 06:23:26Z giovanni $ +# $Id: PKGBUILD 79808 2012-11-12 22:07:56Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: archtux <antonio.arias99999 at gmail.com> pkgname=converseen -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt' 'libwmf' 'openexr') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('db00c0cf86977494effa971fd238c786') +md5sums=('7d0c4b73676d2939ba6230eaad3f6f55') build() { cd "${srcdir}" diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 2f7e40085..d7656d5e3 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78310 2012-10-17 14:02:05Z spupykin $ +# $Id: PKGBUILD 80235 2012-11-18 10:29:50Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb pkgver=1.2.0 -pkgrel=5 +pkgrel=6 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64' 'mips64el') url="http://couchdb.apache.org" diff --git a/community/courier-authlib/PKGBUILD b/community/courier-authlib/PKGBUILD deleted file mode 100644 index fa5b08397..000000000 --- a/community/courier-authlib/PKGBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# $Id: PKGBUILD 72136 2012-06-09 00:24:01Z dreisner $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=courier-authlib -pkgver=0.64.0 -pkgrel=2 -pkgdesc="Authentification library for the courier mailserver(s)" -arch=(i686 x86_64 'mips64el') -license=('GPL2') -url="http://courier-mta.org/authlib/" -backup=('etc/authlib/authdaemonrc' 'etc/authlib/authldaprc' \ - 'etc/authlib/authmysqlrc' 'etc/authlib/authpgsqlrc') -depends=('openssl' 'gdbm' 'perl' 'libtool' 'expect') -makedepends=('pam' 'expect' 'libldap' 'libmysqlclient' 'postgresql-libs>=8.3.0') -optdepends=('libmysqlclient' 'libldap' 'postgresql-libs') -conflicts=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap') -provides=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap') -options=(!libtool) -install=${pkgname}.install -source=(http://downloads.sourceforge.net/project/courier/authlib/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - courier-authlib.tmpfiles - authdaemond.rc.d) -md5sums=('d946a76e81e45a139543305d310399f6' - 'bef189740e9516b0beaace4e8954ef14' - '7de75a9a74796f4fd2e81fd3ca16ed8d') - -build() { - #export MAKEFLAGS="-j1" - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --with-db=gdbm \ - --with-mailuser=courier --with-mailgroup=courier \ - --with-authpam --with-authpwd --with-authshadow \ - --with-authldap --with-authmysql --with-authpgsql \ - --with-authuserdb --with-authcram --with-authdaemon \ - --with-authdaemonvar=/run/authdaemon - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - ############################################################################### - # post_installation ---- rename the config file and change ownerschip - for distfile in ${pkgdir}/etc/authlib/*.dist; do - chown 72:72 ${distfile} - mv ${distfile} ${pkgdir}/etc/authlib/`basename ${distfile} .dist` - done - # copy the .schema; mostly refered to as courier.schema -> rename it - install -Dm 444 authldap.schema \ - ${pkgdir}/etc/openldap/schema/courier.schema - ############################################################################### - # Install daemon, that wraps couriers bashscript - install -Dm 755 ${srcdir}/authdaemond.rc.d ${pkgdir}/etc/rc.d/authdaemond - #mkdir -p ${pkgdir}/var/spool/authdaemon - #chown -R 72:72 ${pkgdir}/var/spool/authdaemon - mkdir -p ${pkgdir}/var/spool/courier - chown -R 72:72 ${pkgdir}/var/spool/courier - # docs say we can remove .a files after make - find ${pkgdir} -name '*\.a' -exec rm -f {} \; - # Make libs available to /usr/lib - cd $pkgdir/usr/lib - for lib in courier-authlib/*.so; do - ln -s $lib . - done - - install -Dm644 "$srcdir/courier-authlib.tmpfiles" "$pkgdir/usr/lib/tmpfiles/courier-authlib.conf" - - # avoid conflict with filesystem>=2012.06 - rmdir "$pkgdir/run/authdaemon" -} diff --git a/community/courier-authlib/authdaemond.rc.d b/community/courier-authlib/authdaemond.rc.d deleted file mode 100644 index 791c3d122..000000000 --- a/community/courier-authlib/authdaemond.rc.d +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -start() { - [ -d /var/run/authdaemon ] || mkdir -p /var/run/authdaemon - chown courier:courier /var/run/authdaemon - - stat_busy "Starting Authdaemond" - /usr/sbin/authdaemond start &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon authdaemond - stat_done - fi -} - -stop() { - stat_busy "Stopping Authdaemond" - /usr/sbin/authdaemond stop &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/authdaemon/{pid.lock,pid,socket} &> /dev/null - - # TODO: Take these out at some point, they're only cleanup for old way - rm -f /var/run/authdaemond.pid &> /dev/null - rm -f /var/spool/authdaemon/{pid.lock,pid,socket} &> /dev/null - - rm_daemon authdaemond - stat_done - fi -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - # calling 'stop' and 'start' without the $0 fails... - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/courier-authlib/courier-authlib.install b/community/courier-authlib/courier-authlib.install deleted file mode 100644 index 7b29f845f..000000000 --- a/community/courier-authlib/courier-authlib.install +++ /dev/null @@ -1,26 +0,0 @@ -# arg 1: the new package version -post_install() { - # creates group and user on virgin systems - if ! getent group courier >/dev/null; then - groupadd -g 72 courier >/dev/null 2>&1 - fi - - if getent passwd courier >/dev/null; then - useradd -u 72 -d /var/spool/courier -g courier -s /bin/false courier >/dev/null 2>&1 - fi - - systemd-tmpfiles --create /usr/lib/tmpfiles/courier-authlib.conf -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - userdel courier - groupdel courier -} >/dev/null 2>&1 - diff --git a/community/courier-authlib/courier-authlib.tmpfiles b/community/courier-authlib/courier-authlib.tmpfiles deleted file mode 100644 index 887303a4c..000000000 --- a/community/courier-authlib/courier-authlib.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/authdaemon 0755 72 72 - diff --git a/community/courier-imap/PKGBUILD b/community/courier-imap/PKGBUILD deleted file mode 100644 index b1f818791..000000000 --- a/community/courier-imap/PKGBUILD +++ /dev/null @@ -1,94 +0,0 @@ -# $Id: PKGBUILD 60091 2011-12-05 02:57:32Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: tobias <tobias@archlinux.org> -# Committer: Manolis Tzanidakis <manolis@archlinux.org> - -pkgname=courier-imap -pkgver=4.10.0 -pkgrel=1 -pkgdesc="IMAP(s)/POP3(s) Server" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -url="http://www.courier-mta.org/imap/" -depends=('courier-maildrop>=2.5.0' 'gcc-libs' 'gamin' 'gdbm' 'openssl') -backup=('etc/courier-imap/imapd.cnf' 'etc/courier-imap/pop3d.cnf' \ - 'etc/courier-imap/imapd' 'etc/courier-imap/imapd-ssl' \ - 'etc/courier-imap/pop3d' 'etc/courier-imap/pop3d-ssl'\ - 'etc/conf.d/courier-imap') -conflicts=('courier-mta') -provides=('imap-server' 'pop3-server') -options=('!libtool') -install=$pkgname.install -source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - courier-imap.conf.d - courier-imap.rc.d - imapd.rc.d - imapd-ssl.rc.d - pop3d.rc.d - pop3d-ssl.rc.d) -md5sums=('2f95c99b9ad1380b9f3ac733ccd741a2' - '3e08f017f6c5a52dea28f6f0dbd50b86' - '500c37831974f4676b67e650c67a59f6' - '6574c8046e44698efa7452c4b445d88e' - '437167a58efddc523f25180df284da20' - '1be23fb224bde93b23da6e771bd1cf01' - 'a326309b02fed3d7226d9aac88add7f2') - -# MIGRATION NOTE: -# In 2012, support for courier-imap.conf.d and courier-imap.rc.d will be removed. -# Remove those files and this note and also courier-imap.install - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # fix a tiny bug - sed -i -e \ - 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ - configure && chmod 755 configure - - ./configure --prefix=/usr \ - --sysconfdir=/etc/courier-imap \ - --libexecdir=/usr/lib/courier-imap \ - --localstatedir=/var/spool/courier-imap \ - --disable-root-check \ - --enable-unicode \ - --enable-workarounds-for-imap-client-bugs \ - --with-piddir=/var/run/courier \ - --with-trashquota \ - --with-db=gdbm \ - --with-trashquota \ - --with-mailuser=courier --with-mailgroup=courier - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install - - # cleanup - provided by courier-maildrop - rm ${pkgdir}/usr/bin/{deliverquota,maildirmake} - rm ${pkgdir}/usr/share/man/man1/maildirmake* - rm ${pkgdir}/usr/share/man/man8/deliverquota* - find ${pkgdir} -name '*\.a' -exec -rm -f {} \; - ############################################################################### - # this is what usually "make install-configure" does - # *.dist files get rid of "dist" - for distfile in ${pkgdir}/etc/courier-imap/*.dist; do - mv ${distfile} ${pkgdir}/etc/courier-imap/$(basename ${distfile} .dist) - done - sed -i 's|TLS_CERTFILE=/usr/share/|TLS_CERTFILE=/etc/courier-imap/|' \ - ${pkgdir}/etc/courier-imap/*-ssl - for pamfile in imap/*.pam; do - sed -i "s|/lib/security/||;s|pam_pwdb|pam_unix|" ${pamfile} - install -Dm 644 ${pamfile} \ - ${pkgdir}/etc/pam.d/$(basename ${pamfile} .pam | sed "s/d$//") - done - # install thingies - install -D -m 755 ${srcdir}/courier-imap.rc.d ${pkgdir}/etc/rc.d/courier-imap - install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd - install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl - install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d - install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl - install -D -m 644 ${srcdir}/courier-imap.conf.d ${pkgdir}/etc/conf.d/courier-imap -} diff --git a/community/courier-imap/courier-imap.conf.d b/community/courier-imap/courier-imap.conf.d deleted file mode 100644 index 66049470d..000000000 --- a/community/courier-imap/courier-imap.conf.d +++ /dev/null @@ -1,18 +0,0 @@ -# -# Parameters to be passed to courier-imap -# -# -# Select the service you want started with courier-imap -# -# Available options : -# imapd pop3d imapd-ssl pop3d-ssl -# -CI_DAEMONS="imapd pop3d imapd-ssl pop3d-ssl" - -# If you want authdaemond to be automatically started and -# stopped by courier-imap, set this to "true" -AUTO_AUTHDAEMON="false" - -# Courier will start this many seconds after autodaemond if -# AUTO_AUTHDAEMON is set to "true" -AUTO_AUTHDAEMON_LAG=2 diff --git a/community/courier-imap/courier-imap.install b/community/courier-imap/courier-imap.install deleted file mode 100644 index 9046777a7..000000000 --- a/community/courier-imap/courier-imap.install +++ /dev/null @@ -1,16 +0,0 @@ -post_upgrade() { - echo "Please migrate to the new daemon format:" - echo "/etc/rc.d/courier-imap has been split into separate daemons:" - echo " imapd, imads-ssl, pop3d, pop3d-ssl" - echo "This elimates the need for /etc/conf.d/courier-imap" - echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure" - echo "you first start authdaemond before any other of these daemons." - echo "Example prior to this change:" - echo " DAEMONS=( ... courier-imap ...)" - echo "Example after this change:" - echo " DAEMONS=( ... authdaemond imapd imapd-ssl pop3d pop3d-ssl ... )" - echo "This allows better control over the daemons and will generate" - echo "correct entries in /run/daemons" - echo "An old configuration will keep working but please do migrate in time" - echo "as support for this will be removed some time in 2012." -} diff --git a/community/courier-imap/courier-imap.pam b/community/courier-imap/courier-imap.pam deleted file mode 100644 index fa52db541..000000000 --- a/community/courier-imap/courier-imap.pam +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so nullok -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so diff --git a/community/courier-imap/courier-imap.rc.d b/community/courier-imap/courier-imap.rc.d deleted file mode 100644 index 8876fe401..000000000 --- a/community/courier-imap/courier-imap.rc.d +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -CI_DAEMONS= -[ -f /etc/conf.d/courier-imap ] && . /etc/conf.d/courier-imap -[ -z $AUTO_AUTHDAEMON_LAG ] && AUTO_AUTHDAEMON_LAG=2 -[ -z $AUTO_AUTHDAEMON ] && AUTO_AUTHDAEMON="false" - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if [ "$AUTO_AUTHDAEMON" == "true" ]; then - /etc/rc.d/authdaemond start - sleep ${AUTO_AUTHDAEMON_LAG} - fi - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - for daemon in $CI_DAEMONS; do - stat_busy "Starting Courier ${daemon}" - /usr/lib/courier-imap/${daemon}.rc start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $daemon - stat_done - fi - done - ;; - stop) - for daemon in $CI_DAEMONS; do - stat_busy "Stopping Courier ${daemon}" - /usr/lib/courier-imap/$daemon.rc stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $daemon - stat_done - fi - done - if [ "$AUTO_AUTHDAEMON" == "true" ]; then - /etc/rc.d/authdaemond stop - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -~ -~ diff --git a/community/courier-imap/imapd-ssl.rc.d b/community/courier-imap/imapd-ssl.rc.d deleted file mode 100644 index 6730d452c..000000000 --- a/community/courier-imap/imapd-ssl.rc.d +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier imapd-ssl" - /usr/lib/courier-imap/imapd-ssl.rc start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon imapd-ssl - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier imapd-ssl" - /usr/lib/courier-imap/imapd-ssl.rc stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon imapd-ssl - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -~ -~ diff --git a/community/courier-imap/imapd.rc.d b/community/courier-imap/imapd.rc.d deleted file mode 100644 index 867b52b78..000000000 --- a/community/courier-imap/imapd.rc.d +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier imapd" - /usr/lib/courier-imap/imapd.rc start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon imapd - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier imapd" - /usr/lib/courier-imap/imapd.rc stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon imapd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -~ -~ diff --git a/community/courier-imap/pop3d-ssl.rc.d b/community/courier-imap/pop3d-ssl.rc.d deleted file mode 100644 index aab0f6a95..000000000 --- a/community/courier-imap/pop3d-ssl.rc.d +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier pop3d-ssl" - /usr/lib/courier-imap/pop3d-ssl.rc start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pop3d-ssl - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier pop3d-ssl" - /usr/lib/courier-imap/pop3d-ssl.rc stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon pop3d-ssl - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -~ -~ diff --git a/community/courier-imap/pop3d.rc.d b/community/courier-imap/pop3d.rc.d deleted file mode 100644 index 7b73c5a7a..000000000 --- a/community/courier-imap/pop3d.rc.d +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier pop3d" - /usr/lib/courier-imap/pop3d.rc start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pop3d - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier pop3d" - /usr/lib/courier-imap/pop3d.rc stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon pop3d - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -~ -~ diff --git a/community/courier-maildrop/PKGBUILD b/community/courier-maildrop/PKGBUILD deleted file mode 100644 index 3cf8dd0ee..000000000 --- a/community/courier-maildrop/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 57086 2009-10-31 13:13:36Z allan $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=courier-maildrop -_srcname=maildrop -pkgver=2.5.5 -pkgrel=2 -pkgdesc="mail delivery agent - procmail like but nicer syntax" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -url="http://courier-mta.org/maildrop/" -depends=('courier-authlib>=0.63.0' 'gamin' 'pcre' 'gdbm') -conflicts=('courier-mta') -options=(!libtool) -source=(http://downloads.sourceforge.net/project/courier/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.bz2) -md5sums=('5d71455ab26096ecf4f624fbee0320cb') - -build() { - cd ${srcdir}/${_srcname}-${pkgver} - - ./configure --prefix=/usr \ - --sysconfdir=/etc/courier \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --with-db=gdbm \ - --with-devel - make LDFLAGS+=-lstdc++ -} - -package() { - cd ${srcdir}/${_srcname}-${pkgver} - - make DESTDIR=${pkgdir} install - chmod u+s ${pkgdir}/usr/bin/maildrop - cd ${pkgdir}/usr/share/maildrop/html - for files in *; do - install -Dm644 ${files} ${pkgdir}/usr/share/htmldoc/${files} - done - rm -rf ${pkgdir}/usr/share/maildrop - - # docs say we can remove .a files after make - cd ${pkgdir} - find ${pkgdir} -name '*\.a' -exec rm -f {} \; -} diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD deleted file mode 100644 index fe66d5ad5..000000000 --- a/community/courier-mta/PKGBUILD +++ /dev/null @@ -1,145 +0,0 @@ -# $Id: PKGBUILD 71916 2012-06-03 14:33:16Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -# ----------- NOTE TO ALL USERS ------------ -# Go read http://www.courier-mta.org/install.html b4 running or building courier - -pkgname=courier-mta -pkgver=0.68.1 -pkgrel=1 -pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" -arch=(i686 x86_64 'mips64el') -license=('GPL2') -backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \ - 'etc/courier/imapd' 'etc/courier/imapd-ssl' \ - 'etc/courier/pop3d' 'etc/courier/pop3d-ssl' \ - 'etc/courier/courierd' 'etc/courier/sqwebmaild' \ - 'etc/courier/esmtpd' 'etc/courier/esmtpd-ssl' \ - 'etc/courier/esmtpd.cnf' 'etc/courier/esmtpd-msa' \ - 'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \ - 'etc/conf.d/courier-mta') -url="http://courier-mta.org" -depends=('courier-authlib>=0.63.0' 'gamin' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates') -optdepends=('libldap') -makedepends=('apache' 'pam' 'expect' 'gnupg' 'libldap' 'gamin') -provides=('smtp-server' 'smtp-forwarder' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop') -conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp') -options=('!libtool') -install=courier-mta.install -source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2 - courier.rc.d - courier-mta.rc.d - courier-mta.conf.d - esmtpd.rc.d - esmtpd-ssl.rc.d - esmtpd-msa.rc.d - imapd.rc.d - imapd-ssl.rc.d - pop3d.rc.d - pop3d-ssl.rc.d - webmaild.rc.d) -md5sums=('d894f57186933480e116350e7e0df8bc' - '9055ba622efd37603186ce1f37277224' - '5cbeb5c323706058e545f74ad7752ebe' - 'f3ff70b40c7a1f7a017e8c4cc4d92f4f' - 'caabce8c7b66296b602316aa5af5d4c5' - '1c8b1b66ebafa4ff09ffc0106a9dc82c' - 'dae6c7d5ff0cce0fba5729fedf2a9051' - 'd0cc5eab5d3e0ec33dadd0392421f63e' - '5873a96aa149edda281730010fb4db34' - 'faa09e06a5dc41ee89ab1f8fa6886b63' - '520501daa66c0a94f2e9844ce4919a09' - '33a93f400c3e87bcd207295b7d7333ca') - -# MIGRATION NOTE: -# In 2012, support for courier-mta.conf.d and courier-mta.rc.d will be removed. -# Remove those files and this note and also courier-mta.install - -build() { - cd ${srcdir}/courier-${pkgver} - - # fix a tiny bug - sed -i -e \ - 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ - configure && chmod 755 configure - - LDFLAGS+=",-L /usr/lib/courier-authlib -lcourierauth" - echo $LDFLAGS - # courier is more about configuring than compiling :-), lets start the mess - ./configure --prefix=/usr \ - --sysconfdir=/etc/courier \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var/spool/courier \ - --disable-root-check \ - --enable-unicode \ - --enable-workarounds-for-imap-client-bugs \ - --enable-mimetypes=/etc/mime.types \ - --with-piddir=/var/run/courier \ - --with-locking-method=lockf \ - --with-trashquota \ - --with-db=gdbm \ - --with-trashquota \ - --with-random=/dev/urandom --without-ispell \ - --with-mailuser=courier --with-mailgroup=courier \ - --with-certdb=/etc/ssl/certs/ - make -} - -package() { - cd ${srcdir}/courier-${pkgver} - - #chown mail.mail ${pkgdir}/var/spool/courier - make DESTDIR=${pkgdir} install - # docs say we can get rid of those after make - find ${pkgdir} -name '*\.a' -exec -rm -f {} \; - # install the perftest-script for testings - install -Dm755 courier/perftest1 ${pkgdir}/usr/lib/courier/perftest1 - ############################################################################### - # this is what usually "make install-configure" does - # *.dist files get rid of "dist" - for distfile in ${pkgdir}/etc/courier/*.dist; do - mv ${distfile} ${pkgdir}/etc/courier/$(basename ${distfile} .dist) - done - # install pam files according to the layout used in Archlinux - for pamfile in ${pkgdir}/etc/courier/*.authpam; do - sed -i 's|/lib/security/pam_pwdb\.so|pam_unix.so|' ${pamfile} - #echo "password required pam_unix.so" >> $pamfile - install -Dm 644 ${pamfile} \ - ${pkgdir}/etc/pam.d/$(basename ${pamfile} .authpam | sed "s/d$//") - rm -f ${pamfile} - done - - ############################################################################### - # Arch Linux specific tweaks to make things easier for the user - # create passwordfile for webadmin -> standard archwebadmin - sed -i 's|/etc/courier/webadmin/password|$(DESTDIR)/etc/courier/webadmin/password|g' Makefile - yes "archwebadmin" | make DESTDIR=${pkgdir} install-webadmin-password - # arch specific scripts - install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta - install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta - install -D -m 755 ${srcdir}/courier.rc.d ${pkgdir}/etc/rc.d/courier - install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd - install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl - install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d - install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl - install -D -m 755 ${srcdir}/esmtpd.rc.d ${pkgdir}/etc/rc.d/esmtpd - install -D -m 755 ${srcdir}/esmtpd-ssl.rc.d ${pkgdir}/etc/rc.d/esmtpd-ssl - install -D -m 755 ${srcdir}/esmtpd-msa.rc.d ${pkgdir}/etc/rc.d/esmtpd-msa - install -D -m 755 ${srcdir}/webmaild.rc.d ${pkgdir}/etc/rc.d/webmaild - #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \ - # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache - # bug http://bugs.archlinux.org/task/5154 - find ${pkgdir}/usr/lib -name '*\.a' -exec rm -f {} \; - # fixing some permissions - chown -R courier:courier ${pkgdir}/usr/lib/courier/modules - rm -r ${pkgdir}/var/run - #chown -R courier:courier ${pkgdir}/var/run/courier - chown root:root ${pkgdir}/usr/{.,bin,lib,sbin,share} - # make a link to /usr/sbin/sendmail - install -dm 755 ${pkgdir}/usr/sbin - cd ${pkgdir}/usr/sbin - ln -s ../bin/sendmail ./sendmail -} diff --git a/community/courier-mta/courier-mta.conf.d b/community/courier-mta/courier-mta.conf.d deleted file mode 100644 index 5856a5cda..000000000 --- a/community/courier-mta/courier-mta.conf.d +++ /dev/null @@ -1,18 +0,0 @@ -# -# Parameters to be passed to courier-imap -# -# -# Select the service you want started with courier-imap -# -# Available options : -# esmtpd imapd pop3d esmtpd-ssl imapd-ssl pop3d-ssl webmaild -# -CI_DAEMONS="courier esmtpd imapd pop3d" - -# If you want authdaemond to be automatically started and -# stopped by courier-imap, set this to "true" -AUTO_AUTHDAEMON="false" - -# Courier will start this many seconds after autodaemond if -# AUTO_AUTHDAEMON is set to "true" -AUTO_AUTHDAEMON_LAG=2 diff --git a/community/courier-mta/courier-mta.install b/community/courier-mta/courier-mta.install deleted file mode 100644 index b0d827e43..000000000 --- a/community/courier-mta/courier-mta.install +++ /dev/null @@ -1,61 +0,0 @@ -# arg 1: the new package version -post_install() { - cat << EOM - --> if you are using LDAP services to provide lookup in sqwebmail or aliases - --> then you have to install: - libldap -EOM - # create the *.dat files - makealiases - makesmtpaccess -} - -pre_upgrade() { - pre_remove $1 -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 - echo "Please migrate to the new daemon format:" - echo "/etc/rc.d/courier-imap has been split into separate daemons:" - echo " imapd, imapd-ssl, pop3d, pop3d-ssl" - echo "This elimates the need for /etc/conf.d/courier-imap" - echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure" - echo "you first start authdaemond before any other of these daemons." - echo "Example prior to this change:" - echo " DAEMONS=( ... courier-mta ...)" - echo "Example after this change:" - echo " DAEMONS=( ... authdaemond courier esmtpd esmtpd-ssl imapd imapd-ssl" - echo " pop3d pop3d-ssl webmaild ... )" - echo "This allows better control over the daemons and will generate" - echo "correct entries in /run/daemons" - echo "An old configuration will keep working but please do migrate in time" - echo "as support for this will be removed some time in 2012." -} - - -pre_remove() { - # manual backup, since courier is always processing the whole directory - # - so it would process "system" AND "system.pacsave" -> bad - [ ! -d /etc/courier/_backup ] && mkdir /etc/courier/_backup - cp /etc/courier/aliases/system /etc/courier/_backup/aliases.system - cp /etc/courier/smtpaccess/default /etc/courier/_backup/smtpaccess.default - cat << EOM - --> the /etc/courier/aliases/system and the /etc/courier/smtpaccess/default - --> files have been backed up to /etc/courier/_backup since the *.pacsave - --> files cannot stay in place. Read about couriers alias handling from the - --> documentation! -EOM -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - -op=$1 -shift - -$op $* diff --git a/community/courier-mta/courier-mta.rc.d b/community/courier-mta/courier-mta.rc.d deleted file mode 100644 index 416946a5a..000000000 --- a/community/courier-mta/courier-mta.rc.d +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/courier-mta ] && . /etc/conf.d/courier-mta -[ -z $AUTO_AUTHDAEMON_LAG ] && AUTO_AUTHDAEMON_LAG=2 -[ -z $AUTO_AUTHDAEMON ] && AUTO_AUTHDAEMON="false" - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if [ "$AUTO_AUTHDAEMON" == "true" ]; then - /etc/rc.d/authdaemond start - sleep ${AUTO_AUTHDAEMON_LAG} - fi - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - for daemon in $CI_DAEMONS; do - stat_busy "Starting Courier ${daemon}" - /usr/sbin/${daemon} start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $daemon - stat_done - fi - done - ;; - stop) - for daemon in $CI_DAEMONS; do - stat_busy "Stopping Courier ${daemon}" - /usr/sbin/${daemon} stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $daemon - stat_done - fi - done - if [ "$AUTO_AUTHDAEMON" == "true" ]; then - /etc/rc.d/authdaemond stop - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/courier-mta/courier-webmail-cleancache.cron.hourly b/community/courier-mta/courier-webmail-cleancache.cron.hourly deleted file mode 100644 index 6c541321e..000000000 --- a/community/courier-mta/courier-webmail-cleancache.cron.hourly +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# Cleans the cache of the sqwebmail server -if [ -x /usr/share/sqwebmail/cleancache.pl ]; then - su -c "/usr/share/sqwebmail/cleancache.pl" bin -fi diff --git a/community/courier-mta/courier.rc.d b/community/courier-mta/courier.rc.d deleted file mode 100644 index 7c581a24a..000000000 --- a/community/courier-mta/courier.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier daemon" - /usr/sbin/courier start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon courier - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier daemon" - /usr/sbin/courier stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon courier - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/courier-mta/esmtpd-msa.rc.d b/community/courier-mta/esmtpd-msa.rc.d deleted file mode 100644 index 31458aca8..000000000 --- a/community/courier-mta/esmtpd-msa.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier esmtpd-msa" - /usr/sbin/esmtpd-msa start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon esmtpd-msa - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier esmtpd-msa" - /usr/sbin/esmtpd-msa stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon esmtpd-msa - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/courier-mta/esmtpd-ssl.rc.d b/community/courier-mta/esmtpd-ssl.rc.d deleted file mode 100644 index 2a13be03f..000000000 --- a/community/courier-mta/esmtpd-ssl.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier esmtpd-ssl" - /usr/sbin/esmtpd-ssl start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon esmtpd-ssl - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier esmtpd-ssl" - /usr/sbin/esmtpd-ssl stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon esmtpd-ssl - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/courier-mta/esmtpd.rc.d b/community/courier-mta/esmtpd.rc.d deleted file mode 100644 index dbaa9d680..000000000 --- a/community/courier-mta/esmtpd.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier esmtpd" - /usr/sbin/esmtpd start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon esmtpd - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier esmtpd" - /usr/sbin/esmtpd stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon esmtpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/courier-mta/imapd-ssl.rc.d b/community/courier-mta/imapd-ssl.rc.d deleted file mode 100644 index 3dc74cfdf..000000000 --- a/community/courier-mta/imapd-ssl.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier imapd-ssl" - /usr/sbin/imapd-ssl start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon imapd-ssl - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier imapd-ssl" - /usr/sbin/imapd-ssl stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon imapd-ssl - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/courier-mta/imapd.rc.d b/community/courier-mta/imapd.rc.d deleted file mode 100644 index 8bce59f6c..000000000 --- a/community/courier-mta/imapd.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier imapd" - /usr/sbin/imapd start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon imapd - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier imapd" - /usr/sbin/imapd stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon imapd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/courier-mta/pop3d-ssl.rc.d b/community/courier-mta/pop3d-ssl.rc.d deleted file mode 100644 index 6e7ae4e12..000000000 --- a/community/courier-mta/pop3d-ssl.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier pop3d-ssl" - /usr/sbin/pop3d-ssl start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pop3d-ssl - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier pop3d-ssl" - /usr/sbin/pop3d-ssl stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon pop3d-ssl - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/courier-mta/pop3d.rc.d b/community/courier-mta/pop3d.rc.d deleted file mode 100644 index 25f8379ba..000000000 --- a/community/courier-mta/pop3d.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier pop3d" - /usr/sbin/pop3d start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pop3d - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier pop3d" - /usr/sbin/pop3d stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon pop3d - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/courier-mta/webmaild.rc.d b/community/courier-mta/webmaild.rc.d deleted file mode 100644 index 835cc2bf0..000000000 --- a/community/courier-mta/webmaild.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if ck_daemon authdaemond; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - - stat_busy "Starting Courier webmaild" - /usr/sbin/webmaild start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon webmaild - stat_done - fi - ;; - stop) - stat_busy "Stopping Courier webmaild" - /usr/sbin/webmaild stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon webmaild - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index 295f3948f..d3ada24cd 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 76074 2012-09-10 20:04:41Z stephane $ +# $Id: PKGBUILD 79443 2012-11-05 16:58:53Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=cppcheck -pkgver=1.56 +pkgver=1.57 pkgrel=1 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('pcre' 'qt') makedepends=('docbook-xsl') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('63999e1a492f73408fcad87b4bef3c2775feb7e5') +sha1sums=('4753472689fdcb4276fde55e6e984597c87921bd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/credentials-preferences/PKGBUILD b/community/credentials-preferences/PKGBUILD new file mode 100644 index 000000000..18a7bf61e --- /dev/null +++ b/community/credentials-preferences/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 79485 2012-11-06 04:10:55Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=credentials-preferences +_pkgname=credentials-control-center +pkgver=0.1.1 +pkgrel=1 +pkgdesc="Control panel for configuring online account credentials and settings" +arch=('i686' 'x86_64' 'mips64el') +url="https://launchpad.net/online-accounts-gnome-control-center" +license=('GPL' 'LGPL') +depends=('libaccounts-glib' 'libsignon-glib' 'gtk3') +makedepends=('gobject-introspection' 'vala' 'intltool' 'itstool') +options=('!libtool') +install=$pkgname.install +source=(https://launchpad.net/online-accounts-gnome-control-center/13.04/$pkgver/+download/$_pkgname-$pkgver.tar.bz2 + http://pkgbuild.com/~bgyorgy/sources/$_pkgname-translations-20121018.tar.gz) +md5sums=('4e42fb2350393c6f8661e38f07d0b765' + '702d6b39136e10ba6dfad0afd300b2af') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + # Install language files + echo 'af ar ast bn bs ca cy cs da de el en_AU en_GB eo es eu fa fi fr gd gl gu he hu it ja ko lt lv ms my nb nl oc pl pt pt_BR ro ru se sk sl sq sv tr ug uk vi zh_CN zh_HK zh_TW' >po/LINGUAS + rename $_pkgname- '' ../po/$_pkgname-*.po + mv -f -t po ../po/* + + # Fix desktop file + sed -i 's/X-GNOME-Settings-Panel;//' data/credentials-preferences.desktop.in.in + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ + --disable-static + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/community/credentials-preferences/credentials-preferences.install b/community/credentials-preferences/credentials-preferences.install new file mode 100644 index 000000000..2c455e952 --- /dev/null +++ b/community/credentials-preferences/credentials-preferences.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/critter/PKGBUILD b/community/critter/PKGBUILD index 3faa94ab4..261ae0239 100644 --- a/community/critter/PKGBUILD +++ b/community/critter/PKGBUILD @@ -1,16 +1,18 @@ -# $Id: PKGBUILD 63520 2012-02-05 11:53:03Z ibiru $ +# $Id: PKGBUILD 78732 2012-10-23 20:20:15Z lcarlier $ +# Maintainer: Laurent Carlier <Lordheavym@gmail.com> # Contributor: Allan McRae <mcrae_allan@hotmail.com> -# Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us> +# Contributor: Daniel J Griffiths <griffithsdj@archlinux.us> pkgname=critter _origname=CriticalMass pkgver=1.0.2 -pkgrel=6 +pkgrel=7 pkgdesc="Critical Mass (aka Critter) is an SDL/OpenGL space shoot'em up game" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/criticalmass" license=('GPL') -depends=('sdl_image' 'sdl_mixer' 'mesa') +depends=('sdl_image' 'sdl_mixer' 'libgl') +makedepends=('mesa') source=(http://downloads.sourceforge.net/sourceforge/criticalmass/$_origname-${pkgver}.tar.bz2 critter-gcc43.patch criticalmass-1.0.2-libpng15.patch diff --git a/community/cuda/PKGBUILD b/community/cuda/PKGBUILD new file mode 100644 index 000000000..5ff98a12d --- /dev/null +++ b/community/cuda/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 69719 2012-04-23 02:56:20Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +pkgname=cuda +pkgver=5.0.35 +pkgrel=3 +pkgdesc="NVIDIA's GPU programming toolkit" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/object/cuda_home.html" +license=('custom') +depends=('gcc-libs' 'opencl-nvidia') +replaces=('cuda-toolkit' 'cuda-sdk') +provides=('cuda-toolkit' 'cuda-sdk') +optdepends=('gdb: for cuda-gdb') +options=(!strip) +if [ "$CARCH" = "i686" ]; then + _arch=32 + md5sums=('40c514acb750902c54656b97a6deded6' + '7e5990e03eea90075f5a500e91a0c3d3' + 'ffe1e6fb7f97b23da28fd94a5fd7356d') +else + _arch=64 + md5sums=('df796fb9ab66075b5c346b3fd0bf596b' + '7e5990e03eea90075f5a500e91a0c3d3' + 'ffe1e6fb7f97b23da28fd94a5fd7356d') +fi +install=cuda.install +source=(http://developer.download.nvidia.com/compute/cuda/5_0/rel-update-1/installers/cuda_${pkgver}_linux_${_arch}_fedora16-1.run + cuda.sh + cuda.conf) + +build() { + cd "$srcdir" +} + +package() { + sh cuda_${pkgver}_linux_${_arch}_fedora16-1.run -toolkitpath=$PWD -samplespath=$PWD -extract=$srcdir + ./cudatoolkit_${pkgver}_linux_${_arch}_fedora16.run -prefix=$pkgdir/opt/cuda -noprompt + ./cuda-samples_${pkgver}_linux.run -cudaprefix=$pkgdir/opt/cuda -prefix=$pkgdir/opt/cuda/samples -noprompt + + # allow gcc 4.7 to work + sed -i "/unsupported GNU/d" $pkgdir/opt/cuda/include/host_config.h + + # fix nvidia path fuckup + sed -i "s|/build/pkg||g" $pkgdir/opt/cuda/bin/nvvp + sed -i "s|/build/pkg||g" $pkgdir/opt/cuda/bin/nsight + + install -Dm755 $srcdir/cuda.sh $pkgdir/etc/profile.d/cuda.sh + install -Dm644 $srcdir/cuda.conf $pkgdir/etc/ld.so.conf.d/cuda.conf + install -Dm644 $pkgdir/opt/cuda/doc/EULA.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE + + # correct cuda path in samples + cd $pkgdir/opt/cuda/samples + find . -type f | egrep -v '(ppm|pgm)' | xargs grep -lI "$pkgdir/opt/cuda" | xargs sed -i "s|$pkgdir/opt/cuda|/opt/cuda|g" + + # make cuda-gdk work + mkdir -p $pkgdir/usr/lib + cd $pkgdir/usr/lib + ln -s /usr/lib/libncurses.so.5 libtinfo.so.5 +} diff --git a/community/cuda/cuda.conf b/community/cuda/cuda.conf new file mode 100644 index 000000000..6161bb0da --- /dev/null +++ b/community/cuda/cuda.conf @@ -0,0 +1,2 @@ +/opt/cuda/lib64 +/opt/cuda/lib diff --git a/community/cuda/cuda.install b/community/cuda/cuda.install new file mode 100644 index 000000000..fb341b1dd --- /dev/null +++ b/community/cuda/cuda.install @@ -0,0 +1,11 @@ +post_install() { + echo "The cuda binaries are in /opt/cuda/bin" + echo "The cuda samples are in /opt/cuda/samples" + echo "The cuda docs are in /opt/cuda/doc" + echo "You need to relogin in order for the cuda binaries to appear in your PATH" + post_upgrade +} + +post_upgrade() { + ldconfig -r . +} diff --git a/community/cuda/cuda.sh b/community/cuda/cuda.sh new file mode 100644 index 000000000..6de59ddd5 --- /dev/null +++ b/community/cuda/cuda.sh @@ -0,0 +1 @@ +export PATH=$PATH:/opt/cuda/bin diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD index 606685173..17fe36d11 100644 --- a/community/cuneiform/PKGBUILD +++ b/community/cuneiform/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55513 2011-09-13 21:33:06Z ebelanger $ +# $Id: PKGBUILD 78925 2012-10-27 23:44:06Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Maxim Vuets <maxim.vuets@gmail.com> pkgname=cuneiform pkgver=1.1.0 _dpkgver=1.1 -pkgrel=2 +pkgrel=4 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/cuneiform-linux" diff --git a/community/cupsddk/PKGBUILD b/community/cupsddk/PKGBUILD deleted file mode 100644 index 33d220f28..000000000 --- a/community/cupsddk/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 65096 2012-02-20 03:38:12Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Georg Grabler (STiAT) <ggrabler@gmail.com> -# Contributor: Georg Grabler (STiAT) <ggrabler@gmail.com> - -pkgname=cupsddk -pkgver=1.2.3 -pkgrel=4 -pkgdesc="CUPSD Development Kit" -url="http://cups.org" -license=("GPL") -depends=('libcups') -makedepends=('libcups' 'cups') -arch=('i686' 'x86_64' 'mips64el') -options=('!emptydirs') -source=(http://ftp.easysw.com/pub/cupsddk/$pkgver/$pkgname-$pkgver-source.tar.bz2) -md5sums=('3ec52813bf12bf9b34d34f8a81bab508') - -build() { - cd $srcdir/$pkgname-$pkgver - - ./configure --prefix=/usr - sed -i '1,1i#include <cups/ppd.h>' ppdc/ppdmerge.cxx - sed -i 's|mkdir images|mkdir -p images|' cups/Makefile* - make - make bindir=$pkgdir/usr/bin \ - datadir=$pkgdir/usr/share \ - docdir=$pkgdir/usr/share/cupsddk \ - mandir=$pkgdir/usr/share/man \ - prefix=$pkgdir/usr \ - CUPS_DATADIR=$pkgdir/`cups-config --datadir` \ - CUPS_SERVERBIN=$pkgdir/`cups-config --serverbin` \ - install - - rm -f $pkgdir/usr/include/cups/driver.h - rm -f $pkgdir/usr/bin/ppdc - rm -f $pkgdir/usr/bin/ppdhtml - rm -f $pkgdir/usr/bin/ppdi - rm -f $pkgdir/usr/bin/ppdmerge - rm -f $pkgdir/usr/bin/ppdpo - rm -f $pkgdir/usr/lib/cups/filter/commandtoescpx - rm -f $pkgdir/usr/lib/cups/filter/commandtopclx - rm -f $pkgdir/usr/lib/cups/filter/rastertoescpx - rm -f $pkgdir/usr/lib/cups/filter/rastertopclx - rm -f $pkgdir/usr/share/man/man1/ppdc.1.gz - rm -f $pkgdir/usr/share/man/man1/ppdhtml.1.gz - rm -f $pkgdir/usr/share/man/man1/ppdi.1.gz - rm -f $pkgdir/usr/share/man/man1/ppdmerge.1.gz - rm -f $pkgdir/usr/share/man/man1/ppdpo.1.gz - rm -f $pkgdir/usr/share/man/man5/ppdcfile.5.gz -} diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index fb1e47a47..886d4796e 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 78181 2012-10-17 10:23:17Z allan $ +# $Id: PKGBUILD 79427 2012-11-04 20:20:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Igor Scabini <furester @ gmail.com> pkgname=('cython' 'cython2') pkgbase=cython -pkgver=0.17 -pkgrel=2 +pkgver=0.17.1 +pkgrel=1 pkgdesc="C-Extensions for Python " arch=(i686 x86_64 'mips64el') url="http://www.cython.org" license=('APACHE') makedepends=('python-distribute' 'python2-distribute') source=("http://cython.org/release/Cython-$pkgver.tar.gz") -md5sums=('d6b669956b25babf7dd86db0a98539e4') +md5sums=('f0bd2494dbe080a1185b61fa358135f2') build() { true diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD index 7907f5fd7..0bc260b77 100644 --- a/community/dante/PKGBUILD +++ b/community/dante/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78352 2012-10-17 15:16:38Z spupykin $ +# $Id: PKGBUILD 79500 2012-11-06 11:18:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=dante pkgver=1.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="SOCKS v4 and v5 compatible proxy server and client" url="http://www.inet.no/dante" arch=(i686 x86_64 'mips64el') @@ -18,7 +18,7 @@ source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz sockd.service) md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd' '5110dfd78a2b38fff27a886ee88b58a6' - '41f1ca885e2383d9db0c29bb7904de65') + 'ceb86b5bd97f7e3ceff28c6e6172a25b') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/dante/sockd.service b/community/dante/sockd.service index 6a18a8b0a..a2a964304 100644 --- a/community/dante/sockd.service +++ b/community/dante/sockd.service @@ -1,11 +1,12 @@ [Unit] Description=SOCKS v4 and v5 compatible proxy server and client +After=network.target [Service] Type=forking EnvironmentFile=/etc/conf.d/sockd.conf PIDFile=/var/run/sockd.pid -ExecStart=sockd $SOCKD_OPTS +ExecStart=/usr/sbin/sockd $SOCKD_OPTS [Install] WantedBy=multi-user.target diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD index a1fc00314..93e4f2578 100644 --- a/community/darkstat/PKGBUILD +++ b/community/darkstat/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 78362 2012-10-17 15:24:25Z spupykin $ +# $Id: PKGBUILD 79547 2012-11-07 09:14:43Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=darkstat pkgver=3.0.715 -pkgrel=3 +pkgrel=7 pkgdesc="Network statistics gatherer (packet sniffer)" url="http://dmr.ath.cx/net/darkstat/" license=("GPL") arch=(i686 x86_64 'mips64el') depends=('libpcap' 'zlib' 'gcc-libs') +backup=('etc/conf.d/darkstat.conf') source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2 darkstat darkstat.service @@ -16,8 +17,9 @@ source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2 install=darkstat.install md5sums=('5b7abc7538dcd8e30667dac150e81d77' '1021f95fabe16cfab4c95f6264d535e5' - 'd22a09fa1f66b2b1afb8521ceea693d6' + 'e2d9efc856201146e2abae145b4c5a1f' 'aa9a9effd1e8f08860afcd6439fc94c5') +options=(!makeflags !distcc) build() { cd $srcdir/darkstat-$pkgver diff --git a/community/darkstat/darkstat.install b/community/darkstat/darkstat.install index fa0ccea48..246bfd808 100644 --- a/community/darkstat/darkstat.install +++ b/community/darkstat/darkstat.install @@ -1,19 +1,20 @@ daemon_name=darkstat -daemon_chroot=/var/"$daemon_name" +daemon_chroot=var/darkstat post_install() { if [ ! -d "$daemon_chroot" ]; then install -d "$daemon_chroot" + touch "$daemon_chroot/darkstat.dat" fi - /usr/sbin/useradd \ + useradd \ --system \ - --home "$daemon_chroot" \ + --home /"$daemon_chroot" \ --shell /bin/false \ --no-user-group \ --gid nobody "$daemon_name" - chown -R "$daemon_name":nobody "$daemon_chroot" + chown -R "$daemon_name":nobody "/$daemon_chroot" } post_remove() { - /usr/sbin/userdel "$daemon_name" + userdel "$daemon_name" } diff --git a/community/darkstat/darkstat.service b/community/darkstat/darkstat.service index 5e303411f..5b7180e45 100644 --- a/community/darkstat/darkstat.service +++ b/community/darkstat/darkstat.service @@ -2,14 +2,15 @@ Description=Network statistics gatherer (packet sniffer) [Service] -User=couchdb -Type=forking +Type=simple EnvironmentFile=/etc/conf.d/darkstat.conf PIDFile=/var/darkstat/darkstat.pid ExecStart=/usr/sbin/darkstat --user "darkstat" --chroot "/var/darkstat" \ --import "darkstat.dat" --export "darkstat.dat" \ --pidfile /var/darkstat/darkstat.pid \ + -b 0.0.0.0 \ -i "$DARKSTAT_IFACE" $DARKSTAT_ARGS +ExecStopPost=/bin/rm -f /var/darkstat/darkstat.pid [Install] WantedBy=multi-user.target diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 4c1487dfd..799e98e20 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 77602 2012-10-13 07:54:00Z ebelanger $ +# $Id: PKGBUILD 80581 2012-11-26 09:25:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.0.5 -_pkgver=1.0 -pkgrel=3 +pkgver=1.1 +_pkgver=1.1 +pkgrel=1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ license=('GPL3') depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' - 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite') + 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite' 'libxslt') makedepends=('intltool>=0.40' 'cmake' 'librsvg') # 'gnome-doc-utils' 'libxslt' 'fop') optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) -md5sums=('9ad88a1a6b9761fce28c8073d8f47941') +md5sums=('1b399636a0386f2167521a0d30c29032') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/dates/0001-Fix-FTBFS-with-newer-GCC.patch b/community/dates/0001-Fix-FTBFS-with-newer-GCC.patch deleted file mode 100644 index 674ec2395..000000000 --- a/community/dates/0001-Fix-FTBFS-with-newer-GCC.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f3e8719489fc5db5ae87dd03d39aad176d65762f Mon Sep 17 00:00:00 2001 -From: Paul Wise <pabs3@bonedaddy.net> -Date: Fri, 29 Apr 2011 13:10:15 +0800 -Subject: [PATCH] Fix FTBFS with newer GCC - ---- - configure.ac | 2 +- - src/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7f009d9..0181292 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -17,7 +17,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) - AC_SUBST(GETTEXT_PACKAGE) - AM_GLIB_GNU_GETTEXT - --PKG_CHECK_MODULES(DATES, glib-2.0 gtk+-2.0 libecal-1.2 gconf-2.0) -+PKG_CHECK_MODULES(DATES, glib-2.0 gtk+-2.0 libecal-1.2 gconf-2.0 pango) - - PKG_CHECK_MODULES(GTK, gtk+-2.0) - AC_SUBST(GTK_CFLAGS) -diff --git a/src/Makefile.am b/src/Makefile.am -index 90c7049..3bb4f32 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -35,7 +35,7 @@ dates_SOURCES = $(platform) \ - gconf-bridge.h \ - gconf-bridge.c - --dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -+dates_LDADD = libgtkdatesview.la -lm $(DATES_LIBS) - - if USE_OWL - dates_LDADD += $(top_builddir)/libowl/libowl.la --- -1.7.4.4 - diff --git a/community/dates/0001-Fix-Makefile-whitespace.patch b/community/dates/0001-Fix-Makefile-whitespace.patch deleted file mode 100644 index 9feda3915..000000000 --- a/community/dates/0001-Fix-Makefile-whitespace.patch +++ /dev/null @@ -1,20 +0,0 @@ -From bc98e2896682ac831cd27142c7e76fe0f8280bee Mon Sep 17 00:00:00 2001 -From: Joshua Lock <josh@linux.intel.com> -Date: Wed, 15 Dec 2010 14:07:50 +0000 -Subject: Fix Makefile whitespace for the new improved strict make 3.82 - -Signed-off-by: Joshua Lock <josh@linux.intel.com> ---- -diff --git a/Makefile.am b/Makefile.am -index e8a3c7f..51b4f1d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -7,5 +7,5 @@ DISTCLEANFILES = intltool-extract intltool-merge intltool-update - MAINTAINERCLEANFILES = $(DISTCLEANFILES) aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing - - snapshot: -- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` -+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` - --- -cgit v0.9.0.2 diff --git a/community/dates/0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch b/community/dates/0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch deleted file mode 100644 index e7fce46f3..000000000 --- a/community/dates/0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 7771e0b3d75b4ba04756d6c6ffc03d644df2db5f Mon Sep 17 00:00:00 2001 -From: Lucas Hermann Negri <lucashnegri@gmail.com> -Date: Wed, 13 Oct 2010 18:49:20 -0300 -Subject: [PATCH] Replaced the calls to the deprecated functions e_source_{set,get}_color - with the new API (e_source_{set,peek}_color_spec). - ---- - src/dates_gtk.c | 40 ++++++++++++---------------------------- - src/dates_main.c | 2 +- - src/dates_view.c | 10 ++++------ - 3 files changed, 17 insertions(+), 35 deletions(-) - -diff --git a/src/dates_gtk.c b/src/dates_gtk.c -index 78e71bb..403bc25 100644 ---- a/src/dates_gtk.c -+++ b/src/dates_gtk.c -@@ -1016,7 +1016,6 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) - GtkTreeIter iter; - GError *error = NULL; - const gchar *relative_uri; -- guint32 new_colour; - - #ifdef WITH_HILDON - GdkColor *hildon_color; -@@ -1055,7 +1054,8 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) - source = e_source_new (name, relative_uri); - - #ifdef USE_OWL -- new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); -+ guint32 new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); -+ e_source_set_color (source, new_colour); - #else - - #ifdef WITH_HILDON -@@ -1063,17 +1063,11 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) - #else - gtk_color_button_get_color (GTK_COLOR_BUTTON(color_button), &colour); - #endif -- new_colour = (guint8)(colour.red >> 8); -- new_colour <<= 8; -- new_colour |= (guint8)(colour.green >> 8); -- new_colour <<= 8; -- new_colour |= (guint8)(colour.blue >> 8); -- new_colour <<= 8; -+ gchar *n_color = gdk_color_to_string (&colour); -+ e_source_set_color_spec (source, n_color); -+ g_free(n_color); - #endif - -- /* Set the colour */ -- e_source_set_color (source, new_colour); -- - /* Set the group for the source */ - e_source_set_group (source, group); - e_source_group_add_source (group, source, 0); -@@ -1169,7 +1163,6 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) - ESourceGroup *group; - - GdkColor colour; -- guint32 raw_colour; - - const gchar *name = NULL; - const gchar *uri = NULL; -@@ -1335,12 +1328,8 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - - /* Get the colour from the the source */ -- e_source_get_color (source, &raw_colour); -- -- /* Munge this into something usable */ -- colour.red = (guint16)(((raw_colour & 0xff0000) >> 16) << 8); -- colour.green = (guint16)(((raw_colour & 0xff00) >> 8) << 8); -- colour.blue = (guint16)(((raw_colour & 0xff) << 8)); -+ const gchar* spec = e_source_peek_color_spec(source); -+ gdk_color_parse(spec, &colour); - - /* Now we need to allocate the colour */ - gdk_colormap_alloc_color (gdk_colormap_get_system (), &colour, TRUE, TRUE); -@@ -1440,26 +1429,21 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) - * Next we need to pack the GDK colour into guint32 - * for eds - */ -- guint32 new_colour = 0; - - GError *error = NULL; - #ifdef USE_OWL -- new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); -+ guint32 new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); -+ e_source_set_color (source, new_colour); - #else - #ifdef WITH_HILDON - hildon_color_button_get_color (HILDON_COLOR_BUTTON(color_button), &colour); - #else - gtk_color_button_get_color (GTK_COLOR_BUTTON(color_button), &colour); - #endif -- new_colour = (guint8)(colour.red >> 8); -- new_colour <<= 8; -- new_colour |= (guint8)(colour.green >> 8); -- new_colour <<= 8; -- new_colour |= (guint8)(colour.blue >> 8); -- new_colour <<= 8; -+ gchar *n_color = gdk_color_to_string (&colour); -+ e_source_set_color_spec (source, n_color); -+ g_free(n_color); - #endif -- /* Update the colour */ -- e_source_set_color (source, new_colour); - - /* And the name */ - e_source_set_name (source, (gtk_entry_get_text (GTK_ENTRY (name_entry)))); -diff --git a/src/dates_main.c b/src/dates_main.c -index ce05fe8..1f7770d 100644 ---- a/src/dates_main.c -+++ b/src/dates_main.c -@@ -112,7 +112,7 @@ dates_load_calendars (DatesData *d) - system_source = e_source_new (_("Personal"), "system"); - - /* Default Evolution colour */ -- e_source_set_color (system_source, 0xBECEDD); -+ e_source_set_color_spec (system_source, "#BECEDD"); - - /* Set the group for the source and put it in the group */ - e_source_set_group (system_source, local_group); -diff --git a/src/dates_view.c b/src/dates_view.c -index d65db2f..9d28a15 100644 ---- a/src/dates_view.c -+++ b/src/dates_view.c -@@ -4846,7 +4846,6 @@ dates_view_add_calendar (DatesView *view, ECal *ecal) - DatesViewPrivate *priv = DATES_VIEW_GET_PRIVATE (view); - DatesViewCalendar *cal; - ESource *source; -- guint32 colour; - /* GError *error = NULL;*/ - - g_return_if_fail (E_IS_CAL (ecal)); -@@ -4876,12 +4875,11 @@ dates_view_add_calendar (DatesView *view, ECal *ecal) - cal->text_gc = gdk_gc_new ( - GDK_DRAWABLE (priv->main->window)); - -- if (e_source_get_color (source, &colour)) { -+ const gchar* spec = e_source_peek_color_spec (source); -+ if (spec) { - GdkColor gcolour, dgcolour, tgcolour; -- gcolour.red = ((colour & 0xFF0000) >> 16) * 0x101; -- gcolour.green = ((colour & 0xFF00) >> 8) * 0x101; -- gcolour.blue = (colour & 0xFF) * 0x101; -- -+ gdk_color_parse(spec, &gcolour); -+ - /* This is simplified sRGB -> LAB conversion; we do not need it - * entirely precise, as we are only going to chose between - * black or white text based on the L value. --- -1.7.3.1 - diff --git a/community/dates/PKGBUILD b/community/dates/PKGBUILD deleted file mode 100644 index be21590ff..000000000 --- a/community/dates/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 69802 2012-04-23 09:46:41Z ibiru $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=dates -pkgver=0.4.11 -pkgrel=5 -pkgdesc="Small, lightweight GTK+ calendar app" -arch=('i686' 'x86_64' 'mips64el') -url="http://pimlico-project.org/dates.html" -license=('GPL') -depends=('gtk2' 'evolution-data-server' 'xdg-utils') -makedepends=('intltool') -options=('!emptydirs') -install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 - 0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch - 0001-Fix-Makefile-whitespace.patch - 0001-Fix-FTBFS-with-newer-GCC.patch) -sha256sums=('60b0cfe1fa6dee684e255c2a0cd02febafb9d16607ba4b05196e983cd8012c03' - '88ab8de4861253be1a8db1be4432f71307fcffa376be95e9495cff021b7ead62' - 'fc20f51200a78c74881b98f2b2ea9c3ba01f09393fcc2cf38ecab78ee54f4bb4' - '0e32c4d9ac4c604330bf8672e47e44c710ae56d9f6dc496e736166c536a4787e') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch" - patch -Np1 -i "$srcdir/0001-Fix-Makefile-whitespace.patch" - patch -Np1 -i "$srcdir/0001-Fix-FTBFS-with-newer-GCC.patch" - - autoreconf -fi - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-owl - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 4b6809042..aab40ea7e 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77106 2012-10-05 10:14:22Z spupykin $ +# $Id: PKGBUILD 79734 2012-11-11 19:36:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.0.2 -pkgrel=5 +pkgrel=7 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64' 'mips64el') depends=('gmime24' 'libzdb' 'mhash' 'libevent') @@ -19,11 +19,10 @@ url="http://www.dbmail.org" license=('GPL') options=('!libtool' 'zipman') backup=(etc/conf.d/dbmail) -conflicts=('dbmail') -provides=('dbmail') source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz dbmail.conf.d dbmail.rc.d + dbmail.tmpfiles dbmail-imapd.service dbmail-lmtpd.service dbmail-pop3d.service @@ -31,10 +30,11 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz md5sums=('eb32235abffdf967253ee9d004e0e4a9' 'e7f72bc360decdb2475266391ad12329' '30774513fb016b9da08e9cf6f2a0b8e7' - '845b8bfe40864c366f7ab69768d1faa2' - '81a59222a43ae89f59299fe798b8e072' - '2e9a9a56ae56218142a115bff3f9a272' - 'd1fb94edb272d2a717af1944ecfd7fce') + 'c4b5793c5422b62a675d4c66ff7e9300' + '84efa46eaac66057c4eb131d9bc27fa8' + '19560277f6a56d1f3f2fdb02315dcf0f' + '89a0f793737eaf36291409f8c840891e' + 'dd1b5b2c542f55d9d934a58a36d0513d') build() { cd $srcdir/dbmail-${pkgver/_/-}/ @@ -60,4 +60,5 @@ package() { install -Dm0644 $srcdir/dbmail-lmtpd.service $pkgdir/usr/lib/systemd/system/dbmail-lmtpd.service install -Dm0644 $srcdir/dbmail-pop3d.service $pkgdir/usr/lib/systemd/system/dbmail-pop3d.service install -Dm0644 $srcdir/dbmail-timsieved.service $pkgdir/usr/lib/systemd/system/dbmail-timsieved.service + install -Dm0644 $srcdir/dbmail.tmpfiles $pkgdir/usr/lib/tmpfiles.d/dbmail.conf } diff --git a/community/dbmail/dbmail-imapd.service b/community/dbmail/dbmail-imapd.service index 110bbbdc4..e67e0c4e8 100644 --- a/community/dbmail/dbmail-imapd.service +++ b/community/dbmail/dbmail-imapd.service @@ -4,7 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service [Service] Type=forking -ExecStart=/usr/sbin/dbmail-imapd +PIDFile=/var/run/dbmail/dbmail-imapd.pid +ExecStart=/usr/sbin/dbmail-imapd -p /var/run/dbmail/dbmail-imapd.pid [Install] WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-lmtpd.service b/community/dbmail/dbmail-lmtpd.service index e531b2e3e..2a059a15c 100644 --- a/community/dbmail/dbmail-lmtpd.service +++ b/community/dbmail/dbmail-lmtpd.service @@ -4,7 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service [Service] Type=forking -ExecStart=/usr/sbin/dbmail-lmtpd +PIDFile=/var/run/dbmail/dbmail-lmtpd.pid +ExecStart=/usr/sbin/dbmail-lmtpd -p /var/run/dbmail/dbmail-lmtpd.pid [Install] WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-pop3d.service b/community/dbmail/dbmail-pop3d.service index eacef4459..907f43b2b 100644 --- a/community/dbmail/dbmail-pop3d.service +++ b/community/dbmail/dbmail-pop3d.service @@ -4,7 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service [Service] Type=forking -ExecStart=/usr/sbin/dbmail-pop3d +PIDFile=/var/run/dbmail/dbmail-pop3d.pid +ExecStart=/usr/sbin/dbmail-pop3d -p /var/run/dbmail/dbmail-pop3d.pid [Install] WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-timsieved.service b/community/dbmail/dbmail-timsieved.service index 847b69580..7f34bacec 100644 --- a/community/dbmail/dbmail-timsieved.service +++ b/community/dbmail/dbmail-timsieved.service @@ -4,7 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service [Service] Type=forking -ExecStart=/usr/sbin/dbmail-timsieved +PIDFile=/var/run/dbmail/dbmail-timsieved.pid +ExecStart=/usr/sbin/dbmail-timsieved -p /var/run/dbmail/dbmail-timsieved.pid [Install] WantedBy=multi-user.target diff --git a/community/dbmail/dbmail.tmpfiles b/community/dbmail/dbmail.tmpfiles new file mode 100644 index 000000000..4b97c91f5 --- /dev/null +++ b/community/dbmail/dbmail.tmpfiles @@ -0,0 +1 @@ +d /run/dbmail 0755 nobody nobody - diff --git a/community/dcron/PKGBUILD b/community/dcron/PKGBUILD index 6d9107715..03c03a08c 100644 --- a/community/dcron/PKGBUILD +++ b/community/dcron/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72785 2012-06-22 12:49:56Z dreisner $ +# $Id: PKGBUILD 79754 2012-11-11 21:14:11Z spupykin $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Paul Mattal <paul.archlinux.org> pkgname=dcron pkgver=4.5 -pkgrel=3 +pkgrel=4 pkgdesc="dillon's lightweight cron daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -18,7 +18,7 @@ install=$pkgname.install source=(http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz service) md5sums=('078833f3281f96944fc30392b1888326' - '5a68a7aee883738e7f7f8549481bb297') + 'e43c3d758384ac644f5e19f460ab5f46') build() { cd "$srcdir/${pkgname}-${pkgver}" diff --git a/community/dcron/service b/community/dcron/service index 59fc64b80..47265791e 100644 --- a/community/dcron/service +++ b/community/dcron/service @@ -5,6 +5,7 @@ Description=Periodic Command Scheduler Type=forking EnvironmentFile=/etc/conf.d/crond ExecStart=/usr/sbin/crond $CROND_ARGS +Restart=always [Install] WantedBy=multi-user.target diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index cd0c4a365..aefe2109a 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74372 2012-07-25 22:55:20Z lfleischer $ +# $Id: PKGBUILD 79601 2012-11-08 19:11:56Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef -pkgver=0.5.5 -pkgrel=2 +pkgver=0.5.6 +pkgrel=1 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64' 'mips64el') url='http://deadbeef.sourceforge.net' @@ -32,7 +32,7 @@ optdepends=('libsamplerate: for Resampler plugin' options=('!libtool') install='deadbeef.install' source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7cc10cefda0f4044eea897893e4cc1a9') +md5sums=('26b6036ca7e59c88267d3de4f42c4d01') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD index e97b7973b..e32a44c42 100644 --- a/community/dee/PKGBUILD +++ b/community/dee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78182 2012-10-17 10:23:20Z allan $ +# $Id: PKGBUILD 80236 2012-11-18 10:29:58Z andrea $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=dee pkgver=1.0.14 -pkgrel=2 +pkgrel=3 pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/dee" @@ -18,7 +18,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-tests \ + --disable-static \ PYTHON=python2 make } diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD index ba17e9c0b..158a9ff8c 100644 --- a/community/deja-dup/PKGBUILD +++ b/community/deja-dup/PKGBUILD @@ -1,25 +1,36 @@ -# $Id: PKGBUILD 77901 2012-10-15 17:33:17Z bgyorgy $ +# $Id: PKGBUILD 79462 2012-11-05 20:10:47Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=deja-dup pkgver=24.0 -pkgrel=1 +pkgrel=2 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/deja-dup" license=('GPL') depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject2' 'dconf' 'xdg-utils') makedepends=('vala' 'intltool' 'itstool' 'nautilus') -optdepends=('nautilus: backup extension') +optdepends=('nautilus: backup extension' + 'ubuntuone-client: backup into Ubuntu One storage') options=('!libtool') install=$pkgname.install -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz) -md5sums=('335131d1f3c85615339fa8b212db50ae') +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz + new-u1backend-support.patch + not-check-ubuntuone-couch.patch) +md5sums=('335131d1f3c85615339fa8b212db50ae' + '944a4c62f042b240feba98f8d9a893b2' + '8d59798638982c2bdb55b2e415087245') build() { cd "$srcdir/$pkgname-$pkgver" sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' common/PythonChecker.vala + # Add support for the new Ubuntu One backend + patch -Np0 -i "$srcdir/new-u1backend-support.patch" + + # Now we don't need ubuntuone-couch for Ubuntu One support + patch -Np1 -i "$srcdir/not-check-ubuntuone-couch.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ --disable-static --disable-schemas-compile --without-unity make diff --git a/community/deja-dup/new-u1backend-support.patch b/community/deja-dup/new-u1backend-support.patch new file mode 100644 index 000000000..08b918cb9 --- /dev/null +++ b/community/deja-dup/new-u1backend-support.patch @@ -0,0 +1,50 @@ +=== modified file 'common/BackendU1.vala' +--- common/BackendU1.vala 2012-08-06 22:41:13 +0000 ++++ common/BackendU1.vala 2012-11-03 21:35:53 +0000 +@@ -212,21 +212,41 @@ + + public override async void get_envp() throws Error + { +- bool found = false; + var obj = get_creds_proxy(); + if (obj.get_name_owner() == null) { + ask_password(); + return; + } + ++ var found = false; ++ var envp = new List<string>(); + var listener = new Listener(obj, "find_credentials", null, (name, args) => { +- if (name == "CredentialsFound") +- found = true; ++ if (name == "CredentialsFound") { ++ VariantIter iter; ++ args.get("(a{ss})", out iter); ++ string key, val; ++ string consumer_key = null, consumer_secret = null, token = null, token_secret = null; ++ while (iter.next("{ss}", out key, out val)) { ++ if (key == "consumer_key") ++ consumer_key = val; ++ else if (key == "consumer_secret") ++ consumer_secret = val; ++ else if (key == "token") ++ token = val; ++ else if (key == "token_secret") ++ token_secret = val; ++ } ++ if (consumer_key != null && consumer_secret != null && token != null && token_secret != null) { ++ warning("appending: %s", "FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret)); ++ envp.append("FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret)); ++ found = true; ++ } ++ } + }); + listener.run(); + + if (found) +- envp_ready(true, null); ++ envp_ready(true, envp); + else + ask_password(); + } + diff --git a/community/deja-dup/not-check-ubuntuone-couch.patch b/community/deja-dup/not-check-ubuntuone-couch.patch new file mode 100644 index 000000000..d7fb903a1 --- /dev/null +++ b/community/deja-dup/not-check-ubuntuone-couch.patch @@ -0,0 +1,45 @@ +diff -Naur deja-dup-24.0.orig/common/BackendU1.vala deja-dup-24.0/common/BackendU1.vala +--- deja-dup-24.0.orig/common/BackendU1.vala 2012-08-07 00:20:51.000000000 +0200 ++++ deja-dup-24.0/common/BackendU1.vala 2012-11-05 16:39:34.140104977 +0100 +@@ -75,11 +75,14 @@ + + class U1Checker : Checker + { +- PythonChecker pyu1; + construct { + try { + var proxy = BackendU1.get_creds_proxy(); +- if (proxy.get_name_owner() == null) { ++ if (proxy.get_name_owner() != null) { ++ available = true; ++ complete = true; ++ } ++ else { + available = false; + complete = true; + } +@@ -89,24 +92,6 @@ + available = false; + complete = true; + } +- +- if (!complete) { +- // A bit of abstraction leakage here; we have to keep these imports in +- // line with what duplicity uses. Maybe we should add to duplicity a way +- // to ask 'can I use this backend?' +- pyu1 = PythonChecker.get_checker("ubuntuone.platform.credentials, ubuntuone.couch.auth"); +- if (pyu1.complete) { +- available = pyu1.available; +- complete = pyu1.complete; +- } +- else { +- pyu1.notify["complete"].connect(() => { +- available = pyu1.available; +- complete = pyu1.complete; +- pyu1 = null; +- }); +- } +- } + } + } + diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD index c64b4dd14..b29d7fcc8 100644 --- a/community/devil/PKGBUILD +++ b/community/devil/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77600 2012-10-13 07:27:55Z allan $ +# $Id: PKGBUILD 78927 2012-10-27 23:44:18Z ebelanger $ # Maintainer: Laurent Carlier <lordheavym@gmail.org> # Contributor: damir <damir@archlinux.org> # Contributor: TheHoff <forums> pkgname=devil pkgver=1.7.8 -pkgrel=13 +pkgrel=14 pkgdesc="Library for reading several different image formats" arch=('i686' 'x86_64' 'mips64el') url="http://openil.sourceforge.net/" diff --git a/community/dhex/PKGBUILD b/community/dhex/PKGBUILD index d9c0213a3..757c7b7cd 100644 --- a/community/dhex/PKGBUILD +++ b/community/dhex/PKGBUILD @@ -5,7 +5,7 @@ pkgname=dhex pkgver=0.68 pkgrel=1 pkgdesc="An ncurses-based hexeditor with a diff mode" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.dettus.net/dhex/" license=('GPL') depends=('ncurses') diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD index 0e271b4ae..793d663e8 100644 --- a/community/dictd/PKGBUILD +++ b/community/dictd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77122 2012-10-05 10:53:56Z spupykin $ +# $Id: PKGBUILD 79187 2012-10-31 09:43:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: SmackleFunky <smacklefunky@optusnet.com.au> # Contributor: Enrico Morelli <morelli@cerm.unifi.it> pkgname=dictd -pkgver=1.12.0 -pkgrel=5 +pkgver=1.12.1 +pkgrel=1 pkgdesc="Online dictionary client and server" url="http://sourceforge.net/projects/dict/" license=('GPL') @@ -28,7 +28,7 @@ source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz" site.info dictd.xinetd colorit.conf) -md5sums=('71aaf3a697ea2e9409643f11ea85b53a' +md5sums=('62696491174c22079f664830d07c0623' '6542df4fc585773fc03f1a088730126b' 'fb72f7d8c55f84b1b37bbc8d33a8e55a' '64cd6ffdb40fb3367224f91ac44926ac' diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD index a27e25f8b..814ea63e5 100644 --- a/community/directfb/PKGBUILD +++ b/community/directfb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74058 2012-07-19 05:01:17Z ebelanger $ +# $Id: PKGBUILD 79438 2012-11-05 08:05:20Z ebelanger $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=directfb -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device" arch=('i686' 'x86_64' 'mips64el') @@ -11,14 +11,11 @@ url="http://www.directfb.org" license=('LGPL') depends=('gcc-libs' 'libjpeg' 'sdl' 'libpng' 'freetype2') options=('!libtool') -source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz \ - DirectFB-1.6.1-zlib-include.patch) -sha1sums=('121c7fd1e81ccb41962986126e1d69f188c2f2c2' - 'f2309edd87c772a7894d4b648d56197d91790cad') +source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz) +sha1sums=('a393a53130e6a80369b7081371cd23dd1cd5e192') build() { cd "${srcdir}/DirectFB-${pkgver}" - patch -p1 -i ../DirectFB-1.6.1-zlib-include.patch ./configure --prefix=/usr --sysconfdir=/etc --enable-static \ --enable-zlib --enable-x11 --enable-sdl --disable-vnc --disable-osx \ --enable-video4linux2 --enable-voodoo diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD index 51037ff0d..b0a913cee 100644 --- a/community/dmenu/PKGBUILD +++ b/community/dmenu/PKGBUILD @@ -7,7 +7,7 @@ pkgname=dmenu pkgver=4.5 -pkgrel=3 +pkgrel=3.1 pkgdesc="A generic menu for X" url="http://tools.suckless.org/dmenu/" arch=('i686' 'x86_64' 'mips64el') @@ -27,4 +27,4 @@ package() { cd $srcdir/$pkgname-$pkgver make PREFIX=/usr DESTDIR=$pkgdir install install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -}
\ No newline at end of file +} diff --git a/community/dunst/PKGBUILD b/community/dunst/PKGBUILD index 33337133b..79d954947 100644 --- a/community/dunst/PKGBUILD +++ b/community/dunst/PKGBUILD @@ -6,7 +6,7 @@ pkgname=dunst pkgver=0.4.0 pkgrel=1 pkgdesc="a dmenu-ish notification system " -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://knopwob.github.com/dunst" license=(MIT) depends=(dbus-core libxinerama libxft libxss libxdg-basedir) diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index b9c55eaf2..f7c359639 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 78184 2012-10-17 10:23:31Z allan $ +# $Id: PKGBUILD 79464 2012-11-05 20:16:41Z bgyorgy $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity -pkgver=0.6.19 +pkgver=0.6.20 pkgrel=2 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/duplicity/' license=('GPL') depends=('librsync' 'ncftp' 'python2' 'python2-boto' 'python2-gnupginterface' 'python2-paramiko') -source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('c88122d0b651f84f3bfa42e55591c36b' - 'df672ed47b8eb4fd8ffa99711623b6b5') +source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + u1-ascii-error.patch) +md5sums=('83a56c4c17fc50961c961943867deae4' + '2bd2d4a3a331ab728473f46963dc87da' + '7e19cc49547848ce847297b1880f5a8e') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # Fix ascii error in U1 backend + patch -Np0 -i "${srcdir}/u1-ascii-error.patch" + # python2 fix for file in $(find . -name '*.py' -print); do sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file diff --git a/community/duplicity/u1-ascii-error.patch b/community/duplicity/u1-ascii-error.patch new file mode 100644 index 000000000..0812653b9 --- /dev/null +++ b/community/duplicity/u1-ascii-error.patch @@ -0,0 +1,13 @@ +=== modified file 'duplicity/backends/u1backend.py' +--- duplicity/backends/u1backend.py 2012-10-27 12:16:19 +0000 ++++ duplicity/backends/u1backend.py 2012-11-03 21:39:23 +0000 +@@ -207,7 +207,7 @@ + "Content-Type": content_type} + resp, content = self.client.request(remote_full, + method="PUT", +- body=str(data), ++ body=bytearray(data), + headers=headers) + + def get(self, filename, local_path): + diff --git a/community/dvdbackup/PKGBUILD b/community/dvdbackup/PKGBUILD index 271c3344d..17db80fc0 100644 --- a/community/dvdbackup/PKGBUILD +++ b/community/dvdbackup/PKGBUILD @@ -8,7 +8,7 @@ pkgname=dvdbackup pkgver=0.4.2 pkgrel=1 pkgdesc="A tool to rip video DVDs from the command line" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://dvdbackup.sourceforge.net/" license=('GPL') depends=('libdvdread') diff --git a/community/dwb/PKGBUILD b/community/dwb/PKGBUILD index 0579c9d73..1ef73ad83 100644 --- a/community/dwb/PKGBUILD +++ b/community/dwb/PKGBUILD @@ -1,10 +1,10 @@ -$Id: PKGBUILD 76661 2012-09-25 22:31:13Z dwallace $ +#$Id: PKGBUILD 80801 2012-12-03 23:17:22Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: portix <portix at gmx.net> pkgname=dwb -pkgver=2012.08.22 -pkgrel=3 +pkgver=2012.12.03 +pkgrel=1 pkgdesc="A webkit web browser with vi-like keyboard shortcuts, stable snapshot" url="http://portix.bitbucket.org/dwb/" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ install=dwb.install license=('GPL') depends=('libwebkit' 'desktop-file-utils') source=(https://bitbucket.org/portix/"${pkgname}"/downloads/"${pkgname}"-"${pkgver}".tar.gz) -md5sums=('5cdf3a2b3f8845071529b44e2d93d653') +md5sums=('cf2e0c8cbd852203deb322c14952756c') build() { cd "${srcdir}"/"${pkgname}"-"${pkgver}" diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD index 4e99638b5..cc508a07c 100644 --- a/community/dwdiff/PKGBUILD +++ b/community/dwdiff/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76393 2012-09-17 08:46:08Z spupykin $ +# $Id: PKGBUILD 80237 2012-11-18 10:30:05Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=dwdiff pkgver=2.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="A front-end for the diff program that operates at the word level instead of the line level" arch=('i686' 'x86_64' 'mips64el') url="http://os.ghalkes.nl/dwdiff.html" diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD index b242a1b3f..e0126243d 100644 --- a/community/ecryptfs-utils/PKGBUILD +++ b/community/ecryptfs-utils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74862 2012-08-07 15:20:01Z tredaelli $ +# $Id: PKGBUILD 80488 2012-11-22 19:34:12Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Richard Murri <admin@richardmurri.com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=ecryptfs-utils -pkgver=100 -pkgrel=2 +pkgver=101 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux" url="https://launchpad.net/ecryptfs" @@ -13,9 +13,11 @@ license=('GPL') makedepends=('swig' 'intltool' 'gettext' 'python2') depends=('keyutils' 'nss' 'openssl') optdepends=('python2: for python module') -source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz") +source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz" + "${pkgname}_${pkgver}.orig.tar.gz.sig::http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/..-${pkgname}_${pkgver}.orig.tar.gz.asc") options=(!libtool) -md5sums=('efaa5eabbd368268874536036397f73b') +md5sums=('7a17714b2e4555a79d464e260b179f4f' + '51e24e3252deabec2b91811545805397') build() { cd "$srcdir/${pkgname}-${pkgver}" diff --git a/community/efax-gtk/PKGBUILD b/community/efax-gtk/PKGBUILD index 33b7348c1..db2f57ea5 100644 --- a/community/efax-gtk/PKGBUILD +++ b/community/efax-gtk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76212 2012-09-14 07:41:39Z giovanni $ +# $Id: PKGBUILD 79527 2012-11-06 17:22:36Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=efax-gtk -pkgver=3.2.9 -pkgrel=3 +pkgver=3.2.10 +pkgrel=1 pkgdesc="A GUI front end for the 'efax' fax program" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://efax-gtk.sourceforge.net/" license=('GPL') depends=('dbus-glib' 'ghostscript' 'c++-gtk-utils') @@ -14,7 +14,7 @@ optdepends=('heirloom-mailx: to use the mail_fax script') backup=('etc/efax-gtkrc') install=efax-gtk.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.src.tgz") -md5sums=('57fac8815c8f49fc7415d3558eb3f842') +md5sums=('24a21ac319b6074390f296e3fb7d4f23') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/egoboo/PKGBUILD b/community/egoboo/PKGBUILD deleted file mode 100644 index 2e4b9ba76..000000000 --- a/community/egoboo/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 71718 2012-06-01 18:47:50Z ebelanger $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Arkham <arkham at archlinux dot us> -# Contributor: rabyte <rabyte*gmail> -# Contributor: Andres Blanc <andresblanc@gmail.com> - -pkgname=egoboo -pkgver=2.8.1 -pkgrel=4 -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -pkgdesc="An open-source action RPG/dungeon crawling adventure with OpenGL 3D graphics" -url="http://egoboo.sourceforge.net/" -makedepends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'physfs' 'enet' 'mesa') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname.png - $pkgname.desktop) -md5sums=('e6f3130695d297dcd9fe74e50bd59b68' - '7019f17b607fd45acf0d48ade746326a' - 'b81e0c8f3e0b9d8640d0cfc9b6d320a8') - -build() { - cd "$srcdir/egoboo-$pkgver/src" - - # fix data paths - sed -i -e 's#egoboo-2.x#egoboo#g' \ - -e 's#share/games#share#g' \ - -e 's#etc#share#g' \ - -e 's#games#bin#g' \ - game/platform/file_linux.c - - # fix linking - sed -i -e 's#-lenet#-lenet -lm#g' game/Makefile - - make all -} - -package() { - depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'physfs' 'enet' 'mesa' 'egoboo-data>=2.8.1') - - cd "$srcdir/egoboo-$pkgver" - - install -Dm755 src/game/egoboo-2.x $pkgdir/usr/bin/egoboo - install -d $pkgdir/usr/share/doc - cp -rf doc/ $pkgdir/usr/share/doc/$pkgname/ - - # Install icon and desktop files - install -Dm 644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png - install -Dm 644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop -} - diff --git a/community/egoboo/egoboo.desktop b/community/egoboo/egoboo.desktop deleted file mode 100644 index b2f2870e4..000000000 --- a/community/egoboo/egoboo.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Egoboo -Exec=egoboo -Icon=egoboo -Type=Application -Comment=A 3D OpenGL dungeon-crawl -Categories=Game;AdventureGame;RolePlaying; diff --git a/community/egoboo/egoboo.png b/community/egoboo/egoboo.png Binary files differdeleted file mode 100644 index 984be247d..000000000 --- a/community/egoboo/egoboo.png +++ /dev/null diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index abb8aff3f..2c9b93cb2 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,17 +1,19 @@ -# $Id: PKGBUILD 77108 2012-10-05 10:15:29Z spupykin $ +# $Id: PKGBUILD 80020 2012-11-15 13:56:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd pkgver=2.1.11 -pkgrel=4 +pkgrel=7 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686' 'mips64el') url="http://www.ejabberd.im/" license=("GPL") depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' 'iproute2') -backup=(etc/ejabberd/ejabberd.cfg etc/logrotate.d/ejabberd) +backup=('etc/ejabberd/ejabberd.cfg' + 'etc/ejabberd/ejabberdctl.cfg' + 'etc/logrotate.d/ejabberd') install=$pkgname.install source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz" "$pkgname.logrotate" @@ -20,7 +22,7 @@ source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${ md5sums=('a70b040c4e7602f47718c8afe8780d50' 'f97c8a96160f30e0aecc9526c12e6606' '2338a6230ce5f9f60be6dddcfa39bc7e' - 'bc4552b833e1927fce52acdbc6d76fb2') + 'bd18cb1034df9ef1b699214f0e3b4567') build() { cd "$srcdir/$pkgname-$pkgver/src" @@ -36,6 +38,7 @@ package() { install -d "$pkgdir/var/lib/$pkgname" install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname" chmod ug+r "$pkgdir/etc/$pkgname/"* + chmod a+rx "$pkgdir/usr/sbin/ejabberdctl" rm -rf "$pkgdir/var/lock" install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service } diff --git a/community/ejabberd/ejabberd.service b/community/ejabberd/ejabberd.service index 47e5f2e27..e7cef53b2 100644 --- a/community/ejabberd/ejabberd.service +++ b/community/ejabberd/ejabberd.service @@ -3,18 +3,12 @@ Description=A distributed, fault-tolerant Jabber/XMPP server After=network.target [Service] -Type=oneshot +Type=forking User=ejabberd Group=jabber LimitNOFILE=16000 RestartSec=5 -ExecStart=/usr/sbin/ejabberdctl \ - --config /etc/ejabberd/ejabberd.cfg \ - --ctl-config /etc/ejabberd/ejabberdctl.cfg \ - --logs "/var/log/ejabberd" \ - --spool "/var/lib/ejabberd" start -ExecStop=/usr/sbin/ejabberdctl stop -RemainAfterExit=yes +ExecStart=/usr/bin/erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\" [Install] WantedBy=multi-user.target diff --git a/community/ekg/PKGBUILD b/community/ekg/PKGBUILD index 8c87efc02..6e13e2428 100644 --- a/community/ekg/PKGBUILD +++ b/community/ekg/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ekg pkgver=1.8rc2 -pkgrel=1.1 +pkgrel=1.2 pkgdesc="A text-mode Gadu-Gadu client" arch=('i686' 'x86_64' 'mips64el') url="http://ekg.chmurka.net/" diff --git a/community/enter/PKGBUILD b/community/enter/PKGBUILD index e74da4ff0..e33389d06 100644 --- a/community/enter/PKGBUILD +++ b/community/enter/PKGBUILD @@ -10,11 +10,14 @@ arch=('i686' 'x86_64' 'mips64el') url="http://enter.sf.net" license=('GPL') depends=('libxft' 'imlib2' 'xorg-server') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('47a77ae57e667f887f856c0a126d667a') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + enter-0.0.9-X11_Xext.patch) +md5sums=('47a77ae57e667f887f856c0a126d667a' + '7e7dee216860d11833706b70b17b6905') build() { cd $srcdir/$pkgname-$pkgver + patch -Np1 -i ${srcdir}/enter-0.0.9-X11_Xext.patch sed -i 's|\[xft-config\]|\[pkg-config\]|' configure.ac autoreconf ./configure --prefix=/usr --sysconfdir=/etc CFLAGS="$CFLAGS -lcrypt" diff --git a/community/enter/enter-0.0.9-X11_Xext.patch b/community/enter/enter-0.0.9-X11_Xext.patch new file mode 100644 index 000000000..bf0459c30 --- /dev/null +++ b/community/enter/enter-0.0.9-X11_Xext.patch @@ -0,0 +1,13 @@ +--- enter-0.0.9.orig/configure.ac 2007-03-26 18:35:54.000000000 -0500 ++++ enter-0.0.9/configure.ac 2012-11-07 02:41:16.137947211 -0500 +@@ -52,6 +52,10 @@ + AC_CHECK_LIB([Imlib2], [imlib_context_new],, + AC_MSG_ERROR([You need to have Imlib2.])) + ++AC_CHECK_LIB(X11, XClearWindow) ++ ++AC_CHECK_LIB(Xext, XdbeQueryExtension) ++ + # Checks for header files. + AC_SUBST([X_CFLAGS]) + AC_SUBST([X_LIBS]) diff --git a/community/erlang-cl/PKGBUILD b/community/erlang-cl/PKGBUILD new file mode 100644 index 000000000..ec9bcc128 --- /dev/null +++ b/community/erlang-cl/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: kappa <kappacurve@gmail.com> + +pkgname=erlang-cl +pkgver=1.0 +pkgrel=2 +arch=('x86_64' 'i686') +pkgdesc='OpenCL binding for Erlang' +url="http://github.com/tonyrog/cl" +license=('custom:unknown') +depends=('erlang' 'libcl' 'bash') +replaces=('cl') +makedepends=('opencl-headers') +source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/tonyrog/cl/tar.gz/master") +sha256sums=('e2cb407489ebe1d8e8f287283eb5c715d559ce95255f6bbcac137cb84c500be6') +_dirname='cl-master' +if [ "$CARCH" = "x86_64" ] +then + _wordsize=64 +else + _wordsize=32 +fi + +build() { + cd "$srcdir/$_dirname/c_src" + + make configure + ./configure --with-wordsize=$_wordsize --prefix=/usr + make all$_wordsize + rm config.* +} + +package() { + cd "$srcdir/$_dirname" + + mkdir -p "$pkgdir/usr/lib/erlang/lib/cl-$pkgver" + cp -r * "$pkgdir/usr/lib/erlang/lib/cl-$pkgver" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD new file mode 100644 index 000000000..ca4a5295e --- /dev/null +++ b/community/erlang-nox/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 80307 2012-11-19 19:18:28Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Lukas Fleischer <archlinux@cryptocrack.de> +# Contributor: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com> +# Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com> + +pkgname=erlang-nox +pkgver=R15B03 +pkgrel=1 +pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)' +arch=('x86_64' 'i686') +url='http://www.erlang.org' +license=('custom') +depends=('ncurses' 'openssl') +provides=('erlang') +conflicts=('erlang') +makedepends=('perl') +optdepends=('unixodbc: for database support' + 'java-environment: for Java support') +source=("http://www.erlang.org/download/otp_src_$pkgver.tar.gz" + "http://www.erlang.org/download/otp_doc_man_$pkgver.tar.gz") +sha256sums=('d1ee5dd3833537ad7533f2deaf164936508c55c992c2b930f0c4c4559d40aa12' + '0a5a01f8c6050551c1ba0591de42731a6640370e7527fae81cdfe3d3d6af0a6b') + +build() { + cd "$srcdir/otp_src_$pkgver" + + msg2 'Configuring...' + ./configure --prefix=/usr --enable-smp-support + msg2 'Compiling...' + make +} + +package() { + cd "$srcdir/otp_src_$pkgver" + + make DESTDIR="$pkgdir" install + + # Install documentation + install -d "$pkgdir/usr/share/doc/erlang" + install -m0644 "$srcdir/otp_src_$pkgver/README.md" \ + "$srcdir"/{README,COPYRIGHT} \ + "$pkgdir/usr/share/doc/erlang" + + # Install compressed man pages + for page in "$srcdir/man/man?/*"; do gzip $page; done + cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" + + # Install license + install -Dm0644 "$srcdir/otp_src_$pkgver/EPLICENCE" \ + "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/erlang-sdl/PKGBUILD b/community/erlang-sdl/PKGBUILD new file mode 100644 index 000000000..7a1fbd882 --- /dev/null +++ b/community/erlang-sdl/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 80318 2012-11-19 22:01:23Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: kappa <kappacurve@gmail.com> + +pkgname=erlang-sdl +pkgver=1.2 +pkgrel=2 +arch=('x86_64' 'i686') +pkgdesc='SDL and OpenGL bindings for Erlang (r15b-driver-compat branch)' +url='http://esdl.sourceforge.net/' +license=('custom') +depends=('erlang' 'sdl' 'glu') +replaces=('esdl') +source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/esdl/tar.gz/dgud/r15b-driver-compat") +sha256sums=('a14d695229b93401a304b773874e87c02c5b304d4b5b66f35cba75e140672086') +_dirname='esdl-dgud-r15b-driver-compat' + +build() { + cd "$srcdir/$_dirname" + + find -type f -print0 | xargs -0 chmod 644 + make +} + +package() { + cd "$srcdir/$_dirname" + + make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/esdl-$pkgver" install + + ## An attempt to make wings3d compile with esdl 1.2 + #ln -s /usr/lib/erlang/lib/wx-0.99/include/glu.hrl \ + # "$pkgdir/usr/lib/erlang/lib/esdl-$pkgver/include/glu.hrl" + #ln -s /usr/lib/erlang/lib/wx-0.99/include/gl.hrl \ + # "$pkgdir/usr/lib/erlang/lib/esdl-$pkgver/include/gl.hrl" + + install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index 5a2369599..30e949636 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,78 +1,56 @@ -# $Id: PKGBUILD 77628 2012-10-13 11:41:57Z allan $ -# Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> +# $Id: PKGBUILD 80658 2012-11-28 21:23:24Z arodseth $ +# Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com> +# Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com> pkgname=erlang -pkgver=R15B01 -pkgrel=2 -pkgdesc='A small concurrent functional programming language developed by Ericsson.' +pkgver=R15B03 +pkgrel=1 +pkgdesc='General-purpose concurrent functional programming language developed by Ericsson' arch=(i686 x86_64 mips64el) -url='http://www.erlang.org/index.html' +url='http://www.erlang.org' license=('custom') -depends=('ncurses' 'glibc') -makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa' 'glu') -optdepends=('wxgtk: for wx support' - 'glu: for wx support' - 'unixodbc: database' - 'java-environment: for Java support') -if [ "$CARCH" = "mips64el" ]; then -makedepends=('perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa') -optdepends=('wxgtk: for wx support' - 'mesa: for wx support' - 'unixodbc: database') +depends=('ncurses' 'glu' 'wxgtk' 'openssl') +makedepends=('perl' 'mesa') +optdepends=('unixodbc: for database support') +if [ "$CARCH" != "mips64el" ]; then + optdepends+=('java-environment: for Java support') fi -options=('!makeflags' '!distcc') -source=("http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz" - "http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz") -md5sums=('f12d00f6e62b36ad027d6c0c08905fad' - 'd87412c2a1e6005bbe29dfe642a9ca20') +source=("http://www.erlang.org/download/otp_src_$pkgver.tar.gz" + "http://www.erlang.org/download/otp_doc_man_$pkgver.tar.gz") +sha256sums=('d1ee5dd3833537ad7533f2deaf164936508c55c992c2b930f0c4c4559d40aa12' + '0a5a01f8c6050551c1ba0591de42731a6640370e7527fae81cdfe3d3d6af0a6b') build() { - cd "$srcdir/otp_src_${pkgver/./-}" + cd "$srcdir/otp_src_$pkgver" - export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk) - export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < \ - lib/erl_interface/vsn.mk) - - sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure - - CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support \ - --enable-threads + msg2 'Configuring...' + ./configure --prefix=/usr --enable-smp-support + msg2 'Compiling...' make } package() { - cd "$srcdir/otp_src_${pkgver/./-}" - - make INSTALL_PREFIX="$pkgdir" install - - # fix prefix - cd "$pkgdir/usr/lib/erlang" - sed -i "s#$pkgdir##" bin/erl bin/start "erts-${ERTSVERSION}/bin/erl" \ - "erts-${ERTSVERSION}/bin/start" releases/RELEASES + cd "$srcdir/otp_src_$pkgver" - # fix symlinks - cd bin/ - ln -sf "../erts-${ERTSVERSION}/bin/epmd" + make DESTDIR="$pkgdir" install - cd "$pkgdir/usr/bin" - for file in *; do - ln -sfv "../lib/erlang/bin/$file" - done - - ln -s "../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call" \ - "$pkgdir/usr/bin/erl_call" - - # install documentation + # Install documentation install -d "$pkgdir/usr/share/doc/erlang" - install -Dm0644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang" + install -m0644 "$srcdir/otp_src_$pkgver/README.md" \ + "$srcdir"/{README,COPYRIGHT} \ + "$pkgdir/usr/share/doc/erlang" - # install man pages + # Install compressed man pages + for page in "$srcdir/man/man?/*"; do gzip $page; done cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" - # install license - install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" \ + # Install license + install -Dm0644 "$srcdir/otp_src_$pkgver/EPLICENCE" \ "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" } + +# vim:set ts=2 sw=2 et: diff --git a/community/esdl/PKGBUILD b/community/esdl/PKGBUILD index 58ee0f8ef..ae73b6568 100644 --- a/community/esdl/PKGBUILD +++ b/community/esdl/PKGBUILD @@ -4,16 +4,16 @@ pkgname=esdl pkgver=1.2 -pkgrel=2 +pkgrel=3 epoch=2 arch=('x86_64' 'i686' 'mips64el') -pkgdesc="SDL and OpenGL bindings for the Erlang programming language" -url="http://esdl.sourceforge.net/" +pkgdesc='SDL and OpenGL bindings for Erlang' +url='http://esdl.sourceforge.net/' license=('custom') depends=('erlang' 'sdl' 'glu') -source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/esdl/tarball/master") -md5sums=('d51f8e2fe07b9e82ff9c2e06af35e3eb') -_dirname='dgud-esdl-4139134' +source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/esdl/tar.gz/dgud/r15b-driver-compat") +sha256sums=('a14d695229b93401a304b773874e87c02c5b304d4b5b66f35cba75e140672086') +_dirname="$pkgname-dgud-r15b-driver-compat" build() { cd "$srcdir/$_dirname" diff --git a/community/esekeyd/PKGBUILD b/community/esekeyd/PKGBUILD deleted file mode 100644 index a7b3bb7b4..000000000 --- a/community/esekeyd/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 65669 2012-02-21 20:29:52Z cbrannon $ -# Maintainer: Chris Brannon <cmbrannon79@gmail.com> -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> -# Contributor: Evgenij Vdovin <evdovin@pochta.ru> - -pkgname=esekeyd -pkgver=1.2.7 -pkgrel=2 -pkgdesc="Multimedia keyboard driver for Linux" -arch=('i686' 'x86_64' 'mips64el') -url="http://freshmeat.net/projects/esekeyd/" -license=('GPL') -depends=('glibc' 'sh') -source=(http://www.burghardt.pl/files/$pkgname-$pkgver.tar.gz - esekeyd.rc esekeyd.confd esekeyd.conf) -backup=('etc/conf.d/esekeyd' 'etc/esekeyd.conf') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -D -m755 "$srcdir/esekeyd.rc" "$pkgdir/etc/rc.d/esekeyd" - install -D -m644 "$srcdir/esekeyd.confd" "$pkgdir/etc/conf.d/esekeyd" - install -D -m644 "$srcdir/esekeyd.conf" "$pkgdir/etc/esekeyd.conf" -} -md5sums=('5937ad6d7815dbc6ab6983411a9f37d4' - '1c1b954265ad29de010b1dd750350ed2' - '5edf18376549251daacd49ae136ba984' - 'f16c1aefe84214856f3a7e49a1a866f3') diff --git a/community/esekeyd/esekeyd.conf b/community/esekeyd/esekeyd.conf deleted file mode 100644 index c391a9670..000000000 --- a/community/esekeyd/esekeyd.conf +++ /dev/null @@ -1,31 +0,0 @@ -# -# ESE Key Deamon 1.2.1 config file -# - -# Note: esekeyd runs all commands as root! -# In order to run commands as user you should call them this way: -#CALC:su -l username -c "/bin/bash -l -c 'DISPLAY=:0 gcalctool &'" -# -# Note that it is impossible to use xdg-utils and some Gnome/KDE applications -# because some vital environment variables are set after desktop session start, -# so shell session started via su won't have them - -#BACK: -#FORWARD: -#STOP: -#REFRESH: -#SEARCH: -#BOOKMARKS:/bin/sh -c "DISPLAY=:0 xterm &" -#WWW: -#MAIL: -#PREVIOUSSONG:mpc prev & -#STOPCD:mpc stop & -#PLAYPAUSE:mpc toggle & -#NEXTSONG:mpc next & -#VOLUMEDOWN:amixer set Master 5%- & -#VOLUMEUP:amixer set Master 5%+ & -#MUTE:amixer set Master toggle & -#MEDIA:mpc update & -#COMPUTER: -#CALC:/bin/sh -c "DISPLAY=:0 xcalc &" -#SLEEP:/bin/sh -c "DISPLAY=:0 xset dpms force standby &" diff --git a/community/esekeyd/esekeyd.confd b/community/esekeyd/esekeyd.confd deleted file mode 100644 index 1fd9a0940..000000000 --- a/community/esekeyd/esekeyd.confd +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG=/etc/esekeyd.conf -# set input device manually if it cannot be autodetected -# DEVICE=/dev/input/event1 -KEYCODES=('e00e:148' 'e00c:149') diff --git a/community/esekeyd/esekeyd.rc b/community/esekeyd/esekeyd.rc deleted file mode 100644 index 67dd42265..000000000 --- a/community/esekeyd/esekeyd.rc +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# -# Start/stop/restart the key daemon. -. /etc/rc.conf -. /etc/rc.d/functions - -keystune(){ - for keycode in "${KEYCODES[@]}"; do - key=`echo $keycode | cut -d: -f1` - code=`echo $keycode | cut -d: -f2` - setkeycodes $key $code - done -} - -# source application-specific settings -CONFIG= -KEYCODES= -DEVICE= -[ -f /etc/conf.d/esekeyd ] && . /etc/conf.d/esekeyd - -PID=`pidof -o %PPID /usr/sbin/esekeyd` -case "$1" in - start) - stat_busy "Starting esekeyd" - [ "$KEYCODES" ] && keystune - [ -z "$PID" ] && /usr/sbin/esekeyd $CONFIG $DEVICE &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon esekeyd - stat_done - fi - ;; - stop) - stat_busy "Stopping esekeyd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon esekeyd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/esmtp/PKGBUILD b/community/esmtp/PKGBUILD index 15d4bd89f..45078ab9c 100644 --- a/community/esmtp/PKGBUILD +++ b/community/esmtp/PKGBUILD @@ -5,7 +5,7 @@ pkgname=esmtp pkgver=1.2 -pkgrel=4.1 +pkgrel=4.2 pkgdesc="An easy SMTP forwarder." arch=('i686' 'x86_64' 'mips64el') url='http://esmtp.sourceforge.net' diff --git a/community/espeakup/PKGBUILD b/community/espeakup/PKGBUILD index 8fe21af60..4abea734b 100644 --- a/community/espeakup/PKGBUILD +++ b/community/espeakup/PKGBUILD @@ -1,26 +1,35 @@ -# $Id: PKGBUILD 65675 2012-02-21 21:13:11Z cbrannon $ -# Maintainer: Chris Brannon <chris@the-brannons.com> +# $Id: PKGBUILD 80362 2012-11-20 18:55:18Z tomegun $ +# Contributor: Chris Brannon <chris@the-brannons.com> +# Contributor: Kyle <kyle@gmx.ca> pkgname=espeakup pkgver=0.71 -pkgrel=4 +pkgrel=7 pkgdesc='Allows the Speakup screen review system to use the ESpeak synthesizer.' arch=('i686' 'x86_64' 'mips64el') url="http://github.com/williamh/espeakup" license=('GPL3') -source=("ftp://linux-speakup.org/pub/linux/goodies/${pkgname}-${pkgver}.tar.bz2" - espeakup espeakup.conf.d) -md5sums=('03daa70b3db3f4f6fbb42c2ee428eda7' - '7cf0abd493710ed924b7bb7c8d279fb3' - '0f93974845b15efa12f5e7a74cc0eecd') +#source=("ftp://linux-speakup.org/pub/linux/goodies/${pkgname}-${pkgver}.tar.bz2" +# temporary location +source=("http://the-brannons.com/espeakup-0.71.tar.bz2" + espeakup espeakup.conf.d espeakup.service espeakup.modules-load.d) depends=(speakup-utils espeak) backup=(etc/conf.d/espeakup) build() { - cd "$srcdir" - install -m755 -D espeakup "${pkgdir}/etc/rc.d/espeakup" - install -m644 -D espeakup.conf.d "${pkgdir}/etc/conf.d/espeakup" cd "$srcdir/$pkgname-$pkgver" - make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="${pkgdir}" install + install -m755 -D "${srcdir}/espeakup" "${pkgdir}/etc/rc.d/espeakup" + install -m644 -D "${srcdir}/espeakup.conf.d" "${pkgdir}/etc/conf.d/espeakup" + install -m644 -D "${srcdir}/espeakup.service" "${pkgdir}/usr/lib/systemd/system/espeakup.service" + install -m644 -D "${srcdir}/espeakup.modules-load.d" "${pkgdir}/usr/lib/modules-load.d/espeakup.conf" } +md5sums=('03daa70b3db3f4f6fbb42c2ee428eda7' + '7cf0abd493710ed924b7bb7c8d279fb3' + '0f93974845b15efa12f5e7a74cc0eecd' + '2c80525983a700d3763d4c90c3ab79a8' + '75eb512d510d6701b6f63390475dd34f') diff --git a/community/espeakup/espeakup.modules-load.d b/community/espeakup/espeakup.modules-load.d new file mode 100644 index 000000000..38d53913d --- /dev/null +++ b/community/espeakup/espeakup.modules-load.d @@ -0,0 +1 @@ +speakup_soft diff --git a/community/espeakup/espeakup.service b/community/espeakup/espeakup.service new file mode 100644 index 000000000..88559d0fe --- /dev/null +++ b/community/espeakup/espeakup.service @@ -0,0 +1,15 @@ +[Unit] +Description=Software speech output for Speakup +# espeakup needs to start after the audio devices appear, hopefully this should go away in the future +Wants=systemd-udev-settle.service +After=systemd-udev-settle.service sound.target + +[Service] +Type=forking +PIDFile=/run/espeakup.pid +ExecStart=/usr/bin/espeakup +ExecReload=/bin/kill -HUP $MAINPID +Restart=always + +[Install] +WantedBy=sound.target diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD index d23dd0e97..68ae89717 100644 --- a/community/ettercap/PKGBUILD +++ b/community/ettercap/PKGBUILD @@ -1,44 +1,34 @@ -# $Id: PKGBUILD 68331 2012-03-21 20:33:50Z andrea $ +# $Id: PKGBUILD 80196 2012-11-17 14:33:46Z jelle $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=ettercap pkgname=('ettercap' 'ettercap-gtk') -pkgver=NG_0.7.4.2 -_origver=${pkgver/_/-} +pkgver=0.7.5 pkgrel=2 arch=('i686' 'x86_64' 'mips64el') -url="http://ettercap.sourceforge.net/" +url="http://ettercap.github.com/ettercap/" license=('GPL') -makedepends=('libpcap' 'libltdl' 'libnet' 'gtk2' 'hicolor-icon-theme') +makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2') options=('!libtool' '!makeflags' '!emptydirs') -source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz") +source=("https://github.com/downloads/Ettercap/$pkgbase/$pkgbase-$pkgver.tar.gz" "ettercap.desktop") md5sums=('ab2354bf9c91195f06ad0b5d058565a4') build() { cd "${srcdir}" - sed -i 's/su-to-root -c/gksu/' ${pkgbase}-${_origver}/desktop/ettercap.desktop - cp -r ${pkgbase}-${_origver} ${pkgbase}-${_origver}-gtk + cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-gtk - cd ${pkgbase}-${_origver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --datarootdir=/usr/share \ - --enable-plugins \ - --enable-https \ - --disable-gtk + cd ${pkgbase}-${pkgver} + mkdir build + cd build + cmake -D ENABLE_GTK=ON -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../ make - cd ../${pkgbase}-${_origver}-gtk - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --datarootdir=/usr/share \ - --enable-plugins \ - --enable-https \ - --enable-gtk + cd "$srcdir"/${pkgbase}-${pkgver}-gtk + mkdir build + cd build + cmake -D ENABLE_GTK=ON -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../ make } @@ -47,24 +37,16 @@ package_ettercap() { depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet') backup=('etc/etter.conf') - cd "${srcdir}"/${pkgbase}-${_origver} + cd "${srcdir}"/${pkgbase}-${pkgver}/build make DESTDIR="${pkgdir}" install } package_ettercap-gtk() { pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK" - depends=('ettercap' 'gtk2' 'hicolor-icon-theme') - optdepends=('gksu: to run ettercap from the menu') - install=ettercap-gtk.install + depends=('ettercap' 'gtk2') - cd "${srcdir}"/${pkgbase}-${_origver}-gtk + cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk - install -Dm644 desktop/ettercap.desktop \ - "${pkgdir}"/usr/share/applications/ettercap.desktop - install -Dm644 share/ettercap.png \ - "${pkgdir}"/usr/share/ettercap/ettercap.png - install -Dm644 desktop/ettercap.xpm \ - "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/ettercap.xpm - install -Dm644 desktop/ettercap.svg \ - "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/ettercap.svg } +md5sums=('037b28cd94efa086a795060fc0f76080' + 'f9281fe1735ceba59753bfe442715bb6') diff --git a/community/ettercap/ettercap-gtk.install b/community/ettercap/ettercap-gtk.install index 1a05f573e..0b09f5904 100644 --- a/community/ettercap/ettercap-gtk.install +++ b/community/ettercap/ettercap-gtk.install @@ -1,5 +1,4 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { diff --git a/community/ettercap/ettercap.desktop b/community/ettercap/ettercap.desktop new file mode 100644 index 000000000..e2345d91a --- /dev/null +++ b/community/ettercap/ettercap.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Ettercap +Comment=Nework sniffer/analyser +Exec=ettercap-gtk +Icon=ettercap +Terminal=false +Type=Application +Categories=Network; diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index b9026c404..1e44b1a1d 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72787 2012-06-22 12:50:29Z dreisner $ +# $Id: PKGBUILD 78961 2012-10-28 07:30:38Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=exim -pkgver=4.80 -pkgrel=2 +pkgver=4.80.1 +pkgrel=1 pkgdesc="Message Transfer Agent" arch=('x86_64' 'i686' 'mips64el') url='http://www.exim.org/' @@ -27,7 +27,7 @@ source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2 exim@.service exim.socket exim-submission.socket) -sha256sums=('787b6defd37fa75311737bcfc42e9e2b2cc62c5d027eed35bb7d800b2d9a0984' +sha256sums=('9565b10f06be224fd03adafae2e07e6fdbb479f8873e3894ddb13f98eeebe78f' '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a' '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6' '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b' diff --git a/community/expac/PKGBUILD b/community/expac/PKGBUILD index b767fc161..2dd454fff 100644 --- a/community/expac/PKGBUILD +++ b/community/expac/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68721 2012-04-01 00:18:57Z dreisner $ +# $Id: PKGBUILD 80201 2012-11-17 15:05:30Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> pkgname=expac pkgver=1 -pkgrel=1 +pkgrel=2 pkgdesc="pacman database extraction utility" arch=('i686' 'x86_64' 'mips64el') url="http://github.com/falconindy/expac" @@ -15,10 +15,13 @@ md5sums=('be8348f18e6af9db250437b14a91e443') build() { make -C "$pkgname-$pkgver" + + sed '/\*\//q' "$pkgname-$pkgver"/expac.c >LICENSE } package() { make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim: ft=sh syn=sh diff --git a/community/ext4magic/PKGBUILD b/community/ext4magic/PKGBUILD index 3734d6aa7..81efb41eb 100644 --- a/community/ext4magic/PKGBUILD +++ b/community/ext4magic/PKGBUILD @@ -5,7 +5,7 @@ pkgname=ext4magic pkgver=0.3.1 pkgrel=1 pkgdesc='Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://developer.berlios.de/projects/ext4magic/' license=('GPL2') depends=('bzip2' 'file' 'util-linux' 'e2fsprogs') @@ -14,7 +14,7 @@ md5sums=('59c194b71e33aa6bd098b91f802e67d5') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --build=$CHOST make } diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index f0b640ad8..3117d9d46 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at> pkgname=fb-client -pkgver=1.0.5 -pkgrel=1 +pkgver=1.1 +pkgrel=2 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64' 'mips64el') url="http://paste.xinu.at" @@ -9,8 +9,8 @@ license=('GPL3') depends=('curl') optdepends=('xclip: for automatically copying the URL into the clipboard') source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz{,.sig}) -md5sums=('7e9a5436b138f67c6b75209034d8a729' - '816da30af8582407adf9701890257b8d') +md5sums=('32551de21b82d2dbd1bb96ad2ecb5fc7' + '04357f4b0d6a84f1de51e275220a042b') build() { cd "$srcdir/fb-$pkgver" diff --git a/community/fbgetty/PKGBUILD b/community/fbgetty/PKGBUILD index 38a78390e..8501ab67f 100644 --- a/community/fbgetty/PKGBUILD +++ b/community/fbgetty/PKGBUILD @@ -15,7 +15,7 @@ build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST patch src/options.c <<EOF 33a34 diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD index 9d0d16132..b6493861c 100644 --- a/community/fbreader/PKGBUILD +++ b/community/fbreader/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76103 2012-09-11 14:04:11Z spupykin $ +# $Id: PKGBUILD 80756 2012-12-03 10:06:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fbreader -pkgver=0.99.2 +pkgver=0.99.4 pkgrel=1 pkgdesc="An e-book reader for Linux" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('fribidi' 'bzip2' 'curl' 'qt' 'liblinebreak' 'sqlite') makedepends=('ccache') source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz) -md5sums=('a6fce0b759c9cbaddfdd3482a9c148e1') +md5sums=('ed13a9c3aeb68aaa98a1dd6f7947a31d') build() { export TARGET_ARCH=desktop diff --git a/community/fcgiwrap/PKGBUILD b/community/fcgiwrap/PKGBUILD index 4f6a4f374..f3d818fea 100644 --- a/community/fcgiwrap/PKGBUILD +++ b/community/fcgiwrap/PKGBUILD @@ -1,44 +1,40 @@ -# $Id: PKGBUILD 75304 2012-08-18 12:28:57Z lfleischer $ +# $Id: PKGBUILD 79378 2012-11-03 21:00:27Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Aaron Bull Schaefer <aaron@elasticdog.com> # Contributor: Ron Huang <ronhuang+aur at gmail dot com> pkgname=fcgiwrap pkgver=1.0.3 -_gitrev='2e301c8' -pkgrel=3 +_gitrev='b9f03e6' +pkgrel=4 pkgdesc='A simple server for running CGI applications over FastCGI.' arch=('i686' 'x86_64' 'mips64el') url='http://nginx.localdomain.pl/wiki/FcgiWrap' license=('MIT') -depends=('fcgi' 'spawn-fcgi') +depends=('fcgi' 'systemd') backup=('etc/conf.d/fcgiwrap') -source=("https://github.com/downloads/gnosek/fcgiwrap/${pkgname}-${pkgver}.tar.gz" +source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${_gitrev}.tar.gz" 'fcgiwrap.conf.d' 'fcgiwrap.rc.d' - 'fcgiwrap.service' 'LICENSE') -md5sums=('be73d90df7c4442084463e2815fc213d' +md5sums=('96d5f5a82b96f6eb7b4117fbab5e1e58' '9fbb5b0e861ffea74e655143a4c1a8f9' '71ea12f43aebca39f73ff2e0b684f361' - 'fda6e50f609ede7c599caac8a7bb127a' '5aee62c27b4308f25ab32f05da387366') build() { - cd "${srcdir}/gnosek-${pkgname}-${_gitrev}" + cd "${srcdir}/${pkgname}" autoreconf --install - ./configure --prefix=/usr + ./configure --prefix=/usr --mandir=/share/man make } package() { - cd "${srcdir}/gnosek-${pkgname}-${_gitrev}" + cd "${srcdir}/${pkgname}" make DESTDIR="${pkgdir}" install install -Dm0644 ../fcgiwrap.conf.d "${pkgdir}/etc/conf.d/${pkgname}" install -Dm0755 ../fcgiwrap.rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -Dm0644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - install -Dm0644 "${srcdir}/fcgiwrap.service" "${pkgdir}/usr/lib/systemd/system/fcgiwrap.service" } diff --git a/community/fcitx-anthy/PKGBUILD b/community/fcitx-anthy/PKGBUILD new file mode 100644 index 000000000..0adcca773 --- /dev/null +++ b/community/fcitx-anthy/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: lh <jason52lh@gmail.com> + +pkgname=fcitx-anthy +pkgver=0.1.1 +pkgrel=1 +pkgdesc="Fcitx Wrapper for anthy." +arch=('i686' 'x86_64') +url="http://code.google.com/p/fcitx" +license=('GPL') +depends=('fcitx>=4.2.5' 'anthy') +makedepends=('cmake' 'intltool') +source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +install='fcitx-anthy.install' + +build(){ + cd "$srcdir"/${pkgname}-${pkgver} + + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package() { + cd "$srcdir"/${pkgname}-${pkgver}/build + make DESTDIR=${pkgdir} install +} +md5sums=('651e9a21e5203c14ca0968c63a820157') diff --git a/community/fcitx-anthy/fcitx-anthy.install b/community/fcitx-anthy/fcitx-anthy.install new file mode 100644 index 000000000..c0797237a --- /dev/null +++ b/community/fcitx-anthy/fcitx-anthy.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/fcitx-chewing/PKGBUILD b/community/fcitx-chewing/PKGBUILD new file mode 100644 index 000000000..bb6154d8a --- /dev/null +++ b/community/fcitx-chewing/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 79762 2012-11-12 02:32:12Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgname=fcitx-chewing +pkgver=0.1.3 +pkgrel=1 +pkgdesc="Fcitx Wrapper for chewing" +arch=('i686' 'x86_64') +url="https://github.com/fcitx/fcitx-chewing" +license=('GPL') +depends=('libchewing' 'fcitx>=4.2.6') +makedepends=('cmake' 'intltool') +source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz) + +build() { + cd "$srcdir"/${pkgname}-${pkgver} + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package() { + cd "$srcdir"/${pkgname}-${pkgver}/build + make DESTDIR="$pkgdir" install +} +md5sums=('052e3f146b6e2805918c008005fc9591') diff --git a/community/fcitx-cloudpinyin/PKGBUILD b/community/fcitx-cloudpinyin/PKGBUILD new file mode 100644 index 000000000..af265a976 --- /dev/null +++ b/community/fcitx-cloudpinyin/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 80517 2012-11-23 12:02:14Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: poplarch <poplarch@gmail.com> + +pkgname=fcitx-cloudpinyin +pkgver=0.3.0 +pkgrel=2 +pkgdesc="Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates" +arch=('i686' 'x86_64') +url="https://github.com/csslayer/fcitx-cloudpinyin" +license=('GPL') +depends=('curl' 'fcitx>=4.2.6') +makedepends=('cmake' 'intltool') +source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +md5sums=('8bffd65fe2172d61edde46ad53380150') + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}/build" + make DESTDIR="$pkgdir" install +} diff --git a/community/fcitx-configtool/PKGBUILD b/community/fcitx-configtool/PKGBUILD new file mode 100644 index 000000000..fa2fa3280 --- /dev/null +++ b/community/fcitx-configtool/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 80513 2012-11-23 11:40:13Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgname=fcitx-configtool +pkgver=0.4.5.1 +pkgrel=2 +pkgdesc="GTK based config tool for Fcitx" +arch=('i686' 'x86_64') +url="http://fcitx.googlecode.com/" +license=('GPL2') +depends=("fcitx>=4.2.6" "gtk3" "iso-codes") +makedepends=("cmake") +source=("http://fcitx.googlecode.com/files/$pkgname-$pkgver.tar.xz") + +build() { + cd "$srcdir/$pkgname-$pkgver" + msg "Starting make..." + + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="$pkgdir" install +} + +md5sums=('6787dedcb57e6147553ef755c51bb46b') diff --git a/community/fcitx-googlepinyin/PKGBUILD b/community/fcitx-googlepinyin/PKGBUILD new file mode 100644 index 000000000..8e15d8c38 --- /dev/null +++ b/community/fcitx-googlepinyin/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 80519 2012-11-23 12:06:38Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgname=fcitx-googlepinyin +pkgver=0.1.6 +pkgrel=2 +pkgdesc="Fcitx Wrapper for googlepinyin" +arch=('i686' 'x86_64') +url="http://code.google.com/p/fcitx" +license=('GPL') +depends=('fcitx>=4.2.0' 'libgooglepinyin>=0.1.2') +makedepends=('cmake' 'intltool') +source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +install='fcitx-googlepinyin.install' +md5sums=('7ee33bbb66d29536819b0d2f73b69713') + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/community/fcitx-googlepinyin/fcitx-googlepinyin.install b/community/fcitx-googlepinyin/fcitx-googlepinyin.install new file mode 100644 index 000000000..c0797237a --- /dev/null +++ b/community/fcitx-googlepinyin/fcitx-googlepinyin.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD new file mode 100644 index 000000000..cfa311719 --- /dev/null +++ b/community/fcitx-libpinyin/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 80511 2012-11-23 11:30:00Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: poplarch <poplarch@gmail.com> + +pkgname=fcitx-libpinyin +pkgver=0.2.1 +pkgrel=2 +pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin" +arch=('i686' 'x86_64') +url="https://github.com/fcitx/fcitx-libpinyin" +license=('GPL') +depends=('fcitx>=4.2.0' 'libpinyin>=0.3.0') +makedepends=('cmake' 'intltool' 'wget') +provides=('fcitx-libpinyin') +source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +install='fcitx-libpinyin.install' + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + + rm -rf build + mkdir build + cd build + + msg "Starting make..." + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install +} +md5sums=('9ff621f6f16ab426ff01652b1ffc06a7') diff --git a/community/fcitx-libpinyin/fcitx-libpinyin.install b/community/fcitx-libpinyin/fcitx-libpinyin.install new file mode 100644 index 000000000..c0797237a --- /dev/null +++ b/community/fcitx-libpinyin/fcitx-libpinyin.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/fcitx-m17n/PKGBUILD b/community/fcitx-m17n/PKGBUILD new file mode 100644 index 000000000..e571815a7 --- /dev/null +++ b/community/fcitx-m17n/PKGBUILD @@ -0,0 +1,29 @@ +# $Id$ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgname=fcitx-m17n +pkgver=0.1.3 +pkgrel=1 +pkgdesc="Fcitx Wrapper for m17n." +arch=('i686' 'x86_64') +url="http://code.google.com/p/fcitx" +license=('GPL') +depends=('fcitx>=4.2.1' 'm17n-lib') +makedepends=('cmake' 'intltool') +source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz) + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install +} +md5sums=('a0df4dc1bf2e15fcfef63605dbeb9bba') diff --git a/community/fcitx-rime/PKGBUILD b/community/fcitx-rime/PKGBUILD new file mode 100644 index 000000000..6d9cee68c --- /dev/null +++ b/community/fcitx-rime/PKGBUILD @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: lh <jason52lh@gmail.com> + +pkgname=fcitx-rime +pkgver=0.1.2 +pkgrel=2 +_rimever=0.9.3 +pkgdesc="Fcitx Wrapper for librime" +arch=('i686' 'x86_64') +url="http://code.google.com/p/fcitx" +license=('GPL') +depends=('fcitx>=4.2.0' "librime>=$_rimever" "brise") +makedepends=('cmake' 'intltool') +install='fcitx-rime.install' +source=( + "rime-$_rimever.tar.gz::https://github.com/lotem/brise/tarball/rime-$_rimever" + "http://fcitx.googlecode.com/files/$pkgname-$pkgver.tar.xz" +) + +_brise_name=lotem-brise-149c684 + +build() { + cd "$srcdir" + rm -rf brise/ + cp -r ${_brise_name}/ brise/ + + msg "Starting make..." + + cd "$pkgname-$pkgver" + + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="$pkgdir" install +} + +md5sums=('7a210167c0e5a474716a3bd1d553ff5a' + '3b1d2ad3363910ed214672078c72e23f') diff --git a/community/fcitx-rime/fcitx-rime.install b/community/fcitx-rime/fcitx-rime.install new file mode 100644 index 000000000..c0797237a --- /dev/null +++ b/community/fcitx-rime/fcitx-rime.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/fcitx-sunpinyin/PKGBUILD b/community/fcitx-sunpinyin/PKGBUILD new file mode 100644 index 000000000..25539e1ff --- /dev/null +++ b/community/fcitx-sunpinyin/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 80506 2012-11-23 11:24:07Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgname=fcitx-sunpinyin +pkgver=0.3.9 +pkgrel=2 +pkgdesc="Fcitx Wrapper for sunpinyin, Statistical Language Model based pinyin IME by Sun" +arch=('i686' 'x86_64') +url="http://code.google.com/p/fcitx" +license=('GPL') +install='fcitx-sunpinyin.install' +depends=('fcitx>=4.2.5' 'sunpinyin>2.0.3') +makedepends=('cmake' 'intltool') +source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +md5sums=('de221daa7b3790b22f5a95d7091d0e38') + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/community/fcitx-sunpinyin/fcitx-sunpinyin.install b/community/fcitx-sunpinyin/fcitx-sunpinyin.install new file mode 100644 index 000000000..c0797237a --- /dev/null +++ b/community/fcitx-sunpinyin/fcitx-sunpinyin.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/fcitx-unikey/PKGBUILD b/community/fcitx-unikey/PKGBUILD new file mode 100644 index 000000000..b2cd0abf7 --- /dev/null +++ b/community/fcitx-unikey/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 80099 2012-11-16 03:00:26Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgname=fcitx-unikey +pkgver=0.1.1 +pkgrel=2 +pkgdesc="Fcitx Wrapper for unikey" +arch=('i686' 'x86_64') +url="http://code.google.com/p/fcitx" +license=('GPL') +depends=('fcitx>=4.2.3') +optdepends=('qt: To run the fcitx unikey macro editor') +makedepends=('cmake' 'intltool' 'qt') +source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz) +install='fcitx-unikey.install' + +build(){ + cd "$srcdir/${pkgname}-${pkgver}" + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package () +{ + cd "$srcdir/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install +} +md5sums=('91dc7bd6991df3c975a0b51a246836bf') diff --git a/community/fcitx-unikey/fcitx-unikey.install b/community/fcitx-unikey/fcitx-unikey.install new file mode 100644 index 000000000..c0797237a --- /dev/null +++ b/community/fcitx-unikey/fcitx-unikey.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD new file mode 100644 index 000000000..77f532c14 --- /dev/null +++ b/community/fcitx/PKGBUILD @@ -0,0 +1,76 @@ +# $Id: PKGBUILD 80275 2012-11-19 02:35:00Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: csslayer <wengxt AT gmail com> + +pkgbase=fcitx +pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') +pkgver=4.2.6.1 +pkgrel=3 +arch=('i686' 'x86_64') +url="http://code.google.com/p/fcitx/" +license=('GPL') +makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' 'wget' \ + 'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant') +source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz) +sha1sums=('dc4577bb6bd6de41317f978196f377fc801cc63a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_OPENCC=OFF \ + -DFORCE_PRESAGE=ON \ + -DENABLE_TEST=ON \ + -DENABLE_GTK3_IM_MODULE=ON \ + -DENABLE_QT_IM_MODULE=ON + make +} + +check() { + cd "${srcdir}"/build + make test +} + +package_fcitx() { + pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system" + depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \ + 'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \ + 'libxfixes' 'dbus-core' 'icu') + optdepends=('enchant: for word predication support') + install=fcitx.install + + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + rm -r "${pkgdir}"/usr/lib/{gtk-2.0,gtk-3.0,qt} +} + +package_fcitx-gtk2() { + pkgdesc='GTK2 IM Module for fcitx' + depends=('gtk2' 'fcitx') + install=fcitx-gtk2.install + + cd "${srcdir}"/build/src/frontend/gtk2 + make DESTDIR="${pkgdir}" install +} + +package_fcitx-gtk3() { + pkgdesc='GTK3 IM Module for fcitx' + depends=('gtk3' 'fcitx') + install=fcitx-gtk3.install + + cd "${srcdir}"/build/src/frontend/gtk3 + make DESTDIR="${pkgdir}" install +} + +package_fcitx-qt() { + pkgdesc='QT IM Module for fcitx' + depends=('qt' 'fcitx') + + cd "${srcdir}"/build/src/frontend/qt + make DESTDIR="${pkgdir}" install +} diff --git a/community/fcitx/fcitx-gtk2.install b/community/fcitx/fcitx-gtk2.install new file mode 100644 index 000000000..2bdfac388 --- /dev/null +++ b/community/fcitx/fcitx-gtk2.install @@ -0,0 +1,13 @@ +post_install() { + if res="$(usr/bin/gtk-query-immodules-2.0)"; then + echo "$res" > etc/gtk-2.0/gtk.immodules + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/fcitx/fcitx-gtk3.install b/community/fcitx/fcitx-gtk3.install new file mode 100644 index 000000000..b44958797 --- /dev/null +++ b/community/fcitx/fcitx-gtk3.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/gtk-query-immodules-3.0 --update-cache +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/blender/blender.install b/community/fcitx/fcitx.install index 724bfce00..7f156e002 100644 --- a/community/blender/blender.install +++ b/community/fcitx/fcitx.install @@ -1,7 +1,7 @@ post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_upgrade() { diff --git a/community/fcron/systab.orig b/community/fcron/systab.orig deleted file mode 100644 index 5b0045626..000000000 --- a/community/fcron/systab.orig +++ /dev/null @@ -1,4 +0,0 @@ -&bootrun 01 * * * * /usr/sbin/run-cron /etc/cron.hourly -&bootrun 02 00 * * * /usr/sbin/run-cron /etc/cron.daily -&bootrun 22 00 * * 0 /usr/sbin/run-cron /etc/cron.weekly -&bootrun 42 00 1 * * /usr/sbin/run-cron /etc/cron.monthly diff --git a/community/ffmpeg-compat/PKGBUILD b/community/ffmpeg-compat/PKGBUILD index 43d256cf4..8805a74c2 100644 --- a/community/ffmpeg-compat/PKGBUILD +++ b/community/ffmpeg-compat/PKGBUILD @@ -6,7 +6,7 @@ pkgname=ffmpeg-compat pkgver=20120509 -pkgrel=1 +pkgrel=2 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://ffmpeg.org/" diff --git a/community/fftw2/PKGBUILD b/community/fftw2/PKGBUILD deleted file mode 100644 index 2980711e9..000000000 --- a/community/fftw2/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 55583 2011-09-14 11:20:19Z andrea $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: damir <damir@archlinux.org> - -pkgname=fftw2 -pkgver=2.1.5 -pkgrel=5 -pkgdesc="A C subroutine library for computing the discrete Fourier transform (DFT)" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.fftw.org/" -license=('GPL2') -depends=('glibc') -makedepends=('gcc-fortran') -options=('!libtool') -source=("http://www.fftw.org/fftw-${pkgver}.tar.gz") -md5sums=('8d16a84f3ca02a785ef9eb36249ba433') - -build() { - cd "${srcdir}" - - cp -r fftw-${pkgver} fftw-${pkgver}-double - - # build single precision - cd fftw-${pkgver} - ./configure F77=gfortran --prefix=/usr \ - --enable-float \ - --enable-type-prefix \ - --enable-shared \ - --enable-threads \ - --infodir=/usr/share/info - make - cd ../ - - # build double precision - cd fftw-${pkgver}-double - ./configure F77=gfortran --prefix=/usr \ - --enable-type-prefix \ - --enable-shared \ - --enable-threads \ - --infodir=/usr/share/info - make -} - -package() { - # install single precision - cd "${srcdir}"/fftw-${pkgver} - make DESTDIR="${pkgdir}" install - - # install double precision - cd "${srcdir}"/fftw-${pkgver}-double - make DESTDIR="${pkgdir}" install -} diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index 9a5035eda..dbafcc916 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 61830 2012-01-08 19:17:47Z bluewind $ +# $Id: PKGBUILD 80712 2012-11-30 12:16:29Z bluewind $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla -pkgver=3.5.3 +pkgver=3.6.0.2 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64' 'mips64el') url="http://filezilla-project.org/" license=('GPL') -depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite3') +depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite') install=filezilla.install source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2") -md5sums=('a1a2848db0c5c8f3321ebe4ee3842e31') build() { cd "${pkgname}-${pkgver}" @@ -32,3 +31,4 @@ package() { make DESTDIR="${pkgdir}" install } +md5sums=('d56773feafb85c216813bbda87838db0') diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD index 646d677d0..1a0dfc363 100644 --- a/community/fox/PKGBUILD +++ b/community/fox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77870 2012-10-15 10:22:54Z spupykin $ +# $Id: PKGBUILD 80103 2012-11-16 06:59:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Ben <ben@benmazer.net> pkgname=fox -pkgver=1.6.46 -pkgrel=3 +pkgver=1.6.47 +pkgrel=1 pkgdesc="Free Objects for X: GUI Toolkit for C++" arch=('i686' 'x86_64' 'mips64el') url="http://www.fox-toolkit.org/" @@ -14,7 +14,7 @@ makedepends=('mesa') optdepends=('perl') options=('!libtool') source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz) -md5sums=('da2c5cf36eff32a0c49cfcd9494fe6b7') +md5sums=('9bd233adff5af3fc2d1139c8a22f556c') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD index aba0ba331..f81715361 100644 --- a/community/freeorion/PKGBUILD +++ b/community/freeorion/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78495 2012-10-19 23:54:49Z arodseth $ +# $Id: PKGBUILD 79478 2012-11-06 02:15:41Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: guini <sidtrun@googlemail.com> # Contributor: Forrest Loomis <cybercyst _ at _ gmail dot com> @@ -7,7 +7,7 @@ pkgname=freeorion pkgver=0.4.1 -pkgrel=3 +pkgrel=4 pkgdesc='Turn-based galactic conquest game inspired by Master of Orion' arch=('x86_64' 'i686') url='http://www.freeorion.org/' @@ -32,18 +32,23 @@ sha256sums=('111532e460aec847ff455ee67dd64f46e2fa5ceba39a0349d25a84b69c646eaf' '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a') _svnrepo='https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/' _pyversion=2.7 +_revision=5379 build() { cd "$srcdir" gendesk -n msg2 'Looking up revision from version number...' - _fixedrevision=`curl --progress-bar -o- ${url}index.php/Compile | grep "$pkgver" | cut -d':' -f2 | cut -d' ' -f10 | tail -1` - msg2 "Checking out svn revision $_fixedrevision..." + _releaserevision=`curl --progress-bar -o- ${url}index.php/Compile | grep "$pkgver" | cut -d':' -f2 | cut -d' ' -f10 | tail -1` + msg2 "The revision for the latest official release is $_releaserevision" + # _revision=$_releaserevision + msg2 "Compiling with revision $_revision" + + msg2 "Checking out svn revision $_revision..." if [[ -d "$pkgname/.svn" ]]; then - (cd "$pkgname" && svn up -r "$_fixedrevision") + (cd "$pkgname" && svn up -r "$_revision") else - svn co "$_svnrepo" --config-dir ./ -r "$_fixedrevision" "$pkgname" + svn co "$_svnrepo" --config-dir ./ -r "$_revision" "$pkgname" fi msg2 "Setting up build directory..." @@ -64,8 +69,8 @@ build() { setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING \ "'-march=x86-64 -mtune=generic -O2 -fno-var-tracking -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU '" - msg2 "Boost fix..." - sed -i 's:TIME_UTC:TIME_UTC_:' util/MultiplayerCommon.cpp + #msg2 "Boost fix..." + #sed -i 's:TIME_UTC:TIME_UTC_:' util/MultiplayerCommon.cpp msg2 "Compiling..." make -j1 diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index 3c5b0a4a2..2290488fd 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 77634 2012-10-13 11:42:27Z allan $ +# $Id: PKGBUILD 78928 2012-10-27 23:44:21Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl pkgver=1.22.13.1 _pkgver=1.22.13 -pkgrel=2 +pkgrel=3 pkgdesc="VRML viewer" arch=('i686' 'x86_64' 'mips64el') url="http://freewrl.sourceforge.net/" license=('GPL') depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox' 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js' 'glu') -makedepends=('java-environment' 'xulrunner' 'wget') +makedepends=('java-environment' 'xulrunner' 'wget' 'mesa') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('27f4bf163011d8ac2088a535cb58a13d') diff --git a/community/frei0r-plugins/PKGBUILD b/community/frei0r-plugins/PKGBUILD index fbf3b1149..71094aa94 100644 --- a/community/frei0r-plugins/PKGBUILD +++ b/community/frei0r-plugins/PKGBUILD @@ -1,30 +1,26 @@ -# $Id: PKGBUILD 76620 2012-09-25 09:17:06Z spupykin $ +# $Id: PKGBUILD 79555 2012-11-07 13:11:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=frei0r-plugins pkgver=1.3 -pkgrel=4 -pkgdesc="frei0r is a minimalistic plugin API for video sources and filters." +pkgrel=6 +pkgdesc="A minimalistic plugin API for video sources and filters" arch=(i686 x86_64 'mips64el') url="http://www.piksel.org/frei0r" license=('GPL') -depends=('gcc-libs' 'gavl>=1.0.0' 'opencv') -makedepends=('graphviz') +depends=('gcc-libs' 'gavl>=1.0.0' 'opencv>=2.4.3') +makedepends=('doxygen') options=('!emptydirs') source=(http://ftp.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz) md5sums=('a2eb63feeeb0c5cf439ccca276cbf70c') build() { cd "$srcdir/frei0r-$pkgver" - ./configure --prefix=/usr --docdir=/usr/share/doc + ./configure --prefix=/usr make } package() { cd "$srcdir/frei0r-$pkgver" - make DESTDIR="$pkgdir" install \ - htmldocsdir=$pkgdir/usr/share/doc/frei0r-plugins-$pkgver \ - docsdir=$pkgdir/usr/share/doc/frei0r-plugins-$pkgver - mkdir -p $pkgdir/usr/share/doc/frei0r-plugins-$pkgver/ - mv $pkgdir/$pkgdir/usr/share/doc/frei0r-plugins-$pkgver/* $pkgdir/usr/share/doc/frei0r-plugins-$pkgver/ + make DESTDIR="$pkgdir" install } diff --git a/community/galago-daemon/PKGBUILD b/community/galago-daemon/PKGBUILD deleted file mode 100644 index 82e506751..000000000 --- a/community/galago-daemon/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 65520 2012-02-21 08:41:22Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=galago-daemon -pkgver=0.5.1 -pkgrel=4 -pkgdesc="Galago presence daemon" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -url="http://www.galago-project.org" -depends=('libgalago') -source=(http://www.galago-project.org/files/releases/source/galago-daemon/galago-daemon-$pkgver.tar.gz) -md5sums=('fdb81f938f86f380b127158ebb542279') - -build() { - cd $srcdir/galago-daemon-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname --disable-tests - make - make DESTDIR=$pkgdir install -} diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index b0d3af32d..619d80c04 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78525 2012-10-20 09:33:20Z heftig $ +# $Id: PKGBUILD 80351 2012-11-20 13:26:38Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -14,8 +14,8 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=3.3.3 -pkgrel=2 +pkgver=3.3.4 +pkgrel=1.1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -31,7 +31,7 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils options=('!emptydirs') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('18902ae2bbd0d66d165503aba7e89474' +md5sums=('ec3971de80901737dcc614059f441848' 'b284be39d147ec799f1116a6abc068b4' '6d9e080b66443e7246387b1716d24e31') diff --git a/community/gavl/PKGBUILD b/community/gavl/PKGBUILD index cf531cc3a..99e9de3e2 100644 --- a/community/gavl/PKGBUILD +++ b/community/gavl/PKGBUILD @@ -12,12 +12,14 @@ url='http://gmerlin.sourceforge.net/' license=('GPL') depends=('glibc') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/gmerlin/$pkgname-$pkgver.tar.gz") -md5sums=('2752013a817fbc43ddf13552215ec2c0') +source=("http://downloads.sourceforge.net/sourceforge/gmerlin/$pkgname-$pkgver.tar.gz" + "gavl-autoconf.patch") +md5sums=('2752013a817fbc43ddf13552215ec2c0' + '8825521b3658b447855cf84c637e5fe3') build() { cd "$srcdir/$pkgname-$pkgver" - + patch -Np1 -i ${srcdir}/gavl-autoconf.patch ./configure --prefix=/usr --without-doxygen --with-cpuflags=none make } diff --git a/community/gavl/gavl-autoconf.patch b/community/gavl/gavl-autoconf.patch new file mode 100644 index 000000000..5853abd8f --- /dev/null +++ b/community/gavl/gavl-autoconf.patch @@ -0,0 +1,61 @@ +Index: gavl-1.4.0/acinclude.m4 +=================================================================== +--- gavl-1.4.0.orig/acinclude.m4 ++++ gavl-1.4.0/acinclude.m4 +@@ -46,7 +46,9 @@ AC_DEFUN([AC_C99_FUNC_LRINT], + ac_cv_c99_lrint, + [ + lrint_save_CFLAGS=$CFLAGS +-CFLAGS="-O2 -lm" ++lrint_save_LIBS=$LIBS ++CFLAGS="$CFLAGS -O2" ++LIBS="$LIBS -lm" + AC_TRY_LINK([ + #define _ISOC9X_SOURCE 1 + #define _ISOC99_SOURCE 1 +@@ -57,6 +59,7 @@ AC_TRY_LINK([ + ], if (!lrint(3.14159)) lrint(2.7183);, ac_cv_c99_lrint=yes, ac_cv_c99_lrint=no) + + CFLAGS=$lrint_save_CFLAGS ++LIBS=$lrint_save_LIBS + + ]) + +Index: gavl-1.4.0/configure.ac +=================================================================== +--- gavl-1.4.0.orig/configure.ac ++++ gavl-1.4.0/configure.ac +@@ -129,6 +129,7 @@ fi + dnl + dnl Check for library functions + dnl ++AC_CHECK_FUNC(m,sinf) + + AC_CHECK_FUNCS([memalign]) + AC_CHECK_FUNCS([sched_setaffinity]) +Index: gavl-1.4.0/src/Makefile.am +=================================================================== +--- gavl-1.4.0.orig/src/Makefile.am ++++ gavl-1.4.0/src/Makefile.am +@@ -30,7 +30,7 @@ benchmark_LDADD = ../gavl/libgavl.la @RT + + + volume_test_SOURCES = volume_test.c +-volume_test_LDADD = ../gavl/libgavl.la ++volume_test_LDADD = ../gavl/libgavl.la -lm + + dump_frame_table_SOURCES = dump_frame_table.c + dump_frame_table_LDADD = ../gavl/libgavl.la +Index: gavl-1.4.0/src/Makefile.in +=================================================================== +--- gavl-1.4.0.orig/src/Makefile.in ++++ gavl-1.4.0/src/Makefile.in +@@ -282,7 +282,7 @@ pixelformat_penalty_LDADD = ../gavl/libg + benchmark_SOURCES = benchmark.c + benchmark_LDADD = ../gavl/libgavl.la @RT_LIBS@ + volume_test_SOURCES = volume_test.c +-volume_test_LDADD = ../gavl/libgavl.la ++volume_test_LDADD = ../gavl/libgavl.la -lm + dump_frame_table_SOURCES = dump_frame_table.c + dump_frame_table_LDADD = ../gavl/libgavl.la + colorspace_test_SOURCES = colorspace_test.c
\ No newline at end of file diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD index ad548df59..0a7c1e191 100644 --- a/community/gcompris/PKGBUILD +++ b/community/gcompris/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 78187 2012-10-17 10:23:42Z allan $ +# $Id: PKGBUILD 80539 2012-11-24 11:52:22Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de> pkgname=gcompris -pkgver=12.05 -pkgrel=2 +pkgver=12.11 +pkgrel=1 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10" arch=('i686' 'x86_64' 'mips64el') url="http://gcompris.net/" license=('GPL3') -depends=('pygtk' 'pyxml' 'librsvg' 'gnet' 'python2-pysqlite' +depends=('pygtk' 'pyxml' 'librsvg' 'python2-pysqlite' 'gstreamer0.10-base-plugins') optdepends=('gnucap: for computer simulation within the electricity activity' 'tuxpaint: for the painting activity' @@ -17,7 +17,7 @@ optdepends=('gnucap: for computer simulation within the electricity activity' makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess') options=('!libtool') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -sha256sums=('a4e9b9d04fd405c4b9ddc30f84a5f521f7ad1966c5f66c3e873bb84269ef55d0') +sha256sums=('97b688497963cc907e3d91f844483fb006a07b22010528dafb09ae5380523b20') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gdlmm/0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch b/community/gdlmm/0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch new file mode 100644 index 000000000..c8e3218a9 --- /dev/null +++ b/community/gdlmm/0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch @@ -0,0 +1,58 @@ +From ce395bc27cf08e5f40c4ee4142cbb4795397ddc6 Mon Sep 17 00:00:00 2001 +From: Kalev Lember <kalevlember@gmail.com> +Date: Sun, 22 Apr 2012 21:23:58 +0300 +Subject: [PATCH] Don't wrap gdl_dock_layout_get_layouts_ui + +Removed from gdl in commit 2b3b292. +--- + gdl/src/docklayout.hg | 2 -- + gdl/src/gdl_method.defs | 6 ------ + 2 files changed, 8 deletions(-) + +diff --git a/gdl/src/docklayout.hg b/gdl/src/docklayout.hg +index 155d58b..bf532a7 100644 +--- a/gdl/src/docklayout.hg ++++ b/gdl/src/docklayout.hg +@@ -58,8 +58,6 @@ public: + + _WRAP_METHOD(bool is_dirty() const, gdl_dock_layout_is_dirty) + +- _WRAP_METHOD(Gtk::Widget* get_layouts_ui(), gdl_dock_layout_get_layouts_ui) +- + + _WRAP_PROPERTY("dirty", bool) + +diff --git a/gdl/src/gdl_method.defs b/gdl/src/gdl_method.defs +index a7f84bb..8c80bc7 100644 +--- a/gdl/src/gdl_method.defs ++++ b/gdl/src/gdl_method.defs +@@ -556,12 +556,6 @@ + (return-type "gboolean") + ) + +-(define-method get_layouts_ui +- (of-object "GdlDockLayout") +- (c-name "gdl_dock_layout_get_layouts_ui") +- (return-type "GtkWidget*") +-) +- + + + ;; From gdl-dock-master.h +-- +1.7.10 + +--- gdlmm-3.3.2/gdl/gdlmm/docklayout.cc.get_layouts_ui 2011-11-23 19:47:10.000000000 +0200 ++++ gdlmm-3.3.2/gdl/gdlmm/docklayout.cc 2012-04-23 00:35:26.839494884 +0300 +@@ -180,11 +180,6 @@ + return gdl_dock_layout_is_dirty(const_cast<GdlDockLayout*>(gobj())); + } + +-Gtk::Widget* DockLayout::get_layouts_ui() +-{ +- return Glib::wrap(gdl_dock_layout_get_layouts_ui(gobj())); +-} +- + + #ifdef GLIBMM_PROPERTIES_ENABLED + Glib::PropertyProxy_ReadOnly<bool> DockLayout::property_dirty() const diff --git a/community/gdlmm/PKGBUILD b/community/gdlmm/PKGBUILD index 68b56b12c..97319e18c 100644 --- a/community/gdlmm/PKGBUILD +++ b/community/gdlmm/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 69726 2012-04-23 09:06:41Z ibiru $ +# $Id: PKGBUILD 79334 2012-11-03 04:07:35Z bgyorgy $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=gdlmm pkgver=3.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="C++ bindings for the gdl library" arch=('x86_64' 'i686' 'mips64el') url="http://git.gnome.org/browse/gdlmm/" depends=('gdl' 'gtkmm3') options=(!libtool !emptydirs) license=('LGPL') -source=("http://ftp.gnome.org/pub/GNOME/sources/gdlmm/3.3/$pkgname-$pkgver.tar.xz") -sha256sums=('cf3253be052737332b2b6e9dbd6f62d79cbc3f3398497158c0099dbc45741a46') +source=("http://ftp.gnome.org/pub/GNOME/sources/gdlmm/3.3/$pkgname-$pkgver.tar.xz" + "0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch") +sha256sums=('cf3253be052737332b2b6e9dbd6f62d79cbc3f3398497158c0099dbc45741a46' + '8fb0d920c5c3d4279738f048cbff65b5b4fa544c9f004f8e64d39e54f52653d5') build() { cd "$srcdir/$pkgname-$pkgver" + # Fix build with gdl 3.6 + patch -Np1 -i "$srcdir/0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch" + ./configure --prefix=/usr --sysconfdir=/etc make } diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD index 39966c035..7ba67dc0b 100644 --- a/community/geany-plugins/PKGBUILD +++ b/community/geany-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73662 2012-07-12 20:54:20Z arodseth $ +# $Id: PKGBUILD 79259 2012-11-01 23:43:48Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: djgera @@ -6,14 +6,15 @@ pkgname=geany-plugins pkgver=1.22 -pkgrel=1 -pkgdesc="Combined plugins release for Geany" -arch=('i686' 'x86_64' 'mips64el') -url="http://plugins.geany.org/" +pkgrel=3 +pkgdesc='Combined plugins release for Geany' +arch=('x86_64' 'i686' 'mips64el') +url='http://plugins.geany.org/' license=('GPL') -depends=('geany=1.22' 'lua' 'gtkspell' 'libwebkit' 'hicolor-icon-theme' 'ctpl' 'gpgme') -makedepends=('intltool') +depends=('geany=1.22' 'lua' 'gtkspell' 'libwebkit' 'ctpl' 'gpgme' 'vte' 'desktop-file-utils' 'gtk-update-icon-cache') +makedepends=('intltool' 'vala' 'gdb' 'cppcheck') optdepends=('hspell: hebrew spell checker') +options=('!libtool') install=geany-plugins.install source=("http://plugins.geany.org/geany-plugins/$pkgname-$pkgver.tar.bz2") sha256sums=('a0dcf0cb00ac260670ef8fae682aade60c7c3075c88121fd21f3aecdff84e1ce') diff --git a/community/geany-plugins/geany-plugins.install b/community/geany-plugins/geany-plugins.install index f26807673..bce670aff 100644 --- a/community/geany-plugins/geany-plugins.install +++ b/community/geany-plugins/geany-plugins.install @@ -1,13 +1,12 @@ -post_upgrade() { - gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } -post_install() { - post_upgrade +post_upgrade() { + post_install } post_remove() { - post_upgrade + post_install } - -# vim:set ts=2 sw=2 et: diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD index 630a3e5ab..6da1e9d1a 100644 --- a/community/gecko-mediaplayer/PKGBUILD +++ b/community/gecko-mediaplayer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69616 2012-04-20 13:43:38Z lfleischer $ +# $Id: PKGBUILD 79363 2012-11-03 16:29:50Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: fancris3 <fancris3 at aol.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gecko-mediaplayer -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc='Browser plugin that uses gnome-mplayer to play media in a web browser.' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=("gnome-mplayer>=${pkgver}" 'dbus-glib' 'gmtk') makedepends=('xulrunner' 'pkgconfig') replaces=('mplayer-plugin') source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('7675c8622c47ff8ccd22b685c48635f8') +md5sums=('d35e3307126f874afba93bd896d605dc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD index f971fd355..53d91653f 100644 --- a/community/geda-gaf/PKGBUILD +++ b/community/geda-gaf/PKGBUILD @@ -15,12 +15,15 @@ optdepends=('python2: for two of the commands (garchive, tragesym)' 'gawk: for sw2asc') replaces=('geda-suite' 'geda-libs') install=geda-gaf.install -source=(http://geda.seul.org/release/v1.6/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('35ae86aebc174ec1fc03863fde4c843c') +source=(http://geda.seul.org/release/v1.6/$pkgver/$pkgname-$pkgver.tar.gz + geda-1.6.2-correct_glib_include.patch) +md5sums=('35ae86aebc174ec1fc03863fde4c843c' + 'af28867b393e0351b97d5d23cdefc812') build () { cd "$srcdir/$pkgname-$pkgver/" + patch -Np1 -i ${srcdir}/geda-1.6.2-correct_glib_include.patch ./configure --prefix=/usr --disable-update-xdg-database make } diff --git a/community/geda-gaf/geda-1.6.2-correct_glib_include.patch b/community/geda-gaf/geda-1.6.2-correct_glib_include.patch new file mode 100644 index 000000000..a8cfa96be --- /dev/null +++ b/community/geda-gaf/geda-1.6.2-correct_glib_include.patch @@ -0,0 +1,13 @@ +--- geda-gaf-1.6.2.orig/libgeda/src/s_path.c ++++ geda-gaf-1.6.2/libgeda/src/s_path.c +@@ -37,9 +37,7 @@ + #include <stdlib.h> + #include <string.h> + +-#include <glib/gmem.h> +-#include <glib/gmessages.h> +-#include <glib/gtypes.h> ++#include <glib.h> + + #include "libgeda_priv.h" + diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index b978e43b1..4389b442f 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70017 2012-04-28 09:24:10Z allan $ +# $Id: PKGBUILD 79119 2012-10-30 23:06:21Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.4.0 -pkgrel=2 +pkgver=3.6.1 +pkgrel=1 pkgdesc="Plugins for gedit" arch=('x86_64' 'i686' 'mips64el') license=('GPL') @@ -19,7 +19,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'vte3') options=('!libtool' '!emptydirs') install=gedit-plugins.install source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz") -sha256sums=('a66138b43e1a77f39258f04936be35163b4c6bfd49643791ca445cb3c3d60e0a') +sha256sums=('c5e92830e6029110bf1117bd9f31b23a9ad907210b8cb37039772f5bfcf6d174') build() { cd $pkgname-$pkgver diff --git a/community/gftp/PKGBUILD b/community/gftp/PKGBUILD index 96c352d86..42f79fc7d 100644 --- a/community/gftp/PKGBUILD +++ b/community/gftp/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gftp pkgver=2.0.19 -pkgrel=4 +pkgrel=4.1 pkgdesc="A multithreaded ftp client for X Windows" arch=('i686' 'x86_64' 'mips64el') url="http://www.gftp.org/" diff --git a/community/giggle/PKGBUILD b/community/giggle/PKGBUILD index 243511dc2..3f043f65a 100644 --- a/community/giggle/PKGBUILD +++ b/community/giggle/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 57210 2011-10-24 13:47:08Z ibiru $ +# $Id: PKGBUILD 79629 2012-11-09 09:55:35Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: neodreams <yanbrodeur@gmail.com> pkgname=giggle -pkgver=0.6.1 +pkgver=0.7 pkgrel=1 pkgdesc="Git repository viewer" arch=('i686' 'x86_64' 'mips64el') @@ -11,19 +11,13 @@ url="http://live.gnome.org/giggle" license=('GPL') depends=('git' 'gtksourceview3' 'vte3') makedepends=('intltool' 'itstool') -source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.6/${pkgname}-${pkgver}.tar.xz - gmodule.patch) +source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/$pkgname-$pkgver.tar.xz) options=(!libtool) install=giggle.install -sha256sums=('6c0b5c2b417217509bf88096447afa4af70fd33e8a6db5caa0aa86b44c01a5b8' - 'f8ad37a5e533e24afe127e6d67f7baf055ebed93b822644d7a08d97c96079474') +sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # An upstream build fix. - patch -p1 -i "$srcdir/gmodule.patch" - autoconf + cd $pkgname-$pkgver ./configure \ --prefix=/usr @@ -31,7 +25,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } diff --git a/community/giggle/gmodule.patch b/community/giggle/gmodule.patch deleted file mode 100644 index 2716ea2cd..000000000 --- a/community/giggle/gmodule.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 6a4d71af9920df76a15e427671c90952fddbb411 Mon Sep 17 00:00:00 2001 -From: Vincent Untz <vuntz@gnome.org> -Date: Thu, 19 Jan 2012 13:48:40 +0000 -Subject: build: Explicitly link to gmodule-2.0 - -gmodule-2.0 is now gone from the pkg-config files for GTK+ 3 and others. - -https://bugzilla.gnome.org/show_bug.cgi?id=667350 ---- -diff --git a/configure.ac b/configure.ac -index 07f5b7b..aa11046 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,6 +55,7 @@ GTKSOURCE_REQUIRED_VERSION=3.0 - PKG_CHECK_MODULES(GIGGLE, [ - gio-2.0 >= $GLIB_REQUIRED_VERSION - glib-2.0 >= $GLIB_REQUIRED_VERSION -+ gmodule-2.0 >= $GLIB_REQUIRED_VERSION - gthread-2.0 >= $GLIB_REQUIRED_VERSION - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION - gdk-3.0 >= $GTK_REQUIRED_VERSION --- -cgit v0.9.0.2 diff --git a/community/gimmage/PKGBUILD b/community/gimmage/PKGBUILD index f4a994d35..521b13153 100644 --- a/community/gimmage/PKGBUILD +++ b/community/gimmage/PKGBUILD @@ -13,11 +13,14 @@ license=('GPL') depends=('gtkmm' 'curl' 'file') makedepends=('pkgconfig') changelog=ChangeLog -source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('f51cca53b3d33415e75a91cf81b6ac39') +source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz + gimmage-0.2.3-gcc47.patch) +md5sums=('f51cca53b3d33415e75a91cf81b6ac39' + '23969d3aaaaf4285dc45bd59f4fb11c3') build() { cd $srcdir/$pkgname-$pkgver + patch -Np1 -i ${srcdir}/gimmage-0.2.3-gcc47.patch rm gimmage.desktop sed -i 's|Exec=@prefix@/bin/gimmage|Exec=@prefix@/bin/gimmage %U|' gimmage.desktop.in ./configure --prefix=/usr diff --git a/community/gimmage/gimmage-0.2.3-gcc47.patch b/community/gimmage/gimmage-0.2.3-gcc47.patch new file mode 100644 index 000000000..72f53396f --- /dev/null +++ b/community/gimmage/gimmage-0.2.3-gcc47.patch @@ -0,0 +1,11 @@ +--- gimmage-0.2.3.orig/src/FileManager.cpp 2007-06-26 15:51:15.000000000 +0200 ++++ gimmage-0.2.3/src/FileManager.cpp 2008-02-16 13:58:34.000000000 +0100 +@@ -21,6 +21,8 @@ + + // we make extensive use of get_current_dir_name() from Glib + ++#include <unistd.h> ++ + #include "FileManager.h" + #include "defines.h" + diff --git a/community/gimp-plugin-fblur/PKGBUILD b/community/gimp-plugin-fblur/PKGBUILD index 204fd0568..f967827fc 100644 --- a/community/gimp-plugin-fblur/PKGBUILD +++ b/community/gimp-plugin-fblur/PKGBUILD @@ -9,11 +9,14 @@ url="http://registry.gimp.org/node/1444" license=('GPL') depends=('gimp' 'fftw') makedepends=('intltool') -source=(http://registry.gimp.org/files/focusblur-$pkgver.tar.bz2) -md5sums=('6196c88aeee8733bacc3c6e9ac3c6cf8') +source=(http://registry.gimp.org/files/focusblur-$pkgver.tar.bz2 + focusblur-3.2.6-correct_glib_include.patch) +md5sums=('6196c88aeee8733bacc3c6e9ac3c6cf8' + '45aec2ee18ef542c849b1085db351b4a') build() { cd "$srcdir"/focusblur-$pkgver + patch -Np1 -i ${srcdir}/focusblur-3.2.6-correct_glib_include.patch ./configure --prefix=/usr make } diff --git a/community/gimp-plugin-fblur/focusblur-3.2.6-correct_glib_include.patch b/community/gimp-plugin-fblur/focusblur-3.2.6-correct_glib_include.patch new file mode 100644 index 000000000..65bd9e96d --- /dev/null +++ b/community/gimp-plugin-fblur/focusblur-3.2.6-correct_glib_include.patch @@ -0,0 +1,184 @@ +--- focusblur-3.2.6.orig/src/aaa.h 2008-10-13 10:13:10.000000000 -0500 ++++ focusblur-3.2.6/src/aaa.h 2012-11-23 22:18:41.915247700 -0500 +@@ -19,8 +19,7 @@ + #ifndef __AAA_H__ + #define __AAA_H__ + +-#include <glib/gmacros.h> +-#include <glib/gtypes.h> ++#include <glib.h> + + + G_BEGIN_DECLS + +--- focusblur-3.2.6.orig/src/brush.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/brush.h 2012-11-23 22:25:19.740130640 -0500 +@@ -22,7 +22,7 @@ + #ifndef __FOCUSBLUR_BRUSH_H__ + #define __FOCUSBLUR_BRUSH_H__ + +-#include <glib/gtypes.h> ++#include <glib.h> + #include "focusblurtypes.h" + + G_BEGIN_DECLS + +--- focusblur-3.2.6.orig/src/focusblurtypes.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/focusblurtypes.h 2012-11-23 22:30:15.870054441 -0500 +@@ -22,7 +22,7 @@ + #ifndef __FOCUSBLUR_TYPES_H__ + #define __FOCUSBLUR_TYPES_H__ + +-#include <glib/gmacros.h> ++#include <glib.h> + + + G_BEGIN_DECLS + +--- focusblur-3.2.6.orig/src/focusblur.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/focusblur.h 2012-11-23 22:29:39.760186387 -0500 +@@ -22,7 +22,7 @@ + #ifndef __FOCUSBLUR_H__ + #define __FOCUSBLUR_H__ + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + + +--- focusblur-3.2.6.orig/src/focusblurparam.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/focusblurparam.h 2012-11-23 22:37:30.876340890 -0500 +@@ -22,8 +22,7 @@ + #ifndef __FOCUSBLUR_PARAM_H__ + #define __FOCUSBLUR_PARAM_H__ + +-#include <glib/gmacros.h> +-#include <glib/gtypes.h> ++#include <glib.h> + #include <gtk/gtkstyle.h> + #include <libgimp/gimptypes.h> + + +--- focusblur-3.2.6.orig/src/depthmap.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/depthmap.h 2012-11-23 22:39:16.736583825 -0500 +@@ -22,7 +22,7 @@ + #ifndef __FOCUSBLUR_DEPTHMAP_H__ + #define __FOCUSBLUR_DEPTHMAP_H__ + +-#include <glib/gtypes.h> ++#include <glib.h> + + #include "focusblurtypes.h" + #include "focusblurenums.h" + +--- focusblur-3.2.6.orig/src/fftblurbuffer.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/fftblurbuffer.h 2012-11-23 22:40:27.340963518 -0500 +@@ -28,8 +28,7 @@ + #endif + #include <fftw3.h> + +-#include <glib/gmacros.h> +-#include <glib/gtypes.h> ++#include <glib.h> + #include <gtk/gtkstyle.h> + #include <libgimp/gimptypes.h> + #include <libgimpwidgets/gimpwidgetstypes.h> + +--- focusblur-3.2.6.orig/src/diffusion.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/diffusion.h 2012-11-23 22:44:00.322319293 -0500 +@@ -23,7 +23,7 @@ + #define __FOCUSBLUR_DIFFUSION_H__ + + +-#include <glib/gtypes.h> ++#include <glib.h> + + #include "focusblur.h" + #include "focusblurtypes.h" + +--- focusblur-3.2.6.orig/src/source.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/source.h 2012-11-23 22:46:56.086021371 -0500 +@@ -24,7 +24,7 @@ + + #include "config.h" + +-#include <glib/gtypes.h> ++#include <glib.h> + #include <libgimp/gimptypes.h> + + #include "focusblurtypes.h" + +--- focusblur-3.2.6.orig/src/shine.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/shine.h 2012-11-23 22:47:54.089813718 -0500 +@@ -22,7 +22,7 @@ + #ifndef __FOCUSBLUR_SHINE_H__ + #define __FOCUSBLUR_SHINE_H__ + +-#include <glib/gtypes.h> ++#include <glib.h> + #include <libgimp/gimptypes.h> + + #include "focusblurtypes.h" + +--- focusblur-3.2.6.orig/src/interface.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/interface.h 2012-11-23 22:49:01.946878171 -0500 +@@ -22,7 +22,7 @@ + #ifndef __FOCUSBLUR_INTERFACE_H__ + #define __FOCUSBLUR_INTERFACE_H__ + +-#include <glib/gtypes.h> ++#include <glib.h> + + #include "focusblurtypes.h" + + +--- focusblur-3.2.6.orig/src/render.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/render.h 2012-11-23 22:49:47.253403346 -0500 +@@ -24,7 +24,7 @@ + + #include "config.h" + +-#include <glib/gtypes.h> ++#include <glib.h> + //#include <libgimp/gimp.h> + #include <libgimp/gimpui.h> + + +--- focusblur-3.2.6.orig/src/focusblurstock.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/focusblurstock.h 2012-11-23 22:52:41.220475079 -0500 +@@ -22,7 +22,7 @@ + #ifndef __FOCUSBLUR_STOCK_H__ + #define __FOCUSBLUR_STOCK_H__ + +-#include <glib/gtypes.h> ++#include <glib.h> + + G_BEGIN_DECLS + + +--- focusblur-3.2.6.orig/src/fftblur.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/fftblur.h 2012-11-23 22:55:44.182789690 -0500 +@@ -23,8 +23,7 @@ + #define __FOCUSBLUR_FFTBLUR_H__ + + +-#include <glib/gmacros.h> +-#include <glib/gtypes.h> ++#include <glib.h> + #include <libgimpwidgets/gimpwidgetstypes.h> + + #include "focusblurparam.h" + +--- focusblur-3.2.6.orig/src/fftblurproc.h 2009-01-23 08:06:54.000000000 -0500 ++++ focusblur-3.2.6/src/fftblurproc.h 2012-11-23 22:59:13.909271157 -0500 +@@ -23,8 +23,7 @@ + #define __FOCUSBLUR_FFTBLUR_PROC_H__ + + +-#include <glib/gmacros.h> +-#include <glib/gtypes.h> ++#include <glib.h> + + #include "focusblurtypes.h" + diff --git a/community/gkrellm/PKGBUILD b/community/gkrellm/PKGBUILD index 918eb548b..f1293632c 100644 --- a/community/gkrellm/PKGBUILD +++ b/community/gkrellm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 62784 2012-01-26 17:53:09Z arodseth $ +# $Id: PKGBUILD 79153 2012-10-31 05:24:09Z ebelanger $ # Maintainer: dorphell <dorphell@archlinux.org> # Contributor: Matt Smith (Majik) <darkknight@helpdesk.zaz.net> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=gkrellm pkgver=2.3.5 -pkgrel=2 +pkgrel=3 pkgdesc="System monitor package for GTK2" arch=('i686' 'x86_64' 'mips64el') url="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html" @@ -15,14 +15,15 @@ depends=('gtk2' 'libsm' 'lm_sensors') makedepends=('gettext') backup=('etc/gkrellmd.conf') source=("http://members.dslextreme.com/users/billw/$pkgname/$pkgname-$pkgver.tar.bz2" - "gkrellmd") + "gkrellmd" "gkrellm.service") sha256sums=('702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b' - 'c6d532dd7a706891aed92d750bceda74d4618e86ad82feadc0503214de904360') + 'c6d532dd7a706891aed92d750bceda74d4618e86ad82feadc0503214de904360' + '2829931127632d0391f6749024809594b78c138fe4f03c98cd65fdbd47cea376') build() { cd "$srcdir/$pkgname-$pkgver" - make LOCALEDIR=/usr/share/locale + make LOCALEDIR=/usr/share/locale SYS_LIBS+=-lgmodule-2.0 } package() { @@ -31,6 +32,7 @@ package() { make DESTDIR="$pkgdir" PREFIX=/usr install install -Dm644 "server/gkrellmd.conf" "$pkgdir/etc/gkrellmd.conf" install -Dm755 "../gkrellmd" "$pkgdir/etc/rc.d/gkrellmd" + install -Dm644 "../gkrellm.service" "$pkgdir/usr/lib/systemd/system/gkrellm.service" install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/community/gkrellm/gkrellm.service b/community/gkrellm/gkrellm.service new file mode 100644 index 000000000..9234b8a79 --- /dev/null +++ b/community/gkrellm/gkrellm.service @@ -0,0 +1,11 @@ +[Unit] +Description=GNU Krell Monitors server +After=network.target +# If hddtemp is added to the dependencies in the PKGBUILD, then use +#After=network.target hddtemp.service + +[Service] +ExecStart=/usr/bin/gkrellmd + +[Install] +WantedBy=multi-user.target diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD index baad6680c..906690383 100644 --- a/community/glabels/PKGBUILD +++ b/community/glabels/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 77545 2012-10-12 03:02:27Z bgyorgy $ +# $Id: PKGBUILD 79126 2012-10-30 23:07:20Z heftig $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: yugrotavele <yugrotavele at archlinux dot us> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=glabels pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Creating labels and business cards the very easy way" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://glabels.org/" license=('GPL' 'LGPL') -depends=('librsvg' 'evolution-data-server>=3.4.0' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils') +depends=('librsvg' 'evolution-data-server>=3.6.0' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils') makedepends=('barcode' 'intltool' 'gnome-doc-utils') options=('!libtool') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('99810705b9fcb234f085ed4ac6dbea50cc5b232c6d8ca05ab2c0634673fb9bd2') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + glabels-3.0.0-new-eds.patch) +sha256sums=('99810705b9fcb234f085ed4ac6dbea50cc5b232c6d8ca05ab2c0634673fb9bd2' + 'f02ecf12e10b1d406607bad65f81e53ebd5d56fabe46035a47bd6fe1ec8bf70b') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/glabels-3.0.0-new-eds.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile diff --git a/community/glabels/glabels-3.0.0-new-eds.patch b/community/glabels/glabels-3.0.0-new-eds.patch new file mode 100644 index 000000000..9cae4c076 --- /dev/null +++ b/community/glabels/glabels-3.0.0-new-eds.patch @@ -0,0 +1,71 @@ +diff -up glabels-3.0.0/src/merge-evolution.c.new-eds glabels-3.0.0/src/merge-evolution.c +--- glabels-3.0.0/src/merge-evolution.c.new-eds 2011-04-04 01:02:48.000000000 +0200 ++++ glabels-3.0.0/src/merge-evolution.c 2012-08-29 11:54:20.240577838 +0200 +@@ -29,7 +29,7 @@ + + #include "merge-evolution.h" + +-#include <libebook/e-book.h> ++#include <libebook/libebook.h> + #include <glib/gi18n.h> + #include <stdio.h> + #include <string.h> +@@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gcon + /*--------------------------------------------------------------------------*/ + /* Open merge source. */ + /*--------------------------------------------------------------------------*/ ++static EBook * ++gl_open_system_addressbook (GError **error) ++{ ++ ESourceRegistry *registry; ++ EBook *book = NULL; ++ ESource *source; ++ ++ registry = e_source_registry_new_sync (NULL, error); ++ if (!registry) ++ return NULL; ++ ++ source = e_source_registry_ref_builtin_address_book (registry); ++ if (!source) { ++ g_object_unref (registry); ++ return NULL; ++ } ++ ++ book = e_book_new (source, error); ++ ++ g_object_unref (source); ++ g_object_unref (registry); ++ ++ return book; ++} ++ + static void + gl_merge_evolution_open (glMerge *merge) + { +@@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge) + return; + } + +- merge_evolution->priv->book = e_book_new_system_addressbook(&error); ++ merge_evolution->priv->book = gl_open_system_addressbook(&error); + if (!merge_evolution->priv->book) { + g_warning ("Couldn't open addressbook."); + if (error) + { +- g_warning ("e_book_new_system_addressbook: %s", error->message); ++ g_warning ("gl_open_system_addressbook: %s", error->message); + g_error_free (error); + } + e_book_query_unref(query); +diff -up glabels-3.0.0/src/merge-vcard.c.new-eds glabels-3.0.0/src/merge-vcard.c +--- glabels-3.0.0/src/merge-vcard.c.new-eds 2011-04-04 01:02:48.000000000 +0200 ++++ glabels-3.0.0/src/merge-vcard.c 2012-08-29 11:54:20.241577849 +0200 +@@ -27,7 +27,7 @@ + + #include "merge-vcard.h" + +-#include <libebook/e-contact.h> ++#include <libebook/libebook.h> + #include <stdio.h> + #include <string.h> + #include <errno.h> diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index 17ab644b4..3624620f9 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73522 2012-07-09 01:16:26Z svenstaro $ +# $Id: PKGBUILD 79769 2012-11-12 09:00:25Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: philefou <tuxication AT gmail DOT com> # Contributor: lindquist <tomas@famolsen.dk> @@ -7,16 +7,16 @@ # Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=glfw -pkgver=2.7.6 +pkgver=2.7.7 pkgrel=1 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64' 'mips64el') url="http://www.glfw.org/" license=('custom:ZLIB') -depends=('libgl' 'libxrandr') +depends=('libgl' 'libxrandr' 'glu') makedepends=('mesa') source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('d76512d292d91782487f6e2d4a43e7bc') +md5sums=('873a721fc415268e2b794d4dd08c558f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD new file mode 100644 index 000000000..f2dc1ea9d --- /dev/null +++ b/community/glusterfs/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 80469 2012-11-22 12:21:36Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributors: +# Andrei Antoukh - niwi@niwi.be - http://www.niwi.be +# henning mueller <henning@orgizm.net> + +pkgname=glusterfs +_basever=3.3 +pkgver=$_basever.1 +pkgrel=1 +pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' +arch=(i686 x86_64 mips64el) +url='http://www.gluster.org/' +license=(GPL2 LGPL3) +depends=(fuse python2 libxml2) +makedepends=(flex bison) +options=(!libtool) +source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz + glusterd.rc + glusterd.service) +sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' + 'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4' + 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') +sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' + 'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4' + 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') + +build() { + cd $srcdir/$pkgname-$pkgver + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --libexecdir=/usr/lib/$pkgname \ + PYTHON=python2 + + make + + sed -i s:env\ python:env\ python2: \ + xlators/features/marker/utils/syncdaemon/gsyncd.py + sed -i s:/usr/bin/python:/usr/bin/python2: \ + contrib/ipaddr-py/ipaddr.py +} + +package() { + cd $srcdir/$pkgname-$pkgver + + mkdir -p $pkgdir/usr/sbin + make DESTDIR=$pkgdir install + mv $pkgdir/sbin/* $pkgdir/usr/sbin + rmdir $pkgdir/sbin + + install -D -m 644 \ + $srcdir/$pkgname-$pkgver/{README,INSTALL,COPYING*} \ + $pkgdir/usr/share/doc/glusterfs/ + + install -D -m 755 \ + $srcdir/glusterd.rc \ + $pkgdir/etc/rc.d/glusterd + + install -D -m 644 \ + $srcdir/glusterd.service \ + $pkgdir/usr/lib/systemd/system/glusterd.service + + cp -rf \ + $srcdir/$pkgname-$pkgver/doc/* \ + $pkgdir/usr/share/doc/glusterfs/ +} + +# vim:set ts=2 sw=2 et: diff --git a/community/glusterfs/glusterd.rc b/community/glusterfs/glusterd.rc new file mode 100644 index 000000000..61cc26476 --- /dev/null +++ b/community/glusterfs/glusterd.rc @@ -0,0 +1,39 @@ +#!/bin/sh +# Thanks to igor + +. /etc/rc.conf +. /etc/rc.d/functions + +PID="/var/run/glusterd.pid" + +case "$1" in + start) + stat_busy "Starting glusterd" + /usr/sbin/glusterd -p $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon glusterd + stat_done + fi + ;; + stop) + stat_busy "Stopping glusterd" + kill -QUIT `cat "$PID"` &>/dev/null + if [ $? -ne 0 ]; then + stat_fail + else + rm_daemon glusterd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac + +exit 0 diff --git a/community/glusterfs/glusterd.service b/community/glusterfs/glusterd.service new file mode 100644 index 000000000..c44024317 --- /dev/null +++ b/community/glusterfs/glusterd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Distributed filesystem daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/glusterd + +[Install] +WantedBy=multi-user.target diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 6b205fab4..91e89eee3 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77710 2012-10-13 20:01:04Z ebelanger $ +# $Id: PKGBUILD 78931 2012-10-27 23:44:41Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -7,7 +7,7 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") pkgver=1.5.1.8 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://gmic.sourceforge.net" license=("custom:CeCILL") diff --git a/community/gmime22/PKGBUILD b/community/gmime22/PKGBUILD deleted file mode 100644 index 792ecd1b1..000000000 --- a/community/gmime22/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 65526 2012-02-21 08:43:50Z spupykin $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Ben <ben@benmazer.net> - -pkgname=gmime22 -pkgver=2.2.26 -pkgrel=2 -pkgdesc="Core mime parsing library" -arch=(i686 x86_64 'mips64el') -license=('GPL') -url="http://spruce.sourceforge.net/gmime/" -depends=('glib2' 'zlib') -makedepends=('pkgconfig') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/gmime/2.2/gmime-${pkgver}.tar.bz2) -md5sums=('fed7c1beab58f5e5f4831c266fe974aa') - -build() { - # get rid of that .wapi errors in fakeroot - export MONO_SHARED_DIR="${srcdir}/weird" - mkdir -p "${MONO_SHARED_DIR}" - - cd ${srcdir}/gmime-${pkgver} - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --disable-mono - make - make DESTDIR=${pkgdir} install - - # These are gmime alternatives for the same shareutils tools - rm -rf ${pkgdir}/usr/bin/uuencode ${pkgdir}/usr/bin/uudecode ${pkgdir}/usr/share - mv ${pkgdir}/usr/bin/gmime-config ${pkgdir}/usr/bin/gmime22-config -} diff --git a/community/gmtk/PKGBUILD b/community/gmtk/PKGBUILD index 11d89fe2b..1a826e993 100644 --- a/community/gmtk/PKGBUILD +++ b/community/gmtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 69612 2012-04-20 13:39:41Z lfleischer $ +# $Id: PKGBUILD 79359 2012-11-03 16:28:22Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> pkgname=gmtk -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc='Common functions for gnome-mplayer and gecko-mediaplay.' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('glib2' 'gtk3' 'dconf') makedepends=('intltool' 'pkg-config') options=(!libtool) source=("http://gmtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('6bf1c63788541272717f63ec370f6b6c') +md5sums=('919ea155b755a33ab052dacbbc6e7f03') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD index ec1bda143..3c9da448f 100644 --- a/community/gnome-commander/PKGBUILD +++ b/community/gnome-commander/PKGBUILD @@ -14,12 +14,14 @@ depends=('libgnomeui' 'gnome-vfs' 'gconf' 'python2' 'libsm') makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool') options=(!libtool) install=gnome-commander.install -source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz) -sha256sums=('d2feecf215db3e0faeb873c559087c2ad9af0a5aac26e2b1b32b28be939da37f') +source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz + gnome-commander-1.2.8.15-build.patch) +sha256sums=('d2feecf215db3e0faeb873c559087c2ad9af0a5aac26e2b1b32b28be939da37f' + '856e9c1a17acbb97772ed93d01d81746098e03f5c06375cc976fc784a0011088') build() { cd "$srcdir/$pkgname-$pkgver" - + patch -Np1 -i ${srcdir}/gnome-commander-1.2.8.15-build.patch # python2 fix for file in doc/*/gnome-commander.xml; do sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file diff --git a/community/gnome-commander/gnome-commander-1.2.8.15-build.patch b/community/gnome-commander/gnome-commander-1.2.8.15-build.patch new file mode 100644 index 000000000..f78eea9d3 --- /dev/null +++ b/community/gnome-commander/gnome-commander-1.2.8.15-build.patch @@ -0,0 +1,25 @@ +--- gnome-commander-1.2.8.15.orig/src/gnome-cmd-pixmap.h 2011-12-06 14:10:28.000000000 -0500 ++++ gnome-commander-1.2.8.15/src/gnome-cmd-pixmap.h 2012-11-29 15:57:52.389904563 -0500 +@@ -44,7 +44,7 @@ + g_return_if_fail (pixmap->pixmap != NULL); + g_return_if_fail (pixmap->mask != NULL); + +- gdk_pixbuf_unref (pixmap->pixbuf); ++ g_object_unref (pixmap->pixbuf); + gdk_pixmap_unref (pixmap->pixmap); + gdk_bitmap_unref (pixmap->mask); + + +--- gnome-commander-1.2.8.15.orig/src/dict.h 2011-11-07 18:26:25.000000000 -0500 ++++ gnome-commander-1.2.8.15/src/dict.h 2012-11-29 16:22:17.341129719 -0500 +@@ -55,8 +55,8 @@ + template <typename KEY, typename VAL> + inline void DICT<KEY,VAL>::add(const KEY k, const VAL &v) + { +- std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(make_pair(k,(const VAL *) NULL)); +- std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(make_pair(v,(const KEY *) NULL)); ++ std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(std::make_pair(k,(const VAL *) NULL)); ++ std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(std::make_pair(v,(const KEY *) NULL)); + + if (k_pos.second) + k_pos.first->second = &v_pos.first->first; diff --git a/community/gnome-menus2/PKGBUILD b/community/gnome-menus2/PKGBUILD new file mode 100644 index 000000000..90495aed2 --- /dev/null +++ b/community/gnome-menus2/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 80041 2012-11-15 18:34:49Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Jan de Groot <jan@archlinux.org> + +pkgname=gnome-menus2 +_pkgname=gnome-menus +pkgver=3.0.1 +pkgrel=2 +pkgdesc="Library for the Desktop Menu Specification (legacy version)" +arch=('i686' 'x86_64' 'mips64el') +depends=('glib2' 'python2') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +license=('LGPL') +url="http://www.gnome.org/" +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2) +sha256sums=('579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static \ + PYTHON=/usr/bin/python2 + make +} + +package(){ + cd "$srcdir/$_pkgname-$pkgver" + + make -C libmenu DESTDIR="$pkgdir" install + make -C python DESTDIR="$pkgdir" install +} diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD index 028e43ded..2dad1ed2c 100644 --- a/community/gnome-mplayer/PKGBUILD +++ b/community/gnome-mplayer/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 69614 2012-04-20 13:41:25Z lfleischer $ +# $Id: PKGBUILD 80171 2012-11-17 12:43:41Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gnome-mplayer -pkgver=1.0.6 -pkgrel=1 +pkgver=1.0.7 +pkgrel=2 pkgdesc='A simple MPlayer GUI.' arch=('i686' 'x86_64' 'mips64el') url='http://gnome-mplayer.googlecode.com/' license=('GPL') -depends=('mplayer' 'dbus-glib' 'libnotify' 'hicolor-icon-theme' 'dconf' 'gmtk') +depends=('mplayer' 'dbus-glib' 'libnotify' 'gnome-icon-theme' 'hicolor-icon-theme' 'dconf' 'gmtk') makedepends=('gnome-power-manager' 'nautilus') install="${pkgname}.install" source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('c1fc23faf70f3bbc23daf60f9b34832d') +md5sums=('d0cdabdf1b3eaa25d5c007b5cbd2d9ce') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index 00f64c431..34d54730a 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 75404 2012-08-22 06:01:57Z jconder $ +# $Id: PKGBUILD 79120 2012-10-30 23:06:26Z heftig $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgname=gnome-packagekit -pkgver=3.4.2 -pkgrel=2 +pkgver=3.6.0 +pkgrel=1 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64' 'mips64el') url='http://www.packagekit.org/' license=('GPL') -depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify' +depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'packagekit') -makedepends=('gconf' 'gtk-doc' 'intltool' 'libcanberra' 'upower') +makedepends=('gconf' 'gtk-doc' 'intltool' 'itstool' 'libcanberra' 'upower') optdepends=('polkit-gnome: required for privileged actions' 'gnome-settings-daemon-updates: update and message notifications') options=('!emptydirs' '!libtool') install="$pkgname.install" source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz") -sha256sums=('b7d87db07cf979409b0e997af32b81c02f5324681978f1d687973e7570c5bdca') +sha256sums=('9f096ec72fb81a78c426d9747145405a8b99e1d8418978828796768c8532d676') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch new file mode 100644 index 000000000..03b662c86 --- /dev/null +++ b/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch @@ -0,0 +1,1476 @@ +From f418ff2cd04b233dbffc1129e856630d8c96cd07 Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Fri, 21 Sep 2012 11:56:53 +0100 +Subject: [PATCH] power and media-keys: Use logind for suspending and + rebooting the system + +Use the new logind features to suspend and resume but making sure we opt out +of logind handling the sleep and power keys, and also inhibiting for lid close +auto-suspend if there is an external monitor connected. + +Also use a delay inihibit for logind so that we can do actions on suspend like +blanking the screen using the screensaver and also poking the screensaver on +resume. + +https://bugzilla.gnome.org/show_bug.cgi?id=680689 + +Conflicts: + plugins/power/gsd-power-manager.c +--- + plugins/common/Makefile.am | 4 +- + plugins/common/gsd-power-helper.c | 203 -------- + plugins/common/gsd-power-helper.h | 35 -- + plugins/media-keys/gsd-media-keys-manager.c | 156 +++++-- + plugins/power/gsd-power-manager.c | 697 +++++++++++++++++++--------- + 5 files changed, 594 insertions(+), 501 deletions(-) + delete mode 100644 plugins/common/gsd-power-helper.c + delete mode 100644 plugins/common/gsd-power-helper.h + +diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am +index 7e50db4..b0e907c 100644 +--- a/plugins/common/Makefile.am ++++ b/plugins/common/Makefile.am +@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \ + gsd-keygrab.c \ + gsd-keygrab.h \ + gsd-input-helper.c \ +- gsd-input-helper.h \ +- gsd-power-helper.c \ +- gsd-power-helper.h ++ gsd-input-helper.h + + libcommon_la_CPPFLAGS = \ + $(AM_CPPFLAGS) +diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c +deleted file mode 100644 +index 27d0eda..0000000 +--- a/plugins/common/gsd-power-helper.c ++++ /dev/null +@@ -1,203 +0,0 @@ +-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +- * +- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net> +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- * +- */ +- +-#include "config.h" +- +-#include "gsd-power-helper.h" +- +-#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" +-#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" +-#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" +- +-#define CONSOLEKIT_DBUS_NAME "org.freedesktop.ConsoleKit" +-#define CONSOLEKIT_DBUS_PATH_MANAGER "/org/freedesktop/ConsoleKit/Manager" +-#define CONSOLEKIT_DBUS_INTERFACE_MANAGER "org.freedesktop.ConsoleKit.Manager" +- +-#ifdef HAVE_SYSTEMD +-static void +-systemd_stop (void) +-{ +- GDBusConnection *bus; +- +- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); +- g_dbus_connection_call (bus, +- SYSTEMD_DBUS_NAME, +- SYSTEMD_DBUS_PATH, +- SYSTEMD_DBUS_INTERFACE, +- "PowerOff", +- g_variant_new ("(b)", FALSE), +- NULL, 0, G_MAXINT, NULL, NULL, NULL); +- g_object_unref (bus); +-} +- +-static void +-systemd_suspend (void) +-{ +- GDBusConnection *bus; +- +- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); +- g_dbus_connection_call (bus, +- SYSTEMD_DBUS_NAME, +- SYSTEMD_DBUS_PATH, +- SYSTEMD_DBUS_INTERFACE, +- "Suspend", +- g_variant_new ("(b)", TRUE), +- NULL, 0, G_MAXINT, NULL, NULL, NULL); +- g_object_unref (bus); +-} +- +-static void +-systemd_hibernate (void) +-{ +- GDBusConnection *bus; +- +- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); +- g_dbus_connection_call (bus, +- SYSTEMD_DBUS_NAME, +- SYSTEMD_DBUS_PATH, +- SYSTEMD_DBUS_INTERFACE, +- "Hibernate", +- g_variant_new ("(b)", TRUE), +- NULL, 0, G_MAXINT, NULL, NULL, NULL); +- g_object_unref (bus); +-} +- +-#else /* HAVE_SYSTEMD */ +- +-static void +-consolekit_stop_cb (GObject *source_object, +- GAsyncResult *res, +- gpointer user_data) +-{ +- GVariant *result; +- GError *error = NULL; +- +- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), +- res, +- &error); +- if (result == NULL) { +- g_warning ("couldn't stop using ConsoleKit: %s", +- error->message); +- g_error_free (error); +- } else { +- g_variant_unref (result); +- } +-} +- +-static void +-consolekit_stop (void) +-{ +- GError *error = NULL; +- GDBusProxy *proxy; +- +- /* power down the machine in a safe way */ +- proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, +- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, +- NULL, +- CONSOLEKIT_DBUS_NAME, +- CONSOLEKIT_DBUS_PATH_MANAGER, +- CONSOLEKIT_DBUS_INTERFACE_MANAGER, +- NULL, &error); +- if (proxy == NULL) { +- g_warning ("cannot connect to ConsoleKit: %s", +- error->message); +- g_error_free (error); +- return; +- } +- g_dbus_proxy_call (proxy, +- "Stop", +- NULL, +- G_DBUS_CALL_FLAGS_NONE, +- -1, NULL, +- consolekit_stop_cb, NULL); +- g_object_unref (proxy); +-} +-static void +-upower_sleep_cb (GObject *source_object, +- GAsyncResult *res, +- gpointer user_data) +-{ +- GVariant *result; +- GError *error = NULL; +- +- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), +- res, +- &error); +- if (result == NULL) { +- g_warning ("couldn't sleep using UPower: %s", +- error->message); +- g_error_free (error); +- } else { +- g_variant_unref (result); +- } +-} +- +-static void +-upower_suspend (GDBusProxy *upower_proxy) +-{ +- g_dbus_proxy_call (upower_proxy, +- "Suspend", +- NULL, +- G_DBUS_CALL_FLAGS_NONE, +- -1, NULL, +- upower_sleep_cb, NULL); +-} +- +-static void +-upower_hibernate (GDBusProxy *upower_proxy) +-{ +- g_dbus_proxy_call (upower_proxy, +- "Hibernate", +- NULL, +- G_DBUS_CALL_FLAGS_NONE, +- -1, NULL, +- upower_sleep_cb, NULL); +-} +-#endif /* HAVE_SYSTEMD */ +- +-void +-gsd_power_suspend (GDBusProxy *upower_proxy) +-{ +-#ifdef HAVE_SYSTEMD +- systemd_suspend (); +-#else +- upower_suspend (upower_proxy); +-#endif +-} +- +-void +-gsd_power_poweroff (void) +-{ +-#ifdef HAVE_SYSTEMD +- systemd_stop (); +-#else +- consolekit_stop (); +-#endif +-} +- +-void +-gsd_power_hibernate (GDBusProxy *upower_proxy) +-{ +-#ifdef HAVE_SYSTEMD +- systemd_hibernate (); +-#else +- upower_hibernate (upower_proxy); +-#endif +-} +diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h +deleted file mode 100644 +index e3be14f..0000000 +--- a/plugins/common/gsd-power-helper.h ++++ /dev/null +@@ -1,35 +0,0 @@ +-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +- * +- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net> +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- */ +- +-#ifndef __GSD_POWER_HELPER_H +-#define __GSD_POWER_HELPER_H +- +-#include <glib.h> +- +-G_BEGIN_DECLS +- +-#include <gio/gio.h> +- +-void gsd_power_suspend (GDBusProxy *upower_proxy); +-void gsd_power_hibernate (GDBusProxy *upower_proxy); +-void gsd_power_poweroff (void); +- +-G_END_DECLS +- +-#endif /* __GSD_POWER_HELPER_H */ +diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c +index 9c84d7f..a2f277e 100644 +--- a/plugins/media-keys/gsd-media-keys-manager.c ++++ b/plugins/media-keys/gsd-media-keys-manager.c +@@ -39,6 +39,7 @@ + #include <gdk/gdkx.h> + #include <gtk/gtk.h> + #include <gio/gdesktopappinfo.h> ++#include <gio/gunixfdlist.h> + + #ifdef HAVE_GUDEV + #include <gudev/gudev.h> +@@ -51,7 +52,6 @@ + #include "shortcuts-list.h" + #include "gsd-osd-window.h" + #include "gsd-input-helper.h" +-#include "gsd-power-helper.h" + #include "gsd-enums.h" + + #include <canberra.h> +@@ -105,6 +105,10 @@ static const gchar introspection_xml[] = + #define KEY_CURRENT_INPUT_SOURCE "current" + #define KEY_INPUT_SOURCES "sources" + ++#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" ++#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" ++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" ++ + #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate)) + + typedef struct { +@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate + + /* Power stuff */ + GSettings *power_settings; +- GDBusProxy *upower_proxy; + GDBusProxy *power_screen_proxy; + GDBusProxy *power_keyboard_proxy; + ++ /* systemd stuff */ ++ GDBusProxy *logind_proxy; ++ gint inhibit_keys_fd; ++ + /* Multihead stuff */ + GdkScreen *current_screen; + GSList *screens; +@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager) + } + + static void ++power_action_suspend (GsdMediaKeysManager *manager) ++{ ++#ifndef HAVE_SYSTEMD ++ g_warning ("no systemd support"); ++ return; ++#endif ++ g_dbus_proxy_call (manager->priv->logind_proxy, ++ "Suspend", ++ g_variant_new ("(b)", TRUE), ++ G_DBUS_CALL_FLAGS_NONE, ++ G_MAXINT, ++ manager->priv->bus_cancellable, ++ NULL, NULL); ++} ++ ++static void ++power_action_hibernate (GsdMediaKeysManager *manager) ++{ ++#ifndef HAVE_SYSTEMD ++ g_warning ("no systemd support"); ++ return; ++#endif ++ g_dbus_proxy_call (manager->priv->logind_proxy, ++ "Hibernate", ++ g_variant_new ("(b)", TRUE), ++ G_DBUS_CALL_FLAGS_NONE, ++ G_MAXINT, ++ manager->priv->bus_cancellable, ++ NULL, NULL); ++} ++ ++static void + do_config_power_action (GsdMediaKeysManager *manager, + const gchar *config_key) + { +@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager, + config_key); + switch (action_type) { + case GSD_POWER_ACTION_SUSPEND: +- gsd_power_suspend (manager->priv->upower_proxy); ++ power_action_suspend (manager); + break; + case GSD_POWER_ACTION_INTERACTIVE: + case GSD_POWER_ACTION_SHUTDOWN: + gnome_session_shutdown (manager); + break; + case GSD_POWER_ACTION_HIBERNATE: +- gsd_power_hibernate (manager->priv->upower_proxy); ++ power_action_hibernate (manager); + break; + case GSD_POWER_ACTION_BLANK: + case GSD_POWER_ACTION_NOTHING: +@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) + } + #endif /* HAVE_GUDEV */ + ++ g_clear_object (&priv->logind_proxy); + if (priv->settings) { + g_object_unref (priv->settings); + priv->settings = NULL; +@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) + priv->power_keyboard_proxy = NULL; + } + +- if (priv->upower_proxy) { +- g_object_unref (priv->upower_proxy); +- priv->upower_proxy = NULL; +- } +- + if (priv->cancellable != NULL) { + g_cancellable_cancel (priv->cancellable); + g_object_unref (priv->cancellable); +@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass) + } + + static void ++inhibit_done (GObject *source, ++ GAsyncResult *result, ++ gpointer user_data) ++{ ++ GDBusProxy *proxy = G_DBUS_PROXY (source); ++ GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data); ++ GError *error = NULL; ++ GVariant *res; ++ GUnixFDList *fd_list = NULL; ++ gint idx; ++ ++ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); ++ if (res == NULL) { ++ g_warning ("Unable to inhibit keypresses: %s", error->message); ++ g_error_free (error); ++ } else { ++ g_variant_get (res, "(h)", &idx); ++ manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error); ++ if (manager->priv->inhibit_keys_fd == -1) { ++ g_warning ("Failed to receive system inhibitor fd: %s", error->message); ++ g_error_free (error); ++ } ++ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd); ++ g_object_unref (fd_list); ++ g_variant_unref (res); ++ } ++} ++ ++static void + gsd_media_keys_manager_init (GsdMediaKeysManager *manager) + { ++ GError *error; ++ GDBusConnection *bus; ++ ++ error = NULL; + manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager); ++ ++ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); ++ if (bus == NULL) { ++ g_warning ("Failed to connect to system bus: %s", ++ error->message); ++ g_error_free (error); ++ return; ++ } ++ ++ manager->priv->logind_proxy = ++ g_dbus_proxy_new_sync (bus, ++ 0, ++ NULL, ++ SYSTEMD_DBUS_NAME, ++ SYSTEMD_DBUS_PATH, ++ SYSTEMD_DBUS_INTERFACE, ++ NULL, ++ &error); ++ ++ if (manager->priv->logind_proxy == NULL) { ++ g_warning ("Failed to connect to systemd: %s", ++ error->message); ++ g_error_free (error); ++ } ++ ++ g_object_unref (bus); ++ ++ g_debug ("Adding system inhibitors for power keys"); ++ manager->priv->inhibit_keys_fd = -1; ++ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, ++ "Inhibit", ++ g_variant_new ("(ssss)", ++ "handle-power-key:handle-suspend-key:handle-hibernate-key", ++ g_get_user_name (), ++ "GNOME handling keypresses", ++ "block"), ++ 0, ++ G_MAXINT, ++ NULL, ++ NULL, ++ inhibit_done, ++ manager); ++ + } + + static void +@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object) + + if (media_keys_manager->priv->start_idle_id != 0) + g_source_remove (media_keys_manager->priv->start_idle_id); ++ if (media_keys_manager->priv->inhibit_keys_fd != -1) ++ close (media_keys_manager->priv->inhibit_keys_fd); + + G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object); + } +@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject *source_object, + } + + static void +-upower_ready_cb (GObject *source_object, +- GAsyncResult *res, +- GsdMediaKeysManager *manager) +-{ +- GError *error = NULL; +- +- manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error); +- if (manager->priv->upower_proxy == NULL) { +- g_warning ("Failed to get proxy for upower: %s", +- error->message); +- g_error_free (error); +- } +-} +- +-static void + power_screen_ready_cb (GObject *source_object, + GAsyncResult *res, + GsdMediaKeysManager *manager) +@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager) + manager->priv->bus_cancellable, + (GAsyncReadyCallback) on_bus_gotten, + manager); +- +- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, +- G_DBUS_PROXY_FLAGS_NONE, +- NULL, +- "org.freedesktop.UPower", +- "/org/freedesktop/UPower", +- "org.freedesktop.UPower", +- NULL, +- (GAsyncReadyCallback) upower_ready_cb, +- manager); + } + + GsdMediaKeysManager * +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index 1c594d8..bb7224c 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -1,7 +1,7 @@ + /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu> +- * Copyright (C) 2011 Richard Hughes <richard@hughsie.com> ++ * Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com> + * Copyright (C) 2011 Ritesh Khadgaray <khadgaray@gmail.com> + * + * This program is free software; you can redistribute it and/or modify +@@ -32,6 +32,7 @@ + #include <libupower-glib/upower.h> + #include <libnotify/notify.h> + #include <canberra-gtk.h> ++#include <gio/gunixfdlist.h> + + #define GNOME_DESKTOP_USE_UNSTABLE_API + #include <libgnome-desktop/gnome-rr.h> +@@ -43,7 +44,6 @@ + #include "gnome-settings-session.h" + #include "gsd-enums.h" + #include "gsd-power-manager.h" +-#include "gsd-power-helper.h" + + #define GNOME_SESSION_DBUS_NAME "org.gnome.SessionManager" + #define GNOME_SESSION_DBUS_PATH "/org/gnome/SessionManager" +@@ -78,6 +78,10 @@ + #define GSD_POWER_MANAGER_RECALL_DELAY 30 /* seconds */ + #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT 30 /* seconds */ + ++#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" ++#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" ++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" ++ + /* Keep this in sync with gnome-shell */ + #define SCREENSAVER_FADE_TIME 10 /* seconds */ + +@@ -193,15 +197,21 @@ struct GsdPowerManagerPrivate + ca_context *canberra_context; + ca_proplist *critical_alert_loop_props; + guint32 critical_alert_timeout_id; +- GDBusProxy *screensaver_proxy; + GDBusProxy *session_proxy; + GDBusProxy *session_presence_proxy; + GpmIdletime *idletime; + GsdPowerIdleMode current_idle_mode; +- guint lid_close_safety_timer_id; + GtkStatusIcon *status_icon; + guint xscreensaver_watchdog_timer_id; + gboolean is_virtual_machine; ++ ++ /* systemd stuff */ ++ GDBusProxy *logind_proxy; ++ gint inhibit_lid_switch_fd; ++ gboolean inhibit_lid_switch_taken; ++ gint inhibit_suspend_fd; ++ gboolean inhibit_suspend_taken; ++ guint inhibit_lid_switch_timer_id; + }; + + enum { +@@ -218,8 +228,8 @@ static GIcon *engine_get_icon (GsdPowerManager *manager); + static gchar *engine_get_summary (GsdPowerManager *manager); + static void do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type); + static void do_lid_closed_action (GsdPowerManager *manager); +-static void lock_screensaver (GsdPowerManager *manager); +-static void kill_lid_close_safety_timer (GsdPowerManager *manager); ++static void uninhibit_lid_switch (GsdPowerManager *manager); ++static gboolean external_monitor_is_connected (GnomeRRScreen *screen); + + G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT) + +@@ -2049,6 +2059,57 @@ gnome_session_shutdown (void) + } + + static void ++action_poweroff (GsdPowerManager *manager) ++{ ++ if (manager->priv->logind_proxy == NULL) { ++ g_warning ("no systemd support"); ++ return; ++ } ++ g_dbus_proxy_call (manager->priv->logind_proxy, ++ "PowerOff", ++ g_variant_new ("(b)", FALSE), ++ G_DBUS_CALL_FLAGS_NONE, ++ G_MAXINT, ++ NULL, ++ NULL, ++ NULL); ++} ++ ++static void ++action_suspend (GsdPowerManager *manager) ++{ ++ if (manager->priv->logind_proxy == NULL) { ++ g_warning ("no systemd support"); ++ return; ++ } ++ g_dbus_proxy_call (manager->priv->logind_proxy, ++ "Suspend", ++ g_variant_new ("(b)", FALSE), ++ G_DBUS_CALL_FLAGS_NONE, ++ G_MAXINT, ++ NULL, ++ NULL, ++ NULL); ++} ++ ++static void ++action_hibernate (GsdPowerManager *manager) ++{ ++ if (manager->priv->logind_proxy == NULL) { ++ g_warning ("no systemd support"); ++ return; ++ } ++ g_dbus_proxy_call (manager->priv->logind_proxy, ++ "Hibernate", ++ g_variant_new ("(b)", FALSE), ++ G_DBUS_CALL_FLAGS_NONE, ++ G_MAXINT, ++ NULL, ++ NULL, ++ NULL); ++} ++ ++static void + do_power_action_type (GsdPowerManager *manager, + GsdPowerActionType action_type) + { +@@ -2057,19 +2118,19 @@ do_power_action_type (GsdPowerManager *manager, + + switch (action_type) { + case GSD_POWER_ACTION_SUSPEND: +- gsd_power_suspend (manager->priv->upower_proxy); ++ action_suspend (manager); + break; + case GSD_POWER_ACTION_INTERACTIVE: + gnome_session_shutdown (); + break; + case GSD_POWER_ACTION_HIBERNATE: +- gsd_power_hibernate (manager->priv->upower_proxy); ++ action_hibernate (manager); + break; + case GSD_POWER_ACTION_SHUTDOWN: + /* this is only used on critically low battery where + * hibernate is not available and is marginally better + * than just powering down the computer mid-write */ +- gsd_power_poweroff (); ++ action_poweroff (manager); + break; + case GSD_POWER_ACTION_BLANK: + ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, +@@ -2141,85 +2202,20 @@ upower_kbd_toggle (GsdPowerManager *manager, + return ret; + } + +-static void +-do_lid_open_action (GsdPowerManager *manager) +-{ +- gboolean ret; +- GError *error = NULL; +- +- /* play a sound, using sounds from the naming spec */ +- ca_context_play (manager->priv->canberra_context, 0, +- CA_PROP_EVENT_ID, "lid-open", +- /* TRANSLATORS: this is the sound description */ +- CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), +- NULL); +- +- /* ensure we turn the panel back on after lid open */ +- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, +- GNOME_RR_DPMS_ON, +- &error); +- if (!ret) { +- g_warning ("failed to turn the panel on after lid open: %s", +- error->message); +- g_clear_error (&error); +- } +- +- /* only toggle keyboard if present and already toggled off */ +- if (manager->priv->upower_kdb_proxy != NULL && +- manager->priv->kbd_brightness_old != -1) { +- ret = upower_kbd_toggle (manager, &error); +- if (!ret) { +- g_warning ("failed to turn the kbd backlight on: %s", +- error->message); +- g_error_free (error); +- } +- } +- +- kill_lid_close_safety_timer (manager); +-} +- + static gboolean +-is_on (GnomeRROutput *output) ++inhibit_lid_switch_timer_cb (GsdPowerManager *manager) + { +- GnomeRRCrtc *crtc; +- +- crtc = gnome_rr_output_get_crtc (output); +- if (!crtc) +- return FALSE; +- return gnome_rr_crtc_get_current_mode (crtc) != NULL; +-} +- +-static gboolean +-non_laptop_outputs_are_all_off (GnomeRRScreen *screen) +-{ +- GnomeRROutput **outputs; +- int i; +- +- outputs = gnome_rr_screen_list_outputs (screen); +- for (i = 0; outputs[i] != NULL; i++) { +- if (gnome_rr_output_is_laptop (outputs[i])) +- continue; +- +- if (is_on (outputs[i])) +- return FALSE; ++ if (!external_monitor_is_connected (manager->priv->x11_screen) || ++ g_settings_get_boolean (manager->priv->settings, ++ "lid-close-suspend-with-external-monitor")) { ++ g_debug ("no external monitors for a while; uninhibiting lid close"); ++ uninhibit_lid_switch (manager); ++ manager->priv->inhibit_lid_switch_timer_id = 0; ++ return G_SOURCE_REMOVE; + } + +- return TRUE; +-} +- +-/* Timeout callback used to check conditions when the laptop's lid is closed but +- * the machine is not suspended yet. We try to suspend again, so that the laptop +- * won't overheat if placed in a backpack. +- */ +-static gboolean +-lid_close_safety_timer_cb (GsdPowerManager *manager) +-{ +- manager->priv->lid_close_safety_timer_id = 0; +- +- g_debug ("lid has been closed for a while; trying to suspend again"); +- do_lid_closed_action (manager); +- +- return FALSE; ++ g_debug ("external monitor still there; trying again later"); ++ return G_SOURCE_CONTINUE; + } + + /* Sets up a timer to be triggered some seconds after closing the laptop lid +@@ -2227,82 +2223,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager) + * again in the timeout handler to see if we can suspend then. + */ + static void +-setup_lid_close_safety_timer (GsdPowerManager *manager) ++setup_inhibit_lid_switch_timer (GsdPowerManager *manager) + { +- if (manager->priv->lid_close_safety_timer_id != 0) ++ if (manager->priv->inhibit_lid_switch_timer_id != 0) { ++ g_debug ("lid close safety timer already set up"); + return; ++ } ++ ++ g_debug ("setting up lid close safety timer"); + +- manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, +- (GSourceFunc) lid_close_safety_timer_cb, ++ manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, ++ (GSourceFunc) inhibit_lid_switch_timer_cb, + manager); +- g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer"); ++ g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer"); + } + + static void +-kill_lid_close_safety_timer (GsdPowerManager *manager) ++restart_inhibit_lid_switch_timer (GsdPowerManager *manager) + { +- if (manager->priv->lid_close_safety_timer_id != 0) { +- g_source_remove (manager->priv->lid_close_safety_timer_id); +- manager->priv->lid_close_safety_timer_id = 0; ++ if (manager->priv->inhibit_lid_switch_timer_id != 0) { ++ g_debug ("restarting lid close safety timer"); ++ g_source_remove (manager->priv->inhibit_lid_switch_timer_id); ++ manager->priv->inhibit_lid_switch_timer_id = 0; ++ setup_inhibit_lid_switch_timer (manager); + } + } + + static void +-suspend_with_lid_closed (GsdPowerManager *manager) ++do_lid_open_action (GsdPowerManager *manager) + { + gboolean ret; + GError *error = NULL; +- GsdPowerActionType action_type; + +- /* maybe lock the screen if the lid is closed */ +- lock_screensaver (manager); +- +- /* we have different settings depending on AC state */ +- if (up_client_get_on_battery (manager->priv->up_client)) { +- action_type = g_settings_get_enum (manager->priv->settings, +- "lid-close-battery-action"); +- } else { +- action_type = g_settings_get_enum (manager->priv->settings, +- "lid-close-ac-action"); +- } +- +- /* check we won't melt when the lid is closed */ +- if (action_type != GSD_POWER_ACTION_SUSPEND && +- action_type != GSD_POWER_ACTION_HIBERNATE) { +- if (up_client_get_lid_force_sleep (manager->priv->up_client)) { +- g_warning ("to prevent damage, now forcing suspend"); +- do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND); +- return; +- } +- } ++ /* play a sound, using sounds from the naming spec */ ++ ca_context_play (manager->priv->canberra_context, 0, ++ CA_PROP_EVENT_ID, "lid-open", ++ /* TRANSLATORS: this is the sound description */ ++ CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), ++ NULL); + +- /* ensure we turn the panel back on after resume */ ++ /* ensure we turn the panel back on after lid open */ + ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, +- GNOME_RR_DPMS_OFF, ++ GNOME_RR_DPMS_ON, + &error); + if (!ret) { +- g_warning ("failed to turn the panel off after lid close: %s", ++ g_warning ("failed to turn the panel on after lid open: %s", + error->message); + g_clear_error (&error); + } + +- /* only toggle keyboard if present and not already toggled */ +- if (manager->priv->upower_kdb_proxy && +- manager->priv->kbd_brightness_old == -1) { ++ /* only toggle keyboard if present and already toggled off */ ++ if (manager->priv->upower_kdb_proxy != NULL && ++ manager->priv->kbd_brightness_old != -1) { + ret = upower_kbd_toggle (manager, &error); + if (!ret) { +- g_warning ("failed to turn the kbd backlight off: %s", ++ g_warning ("failed to turn the kbd backlight on: %s", + error->message); + g_error_free (error); + } + } +- +- do_power_action_type (manager, action_type); + } + + static void + do_lid_closed_action (GsdPowerManager *manager) + { ++ gboolean ret; ++ GError *error = NULL; ++ + /* play a sound, using sounds from the naming spec */ + ca_context_play (manager->priv->canberra_context, 0, + CA_PROP_EVENT_ID, "lid-close", +@@ -2310,21 +2297,22 @@ do_lid_closed_action (GsdPowerManager *manager) + CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"), + NULL); + ++ /* turn the panel off if the lid is closed (mainly for Dells...) */ ++ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, ++ GNOME_RR_DPMS_OFF, ++ &error); ++ if (!ret) { ++ g_warning ("failed to turn the panel off after lid close: %s", ++ error->message); ++ g_error_free (error); ++ } ++ + /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */ + gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */ + +- /* perform policy action */ +- if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor") +- || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) { +- g_debug ("lid is closed; suspending or hibernating"); +- suspend_with_lid_closed (manager); +- } else { +- g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active"); +- setup_lid_close_safety_timer (manager); +- } ++ restart_inhibit_lid_switch_timer (manager); + } + +- + static void + up_client_changed_cb (UpClient *client, GsdPowerManager *manager) + { +@@ -2344,6 +2332,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager) + if (manager->priv->lid_is_closed == tmp) + return; + manager->priv->lid_is_closed = tmp; ++ g_debug ("up changed: lid is now %s", tmp ? "closed" : "open"); + + /* fake a keypress */ + if (tmp) +@@ -3302,30 +3291,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass) + } + + static void +-sleep_cb_screensaver_proxy_ready_cb (GObject *source_object, +- GAsyncResult *res, +- gpointer user_data) +-{ +- GError *error = NULL; +- GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); +- +- manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error); +- if (manager->priv->screensaver_proxy == NULL) { +- g_warning ("Could not connect to gnome-screensaver: %s", +- error->message); +- g_error_free (error); +- return; +- } +- +- /* Finish the upower_notify_sleep_cb() call by locking the screen */ +- g_debug ("gnome-screensaver activated, doing gnome-screensaver lock"); +- g_dbus_proxy_call (manager->priv->screensaver_proxy, +- "Lock", +- NULL, G_DBUS_CALL_FLAGS_NONE, -1, +- NULL, NULL, NULL); +-} +- +-static void + idle_dbus_signal_cb (GDBusProxy *proxy, + const gchar *sender_name, + const gchar *signal_name, +@@ -3477,75 +3442,38 @@ out: + } + + static void +-lock_screensaver (GsdPowerManager *manager) ++lock_screensaver (GsdPowerManager *manager, ++ GSourceFunc done_cb) + { + gboolean do_lock; + + do_lock = g_settings_get_boolean (manager->priv->settings_screensaver, + "lock-enabled"); +- if (!do_lock) ++ if (!do_lock && done_cb) { ++ done_cb (manager); + return; +- +- if (manager->priv->screensaver_proxy != NULL) { +- g_debug ("doing gnome-screensaver lock"); +- g_dbus_proxy_call (manager->priv->screensaver_proxy, +- "Lock", +- NULL, G_DBUS_CALL_FLAGS_NONE, -1, +- NULL, NULL, NULL); +- } else { +- /* connect to the screensaver first */ +- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, +- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, +- NULL, +- GS_DBUS_NAME, +- GS_DBUS_PATH, +- GS_DBUS_INTERFACE, +- NULL, +- sleep_cb_screensaver_proxy_ready_cb, +- manager); +- } +-} +- +-static void +-upower_notify_sleep_cb (UpClient *client, +- UpSleepKind sleep_kind, +- GsdPowerManager *manager) +-{ +- lock_screensaver (manager); +-} +- +-static void +-upower_notify_resume_cb (UpClient *client, +- UpSleepKind sleep_kind, +- GsdPowerManager *manager) +-{ +- gboolean ret; +- GError *error = NULL; +- +- /* this displays the unlock dialogue so the user doesn't have +- * to move the mouse or press any key before the window comes up */ +- if (manager->priv->screensaver_proxy != NULL) { +- g_dbus_proxy_call (manager->priv->screensaver_proxy, +- "SimulateUserActivity", +- NULL, +- G_DBUS_CALL_FLAGS_NONE, +- -1, NULL, NULL, NULL); + } + +- /* close existing notifications on resume, the system power +- * state is probably different now */ +- notify_close_if_showing (manager->priv->notification_low); +- notify_close_if_showing (manager->priv->notification_discharging); +- +- /* ensure we turn the panel back on after resume */ +- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, +- GNOME_RR_DPMS_ON, +- &error); +- if (!ret) { +- g_warning ("failed to turn the panel on after resume: %s", +- error->message); +- g_error_free (error); +- } ++ g_dbus_connection_call (manager->priv->connection, ++ GS_DBUS_NAME, ++ GS_DBUS_PATH, ++ GS_DBUS_INTERFACE, ++ "Lock", ++ NULL, NULL, ++ G_DBUS_CALL_FLAGS_NONE, -1, ++ NULL, NULL, NULL); ++ ++ /* Wait until gnome-shell shield animation is done ++ * ++ * FIXME: the shell should mark the lock as active ++ * when the shield is down, then we could wait for ++ * that. This would also fix the problem that we wait ++ * needlessly when the shell has already locked the ++ * screen because it is initiating the suspend. ++ * ++ * https://bugzilla.gnome.org/show_bug.cgi?id=685053 ++ */ ++ g_timeout_add (500, done_cb, manager); + } + + static void +@@ -3755,6 +3683,287 @@ out: + return ret; + } + ++static void ++inhibit_lid_switch_done (GObject *source, ++ GAsyncResult *result, ++ gpointer user_data) ++{ ++ GDBusProxy *proxy = G_DBUS_PROXY (source); ++ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); ++ GError *error = NULL; ++ GVariant *res; ++ GUnixFDList *fd_list = NULL; ++ gint idx; ++ ++ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); ++ if (res == NULL) { ++ g_warning ("Unable to inhibit lid switch: %s", error->message); ++ g_error_free (error); ++ } else { ++ g_variant_get (res, "(h)", &idx); ++ manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error); ++ if (manager->priv->inhibit_lid_switch_fd == -1) { ++ g_warning ("Failed to receive system inhibitor fd: %s", error->message); ++ g_error_free (error); ++ } ++ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd); ++ g_object_unref (fd_list); ++ g_variant_unref (res); ++ } ++} ++ ++static void ++inhibit_lid_switch (GsdPowerManager *manager) ++{ ++ GVariant *params; ++ ++ if (manager->priv->inhibit_lid_switch_taken) { ++ g_debug ("already inhibited lid-switch"); ++ return; ++ } ++ g_debug ("Adding lid switch system inhibitor"); ++ manager->priv->inhibit_lid_switch_taken = TRUE; ++ ++ params = g_variant_new ("(ssss)", ++ "handle-lid-switch", ++ g_get_user_name (), ++ "Multiple displays attached", ++ "block"); ++ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, ++ "Inhibit", ++ params, ++ 0, ++ G_MAXINT, ++ NULL, ++ NULL, ++ inhibit_lid_switch_done, ++ manager); ++} ++ ++static void ++uninhibit_lid_switch (GsdPowerManager *manager) ++{ ++ if (manager->priv->inhibit_lid_switch_fd == -1) { ++ g_debug ("no lid-switch inhibitor"); ++ return; ++ } ++ g_debug ("Removing lid switch system inhibitor"); ++ close (manager->priv->inhibit_lid_switch_fd); ++ manager->priv->inhibit_lid_switch_fd = -1; ++ manager->priv->inhibit_lid_switch_taken = FALSE; ++} ++ ++static void ++inhibit_suspend_done (GObject *source, ++ GAsyncResult *result, ++ gpointer user_data) ++{ ++ GDBusProxy *proxy = G_DBUS_PROXY (source); ++ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); ++ GError *error = NULL; ++ GVariant *res; ++ GUnixFDList *fd_list = NULL; ++ gint idx; ++ ++ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); ++ if (res == NULL) { ++ g_warning ("Unable to inhibit suspend: %s", error->message); ++ g_error_free (error); ++ } else { ++ g_variant_get (res, "(h)", &idx); ++ manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error); ++ if (manager->priv->inhibit_suspend_fd == -1) { ++ g_warning ("Failed to receive system inhibitor fd: %s", error->message); ++ g_error_free (error); ++ } ++ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd); ++ g_object_unref (fd_list); ++ g_variant_unref (res); ++ } ++} ++ ++/* We take a delay inhibitor here, which causes logind to send a ++ * PrepareToSleep signal, which gives us a chance to lock the screen ++ * and do some other preparations. ++ */ ++static void ++inhibit_suspend (GsdPowerManager *manager) ++{ ++ if (manager->priv->inhibit_suspend_taken) { ++ g_debug ("already inhibited lid-switch"); ++ return; ++ } ++ g_debug ("Adding suspend delay inhibitor"); ++ manager->priv->inhibit_suspend_taken = TRUE; ++ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, ++ "Inhibit", ++ g_variant_new ("(ssss)", ++ "sleep", ++ g_get_user_name (), ++ "GNOME needs to lock the screen", ++ "delay"), ++ 0, ++ G_MAXINT, ++ NULL, ++ NULL, ++ inhibit_suspend_done, ++ manager); ++} ++ ++static void ++uninhibit_suspend (GsdPowerManager *manager) ++{ ++ if (manager->priv->inhibit_suspend_fd == -1) { ++ g_debug ("no suspend delay inhibitor"); ++ return; ++ } ++ g_debug ("Removing suspend delay inhibitor"); ++ close (manager->priv->inhibit_suspend_fd); ++ manager->priv->inhibit_suspend_fd = -1; ++ manager->priv->inhibit_suspend_taken = FALSE; ++} ++ ++static gboolean ++randr_output_is_on (GnomeRROutput *output) ++{ ++ GnomeRRCrtc *crtc; ++ ++ crtc = gnome_rr_output_get_crtc (output); ++ if (!crtc) ++ return FALSE; ++ return gnome_rr_crtc_get_current_mode (crtc) != NULL; ++} ++ ++static gboolean ++external_monitor_is_connected (GnomeRRScreen *screen) ++{ ++ GnomeRROutput **outputs; ++ guint i; ++ ++ if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS)) ++ return TRUE; ++ ++ /* see if we have more than one screen plugged in */ ++ outputs = gnome_rr_screen_list_outputs (screen); ++ for (i = 0; outputs[i] != NULL; i++) { ++ if (randr_output_is_on (outputs[i]) && ++ !gnome_rr_output_is_laptop (outputs[i])) ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++static void ++on_randr_event (GnomeRRScreen *screen, gpointer user_data) ++{ ++ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); ++ ++ /* when a second monitor is plugged in, we take the ++ * handle-lid-switch inhibitor lock of logind to prevent ++ * it from suspending. ++ * ++ * Uninhibiting is done in the inhibit_lid_switch_timer, ++ * since we want to give users a few seconds when unplugging ++ * and replugging an external monitor, not suspend right away. ++ */ ++ if (external_monitor_is_connected (screen) && ++ !g_settings_get_boolean (manager->priv->settings, ++ "lid-close-suspend-with-external-monitor")) { ++ inhibit_lid_switch (manager); ++ setup_inhibit_lid_switch_timer (manager); ++ } ++ else { ++ restart_inhibit_lid_switch_timer (manager); ++ } ++} ++ ++static gboolean ++screen_lock_done_cb (gpointer data) ++{ ++ GsdPowerManager *manager = data; ++ ++ /* lift the delay inhibit, so logind can proceed */ ++ uninhibit_suspend (manager); ++ ++ return FALSE; ++} ++ ++static void ++handle_suspend_actions (GsdPowerManager *manager) ++{ ++ gboolean ret; ++ GError *error = NULL; ++ ++ /* ensure we turn the panel back on after resume */ ++ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, ++ GNOME_RR_DPMS_ON, ++ &error); ++ if (!ret) { ++ g_warning ("failed to turn the panel on after resume: %s", ++ error->message); ++ g_error_free (error); ++ } ++ ++ lock_screensaver (manager, screen_lock_done_cb); ++} ++ ++static void ++handle_resume_actions (GsdPowerManager *manager) ++{ ++ gboolean ret; ++ GError *error = NULL; ++ ++ /* this displays the unlock dialogue so the user doesn't have ++ * to move the mouse or press any key before the window comes up */ ++ g_dbus_connection_call (manager->priv->connection, ++ GS_DBUS_NAME, ++ GS_DBUS_PATH, ++ GS_DBUS_INTERFACE, ++ "SimulateUserActivity", ++ NULL, NULL, ++ G_DBUS_CALL_FLAGS_NONE, -1, ++ NULL, NULL, NULL); ++ ++ /* close existing notifications on resume, the system power ++ * state is probably different now */ ++ notify_close_if_showing (manager->priv->notification_low); ++ notify_close_if_showing (manager->priv->notification_discharging); ++ ++ /* ensure we turn the panel back on after resume */ ++ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, ++ GNOME_RR_DPMS_ON, ++ &error); ++ if (!ret) { ++ g_warning ("failed to turn the panel on after resume: %s", ++ error->message); ++ g_error_free (error); ++ } ++ ++ /* set up the delay again */ ++ inhibit_suspend (manager); ++} ++ ++static void ++logind_proxy_signal_cb (GDBusProxy *proxy, ++ const gchar *sender_name, ++ const gchar *signal_name, ++ GVariant *parameters, ++ gpointer user_data) ++{ ++ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); ++ gboolean is_about_to_suspend; ++ ++ if (g_strcmp0 (signal_name, "PrepareForSleep") != 0) ++ return; ++ g_variant_get (parameters, "(b)", &is_about_to_suspend); ++ if (is_about_to_suspend) { ++ handle_suspend_actions (manager); ++ } else { ++ handle_resume_actions (manager); ++ } ++} ++ + gboolean + gsd_power_manager_start (GsdPowerManager *manager, + GError **error) +@@ -3764,6 +3973,25 @@ gsd_power_manager_start (GsdPowerManager *manager, + g_debug ("Starting power manager"); + gnome_settings_profile_start (NULL); + ++ manager->priv->logind_proxy = ++ g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, ++ 0, ++ NULL, ++ SYSTEMD_DBUS_NAME, ++ SYSTEMD_DBUS_PATH, ++ SYSTEMD_DBUS_INTERFACE, ++ NULL, ++ error); ++ if (manager->priv->logind_proxy == NULL) { ++ g_warning ("no systemd support"); ++ return FALSE; ++ } ++ g_signal_connect (manager->priv->logind_proxy, "g-signal", ++ G_CALLBACK (logind_proxy_signal_cb), ++ manager); ++ /* Set up a delay inhibitor to be informed about suspend attempts */ ++ inhibit_suspend (manager); ++ + /* track the active session */ + manager->priv->session = gnome_settings_session_new (); + g_signal_connect (manager->priv->session, "notify::state", +@@ -3778,10 +4006,6 @@ gsd_power_manager_start (GsdPowerManager *manager, + G_CALLBACK (engine_settings_key_changed_cb), manager); + manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver"); + manager->priv->up_client = up_client_new (); +- g_signal_connect (manager->priv->up_client, "notify-sleep", +- G_CALLBACK (upower_notify_sleep_cb), manager); +- g_signal_connect (manager->priv->up_client, "notify-resume", +- G_CALLBACK (upower_notify_resume_cb), manager); + manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client); + g_signal_connect (manager->priv->up_client, "device-added", + G_CALLBACK (engine_device_added_cb), manager); +@@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager, + manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error); + if (manager->priv->x11_screen == NULL) + return FALSE; ++ g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager); ++ /* set up initial state */ ++ on_randr_event (manager->priv->x11_screen, manager); + + /* ensure the default dpms timeouts are cleared */ + ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, +@@ -3927,6 +4154,11 @@ gsd_power_manager_stop (GsdPowerManager *manager) + { + g_debug ("Stopping power manager"); + ++ if (manager->priv->inhibit_lid_switch_timer_id != 0) { ++ g_source_remove (manager->priv->inhibit_lid_switch_timer_id); ++ manager->priv->inhibit_lid_switch_timer_id = 0; ++ } ++ + if (manager->priv->bus_cancellable != NULL) { + g_cancellable_cancel (manager->priv->bus_cancellable); + g_object_unref (manager->priv->bus_cancellable); +@@ -3938,8 +4170,6 @@ gsd_power_manager_stop (GsdPowerManager *manager) + manager->priv->introspection_data = NULL; + } + +- kill_lid_close_safety_timer (manager); +- + g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager); + + g_clear_object (&manager->priv->connection); +@@ -3947,6 +4177,19 @@ gsd_power_manager_stop (GsdPowerManager *manager) + g_clear_object (&manager->priv->settings); + g_clear_object (&manager->priv->settings_screensaver); + g_clear_object (&manager->priv->up_client); ++ ++ if (manager->priv->inhibit_lid_switch_fd != -1) { ++ close (manager->priv->inhibit_lid_switch_fd); ++ manager->priv->inhibit_lid_switch_fd = -1; ++ manager->priv->inhibit_lid_switch_taken = FALSE; ++ } ++ if (manager->priv->inhibit_suspend_fd != -1) { ++ close (manager->priv->inhibit_suspend_fd); ++ manager->priv->inhibit_suspend_fd = -1; ++ manager->priv->inhibit_suspend_taken = FALSE; ++ } ++ ++ g_clear_object (&manager->priv->logind_proxy); + g_clear_object (&manager->priv->x11_screen); + + g_ptr_array_unref (manager->priv->devices_array); +@@ -3980,6 +4223,8 @@ static void + gsd_power_manager_init (GsdPowerManager *manager) + { + manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager); ++ manager->priv->inhibit_lid_switch_fd = -1; ++ manager->priv->inhibit_suspend_fd = -1; + } + + static void +-- +1.8.0 + diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index f76929bc1..c12723aac 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 70738 2012-05-16 07:55:23Z jconder $ +# $Id: PKGBUILD 80371 2012-11-21 04:26:48Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.4.2 +pkgver=3.6.3 pkgrel=1 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') @@ -14,24 +14,27 @@ options=('!emptydirs' '!libtool') install=$_pkgname.install url="http://www.gnome.org" source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz" - 'systemd-fallback.patch' + '0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch' 'arch.patch') -sha256sums=('00499118c80474981f3389ef518e2d001f1b1a3b1fb78e54859d59f3bee38ff4' - '82b721d0e274af15ed2770052d550d3162d2d37e5e9ee5e6fcebac1ed6cb8199' - '727ab3e8181464af32ba604b2931b77cd6d4fbf34e10bbba99bb213eb992466e') +sha256sums=('606aaaba9cc7f51035702aead46c8bb595917a09cb947b396a579ea443328cdc' + 'c4aab9b45346fbae18808358346208f989cce8bf9c9eb753e2af7eca73715109' + '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea') build() { cd "$srcdir/$_pkgname-$pkgver" + patch -Np1 -i "$srcdir/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch" patch -Np1 -i "$srcdir/arch.patch" - patch -Np1 -i "$srcdir/systemd-fallback.patch" - gnome-autogen.sh --prefix=/usr \ + aclocal + automake + ./configure --prefix=/usr \ --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-settings-daemon \ - --disable-static \ - --enable-systemd + --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-settings-daemon \ + --disable-static \ + --enable-systemd \ + --disable-ibus #https://bugzilla.gnome.org/show_bug.cgi?id=656231 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/community/gnome-settings-daemon-updates/arch.patch b/community/gnome-settings-daemon-updates/arch.patch index 6718e4db9..df70cd9f8 100644 --- a/community/gnome-settings-daemon-updates/arch.patch +++ b/community/gnome-settings-daemon-updates/arch.patch @@ -1,17 +1,17 @@ diff --git a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in -index c09096a..3fa4159 100644 +index 9af2718..bb45e48 100644 --- a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in +++ b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in -@@ -31,7 +31,7 @@ - <_description>Automatically download updates in the background without confirmation. Updates will be auto-downloaded when using wired network connnections, and also WiFi if 'connection-use-wifi' is enabled and mobile broadband if 'connection-use-mobile' is enabled.</_description> +@@ -16,7 +16,7 @@ + <_description>Use mobile broadband connections such as GSM and CDMA to check for updates.</_description> </key> - <key name="auto-update-type" enum="org.gnome.settings-daemon.GsdUpdateType"> -- <default>'security'</default> -+ <default>'none'</default> - <_summary>Automatically install these types of updates</_summary> - <_description>Automatically install these types of updates.</_description> + <key name="auto-download-updates" type="b"> +- <default>true</default> ++ <default>false</default> + <_summary>Automatically download updates in the background without confirmation</_summary> + <_description>Automatically download updates in the background without confirmation. Updates will be auto-downloaded when using wired network connnections, and mobile broadband if 'connection-use-mobile' is enabled.</_description> </key> -@@ -56,7 +56,7 @@ +@@ -36,7 +36,7 @@ <_description>The last time we notified the user about non-critical updates. Value is in seconds since the epoch, or zero for never.</_description> </key> <key name="frequency-get-upgrades" type="i"> @@ -21,7 +21,7 @@ index c09096a..3fa4159 100644 <_description>How often to check for distribution upgrades. Value is in seconds.</_description> </key> diff --git a/plugins/updates/Makefile.am b/plugins/updates/Makefile.am -index 9510c65..191092d 100644 +index 81c7179..6fd3534 100644 --- a/plugins/updates/Makefile.am +++ b/plugins/updates/Makefile.am @@ -15,7 +15,9 @@ libupdates_la_SOURCES = \ @@ -36,10 +36,10 @@ index 9510c65..191092d 100644 libupdates_la_CPPFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c -index 4ed046c..9842b32 100644 +index 95ee1c4..7b26c06 100644 --- a/plugins/updates/gsd-updates-manager.c +++ b/plugins/updates/gsd-updates-manager.c -@@ -32,6 +32,7 @@ +@@ -33,6 +33,7 @@ #include "gsd-updates-manager.h" #include "gsd-updates-firmware.h" #include "gsd-updates-refresh.h" @@ -47,44 +47,41 @@ index 4ed046c..9842b32 100644 #include "gsd-updates-common.h" #include "gnome-settings-profile.h" -@@ -46,6 +47,7 @@ struct GsdUpdatesManagerPrivate +@@ -47,6 +48,7 @@ struct GsdUpdatesManagerPrivate GCancellable *cancellable; GsdUpdatesRefresh *refresh; GsdUpdatesFirmware *firmware; + GsdUpdatesWatch *watch; + GSettings *settings_proxy; GSettings *settings_ftp; GSettings *settings_gsd; - GSettings *settings_http; -@@ -1358,6 +1360,9 @@ gsd_updates_manager_start (GsdUpdatesManager *manager, +@@ -1360,6 +1362,9 @@ gsd_updates_manager_start (GsdUpdatesManager *manager, g_signal_connect (manager->priv->refresh, "get-updates", G_CALLBACK (due_get_updates_cb), manager); -+ /* watch transaction progress */ -+ manager->priv->watch = gsd_updates_watch_new (); -+ - /* get http settings */ - manager->priv->settings_http = g_settings_new ("org.gnome.system.proxy.http"); - g_signal_connect (manager->priv->settings_http, "changed", -@@ -1463,6 +1468,10 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager) - g_object_unref (manager->priv->firmware); - manager->priv->firmware = NULL; - } -+ if (manager->priv->watch != NULL) { -+ g_object_unref (manager->priv->watch); -+ manager->priv->watch = NULL; -+ } - if (manager->priv->proxy_session != NULL) { - g_object_unref (manager->priv->proxy_session); - manager->priv->proxy_session = NULL; ++ /* watch transaction progress */ ++ manager->priv->watch = gsd_updates_watch_new (); ++ + /* get proxy settings */ + manager->priv->settings_proxy = g_settings_new ("org.gnome.system.proxy"); + g_signal_connect (manager->priv->settings_proxy, "changed", +@@ -1455,6 +1460,7 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager) + g_clear_object (&manager->priv->task); + g_clear_object (&manager->priv->refresh); + g_clear_object (&manager->priv->firmware); ++ g_clear_object (&manager->priv->watch); + g_clear_object (&manager->priv->proxy_session); + g_clear_object (&manager->priv->volume_monitor); + g_clear_object (&manager->priv->cancellable); diff --git a/plugins/updates/gsd-updates-watch.c b/plugins/updates/gsd-updates-watch.c new file mode 100644 -index 0000000..37d8778 +index 0000000..d3a0202 --- /dev/null +++ b/plugins/updates/gsd-updates-watch.c -@@ -0,0 +1,179 @@ +@@ -0,0 +1,186 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * -+ * Copyright (C) 2007-2011 Richard Hughes <richard@hughsie.com> ++ * Copyright (C) 2011-2012 Jonathan Conder <jonno.conder@gmail.com> + * + * Licensed under the GNU General Public License Version 2 + * @@ -116,160 +113,167 @@ index 0000000..37d8778 + +struct GsdUpdatesWatchPrivate +{ -+ PkTransactionList *tlist; -+ PkClient *client; ++ PkTransactionList *tlist; ++ PkClient *client; +}; + +G_DEFINE_TYPE (GsdUpdatesWatch, gsd_updates_watch, G_TYPE_OBJECT) + +static void ++on_notification_closed (NotifyNotification *notification, gpointer data) ++{ ++ g_object_unref (notification); ++} ++ ++static void +gsd_updates_watch_message_cb (PkMessage *item, GsdUpdatesWatch *watch) +{ -+ NotifyNotification *notification; -+ gchar *details = NULL; -+ const gchar *title, *message; -+ GError *error = NULL; -+ -+ g_return_if_fail (PK_IS_MESSAGE (item)); -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); -+ -+ g_object_get (item, "details", &details, NULL); -+ title = _("More information"); -+ message = details; -+ -+ /* use a better title if available */ -+ if (g_str_has_prefix (details, "<b>")) { -+ gchar *end = g_strstr_len (details, -1, "</b>\n"); -+ if (end != NULL && g_strstr_len (details, end - details, "\n") == NULL) { -+ title = details + 3; -+ *end = '\0'; -+ message = end + 5; -+ } -+ } -+ -+ /* display a notification */ -+ notification = notify_notification_new (title, message, NULL); -+ notify_notification_set_app_name (notification, _("Software Updates")); -+ notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); -+ notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL); -+ -+ if (!notify_notification_show (notification, &error)) { -+ g_warning ("error: %s", error->message); -+ g_error_free (error); -+ } -+ -+ g_free (details); ++ NotifyNotification *notification; ++ gchar *details = NULL; ++ const gchar *title, *message; ++ GError *error = NULL; ++ ++ g_return_if_fail (PK_IS_MESSAGE (item)); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); ++ ++ g_object_get (item, "details", &details, NULL); ++ title = _("More information"); ++ message = details; ++ ++ /* use a better title if available */ ++ if (g_str_has_prefix (details, "<b>")) { ++ gchar *end = g_strstr_len (details, -1, "</b>\n"); ++ if (end != NULL && g_strstr_len (details, end - details, "\n") == NULL) { ++ title = details + 3; ++ *end = '\0'; ++ message = end + 5; ++ } ++ } ++ ++ /* display a notification */ ++ notification = notify_notification_new (title, message, NULL); ++ notify_notification_set_app_name (notification, _("Software Updates")); ++ notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); ++ notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL); ++ ++ g_signal_connect (notification, "closed", G_CALLBACK (on_notification_closed), NULL); ++ if (!notify_notification_show (notification, &error)) { ++ g_warning ("error: %s", error->message); ++ g_error_free (error); ++ } ++ ++ g_free (details); +} + +static void +gsd_updates_watch_adopt_cb (PkClient *client, GAsyncResult *res, GsdUpdatesWatch *watch) +{ -+ PkResults *results; -+ PkProgress *progress = NULL; -+ guint uid; -+ GPtrArray *array; -+ GError *error = NULL; -+ -+ g_return_if_fail (PK_IS_CLIENT (client)); -+ g_return_if_fail (G_IS_ASYNC_RESULT (res)); -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); -+ -+ results = pk_client_generic_finish (client, res, &error); -+ if (results == NULL) { -+ g_warning ("failed to adopt: %s", error->message); -+ g_error_free (error); -+ goto out; -+ } -+ -+ g_object_get (results, "progress", &progress, NULL); -+ g_object_get (progress, "uid", &uid, NULL); -+ -+ /* only display messages from the same user */ -+ if (uid != getuid ()) { -+ g_printerr ("ignoring messages\n"); -+ goto out; -+ } -+ -+ array = pk_results_get_message_array (results); -+ g_ptr_array_foreach (array, (GFunc) gsd_updates_watch_message_cb, watch); -+ g_ptr_array_unref (array); ++ PkResults *results; ++ PkProgress *progress = NULL; ++ guint uid; ++ GPtrArray *array; ++ GError *error = NULL; ++ ++ g_return_if_fail (PK_IS_CLIENT (client)); ++ g_return_if_fail (G_IS_ASYNC_RESULT (res)); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); ++ ++ results = pk_client_generic_finish (client, res, &error); ++ if (results == NULL) { ++ g_warning ("failed to adopt: %s", error->message); ++ g_error_free (error); ++ goto out; ++ } ++ ++ g_object_get (results, "progress", &progress, NULL); ++ g_object_get (progress, "uid", &uid, NULL); ++ ++ /* only display messages from the same user */ ++ if (uid != getuid ()) { ++ g_printerr ("ignoring messages\n"); ++ goto out; ++ } ++ ++ array = pk_results_get_message_array (results); ++ g_ptr_array_foreach (array, (GFunc) gsd_updates_watch_message_cb, watch); ++ g_ptr_array_unref (array); + +out: -+ if (progress != NULL) { -+ g_object_unref (progress); -+ } -+ if (results != NULL) { -+ g_object_unref (results); -+ } ++ if (progress != NULL) { ++ g_object_unref (progress); ++ } ++ if (results != NULL) { ++ g_object_unref (results); ++ } +} + +static void +gsd_updates_watch_tlist_added_cb (PkTransactionList *tlist, const gchar *tid, GsdUpdatesWatch *watch) +{ -+ g_return_if_fail (PK_IS_TRANSACTION_LIST (tlist)); -+ g_return_if_fail (tid != NULL); -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); ++ g_return_if_fail (PK_IS_TRANSACTION_LIST (tlist)); ++ g_return_if_fail (tid != NULL); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); + -+ /* listen for messages */ -+ pk_client_adopt_async (watch->priv->client, tid, NULL, NULL, NULL, -+ (GAsyncReadyCallback) gsd_updates_watch_adopt_cb, watch); ++ /* listen for messages */ ++ pk_client_adopt_async (watch->priv->client, tid, NULL, NULL, NULL, ++ (GAsyncReadyCallback) gsd_updates_watch_adopt_cb, watch); +} + +static void +gsd_updates_watch_init (GsdUpdatesWatch *watch) +{ -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); + -+ watch->priv = GSD_UPDATES_WATCH_GET_PRIVATE (watch); -+ watch->priv->tlist = pk_transaction_list_new (); -+ watch->priv->client = pk_client_new (); ++ watch->priv = GSD_UPDATES_WATCH_GET_PRIVATE (watch); ++ watch->priv->tlist = pk_transaction_list_new (); ++ watch->priv->client = pk_client_new (); + -+ g_signal_connect (watch->priv->tlist, "added", -+ G_CALLBACK (gsd_updates_watch_tlist_added_cb), watch); ++ g_signal_connect (watch->priv->tlist, "added", ++ G_CALLBACK (gsd_updates_watch_tlist_added_cb), watch); +} + +static void +gsd_updates_watch_finalize (GObject *object) +{ -+ GsdUpdatesWatch *watch; ++ GsdUpdatesWatch *watch; + -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (object)); ++ g_return_if_fail (GSD_IS_UPDATES_WATCH (object)); + -+ watch = GSD_UPDATES_WATCH (object); -+ g_return_if_fail (watch->priv != NULL); ++ watch = GSD_UPDATES_WATCH (object); ++ g_return_if_fail (watch->priv != NULL); + -+ if (watch->priv->tlist != NULL) { -+ g_object_unref (watch->priv->tlist); -+ } -+ if (watch->priv->client != NULL) { -+ g_object_unref (watch->priv->client); -+ } ++ if (watch->priv->tlist != NULL) { ++ g_object_unref (watch->priv->tlist); ++ } ++ if (watch->priv->client != NULL) { ++ g_object_unref (watch->priv->client); ++ } + -+ G_OBJECT_CLASS (gsd_updates_watch_parent_class)->finalize (object); ++ G_OBJECT_CLASS (gsd_updates_watch_parent_class)->finalize (object); +} + +GsdUpdatesWatch * +gsd_updates_watch_new (void) +{ -+ return GSD_UPDATES_WATCH (g_object_new (GSD_TYPE_UPDATES_WATCH, NULL)); ++ return GSD_UPDATES_WATCH (g_object_new (GSD_TYPE_UPDATES_WATCH, NULL)); +} + +static void +gsd_updates_watch_class_init (GsdUpdatesWatchClass *klass) +{ -+ GObjectClass *object_class = G_OBJECT_CLASS (klass); -+ object_class->finalize = gsd_updates_watch_finalize; -+ g_type_class_add_private (klass, sizeof (GsdUpdatesWatchPrivate)); ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ object_class->finalize = gsd_updates_watch_finalize; ++ g_type_class_add_private (klass, sizeof (GsdUpdatesWatchPrivate)); +} diff --git a/plugins/updates/gsd-updates-watch.h b/plugins/updates/gsd-updates-watch.h new file mode 100644 -index 0000000..d90976e +index 0000000..439464f --- /dev/null +++ b/plugins/updates/gsd-updates-watch.h @@ -0,0 +1,52 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * -+ * Copyright (C) 2007-2011 Richard Hughes <richard@hughsie.com> ++ * Copyright (C) 2011-2012 Jonathan Conder <jonno.conder@gmail.com> + * + * Licensed under the GNU General Public License Version 2 + * diff --git a/community/gnome-settings-daemon-updates/gnome-settings-daemon.install b/community/gnome-settings-daemon-updates/gnome-settings-daemon.install index 326aa98a2..f7e8c46ac 100644 --- a/community/gnome-settings-daemon-updates/gnome-settings-daemon.install +++ b/community/gnome-settings-daemon-updates/gnome-settings-daemon.install @@ -1,5 +1,6 @@ post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/community/gnome-settings-daemon-updates/screensaver.patch b/community/gnome-settings-daemon-updates/screensaver.patch new file mode 100644 index 000000000..bbcfe3430 --- /dev/null +++ b/community/gnome-settings-daemon-updates/screensaver.patch @@ -0,0 +1,145 @@ +From b47e4019a12ac84fba31e1c631d878ce03fa3808 Mon Sep 17 00:00:00 2001 +From: Rui Matos <tiagomatos@gmail.com> +Date: Wed, 17 Oct 2012 22:44:54 +0000 +Subject: power: Add a watchdog to keep X's builtin screen saver disabled + +X's builtin screen saver may activate DPMS. Since we want to activate +DPMS ourselves according to our own policy we must make sure that X's +screen saver remains disabled. + +This code is a copy of the original found in gs-watcher-x11.c from +gnome-screensaver which stopped being used in GNOME 3.6. + +https://bugzilla.gnome.org/show_bug.cgi?id=686339 +--- +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index 0e06495..070cf32 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -27,6 +27,7 @@ + #include <stdio.h> + #include <sys/wait.h> + #include <glib/gi18n.h> ++#include <gdk/gdkx.h> + #include <gtk/gtk.h> + #include <libupower-glib/upower.h> + #include <libnotify/notify.h> +@@ -80,6 +81,8 @@ + /* Keep this in sync with gnome-shell */ + #define SCREENSAVER_FADE_TIME 10 /* seconds */ + ++#define XSCREENSAVER_WATCHDOG_TIMEOUT 120 /* seconds */ ++ + enum { + GSD_POWER_IDLETIME_NULL_ID, + GSD_POWER_IDLETIME_DIM_ID, +@@ -197,6 +200,7 @@ struct GsdPowerManagerPrivate + GsdPowerIdleMode current_idle_mode; + guint lid_close_safety_timer_id; + GtkStatusIcon *status_icon; ++ guint xscreensaver_watchdog_timer_id; + }; + + enum { +@@ -3621,6 +3625,77 @@ engine_session_active_changed_cb (GnomeSettingsSession *session, + idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL); + } + ++/* This timer goes off every few minutes, whether the user is idle or not, ++ to try and clean up anything that has gone wrong. ++ ++ It calls disable_builtin_screensaver() so that if xset has been used, ++ or some other program (like xlock) has messed with the XSetScreenSaver() ++ settings, they will be set back to sensible values (if a server extension ++ is in use, messing with xlock can cause the screensaver to never get a wakeup ++ event, and could cause monitor power-saving to occur, and all manner of ++ heinousness.) ++ ++ This code was originally part of gnome-screensaver, see ++ http://git.gnome.org/browse/gnome-screensaver/tree/src/gs-watcher-x11.c?id=fec00b12ec46c86334cfd36b37771cc4632f0d4d#n530 ++ */ ++static gboolean ++disable_builtin_screensaver (gpointer unused) ++{ ++ int current_server_timeout, current_server_interval; ++ int current_prefer_blank, current_allow_exp; ++ int desired_server_timeout, desired_server_interval; ++ int desired_prefer_blank, desired_allow_exp; ++ ++ XGetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), ++ ¤t_server_timeout, ++ ¤t_server_interval, ++ ¤t_prefer_blank, ++ ¤t_allow_exp); ++ ++ desired_server_timeout = current_server_timeout; ++ desired_server_interval = current_server_interval; ++ desired_prefer_blank = current_prefer_blank; ++ desired_allow_exp = current_allow_exp; ++ ++ desired_server_interval = 0; ++ ++ /* I suspect (but am not sure) that DontAllowExposures might have ++ something to do with powering off the monitor as well, at least ++ on some systems that don't support XDPMS? Who know... */ ++ desired_allow_exp = AllowExposures; ++ ++ /* When we're not using an extension, set the server-side timeout to 0, ++ so that the server never gets involved with screen blanking, and we ++ do it all ourselves. (However, when we *are* using an extension, ++ we tell the server when to notify us, and rather than blanking the ++ screen, the server will send us an X event telling us to blank.) ++ */ ++ desired_server_timeout = 0; ++ ++ if (desired_server_timeout != current_server_timeout ++ || desired_server_interval != current_server_interval ++ || desired_prefer_blank != current_prefer_blank ++ || desired_allow_exp != current_allow_exp) { ++ ++ g_debug ("disabling server builtin screensaver:" ++ " (xset s %d %d; xset s %s; xset s %s)", ++ desired_server_timeout, ++ desired_server_interval, ++ (desired_prefer_blank ? "blank" : "noblank"), ++ (desired_allow_exp ? "expose" : "noexpose")); ++ ++ XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), ++ desired_server_timeout, ++ desired_server_interval, ++ desired_prefer_blank, ++ desired_allow_exp); ++ ++ XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE); ++ } ++ ++ return TRUE; ++} ++ + gboolean + gsd_power_manager_start (GsdPowerManager *manager, + GError **error) +@@ -3778,6 +3853,9 @@ gsd_power_manager_start (GsdPowerManager *manager, + /* set the initial dim time that can adapt for the user */ + refresh_idle_dim_settings (manager); + ++ manager->priv->xscreensaver_watchdog_timer_id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT, ++ disable_builtin_screensaver, ++ NULL); + gnome_settings_profile_end (NULL); + return TRUE; + } +@@ -3829,6 +3907,11 @@ gsd_power_manager_stop (GsdPowerManager *manager) + + g_clear_object (&manager->priv->idletime); + g_clear_object (&manager->priv->status_icon); ++ ++ if (manager->priv->xscreensaver_watchdog_timer_id > 0) { ++ g_source_remove (manager->priv->xscreensaver_watchdog_timer_id); ++ manager->priv->xscreensaver_watchdog_timer_id = 0; ++ } + } + + static void +-- +cgit v0.9.0.2 diff --git a/community/gnomesu/PKGBUILD b/community/gnomesu/PKGBUILD index 579e75278..bf26c6a3f 100644 --- a/community/gnomesu/PKGBUILD +++ b/community/gnomesu/PKGBUILD @@ -22,7 +22,7 @@ build() { sed -i 's/gsu/gnomesu/' xsu.desktop.in sed -i 's/gnome-warning/dialog-warning/' xsu.desktop.in sed -i 's|gnome-warning|/usr/share/icons/gnome/16x16/status/dialog-warning|' src/xsu.c - ./configure --prefix=/usr --mandir=/usr/share + ./configure --prefix=/usr --mandir=/usr/share --build=$CHOST make CFLAGS+=-Wl,-export-dynamic make DESTDIR=$pkgdir install install -D -m644 xsu.desktop $pkgdir/usr/share/applications/gnomesu.desktop diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD index f553e04e7..71a0e4a0c 100644 --- a/community/gnote/PKGBUILD +++ b/community/gnote/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 69794 2012-04-23 09:41:58Z ibiru $ +# $Id: PKGBUILD 79122 2012-10-30 23:06:42Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: uastasi <uastasi@archlinux.us> pkgname=gnote -pkgver=0.8.3 +pkgver=3.6.1 pkgrel=1 pkgdesc="A note taking application." arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Gnote" license=('GPL3') -depends=('gtkmm3' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf') -makedepends=('intltool' 'gnome-doc-utils' 'boost') +depends=('gtkmm3' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf' 'libsecret') +makedepends=('intltool' 'itstool' 'boost') options=('!libtool') install=gnote.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.8/$pkgname-$pkgver.tar.xz) -sha256sums=('41308f957b9cb6f885adb61a607b93ec969be069676e7d518c007ecf35f474ab') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('f1f62ccf9cce1eef2ee2b41039360f946f3b4223983ca52223ccb6687a59f2f9') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -28,6 +28,6 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/gnuchess/PKGBUILD b/community/gnuchess/PKGBUILD index ab77e7855..ee192edc3 100644 --- a/community/gnuchess/PKGBUILD +++ b/community/gnuchess/PKGBUILD @@ -4,10 +4,10 @@ pkgname=gnuchess pkgver=6.0.2 -pkgrel=1 +pkgrel=1.1 pkgdesc="Lets most modern computers play a full game of chess" url="http://www.gnu.org/software/chess/chess.html" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('glibc' 'ncurses' 'readline') source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz{,.sig}) diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD index e8e7f7a5e..c8cadf107 100644 --- a/community/gnunet-gtk/PKGBUILD +++ b/community/gnunet-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71939 2012-06-03 21:25:05Z spupykin $ +# $Id: PKGBUILD 79553 2012-11-07 10:36:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet-gtk -pkgver=0.9.3 +pkgver=0.9.4 pkgrel=1 pkgdesc="A frontend for GNUnet" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=('gnunet' 'glade' 'adns') makedepends=('pkgconfig') source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz) -md5sums=('0ca9f143a928ee29ddc3c60e1d4b6dc8') +md5sums=('cf4c949c20033fe2b392f1b478ce2522') build() { cd $srcdir/$pkgname-$pkgver @@ -24,4 +24,5 @@ build() { package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install + mv $pkgdir/usr/share/doc/gnunet $pkgdir/usr/share/doc/gnunet-gtk } diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD index 7fbf3f806..bb716752f 100644 --- a/community/gnunet/PKGBUILD +++ b/community/gnunet/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 78354 2012-10-17 15:17:48Z spupykin $ +# $Id: PKGBUILD 79549 2012-11-07 09:34:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet -pkgver=0.9.3 -pkgrel=2 +pkgver=0.9.4 +pkgrel=1 pkgdesc="A framework for secure peer-to-peer networking" arch=('i686' 'x86_64' 'mips64el') url="http://gnunet.org" license=('GPL') depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite' 'curl' - 'libmicrohttpd' 'libunistring') + 'libmicrohttpd' 'libunistring' 'libidn') makedepends=('gettext' 'pkgconfig') backup=(etc/gnunetd.conf) options=('!libtool' '!makeflags') @@ -20,7 +20,7 @@ source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz{,.sig} gnunet.service gnunet.conf.d defaults.conf) -md5sums=('4234ad22e3204941773632a1d0c2e0e8' +md5sums=('ad4fa34cea8a9e905f1353b68db179ea' '5baf691913b007fb33e365239e3f7217' '54cce3d2415d95b2e5bd1bd88db3a0ea' 'f161b46915736e4017e77ad735521453' @@ -42,3 +42,9 @@ package() { rm -rf $pkgdir/usr/include/libltdl $pkgdir/usr/lib/libltdl.* $pkgdir/usr/include/ltdl.h install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } +md5sums=('ad4fa34cea8a9e905f1353b68db179ea' + '3db767d31239430cc22afb81596a4d5d' + '5baf691913b007fb33e365239e3f7217' + '54cce3d2415d95b2e5bd1bd88db3a0ea' + 'f161b46915736e4017e77ad735521453' + '0fe23b2ca5b3fc47a0b5645e04406da0') diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index d57e9373a..06bcb0b3e 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77818 2012-10-15 00:41:07Z arodseth $ +# $Id: PKGBUILD 80625 2012-11-27 11:18:45Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -10,7 +10,7 @@ pkgname=go pkgver=1.0.3 -pkgrel=2 +pkgrel=4 epoch=2 pkgdesc='Google Go compiler and tools' arch=('x86_64' 'i686') @@ -27,6 +27,8 @@ sha256sums=('7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df' 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') build() { + cd $srcdir/$pkgname + if [ "$CARCH" == 'x86_64' ]; then export GOARCH=amd64 fi @@ -34,18 +36,26 @@ build() { export GOARCH=386 fi - # Set GOARCH to arm for crosscompilation (currently doesn't work) - - cd $srcdir/$pkgname export GOROOT_FINAL=/usr/lib/go export GOOS=linux cd src bash make.bash + + # Enable ARM crosscompilation + export GOARCH=arm + bash make.bash } check() { cd $srcdir/$pkgname + if [ "$CARCH" == 'x86_64' ]; then + export GOARCH=amd64 + fi + if [ "$CARCH" == 'i686' ]; then + export GOARCH=386 + fi + export GOROOT=$srcdir/$pkgname export PATH=$srcdir/$pkgname/bin:$PATH @@ -90,6 +100,9 @@ package() { # Remove object files from target src dir find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete + # Fix for FS#32813 + find $pkgdir -type f -name sql.go -exec chmod -x {} \; + # Remove all executable source files find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete # Headers for C modules @@ -103,11 +116,6 @@ package() { # This is to make go get code.google.com/p/go-tour/gotour and # then running the gotour executable work out of the box. - # - # Also, /usr/bin is the place for system-wide executables, - # not /usr/lib/go/bin. Users should use different paths by - # setting the appropriate environment variables. - # ln -sf /usr/bin $pkgdir/usr/lib/go/bin # For godoc diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD new file mode 100644 index 000000000..fc087c24d --- /dev/null +++ b/community/golangide/PKGBUILD @@ -0,0 +1,82 @@ +#$Id: PKGBUILD 80553 2012-11-25 02:17:39Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: spambanane <happy.house@gmx.de> +# Contributor: Matteo <matteo.dek@gmail.com> +pkgname=golangide +pkgver=14.0 +pkgrel=1 +_hgrev=828 +pkgdesc='Simple IDE for Go to edit code and build projects' +license=('LGPL') +arch=('x86_64' 'i686') +url='http://code.google.com/p/golangide/' +depends=('go' 'libpng12' 'glib2') +makedepends=('gendesk') +if [ "$CARCH" == "x86_64" ]; then + source=("http://$pkgname.googlecode.com/files/liteidex${pkgver}.linux-amd64.hg${_hgrev}.tar.bz2" + 'golangide.png' + 'golangide.sh') + sha256sums=('8f166ae5b97c4484bfa47932a716e28c78547944db4f2d0e222d21694c510e5b' + '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' + '8054157f7d1b61a9d97c045f271f935636feb4939249d1bf1ab1b39f18a15207') +else + source=("http://$pkgname.googlecode.com/files/liteidex${pkgver}.linux-386.hg${_hgrev}.tar.bz2" + 'golangide.png' + 'golangide.sh') + sha256sums=('3b2e565aecc141affc7d10d3aa3e2efe06866559091690b6fe13b9a664eb81c0' + '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' + '8054157f7d1b61a9d97c045f271f935636feb4939249d1bf1ab1b39f18a15207') +fi +options=('!strip') +_name=('Golang IDE') +_genericname=('Integrated development environment') + +build() { + cd "$srcdir" + gendesk -n + + cd "liteide" + # Fixing insecure RPATH + find . -name "*.so" -type f -exec sed -i 's|/home/win|/usr/lib/|g' {} \; + find . -name liteide -type f -exec sed -i 's|/home/win|/usr/lib/|g' {} \; +} + +package() { + cd "$srcdir/liteide" + + msg2 "Creating directories..." + mkdir -p "$pkgdir/usr/lib/liteide" + mkdir -p "$pkgdir/usr/share/liteide" + mkdir -p "$pkgdir/usr/share/doc/$pkgname" + + msg2 "Packaging executables..." + for binary in goastview goapi goexec godocview liteide; do + install -Dm755 "bin/$binary" "$pkgdir/usr/bin/$binary" + done + install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname" + + msg2 "Packaging resources..." + cp -r share/liteide/* "$pkgdir/usr/share/liteide" + + msg2 "Packaging libraries and plugins..." + cp -r lib/liteide/* "$pkgdir/usr/lib/liteide" + + msg2 "Packaging license and license exception..." + install -Dm644 LICENSE.LGPL \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE.LGPL" + install -Dm644 LGPL_EXCEPTION.TXT \ + "$pkgdir/usr/share/licenses/$pkgname/LGPL_EXCEPTION.TXT" + + cd .. + + msg2 "Packaging menu entry and icon..." + install -Dm644 "$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" + + msg2 "Cleaning up..." + rm -rf "$pkgdir/usr/share/$pkgname/doc" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/golangide/golangide.png b/community/golangide/golangide.png Binary files differnew file mode 100644 index 000000000..1aed5e1dd --- /dev/null +++ b/community/golangide/golangide.png diff --git a/community/golangide/golangide.sh b/community/golangide/golangide.sh new file mode 100644 index 000000000..486c8590b --- /dev/null +++ b/community/golangide/golangide.sh @@ -0,0 +1,6 @@ +#!/bin/sh +if [ ! -z $GOROOT -a -e $GOROOT ]; then + /usr/bin/liteide +else + GOROOT=/usr/lib/go /usr/bin/liteide +fi diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD index 5ff50b09a..728d5407c 100644 --- a/community/goldendict/PKGBUILD +++ b/community/goldendict/PKGBUILD @@ -14,15 +14,17 @@ makedepds=('patch') provides=('stardict') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 - $pkgname-paths.diff) + $pkgname-paths.diff + goldendict-1.0.1-gcc-4.7.patch) sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6' - '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589') + '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589' + 'd61d95f464e82ed83493cbb5ded3ecc59a34eb879eb9c7140d801ee6e0c4454e') build(){ cd ${srcdir} patch -Np0 -i ${srcdir}/$pkgname-paths.diff - + patch -Np1 -i ${srcdir}/goldendict-1.0.1-gcc-4.7.patch qmake make qmake diff --git a/community/goldendict/goldendict-1.0.1-gcc-4.7.patch b/community/goldendict/goldendict-1.0.1-gcc-4.7.patch new file mode 100644 index 000000000..24995a221 --- /dev/null +++ b/community/goldendict/goldendict-1.0.1-gcc-4.7.patch @@ -0,0 +1,40 @@ +From b00d081da20b9a6b257573c6b23a6bc640c4dab1 Mon Sep 17 00:00:00 2001 +From: Michael Palimaka <kensington@gentoo.org> +Date: Fri, 20 Jul 2012 03:27:38 +1000 +Subject: [PATCH] Fix build with GCC 4.7 by adding missing includes. + +--- + processwrapper.cc | 4 ++++ + qtsingleapplication/src/qtlocalpeer.cpp | 1 + + 2 files changed, 5 insertions(+) + +diff --git a/processwrapper.cc b/processwrapper.cc +index f7f3f19..86b985d 100644 +--- a/processwrapper.cc ++++ b/processwrapper.cc +@@ -2,6 +2,10 @@ +
+ #include <QtCore>
+
++#if defined(Q_OS_UNIX)
++#include <unistd.h>
++#endif
++
+ #ifdef Q_OS_WIN32
+
+ #include <windows.h>
+diff --git a/qtsingleapplication/src/qtlocalpeer.cpp b/qtsingleapplication/src/qtlocalpeer.cpp +index 382d182..506c142 100644 +--- a/qtsingleapplication/src/qtlocalpeer.cpp ++++ b/qtsingleapplication/src/qtlocalpeer.cpp +@@ -50,6 +50,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0; + #endif + #if defined(Q_OS_UNIX) + #include <time.h> ++#include <unistd.h> + #endif + + namespace QtLP_Private { +-- +1.7.11.1 + diff --git a/community/goobox/PKGBUILD b/community/goobox/PKGBUILD index 322e0ed15..79957b933 100644 --- a/community/goobox/PKGBUILD +++ b/community/goobox/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 69379 2012-04-15 01:54:25Z bgyorgy $ +# $Id: PKGBUILD 79409 2012-11-04 15:53:30Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=goobox pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="CD player and ripper for GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://people.gnome.org/~paobac/goobox/" license=('GPL') -depends=('brasero' 'libmusicbrainz3' 'libnotify' 'xdg-utils') +depends=('brasero' 'gstreamer0.10-base-plugins' 'libmusicbrainz3' 'libnotify' 'xdg-utils') makedepends=('gconf' 'intltool' 'gnome-doc-utils') optdepends=('gstreamer0.10-good-plugins: rip CDs into flac and wav format') install=$pkgname.install diff --git a/community/google-glog/PKGBUILD b/community/google-glog/PKGBUILD new file mode 100644 index 000000000..f30efef3c --- /dev/null +++ b/community/google-glog/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 80554 2012-11-25 02:18:10Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Ian Yang <doit.ian@gmail.com> + +pkgname=google-glog +pkgver=0.3.2 +pkgrel=1 +pkgdesc="Logging library for C++" +arch=('i686' 'x86_64') +license=('custom:BSD3') +url="http://code.google.com/p/google-glog/" +depends=('gcc-libs') +makedepends=('make' 'gcc') +options=('!libtool') +source=("http://google-glog.googlecode.com/files/glog-${pkgver}.tar.gz") +md5sums=('897fbff90d91ea2b6d6e78c8cea641cc') + +build() { + cd "$srcdir/glog-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/glog-${pkgver}" + make DESTDIR="$pkgdir" install + + # Lazy way of dealing with conflicting man and info pages... + rm -rf "${pkgdir}/usr/share" + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index 727d77cc4..f2f02738c 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77645 2012-10-13 11:43:38Z allan $ +# $Id: PKGBUILD 78932 2012-10-27 23:44:44Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource pkgver=0.38 -pkgrel=4 +pkgrel=5 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64 'mips64el') diff --git a/community/gpg-crypter/PKGBUILD b/community/gpg-crypter/PKGBUILD index cb313d0f9..60a196bb1 100644 --- a/community/gpg-crypter/PKGBUILD +++ b/community/gpg-crypter/PKGBUILD @@ -1,26 +1,24 @@ -# $Id: PKGBUILD 67947 2012-03-16 11:29:44Z giovanni $ +# $Id: PKGBUILD 79925 2012-11-14 19:52:32Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=gpg-crypter -pkgver=0.3.5 -pkgrel=5 -pkgdesc="A graphical front-end to GnuPG(GPG) using the GTK2 toolkit and libgpgme" +pkgver=0.4.1 +pkgrel=1 +pkgdesc="A graphical front-end to GnuPG(GPG) using the GTK3 toolkit and libgpgme" arch=('i686' 'x86_64' 'mips64el') url="http://gpg-crypter.sourceforge.net/" -license=('GPL') -depends=('gtk2' 'gpgme') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname.desktop) -md5sums=('be33140ae205b8a3f37217c1c2c0737a' - 'a2a226ff44eb02cdab7bee46864dea6d') +license=('GPL2') +depends=('gtk3' 'gpgme') +makedepends=('intltool') +changelog=$pkgname.changelog +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('1f7e2b27bf4a27ecbb07bce9cd40d1c08477a3bd065ba7d1a75d1732e4bdc023') build() { cd ${srcdir}/$pkgname-$pkgver - export CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" - ./configure --prefix=/usr make } @@ -29,15 +27,4 @@ package() { cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install - -# icon - install -Dm644 ${srcdir}/$pkgname-$pkgver/pixmaps/$pkgname.png \ - ${pkgdir}/usr/share/pixmaps/$pkgname.png - -# .desktop file - install -Dm644 ${srcdir}/$pkgname.desktop \ - ${pkgdir}/usr/share/applications/$pkgname.desktop - -# delete unneeded icon - rm -rf ${pkgdir}/usr/share/$pkgname } diff --git a/community/gpg-crypter/gpg-crypter.changelog b/community/gpg-crypter/gpg-crypter.changelog new file mode 100644 index 000000000..a56f276cc --- /dev/null +++ b/community/gpg-crypter/gpg-crypter.changelog @@ -0,0 +1,2 @@ +2012-11-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * gpg-crypter 0.4.1-1 diff --git a/community/gprolog/PKGBUILD b/community/gprolog/PKGBUILD index 405263831..358ce05f4 100644 --- a/community/gprolog/PKGBUILD +++ b/community/gprolog/PKGBUILD @@ -7,7 +7,7 @@ pkgname=gprolog pkgver=1.4.1 pkgrel=1 pkgdesc="GNU Prolog" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.gprolog.org/" depends=() license=('GPL') diff --git a/community/grace/PKGBUILD b/community/grace/PKGBUILD index 9e021bb48..9298a82f0 100644 --- a/community/grace/PKGBUILD +++ b/community/grace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63610 2012-02-05 12:00:16Z ibiru $ +# $Id: PKGBUILD 78616 2012-10-22 09:17:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: damir <damir@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=grace -pkgver=5.1.22 -pkgrel=6 +pkgver=5.1.23 +pkgrel=1 pkgdesc="2D plotting tool" arch=(i686 x86_64 'mips64el') url="http://plasma-gate.weizmann.ac.il/Grace/" @@ -13,7 +13,7 @@ depends=('libjpeg' 'libpng' 'lesstif' 't1lib' 'netcdf') makedepends=('netcdf' 'fftw') license=('GPL') source=(ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/$pkgname-$pkgver.tar.gz) -md5sums=('672356466f18fe59ed21a8fb44f9851d') +md5sums=('e2b28ebe31288952d899fbb5c97858ae') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/grsync/PKGBUILD b/community/grsync/PKGBUILD index bd12228fd..9508c1ed8 100644 --- a/community/grsync/PKGBUILD +++ b/community/grsync/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62005 2012-01-14 00:21:54Z spupykin $ +# $Id: PKGBUILD 78660 2012-10-22 13:48:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=grsync -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="GTK GUI for rsync" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('gtk2' 'rsync') makedepends=('gettext' 'intltool') install=grsync.install source=(http://www.opbyte.it/release/grsync-$pkgver.tar.gz) -md5sums=('e57f46d67f7f9e8df08fdd0b97db10a6') +md5sums=('1b40ee3c9191dbf6080285ce6dc2383d') build() { cd $srcdir/grsync-$pkgver diff --git a/community/gsasl/PKGBUILD b/community/gsasl/PKGBUILD deleted file mode 100644 index 6f41deacb..000000000 --- a/community/gsasl/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 71612 2012-05-31 08:51:27Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Orivej Desh <smpuj@bk.ru> -# Maintainer: Orivej Desh <smpuj@bk.ru> - -pkgname=gsasl -pkgver=1.8.0 -pkgrel=2 -pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms" -arch=("i686" "x86_64" 'mips64el') -url="http://josefsson.org/gsasl/" -license=("GPL") -depends=('gnutls' 'libidn' 'krb5' 'libgcrypt') -source=("ftp://ftp.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz") -md5sums=('982fe54a20016aa46a871c084c990c36') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-gssapi-impl=mit - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la" -} diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD index 6b8be0415..7af4d7861 100644 --- a/community/gsoap/PKGBUILD +++ b/community/gsoap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70883 2012-05-18 13:41:50Z spupykin $ +# $Id: PKGBUILD 78618 2012-10-22 09:18:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> # Contributor: Lee.MaRS <leemars@gmail.com> pkgname=gsoap -pkgver=2.8.8 +pkgver=2.8.11 pkgrel=1 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++" url="http://www.cs.fsu.edu/~engelen/soap.html" @@ -13,8 +13,8 @@ license=('GPL' 'custom') depends=('openssl' 'zlib' 'gcc-libs') makedepends=('autoconf' 'automake') source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip - LICENSE) -md5sums=('cffb523b66eb36c51ca455645f1cfeb0' + LICENSE) +md5sums=('ea2d7ee876d274a188b8fbb365702eec' '27aaa3f5166db94d44044c11a7b2c37b') build() { diff --git a/community/gtk-engine-unico/PKGBUILD b/community/gtk-engine-unico/PKGBUILD index 5f2341d1d..21e856757 100644 --- a/community/gtk-engine-unico/PKGBUILD +++ b/community/gtk-engine-unico/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 69736 2012-04-23 09:07:35Z ibiru $ +# $Id: PKGBUILD 79966 2012-11-15 05:43:40Z bpiotrowski $ # Maintainer: Bartlomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Hilinus <itahilinus[at]hotmail[dot]it> pkgname=gtk-engine-unico pkgver=1.0.2 -pkgrel=1 -pkgdesc="Unico GTK3 theme engine" +pkgrel=3 +pkgdesc='Unico GTK3 theme engine' arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/unico" +url='https://launchpad.net/unico' license=('GPL') -depends=("gtk3") +depends=('gtk3') +makedepends=('gnome-common') options=(!libtool) -source=("http://launchpad.net/unico/1.0/$pkgver/+download/${pkgname#gtk-engine-}-$pkgver.tar.gz") -md5sums=('19fb3ecc36d4d13b4a76e26a4ebd6412') - +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-139.tar.xz) +md5sums=('a451cf9e3d6b092a2fbeb424d0436dd3') build() { - cd ${srcdir}/${pkgname#gtk-engine-}-$pkgver - - ./configure --prefix=/usr --disable-static + cd "~unico-team/unico/trunk" + ./autogen.sh --prefix=/usr --disable-static make } package() { - cd ${srcdir}/${pkgname#gtk-engine-}-$pkgver + cd "~unico-team/unico/trunk" make DESTDIR=${pkgdir} install } diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD index 18ce2b97d..25d8c3a1b 100644 --- a/community/gtk2hs-buildtools/PKGBUILD +++ b/community/gtk2hs-buildtools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77337 2012-10-09 04:16:44Z tdziedzic $ +# $Id: PKGBUILD 79423 2012-11-04 20:12:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=gtk2hs-buildtools @@ -8,7 +8,7 @@ pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries." url="http://hackage.haskell.org/package/gtk2hs-buildtools" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') -makedepends=('ghc=7.6.1-1' 'alex=3.0.2-2' 'happy=1.18.9-6' 'haskell-random=1.0.1.1-3') +makedepends=('ghc' 'alex' 'happy' 'haskell-random') depends=('gmp') options=('strip') provides=('haskell-gtk2hs-buildtools') diff --git a/community/gtkdatabox/PKGBUILD b/community/gtkdatabox/PKGBUILD index ffe6c1074..d6ddf73e1 100644 --- a/community/gtkdatabox/PKGBUILD +++ b/community/gtkdatabox/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 73537 2012-07-09 10:13:52Z spupykin $ +# $Id: PKGBUILD 79742 2012-11-11 19:42:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=gtkdatabox -pkgver=0.9.1.3 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="A widget for the Gtk+ library designed to display large amounts of numerical data" -arch=(i686 x86_64 'mips64el') -url="http://www.eudoxos.net/gtk/gtkdatabox" -options=('!libtool') +arch=(i686 x86_64 mips64el) +url="http://sourceforge.net/projects/gtkdatabox/" license=("LGPL") -depends=('gtk2') -#source=(http://www.eudoxos.net/gtk/gtkdatabox/download/gtkdatabox-$pkgver.tar.gz) +depends=('gtk2' 'libglade') +makedepends=('gtk-doc') +options=('!libtool' 'docs') source=(http://downloads.sourceforge.net/project/gtkdatabox/gtkdatabox/$pkgver/gtkdatabox-$pkgver.tar.gz) -md5sums=('60a3eebd61a4ca36879d7e60d1aca727') +md5sums=('99c1fe9a918ee94e2b6f967cd22a6f5b') build() { cd $srcdir/gtkdatabox-$pkgver - find -name 'Makefile*' -type f -exec sed -i 's#.*DISABLE_DEPRECATED\\#\\#' {} \; - LDFLAGS=-lm ./configure --prefix=/usr + export LDFLAGS=-lm + ./configure --prefix=/usr \ + --enable-gtk-doc \ + --enable-gtk-doc-html \ + --enable-gtk-doc-pdf \ + --enable-libglade make make DESTDIR=$pkgdir install } diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD index e07883740..890dba215 100644 --- a/community/gtranslator/PKGBUILD +++ b/community/gtranslator/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74570 2012-07-30 18:54:46Z jlichtblau $ +# $Id: PKGBUILD 79447 2012-11-05 19:27:31Z bgyorgy $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Christer Solskogen (solskogen@carebears.mine.nu) pkgname=gtranslator pkgver=2.91.5 -pkgrel=1 +pkgrel=2 pkgdesc="An enhanced gettext po file editor for the GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://projects.gnome.org/gtranslator/" @@ -17,12 +17,17 @@ optdepends=('gucharmap: for charmap plugin' options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog -source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz) -sha256sums=('7dcdabd5c2156bef98f35d2ec31798287d1721e400ea738fb3ccc2ff2ef186e6') +source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz + disable-dockbar.patch) +sha256sums=('7dcdabd5c2156bef98f35d2ec31798287d1721e400ea738fb3ccc2ff2ef186e6' + '04647eb198291024e5a65564ad6be239b7af4472421a44c2d57ed5d6a8bb4384') build() { cd ${srcdir}/${pkgname}-${pkgver} + # Tempolary disable dockbar, because layout loading is completely broken with gdl 3.6 + patch -Np1 -i ${srcdir}/disable-dockbar.patch + ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile make } diff --git a/community/gtranslator/disable-dockbar.patch b/community/gtranslator/disable-dockbar.patch new file mode 100644 index 000000000..aa8de6c60 --- /dev/null +++ b/community/gtranslator/disable-dockbar.patch @@ -0,0 +1,76 @@ +diff -Naur gtranslator-2.91.5.orig/src/gtr-tab.c gtranslator-2.91.5/src/gtr-tab.c +--- gtranslator-2.91.5.orig/src/gtr-tab.c 2012-06-07 13:48:56.000000000 +0200 ++++ gtranslator-2.91.5/src/gtr-tab.c 2012-11-05 19:18:01.899014670 +0100 +@@ -149,9 +149,6 @@ + g_return_if_fail (GTR_IS_TAB (tab)); + g_return_if_fail (filename != NULL); + +- gdl_dock_layout_save_layout (tab->priv->layout_manager, name); +- if (!gdl_dock_layout_save_to_file (tab->priv->layout_manager, filename)) +- g_warning ("Saving dock layout to '%s' failed!", filename); + } + + static void +@@ -160,23 +157,6 @@ + const gchar *name) + { + g_return_if_fail (GTR_IS_TAB (tab)); +- +- if (!layout_filename || +- !gdl_dock_layout_load_from_file (tab->priv->layout_manager, +- layout_filename)) +- { +- gchar *path; +- +- path = gtr_dirs_get_ui_file ("layout.xml"); +- +- if (!gdl_dock_layout_load_from_file (tab->priv->layout_manager, +- path)) +- g_warning ("Loading layout from '%s' failed!!", path); +- g_free (path); +- } +- +- if (!gdl_dock_layout_load_layout (tab->priv->layout_manager, name)) +- g_warning ("Loading layout failed!!"); + } + + static void +@@ -702,7 +682,6 @@ + GtkWidget *vertical_box; + GtkWidget *msgid_label; + GtkWidget *scroll; +- GtkWidget *dockbar; + GtrTabPrivate *priv; + + tab->priv = GTR_TAB_GET_PRIVATE (tab); +@@ -727,22 +706,6 @@ + gtk_widget_show (priv->dock); + gtk_box_pack_end (GTK_BOX (hbox), priv->dock, TRUE, TRUE, 0); + +- dockbar = gdl_dock_bar_new (GDL_DOCK (priv->dock)); +- gtk_widget_show (dockbar); +- gtk_box_pack_start (GTK_BOX (hbox), dockbar, FALSE, FALSE, 0); +- +- priv->layout_manager = gdl_dock_layout_new (GDL_DOCK (priv->dock)); +- g_signal_connect (priv->layout_manager->master, +- "layout-changed", +- G_CALLBACK (on_layout_changed), +- tab); +- +- g_settings_bind (priv->ui_settings, +- GTR_SETTINGS_PANEL_SWITCHER_STYLE, +- priv->layout_manager->master, +- "switcher-style", +- G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); +- + /* Message table */ + priv->message_table = gtr_message_table_new (GTK_WIDGET (tab)); + gtk_widget_show (priv->message_table); +@@ -904,7 +867,6 @@ + g_clear_object (&priv->files_settings); + g_clear_object (&priv->editor_settings); + g_clear_object (&priv->state_settings); +- g_clear_object (&priv->layout_manager); + + G_OBJECT_CLASS (gtr_tab_parent_class)->dispose (object); + } diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog index 49dbfa714..7187196b4 100644 --- a/community/gtranslator/gtranslator.changelog +++ b/community/gtranslator/gtranslator.changelog @@ -1,3 +1,8 @@ +2012-11-05 Balló György <ballogyor+arch at gmail dot com> + * gtranslator 2.91.5-2 + rebuild for gdl 3.6 + tempolary disable dockbar, because layout loading is completely broken with gdl 3.6 + 2012-07-30 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org> * gtranslator 2.91.5-1 diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD index e30fdc0a5..ed9b420d0 100644 --- a/community/gummi/PKGBUILD +++ b/community/gummi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72952 2012-06-25 13:05:56Z arodseth $ +# $Id: PKGBUILD 78640 2012-10-22 12:45:21Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Sergio A. Morales <sergiomorales@archlinux.cl> # Contributor: soeren <nonick@posteo.de> pkgname=gummi -pkgver=0.6.4 +pkgver=0.6.5 pkgrel=1 pkgdesc='Simple LaTex editor for GTK users' arch=('x86_64' 'i686' 'mips64el') @@ -14,11 +14,11 @@ license=('MIT') depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib' 'desktop-file-utils') makedepends=('glib2' 'gtk2' 'pango' 'poppler' 'intltool') install=$pkgname.install -source=("http://dev.midnightcoding.org/projects/$pkgname/latest.tar.gz") -sha256sums=('ac5c1de476f8689040a185b01515544a5e53da45ff4e10a072b8944e9de8a6ff') +source=("$pkgname-$pkgver.tar.gz::http://dev.midnightcoding.org/projects/$pkgname/latest.tar.gz") +sha256sums=('b23c2958376ea43c701a276ad19ceac5b50d9cb32a489a10897b25aa5004fffb') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver find . -type f -exec touch {} \; ./configure --prefix=/usr @@ -26,10 +26,10 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver - make prefix="$pkgdir/usr" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + make prefix=$pkgdir/usr install + install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING } # vim:set ts=2 sw=2 et: diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD index dcb0e0c78..d990ce73d 100644 --- a/community/gwibber/PKGBUILD +++ b/community/gwibber/PKGBUILD @@ -1,25 +1,32 @@ -# $Id: PKGBUILD 78193 2012-10-17 10:24:07Z allan $ +# $Id: PKGBUILD 79486 2012-11-06 04:11:00Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=gwibber -pkgver=3.4.2 -pkgrel=2 -pkgdesc="Microblogging client for GNOME, which supports Twitter, Identi.ca, StatusNet, Facebook, Flickr, Digg, FriendFeed and Qaiku" +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu" arch=('i686' 'x86_64') url="http://gwibber.com/" license=('GPL') -depends=('libgee' 'libnotify' 'dee>=1.0.0' 'json-glib' 'gtkspell3' 'python2-gobject' 'libwnck3' 'libwebkit3' 'libgnome-keyring>=3.3' 'python2-dbus' 'python2-httplib2' 'python2-egenix-mx-base' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('intltool' 'vala>=0.15.0') +depends=('libgee' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf') +makedepends=('intltool' 'vala') options=('!libtool') install=$pkgname.install source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('0ac544f8e626547312b9d0da0b57358e') +md5sums=('5988e36e9f592c6eca6537ba6878307a') build() { cd "$srcdir/$pkgname-$pkgver" find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + # Use the standalone accounts configuration panel + sed -i 's/"gnome-control-center", "credentials", "application=gwibber"/"credentials-preferences"/' client/gwibber-client.vala + sed -i 's/"gnome-control-center", "credentials"/"credentials-preferences"/' gwibber/microblog/dispatcher.py + + # Remove unneeded dependency on libdbusmenu + sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in} + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ --disable-static --disable-schemas-compile --disable-unity make } diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index c57706999..6caf4144d 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,27 +1,24 @@ +# $Id: PKGBUILD 79532 2012-11-06 18:05:24Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haddock -pkgver=2.12.0 +pkgver=2.13.1 pkgrel=1 -pkgdesc="Tool for generating documentation for Haskell libraries" -url="http://hackage.haskell.org/package/haddock" +pkgdesc='Tool for generating documentation for Haskell libraries' +url='http://hackage.haskell.org/package/haddock/' license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -makedepends=('alex=3.0.2-2' 'happy=1.18.9-6') +arch=('x86_64' 'i686' 'mips64el') +makedepends=('alex' 'happy') depends=('ghc=7.6.1-1' 'haskell-xhtml=3000.2.1-2' 'haskell-ghc-paths=0.1.0.8-9') install=$pkgname.install -source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz" - '0001-fix-incorrect-types-in-documentation-haddock.patch') -sha256sums=('b6c53c3c2dcfc7604941f81acd8954c7deb101b1341003d2e9c6c26dd4ad6d02' - 'a260b828ddf6e56440209d9631efcd6e1530b8996859528feee37638cc26e92a') +source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") +sha256sums=('6e5e2295cd191e43a046c12544f2f4e8b4260cfda8282d48b15a7a35d8a24e7f') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i ${srcdir}/0001-fix-incorrect-types-in-documentation-haddock.patch - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/"$pkgname" \ --libsubdir=\$compiler/site-local/\$pkgid diff --git a/community/haskell-binary/PKGBUILD b/community/haskell-binary/PKGBUILD deleted file mode 100644 index c55afc770..000000000 --- a/community/haskell-binary/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 67046 2012-03-03 16:09:33Z tdziedzic $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=haskell-binary -pkgver=0.5.1.0 -pkgrel=1 -pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings" -url="http://hackage.haskell.org/package/binary" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.4.1 sh) -options=('strip') -source=("http://hackage.haskell.org/packages/archive/binary/$pkgver/binary-$pkgver.tar.gz") -install=haskell-binary.install -sha256sums=('2ad477b47e9158d61517689f5f0c7b0240ff891059418d6758879020800351a3') - -build() { - cd "$srcdir/binary-$pkgver" - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/binary-$pkgver" - - install -Dm 744 register.sh \ - "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m 744 unregister.sh \ - "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s "/usr/share/doc/$pkgname/html" \ - "$pkgdir/usr/share/doc/ghc/html/libraries/binary" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/haskell-binary/haskell-binary.install b/community/haskell-binary/haskell-binary.install deleted file mode 100644 index 844b8a67c..000000000 --- a/community/haskell-binary/haskell-binary.install +++ /dev/null @@ -1,24 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-binary - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -post_upgrade() { - ${HS_DIR}/register.sh - post_remove -} - -post_install() { - post_upgrade -} - -pre_remove() { - pre_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD index 3f0ee6008..4b6ebcf75 100644 --- a/community/haskell-bytestring-show/PKGBUILD +++ b/community/haskell-bytestring-show/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 77340 2012-10-09 04:16:59Z tdziedzic $ +# $Id: PKGBUILD 80279 2012-11-19 12:14:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-bytestring-show -pkgver=0.3.5.3 +pkgver=0.3.5.4 pkgrel=1 pkgdesc="Efficient conversion of values into readable byte strings." url="http://hackage.haskell.org/package/bytestring-show" license=("BSD3") arch=('i686' 'x86_64') -depends=("ghc=7.6.1-1") +depends=("ghc") install="${pkgname}.install" source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz") -md5sums=('cbcc94f57fc754685f428aba003ba058') +md5sums=('2a4ab243c4b6fffed1fc663975a9ec6d') build() { cd ${srcdir}/bytestring-show-${pkgver} @@ -30,6 +30,8 @@ build() { } package() { + depends=("ghc=`pacman -Q ghc | cut -f2 -d\ |cut -f1 -d-`") + cd ${srcdir}/bytestring-show-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD index f5053689a..551ac4980 100644 --- a/community/haskell-cairo/PKGBUILD +++ b/community/haskell-cairo/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 77341 2012-10-09 04:17:04Z tdziedzic $ +# $Id: PKGBUILD 80281 2012-11-19 12:15:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-cairo -pkgver=0.12.3.1 -pkgrel=2 +pkgver=0.12.4 +pkgrel=1 pkgdesc="Binding to the cairo library for Gtk2Hs." url="http://hackage.haskell.org/package/cairo" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'cairo' 'haskell-mtl=2.1.2-1') +depends=('ghc' 'cairo' 'haskell-mtl') makedepends=("gtk2hs-buildtools") options=('strip') conflicts=('gtk2hs-cairo') @@ -16,7 +16,7 @@ provides=('gtk2hs-cairo') replaces=('gtk2hs-cairo') install=gtk2hs-cairo.install source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz) -md5sums=('9d489fbb6cadb3d109543fe25c50195e') +md5sums=('b9d7e8de6ba4db680c222958622d6ee6') build() { cd ${srcdir}/cairo-$pkgver @@ -31,6 +31,8 @@ build() { } package() { + depends=("ghc=`pacman -Q ghc | cut -f2 -d\ |cut -f1 -d-`" 'cairo' "haskell-mtl=`pacman -Q haskell-mtl | cut -f2 -d\ |cut -f1 -d-`") + cd ${srcdir}/cairo-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD index 2ea2ff587..517fd8644 100644 --- a/community/haskell-glib/PKGBUILD +++ b/community/haskell-glib/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 77344 2012-10-09 04:17:23Z tdziedzic $ +# $Id: PKGBUILD 80282 2012-11-19 12:15:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-glib -pkgver=0.12.3.1 -pkgrel=2 +pkgver=0.12.4 +pkgrel=1 pkgdesc="Binding to the GLIB library for Gtk2Hs." url="http://hackage.haskell.org/package/glib" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'glib2') +depends=('ghc' 'glib2') makedepends=("gtk2hs-buildtools") options=('strip') install=gtk2hs-glib.install @@ -17,13 +17,13 @@ replaces=('gtk2hs-glib') conflicts=('gtk2hs-glib') source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz '0001-compatibility-with-ghc-7.6.1.patch') -md5sums=('f2899bd2a2850fe95479ddb63490eb04' +md5sums=('3172907258183466f1e604a435285c51' 'b00660b7102542942b0b9d84b59d1f3c') build() { cd glib-$pkgver - patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch +# patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/haskell-glib \ diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD index 89e49dc07..9825c9508 100644 --- a/community/haskell-gtk/PKGBUILD +++ b/community/haskell-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 77345 2012-10-09 04:17:32Z tdziedzic $ +# $Id: PKGBUILD 80288 2012-11-19 12:54:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-gtk -pkgver=0.12.3.1 -pkgrel=2 +pkgver=0.12.4 +pkgrel=1 pkgdesc="Binding to the gtk library for Gtk2Hs." url="http://hackage.haskell.org/package/gtk" license=('LGPL2.1') @@ -17,12 +17,12 @@ options=('strip') install=gtk2hs-gtk.install source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz ghc-7.6.1.patch) -md5sums=('b10dfe92d2e4dfe3c0c92dd349489727' +md5sums=('165a04134cdc3aec9a9aa149c421b1de' '5fb93f37fe3f494b30ee682a36b8f1b6') build() { cd ${srcdir}/gtk-${pkgver} - patch -p1 <$srcdir/ghc-7.6.1.patch +# patch -p1 <$srcdir/ghc-7.6.1.patch runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ --libsubdir=\$compiler/site-local/\$pkgid diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD index 347c3a31d..d839f4995 100644 --- a/community/haskell-pango/PKGBUILD +++ b/community/haskell-pango/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 77349 2012-10-09 04:17:52Z tdziedzic $ +# $Id: PKGBUILD 80284 2012-11-19 12:16:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-pango -pkgver=0.12.3 -pkgrel=3 +pkgver=0.12.4 +pkgrel=1 pkgdesc="Binding to the pango library for Gtk2Hs." url="http://hackage.haskell.org/package/pango" license=('LGPL2.1') @@ -16,7 +16,7 @@ conflicts=('gtk2hs-pango') options=('strip') install=gtk2hs-pango.install source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) -md5sums=('1ef3132cb569703d5b1bc262c9d86fe3') +md5sums=('e498beb2d10b45ebf08bffc2296e1195') build() { cd ${srcdir}/pango-${pkgver} diff --git a/community/haskell-primitive/PKGBUILD b/community/haskell-primitive/PKGBUILD new file mode 100644 index 000000000..874fd46ba --- /dev/null +++ b/community/haskell-primitive/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 79233 2012-11-01 11:21:27Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-primitive +pkgver=0.5.0.1 +pkgrel=1 +pkgdesc="Wrappers for primitive operations" +url="http://hackage.haskell.org/package/primitive" +license=("BSD3") +arch=('i686' 'x86_64') +makedepends=() +depends=("ghc") +options=('strip') +install="${pkgname}.install" +source=("http://hackage.haskell.org/packages/archive/primitive/${pkgver}/primitive-${pkgver}.tar.gz") +sha256sums=('526c9d4d06b7b379cb1aaffeffbb30bef810e771f29617ef6d0d99df711f4313') + +build() { + cd ${srcdir}/primitive-${pkgver} + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd ${srcdir}/primitive-${pkgver} + install -Dm744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -dm755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/primitive + runhaskell Setup copy --destdir=${pkgdir} + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-primitive/haskell-primitive.install b/community/haskell-primitive/haskell-primitive.install new file mode 100644 index 000000000..038c509df --- /dev/null +++ b/community/haskell-primitive/haskell-primitive.install @@ -0,0 +1,26 @@ +# custom variables +pkgname=haskell-primitive +HS_DIR=/usr/share/haskell/${pkgname} + +# functions +post_install() { + ${HS_DIR}/register.sh + (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_upgrade() { + ${HS_DIR}/unregister.sh +} + +post_upgrade() { + ${HS_DIR}/register.sh + (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_remove() { + ${HS_DIR}/unregister.sh +} + +post_remove() { + (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/haskell-vector/PKGBUILD b/community/haskell-vector/PKGBUILD new file mode 100644 index 000000000..9020a2f0b --- /dev/null +++ b/community/haskell-vector/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 79236 2012-11-01 13:18:13Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-vector +pkgver=0.10.0.1 +pkgrel=1 +pkgdesc="Efficient Arrays" +url="http://code.haskell.org/vector" +license=("custom:BSD3") +arch=('i686' 'x86_64') +makedepends=() +depends=("ghc" "haskell-primitive") +options=('strip') +install="${pkgname}.install" +source=("http://hackage.haskell.org/packages/archive/vector/${pkgver}/vector-${pkgver}.tar.gz") +sha256sums=('ece945058b01a77c5fff31e89bbea76ac619677041c41286a2da5e8b515508af') + +build() { + cd ${srcdir}/vector-${pkgver} + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd ${srcdir}/vector-${pkgver} + install -Dm744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -Dm744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -dm755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/vector + runhaskell Setup copy --destdir=${pkgdir} + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-vector/haskell-vector.install b/community/haskell-vector/haskell-vector.install new file mode 100644 index 000000000..b6bc92892 --- /dev/null +++ b/community/haskell-vector/haskell-vector.install @@ -0,0 +1,26 @@ +# custom variables +pkgname=haskell-vector +HS_DIR=/usr/share/haskell/${pkgname} + +# functions +post_install() { + ${HS_DIR}/register.sh + (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_upgrade() { + ${HS_DIR}/unregister.sh +} + +post_upgrade() { + ${HS_DIR}/register.sh + (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_remove() { + ${HS_DIR}/unregister.sh +} + +post_remove() { + (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index d1542e75f..8b2e80db6 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 77362 2012-10-09 04:19:03Z tdziedzic $ +# $Id: PKGBUILD 79325 2012-11-02 19:21:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars -pkgver=0.9.17 -pkgrel=5 +pkgver=0.9.18 +pkgrel=3 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64' 'mips64el') url="http://hedgewars.org" @@ -14,27 +14,23 @@ makedepends=('fpc' 'cmake' 'ghc' 'haskell-network' 'haskell-bytestring-show' 'haskell-utf8-string' 'haskell-dataenc' - 'haskell-hslogger') -source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 + 'haskell-hslogger' 'haskell-vector') +source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver-3.tar.bz2 hedgewars.desktop hedgewars.png) -md5sums=('77c0bc4bc664604adbba67fab606d8f1' +md5sums=('02465736fdcf48feea1cacaa0aa5960e' '48c66a3204d4fa0a69e9aa46f7c31e0c' 'eeb14d50df39063549ac5eca9dbc65d1') build() { cd $pkgname-src-$pkgver - -# sed -i 's|.*misc/liblua.*||' CMakeLists.txt sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs - cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATA_INSTALL_DIR=/usr/share \ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \ -DQT_MOC_EXECUTABLE=/usr/bin/moc \ -DWITH_SERVER=1 . - make } diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD index ffe7847dc..735d181e9 100644 --- a/community/hostapd/PKGBUILD +++ b/community/hostapd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 72181 2012-06-09 21:54:04Z heftig $ +# $Id: PKGBUILD 80758 2012-12-03 10:07:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hostapd -pkgver=1.0 -pkgrel=2 +pkgver=1.1 +pkgrel=1 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator" arch=('i686' 'x86_64' 'mips64el') -url="http://hostap.epitest.fi/hostapd/" +url="http://w1.fi/hostapd/" license=('custom') depends=('openssl' 'libnl') backup=('etc/hostapd/hostapd.conf' @@ -21,9 +21,12 @@ backup=('etc/hostapd/hostapd.conf' 'etc/hostapd/hostapd.wpa_psk' 'etc/hostapd/wired.conf') install=hostapd.install -source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz - config hostapd hostapd.conf.d hostapd.service) -md5sums=('236247a7bbd4f60d5fa3e99849d1ffc9' +source=(http://w1.fi/releases/$pkgname-$pkgver.tar.gz + config + hostapd + hostapd.conf.d + hostapd.service) +md5sums=('e3ace8306d066ab2d24b4c9f668e2dd7' '5d7ee10b04e33f22c37be56a4c33dddb' 'd570327c385f34a4af24d3a0d61cea19' 'f169534b0f59b341f6df1a21e0344511' diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD index 865c7780d..a168569bc 100644 --- a/community/iasl/PKGBUILD +++ b/community/iasl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75633 2012-08-27 20:02:12Z lcarlier $ +# $Id: PKGBUILD 78869 2012-10-26 09:53:06Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com> pkgname=iasl -pkgver=20120816 +pkgver=20121018 pkgrel=1 pkgdesc="Intel ACPI Source Language compiler" arch=('i686' 'x86_64' 'mips64el') @@ -13,10 +13,10 @@ license=('custom') depends=('glibc') makedepends=('flex' 'bison') options=('!makeflags') -install=iasl.install +#install=iasl.install source=(http://acpica.org/download/acpica-unix-${pkgver}.tar.gz LICENSE) -md5sums=('eae80f528320717357b3cb5368ba580b' +md5sums=('07b8137a6870e3dad862e5752c87de75' '8615526144f69ea4e870d9bc37df9b29') build() { diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD index bae3ce039..ef42954e5 100644 --- a/community/ibus-anthy/PKGBUILD +++ b/community/ibus-anthy/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 68017 2012-03-17 00:56:59Z ebelanger $ +# $Id: PKGBUILD 79278 2012-11-02 10:15:38Z bpiotrowski $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-anthy -pkgver=1.2.7 +pkgver=1.4.99.20121006 pkgrel=1 -pkgdesc="Japanese input method Anthy IMEngine for IBus Framework" +pkgdesc='Japanese input method Anthy IMEngine for IBus Framework' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -url="http://ibus.googlecode.com" -depends=('ibus' 'anthy' 'python2') +url='http://ibus.googlecode.com' +depends=('ibus' 'anthy' 'python2' 'pygtk') makedepends=('swig' 'intltool') options=('!libtool') source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('091a13ff950171981768463993ffb683') +md5sums=('518aa503ce40054e0027f2a79c9df640') build() { - cd "${srcdir}/${pkgname}-${pkgver}" -# python2 fix + cd $srcdir/$pkgname-$pkgver + + # python2 fix for file in setup/ibus-setup-anthy.in engine/ibus-engine-anthy.in; do sed -i 's_exec python_exec python2_' $file done @@ -28,6 +29,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir/ install } diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD index 2a889dfec..7be987315 100644 --- a/community/ibus-chewing/PKGBUILD +++ b/community/ibus-chewing/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 75677 2012-08-29 04:37:22Z ebelanger $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# $Id: PKGBUILD 80617 2012-11-27 04:47:44Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars@gmail.com> # Contributor: Hiroshi Yui <hiroshiyui@gmail.com> pkgname=ibus-chewing -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=1 pkgdesc='Chinese Chewing Engine for IBus Framework' arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://ibus.googlecode.com' depends=('ibus' 'libchewing' 'libxtst') -makedepends=('swig' 'cmake' 'gob2') +makedepends=('swig' 'cmake' 'gob2' 'gconf') +options=('!makeflags') install=ibus-chewing.install -source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz) -md5sums=('67d944ddfb7dd4eb325967ce43390092') +source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz") build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" @@ -29,3 +30,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}-Source" make DESTDIR="${pkgdir}" install } +md5sums=('20b1d553ba14cecabcf7418e91da353b') diff --git a/community/ibus-hangul/PKGBUILD b/community/ibus-hangul/PKGBUILD index 0a57b517d..389aa38f8 100644 --- a/community/ibus-hangul/PKGBUILD +++ b/community/ibus-hangul/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70167 2012-05-01 04:52:15Z ebelanger $ +# $Id: PKGBUILD 79159 2012-10-31 05:32:23Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Radim Hvizdák <hvizdakr at gmail dot com> pkgname=ibus-hangul pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc='Korean input engine for IBus' arch=('i686' 'x86_64' 'mips64el') url='http://ibus.googlecode.com' diff --git a/community/ibus-libpinyin/PKGBUILD b/community/ibus-libpinyin/PKGBUILD new file mode 100644 index 000000000..151ca40c4 --- /dev/null +++ b/community/ibus-libpinyin/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 79787 2012-11-12 15:24:58Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Yangtse Su<yangtsesu@gmail.com> +# Contributor: Jekyll Wu<adaptee [at] gmail [dot] com> +# Contributor: riverscn<riverscn at gmail.com> +# Contributor: rainy<rainylau at gmail.com> +# Contributor: Lee.MaRS<leemars at gmail.com> + +pkgname=ibus-libpinyin +pkgver=1.4.93 +pkgrel=1 +pkgdesc="Intelligent Pinyin engine based on libpinyin for IBus" +arch=('i686' 'x86_64') +license=('LGPL') +url="https://github.com/libpinyin" +depends=('ibus>=1.4' 'libpinyin') +makedepends=('git' 'intltool' 'gnome-common') +source=(https://github.com/downloads/libpinyin/ibus-libpinyin/${pkgname}-${pkgver}.tar.gz) +md5sums=("95f6143323deddaf6d82020dcc14a1af") + +build() { + cd ${srcdir} + rm -rf "${srcdir}/${pkgname}-build" + cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-build" + cd "${srcdir}/${pkgname}-build" + + msg "Starting make..." + cd "${srcdir}/${pkgname}-build" + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + for file in setup/ibus-setup-libpinyin.in; do + sed -i 's_exec python_exec python2_' $file + done + + ./autogen.sh --prefix=/usr --libexecdir=/usr/lib/$pkgname + make +} + +package() { + cd "${srcdir}/${pkgname}-build" + make NO_INDEX=true DESTDIR=${pkgdir} install +} diff --git a/community/ibus-m17n/PKGBUILD b/community/ibus-m17n/PKGBUILD index 561873b00..c56798229 100644 --- a/community/ibus-m17n/PKGBUILD +++ b/community/ibus-m17n/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72692 2012-06-20 01:20:28Z ebelanger $ +# $Id: PKGBUILD 79165 2012-10-31 05:47:23Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Lonfucius <Lonfucius@gmail.com> # Contributor: Jesse Jaara <jesse.jaara@gmail.com> pkgname=ibus-m17n pkgver=1.3.4 -pkgrel=1 +pkgrel=2 pkgdesc='M17N engine for IBus' arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/ibus/' diff --git a/community/ibus-pinyin/PKGBUILD b/community/ibus-pinyin/PKGBUILD index b5e3fdf3a..ea5d5e576 100644 --- a/community/ibus-pinyin/PKGBUILD +++ b/community/ibus-pinyin/PKGBUILD @@ -1,36 +1,30 @@ -# $Id: PKGBUILD 61930 2012-01-11 03:50:39Z ebelanger $ +# $Id: PKGBUILD 79511 2012-11-06 12:01:15Z arodseth $ +# Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.maRS<leemars at gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Kerrick Staley <mail at kerrickstaley.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-pinyin -pkgver=1.4.0 +pkgver=1.4.99.20120808 pkgrel=1 -pkgdesc='The PinYin Engine for IBus Input Framework.' +pkgdesc='Pinyin (Chinese) input method for the IBus framework' arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') +license=('GPL') url='http://ibus.googlecode.com' -depends=('ibus') +depends=('ibus' 'pyzy' 'lua') makedepends=('intltool') -install=ibus-pinyin.install -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" - "http://ibus.googlecode.com/files/pinyin-database-1.2.99.tar.bz2") -sha1sums=('499ceb4d3bec5614f88322b8e7695c04586b63e9' - 'e38a148a772e9909facda66b2d579e17b94cccbe') +source=("https://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('aa298212d9f63acab48cf9f6370c94cdc6920c2a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ln -sf "${srcdir}/pinyin-database-1.2.99.tar.bz2" \ - "${srcdir}/${pkgname}-${pkgver}/data/db/open-phrase" - - sed -i -e "s|python|python2|" data/db/android/create_db.py \ - setup/ibus-setup-pinyin.in + sed -i -e "s|python|python2|" setup/ibus-setup-pinyin.in PYTHON=python2 ./configure \ --prefix=/usr \ - --libexecdir=/usr/lib/ibus \ - --enable-db-open-phrase + --libexecdir=/usr/lib/ibus make } diff --git a/community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch b/community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch new file mode 100644 index 000000000..eab3a51fe --- /dev/null +++ b/community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch @@ -0,0 +1,75 @@ +From fab6dc760edc39b9b4e561cfbf21b38c4fa86234 Mon Sep 17 00:00:00 2001 +From: Peter Wu <lekensteyn@gmail.com> +Date: Tue, 4 Sep 2012 19:40:08 +0200 +Subject: [PATCH] Do not crash on missing/invalid DISPLAY envvar. + +- Check whether the passed DISPLAY environment variable contains ":". + +- Fallback to "-display" parameter passed to QApplication. +--- + src/CMakeLists.txt | 2 ++ + src/qibusbus.cpp | 23 ++++++++++++++++------- + 2 files changed, 18 insertions(+), 7 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2ad5588..8866ac0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -92,9 +92,11 @@ set_target_properties( + target_link_libraries( + ibus-qt + debug ${QT_QTCORE_LIBRARY_DEBUG} ++ debug ${QT_QTGUI_LIBRARY_DEBUG} + debug ${QT_QTDBUS_LIBRARY_DEBUG} + debug ${QT_QTXML_LIBRARY_DEBUG} + optimized ${QT_QTCORE_LIBRARY_RELEASE} ++ optimized ${QT_QTGUI_LIBRARY_RELEASE} + optimized ${QT_QTDBUS_LIBRARY_RELEASE} + optimized ${QT_QTXML_LIBRARY_RELEASE} + ${DBUS_LIBRARIES} +diff --git a/src/qibusbus.cpp b/src/qibusbus.cpp +index 6a45d65..ed8248a 100644 +--- a/src/qibusbus.cpp ++++ b/src/qibusbus.cpp +@@ -12,7 +12,8 @@ + #include "qibusbus.h" + #include "qibusibusproxy.h" + #include "qibusdbusproxy.h" +- ++#include <X11/Xlib.h> ++#include <QX11Info> + + namespace IBus { + /** +@@ -121,15 +122,23 @@ QString + Bus::getSocketPath (void) + { + QString display = getenv ("DISPLAY"); +- QStringList strs = display.split(":"); + QString hostname = "unix"; + QString display_number = "0"; ++ /* fallback when -display is passed to QApplication with no DISPLAY env */ ++ if (display == NULL) { ++ Display * dpy = QX11Info::display(); ++ if (dpy) ++ display = XDisplayString(dpy); ++ } ++ if (display != NULL && display.contains(':')) { ++ QStringList strs = display.split(":"); + +- if (!strs[0].isEmpty()) +- hostname = strs[0]; +- strs = strs[1].split("."); +- if (!strs[0].isEmpty()) +- display_number = strs[0]; ++ if (!strs[0].isEmpty()) ++ hostname = strs[0]; ++ strs = strs[1].split("."); ++ if (!strs[0].isEmpty()) ++ display_number = strs[0]; ++ } + + QString path = + QDir::homePath() + +-- +1.7.12 diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD index dcc84c1d8..02388519a 100644 --- a/community/ibus-qt/PKGBUILD +++ b/community/ibus-qt/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 69758 2012-04-23 09:15:08Z ibiru $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# $Id: PKGBUILD 80239 2012-11-18 10:30:25Z andrea $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: garion < garion @ mailoo.org > # Contributor: leemars pkgname=ibus-qt pkgver=1.3.1 -pkgrel=5 +pkgrel=6 pkgdesc='IBus qt library and IBus qt input method plugin' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url='http://ibus.googlecode.com' -depends=('qt' 'ibus' 'icu') +depends=('qt' 'ibus' 'icu>=50') makedepends=('cmake' 'automoc4' 'doxygen') -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz") -md5sums=('769e8872ca8a59327b2073ce2f142589') +source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz" + 0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch) build() { - cd "${srcdir}" + cd "${srcdir}/${pkgname}-${pkgver}-Source" + patch -p1 -i ../0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch + mkdir build cd build - cmake "../${pkgname}-${pkgver}-Source" -DCMAKE_INSTALL_PREFIX=/usr + cmake .. -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}/build" + cd "${srcdir}//${pkgname}-${pkgver}-Source/build" make DESTDIR="${pkgdir}" install } +md5sums=('769e8872ca8a59327b2073ce2f142589' + 'c30f52b1a9018132e5ecd0c14616cb65') diff --git a/community/ibus-rime/PKGBUILD b/community/ibus-rime/PKGBUILD new file mode 100644 index 000000000..7507f1ec7 --- /dev/null +++ b/community/ibus-rime/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 80615 2012-11-27 03:11:48Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: GONG Chen <chen dot sst at gmail dot com> +# Contributor: 網軍總司令 + +pkgname=ibus-rime +pkgver=0.9.4 +pkgrel=2 +pkgdesc="Rime input method engine for ibus" +arch=('i686' 'x86_64') +url="http://code.google.com/p/rimeime/" +license=('GPL3') +depends=('ibus' 'libnotify' 'librime>=0.9.3' 'brise') +makedepends=('cmake') +install='ibus-rime.install' +source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz") + +build() { + cd "$srcdir/$pkgname" + make +} + +package() { + cd "$srcdir/$pkgname" + make DESTDIR="$pkgdir" install +} + +md5sums=('ec7fdc6f8c772b1c5412be59546bc667') diff --git a/community/ibus-rime/ibus-rime.install b/community/ibus-rime/ibus-rime.install new file mode 100644 index 000000000..220126eb3 --- /dev/null +++ b/community/ibus-rime/ibus-rime.install @@ -0,0 +1,3 @@ +pre_upgrade() { + rm /usr/share/ibus-rime/*.bin || true +} diff --git a/community/ibus-sunpinyin/PKGBUILD b/community/ibus-sunpinyin/PKGBUILD index f187ec36f..d15c4ae9c 100644 --- a/community/ibus-sunpinyin/PKGBUILD +++ b/community/ibus-sunpinyin/PKGBUILD @@ -1,32 +1,52 @@ -# $Id: PKGBUILD 56121 2011-10-02 03:13:11Z ebelanger $ -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 79729 2012-11-11 16:11:46Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-sunpinyin -pkgver=2.0.3 +pkgver=2.0.3.20121107 +_commit=cf3fe3d7aa5bb7aa6aa5b870a759af468b6d5b2b pkgrel=2 -pkgdesc='The SunPinYin Engine for IBus Input Framework. SunPinYin is a Statistical Language Model based pinyin IME by Sun.' +pkgdesc="IBus Wrapper for sunpinyin." arch=('i686' 'x86_64' 'mips64el') -url='http://sunpinyin.googlecode.com' +url="http://sunpinyin.googlecode.com" license=('LGPL') -depends=('ibus' 'sunpinyin') -makedepends=('scons') -source=("http://sunpinyin.googlecode.com/files/ibus-sunpinyin-${pkgver}.tar.gz") -md5sums=('e678b2e1ac70c325cfc64c02fef7041f') +depends=('sunpinyin>2.0.3' 'ibus') +makedepends=('git' 'scons') + +__gitroot=git://github.com/sunpinyin/sunpinyin.git +__gitname=sunpinyin build() { - cd "${srcdir}/ibus-sunpinyin-${pkgver}" + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $__gitname ] ; then + cd $__gitname && git pull origin + msg "The local files are updated." + else + git clone $__gitroot + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." - sed -i 's/python/&2/' setup/ibus-setup-sunpinyin.in + rm -rf "$srcdir/$__gitname-build" + git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build" + cd "$srcdir/$__gitname-build" + git checkout "$_commit" + cd "$srcdir/$__gitname-build/wrapper/ibus" + sed -i -e "s|python|python2|" setup/ibus-setup-sunpinyin.in + scons \ --prefix=/usr } package() { - cd "${srcdir}/ibus-sunpinyin-${pkgver}" + cd "$srcdir/$__gitname-build/wrapper/ibus" scons \ --prefix=/usr \ - --install-sandbox="${pkgdir}" \ + --install-sandbox="$pkgdir" \ install } diff --git a/community/ibus-table/PKGBUILD b/community/ibus-table/PKGBUILD index c7a05272b..404d48e59 100644 --- a/community/ibus-table/PKGBUILD +++ b/community/ibus-table/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 56830 2011-10-14 06:44:36Z ebelanger $ +# $Id: PKGBUILD 79721 2012-11-11 15:10:35Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: coderoar <coderoar@gmail.com> # Contributor: leemars <leemars@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-table -pkgver=1.3.9.20110827 +pkgver=1.4.99.20121112 pkgrel=1 pkgdesc='The IM Engine framework for table-based input methods, such as ZhengMa, WuBi, ErBi, CangJie and so on.' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +13,6 @@ url="http://code.google.com/p/ibus/" license=('LGPL') depends=('python2-pyenchant' 'ibus' 'aspell-en') source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('251e2c8ace8ed265d780b30755afc163') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -32,3 +32,4 @@ package() { make DESTDIR="${pkgdir}" install } +md5sums=('85c3a57bcbb052d3222c5b6d07e0e565') diff --git a/community/ibus-unikey/PKGBUILD b/community/ibus-unikey/PKGBUILD index 0cb498684..fb0f50524 100644 --- a/community/ibus-unikey/PKGBUILD +++ b/community/ibus-unikey/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68023 2012-03-17 01:19:28Z ebelanger $ +# $Id: PKGBUILD 79163 2012-10-31 05:41:19Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Trương Xuân Tính <xuantinh at gmail dot com> pkgname=ibus-unikey pkgver=0.6.1 -pkgrel=1 +pkgrel=2 pkgdesc='IBus module for Vietnamese Keyboard' arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/community/ibus/PKGBUILD b/community/ibus/PKGBUILD deleted file mode 100644 index 3486353fa..000000000 --- a/community/ibus/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 78196 2012-10-17 10:24:17Z allan $ -# Contributor: Rainy <rainylau(at)gmail(dot)com> -# Contributor: Lee.MaRS <leemars at gmail dot com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> - -pkgname=ibus -pkgver=1.4.2 -pkgrel=2 -pkgdesc="Next Generation Input Bus for Linux" -arch=('i686' 'x86_64' 'mips64el') -url="http://ibus.googlecode.com" -license=('LGPL') -depends=('python2-dbus' 'gconf' 'dconf' 'python2-xdg' \ - 'iso-codes' 'librsvg' 'python2-notify' 'hicolor-icon-theme') -makedepends=('intltool' 'gobject-introspection') -optdepends=('notification-daemon') -options=('!libtool') -install=ibus.install -source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('a2d11d8bb64761691df918e9e50f0b35c711760d') - -build() { - cd ${pkgname}-${pkgver} - export PYTHON=python2 - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/ibus \ - --sysconfdir=/etc \ - --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ - --enable-gtk3 - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/etc/xdg/autostart" - ln -s /usr/share/applications/ibus.desktop "${pkgdir}/etc/xdg/autostart/ibus.desktop" -} diff --git a/community/ibus/ibus-1389-dbus-address.patch b/community/ibus/ibus-1389-dbus-address.patch deleted file mode 100644 index e6b18bdb2..000000000 --- a/community/ibus/ibus-1389-dbus-address.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ibus-1.4.99.20120317/src/ibusshare.c.orig 2012-04-26 12:24:55.922072674 +0900 -+++ ibus-1.4.99.20120317/src/ibusshare.c 2012-04-26 13:10:44.301421547 +0900 -@@ -44,7 +44,11 @@ ibus_get_local_machine_id (void) - if (!g_file_get_contents ("/var/lib/dbus/machine-id", - &machine_id, - NULL, -- &error)) { -+ &error) && -+ !g_file_get_contents ("/etc/machine-id", -+ &machine_id, -+ NULL, -+ NULL)) { - g_warning ("Unable to load /var/lib/dbus/machine-id: %s", error->message); - g_error_free (error); - machine_id = "machine-id"; diff --git a/community/ibus/ibus.install b/community/ibus/ibus.install deleted file mode 100644 index f44e3be1d..000000000 --- a/community/ibus/ibus.install +++ /dev/null @@ -1,29 +0,0 @@ -post_install() { - gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - - gconfpkg --install ibus - gtk-update-icon-cache -fq -t usr/share/icons/hicolor - - # update for gkt3 - gtk-query-immodules-3.0 --update-cache -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gconfpkg --uninstall ibus -} - -post_remove() { - gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - gtk-update-icon-cache -fq -t usr/share/icons/hicolor - - # update for gkt3 - gtk-query-immodules-3.0 --update-cache -} diff --git a/community/intel-tbb/PKGBUILD b/community/intel-tbb/PKGBUILD deleted file mode 100644 index b93442377..000000000 --- a/community/intel-tbb/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 76482 2012-09-18 21:17:25Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Denis Martinez <deuns.martinez AT gmail.com> - -pkgname=intel-tbb -pkgver=4.1_20120718 -pkgrel=1 -pkgdesc='High level abstract threading library' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.threadingbuildingblocks.org/' -license=('GPL') -depends=('gcc-libs') -source=("http://threadingbuildingblocks.org/uploads/77/188/4.1/tbb${pkgver/\./}oss_src.tgz") -sha1sums=('3fad942c867f032dc5ddeccd7ca19606eda7065d') - -build() { - cd "${srcdir}"/tbb${pkgver/\./}oss - - make -} - -package() { - cd "${srcdir}"/tbb${pkgver/\./}oss - - install -d "${pkgdir}"/usr/lib - install -m755 build/linux_*/*.so* "${pkgdir}"/usr/lib - - install -d "${pkgdir}"/usr/include - cp -a include/tbb "${pkgdir}"/usr/include -} diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index ad9ab0ade..4f803c005 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 74411 2012-07-27 08:27:33Z stativ $ +# $Id: PKGBUILD 79196 2012-10-31 12:36:36Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=11.1.3 -_pkgver=117.798 +pkgver=11.1.4 +_pkgver=117.963 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('b8ae865e3645cfd0a8d16dac481fd25c') +md5sums=('e4a8d95573c8b00e2f6722ac63efde0d') build() { cd "$srcdir" diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index 4270bf249..30f3e07e4 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 76538 2012-09-22 15:01:58Z seblu $ +# $Id: PKGBUILD 80651 2012-11-28 16:13:35Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ipset -pkgver=6.14 +pkgver=6.16.1 pkgrel=1 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.rc" "$pkgname.systemd" "$pkgname.service") -md5sums=('70f2d4c054592236dcda285855a4ee58' +md5sums=('9fd70c825f052db7dc9d5ba0562b7083' '3e606a2823a700b4e9c5f17511a6f6a5' 'de89b054d967036e08b13bc6a7235286' 'dfc3105b89ed41fc4a1feb4f4f13f2a3' diff --git a/community/ircservices/PKGBUILD b/community/ircservices/PKGBUILD deleted file mode 100644 index f6f00125f..000000000 --- a/community/ircservices/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 65578 2012-02-21 09:05:04Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=ircservices -pkgver=5.1.24 -pkgrel=2 -pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)" -arch=(i686 x86_64 'mips64el') -url="http://www.ircservices.za.net/" -license=('GPL') -depends=('glibc') -makedepends=('patch') -options=('!makeflags' 'emptydirs') -install=ircservices.install -#source=(http://www.ircservices.za.net/download/ircservices-$pkgver.tar.gz -source=(http://achurch.org/services/tarballs/ircservices-$pkgver.tar.gz - path-patch.patch - ircservices) -md5sums=('d4f531537aeed230026cf5560f221ecb' - '7e4bbf6fb398323afc8e85656ec82c13' - 'd5d6409ab04b3a715f9adc29a4fb8a2d') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -Np0 <../path-patch.patch - ./configure -prefix /usr - sed -i 's#getline#xgetline#' lang/langcomp.c - make - sed -i "s#DATDEST=/usr/lib/ircservices#DATDEST=$pkgdir/usr/lib/ircservices#" ./Makefile.inc - sed -i "s#BINDEST=/usr/sbin#BINDEST=$pkgdir/usr/sbin#" ./Makefile.inc -} - -package() { - cd $srcdir/$pkgname-$pkgver - install -d -m 0755 $pkgdir/usr/sbin - install -d -m 0755 $pkgdir/usr/lib - install -d -m 0755 $pkgdir/etc/ircd - make DESTDIR=$pkgdir install - - install -D -m 0755 $srcdir/ircservices $pkgdir/etc/rc.d/ircservices - cd $pkgdir && chmod -R ugo+r * && chmod 0755 ./usr/sbin/ircservices - find -type d -exec chmod 0755 {} \; - install -d -m 0755 $pkgdir/var/lib/ircd - cd ./var/lib/ircd - ln -s /usr/lib/ircservices/modules modules - ln -s /usr/lib/ircservices/languages languages - ln -s /usr/lib/ircservices/helpfiles helpfiles - ln -s /etc/ircd/ircservices.conf ircservices.conf - ln -s /etc/ircd/modules.conf modules.conf - - mkdir -p $pkgdir/var/log/ircd - mv $pkgdir/usr/lib/ircservices/*.conf $pkgdir/etc/ircd/ -} diff --git a/community/ircservices/ircservices b/community/ircservices/ircservices deleted file mode 100755 index 9acd2a6c6..000000000 --- a/community/ircservices/ircservices +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof /usr/sbin/ircservices -} - -case "$1" in - start) - stat_busy "Starting IRC services" - - [ -d /var/run/ircd ] || mkdir -p /var/run/ircd - [ -f /var/run/ircd/ircservices.pid ] && rm -f /var/run/ircd/ircservices.pid - chown -R ircd.irc /var/run/ircd - PID=`get_pid` - if [ -z "$PID" ]; then - su -c '/usr/sbin/ircservices -dir=/var/lib/ircd/ -remote=127.0.0.1:6667 -log=/var/log/ircd/ircservices.log' ircd 1>>/var/log/ircd/stdout.log 2>>/var/log/ircd/sterr.log - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon ircservices - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping IRC services" - PID=`get_pid` - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/ircd/ircservices.pid &> /dev/null - rm_daemon ircservices - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ircservices/ircservices.install b/community/ircservices/ircservices.install deleted file mode 100644 index a6d3fa1ab..000000000 --- a/community/ircservices/ircservices.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - groupadd irc - useradd -G irc ircd - chown -R ircd.irc /var/log/ircd - chown -R ircd.irc /var/lib/ircd -} - -post_upgrade() { - chown -R ircd.irc /var/log/ircd - chown -R ircd.irc /var/lib/ircd -} - -post_remove() { - echo "-- Don't forget to remove ircd user and irc group if you do not use it" -} diff --git a/community/ircservices/path-patch.patch b/community/ircservices/path-patch.patch deleted file mode 100644 index b7dd78a61..000000000 --- a/community/ircservices/path-patch.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- defs.h.org 2009-02-26 12:49:16.000000000 +0000 -+++ defs.h 2009-02-26 12:50:04.000000000 +0000 -@@ -17,10 +17,10 @@ - /******* General configuration *******/ - - /* Name of configuration file (in Services directory) */ --#define IRCSERVICES_CONF PROGRAM ".conf" -+#define IRCSERVICES_CONF "/etc/ircd/" PROGRAM ".conf" - - /* Name of module configuration file (in Services directory) */ --#define MODULES_CONF "modules.conf" -+#define MODULES_CONF "/etc/ircd/modules.conf" - - /* Maximum number of parameters for a configuration directive */ - #define CONFIG_MAXPARAMS 8 diff --git a/community/irrlicht/PKGBUILD b/community/irrlicht/PKGBUILD index 1321de38b..c02fadd97 100644 --- a/community/irrlicht/PKGBUILD +++ b/community/irrlicht/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66356 2012-02-23 23:04:08Z svenstaro $ +# $Id: PKGBUILD 79765 2012-11-12 07:14:50Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Hilton Medeiros <medeiros.hilton AT gmail DOT com> # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com> @@ -6,40 +6,31 @@ # Contributor: Lukas Kropatschek <lukas.krop AT gmail DOT com> pkgname=irrlicht -pkgver=1.7.3 +pkgver=1.8 pkgrel=1 pkgdesc="An open source high performance realtime 3D graphics engine." arch=('i686' 'x86_64' 'mips64el') url="http://irrlicht.sourceforge.net/" license=('ZLIB') depends=('libgl' 'libjpeg' 'bzip2' 'libpng') -makedepends=('mesa' 'unzip') -source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip" - "irrlicht-1.7.2-libpng15.patch") +makedepends=('mesa' 'unzip' 'libxcursor') +optdepends=('libxcursor: run examples') +source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip") noextract=($pkgname-$pkgver.zip) -md5sums=('cfbdc8c68fbca544c7c8dfb3623ae086' - 'a7f8d4aa1bc2880bbeaf3449e09f69a5') +md5sums=('d06329d8f466658caaf4838ba349e393') build() { unzip $pkgname-$pkgver.zip cd $srcdir/$pkgname-$pkgver - patch -Np0 < $srcdir/irrlicht-1.7.2-libpng15.patch - - sed -i -e '/^#.*NON_SYSTEM_ZLIB/d' \ - -e '/^#.*NON_SYSTEM_JPEG/d' \ - -e '/^#.*NON_SYSTEM_LIB_PNG/d' \ - -e '/^#.*NON_SYSTEM_BZLIB/d' \ - include/IrrCompileConfig.h - cd source/Irrlicht sed -i "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" \ Makefile - make sharedlib + make NDEBUG=1 sharedlib - make + make NDEBUG=1 install -d $pkgdir/usr/lib \ $pkgdir/usr/share/licenses/$pkgname \ diff --git a/community/jabberd14/PKGBUILD b/community/jabberd14/PKGBUILD deleted file mode 100644 index dc5f2be48..000000000 --- a/community/jabberd14/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 64996 2012-02-19 13:18:38Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=jabberd14 -pkgver=1.6.1.1 -pkgrel=11 -pkgdesc="old (1.4) jabber server branch" -arch=(i686 x86_64 'mips64el') -url="http://jabberd.org/" -license=("GPL") -depends=(pth libidn expat popt gnutls) -optdepends=(libmysqlclient) -conflicts=(jabberd) -backup=(etc/jabberd/jabber.xml) -options=('!libtool') -source=(http://download.jabberd.org/jabberd14/jabberd14-$pkgver.tar.gz - build-fix.patch - jabberd) -md5sums=('597c7ee14518ba22b1cee883b4737d87' - 'ad795626f26c01700a23515e0e75d654' - '5869169394d70977858320648075c7a6') - -build() { - cd $srcdir/jabberd14-$pkgver - export LDFLAGS="$LDFLAGS -lgcrypt" - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-ssl --enable-legacy --sysconfdir=/etc/jabberd --localstatedir=/var - echo "#undef HAVE_GNUTLS_EXTRA" >>config.h - [ $NOEXTRACT -eq 1 ] || patch -Rp1 <$srcdir/build-fix.patch - make -j1 - make DESTDIR=$pkgdir install - install -D -m 0755 $srcdir/jabberd $pkgdir/etc/rc.d/jabberd - rm -rf $pkgdir/var/run -} diff --git a/community/jabberd14/build-fix.patch b/community/jabberd14/build-fix.patch deleted file mode 100644 index 4f39b523e..000000000 --- a/community/jabberd14/build-fix.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc ---- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc 2011-08-09 00:37:29.000000000 +0400 -+++ jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc 2007-04-07 23:43:18.000000000 +0400 -@@ -910,8 +910,8 @@ - } - - /* separate this step from the next one, and check for a predicate in this step */ -- start_predicate = strchr((char*)path, '['); -- next_step = strchr((char*)path, '/'); -+ start_predicate = strchr(path, '['); -+ next_step = strchr(path, '/'); - if (start_predicate == NULL && next_step == NULL) { - this_step = pstrdup(p, path); - } else if (start_predicate == NULL || start_predicate > next_step && next_step != NULL) { -@@ -1833,8 +1833,7 @@ - if (lang != NULL && strchr(lang, '-') != NULL) { - snprintf(general_lang, sizeof(general_lang), "%s", lang); - if (strchr(lang, '-') != NULL) { -- char *tmp = strchr((char*)lang, '-'); -- tmp[0] = 0; -+ strchr(lang, '-')[0] = 0; - } else { - general_lang[0] = 0; - } -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc jabberd14-1.6.1.1/jabberd/log.cc ---- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc 2011-08-09 00:37:29.000000000 +0400 -+++ jabberd14-1.6.1.1/jabberd/log.cc 2007-07-20 17:56:59.000000000 +0400 -@@ -86,7 +86,7 @@ - char *pos, c = '\0'; - if(zone != NULL && debug__zones != NULL) - { -- pos = strchr((char*)zone,'.'); -+ pos = strchr(zone,'.'); - if(pos != NULL) - { - c = *pos; -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc jabberd14-1.6.1.1/jabberd/mio_tls.cc ---- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc 2011-08-09 00:53:55.000000000 +0400 -+++ jabberd14-1.6.1.1/jabberd/mio_tls.cc 2007-07-17 03:20:44.000000000 +0400 -@@ -43,7 +43,6 @@ - #include <vector> - #include <list> - #include <iostream> --#include <gnutls/openpgp.h> - - // Tell gcrypt that we are using libpth - had to move this to a plain C file - extern "C" void mio_tls_gcrypt_init(void); -@@ -613,8 +612,7 @@ - } - - // load OpenPGP key/certificate --// ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile); -- ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64); -+ ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile); - if (ret < 0) { - log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret)); - continue; -@@ -633,8 +631,7 @@ - } - - // load the OpenPGP keyring --// ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file); -- ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64); -+ ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file); - if (ret < 0) { - log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret)); - continue; -@@ -643,8 +640,6 @@ - continue; - } - -- --/* - // load GnuPG trustdb - if (j_strcmp(xmlnode_get_localname(cur), "trustdb") == 0) { - char const *const file = xmlnode_get_data(cur); -@@ -661,7 +656,6 @@ - continue; - } - } --*/ - - // setup protocols to use - if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) { diff --git a/community/jabberd14/jabberd b/community/jabberd14/jabberd deleted file mode 100644 index afbe6ef69..000000000 --- a/community/jabberd14/jabberd +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof /usr/bin/jabberd -} - -case "$1" in - start) - stat_busy "Starting Jabber daemon" - - [ -d /var/run/jabberd ] || mkdir -p /var/run/jabberd - [ -f /var/run/jabberd/jabber.pid ] && rm -f /var/run/jabberd/jabber.pid - PID=`get_pid` - if [ -z "$PID" ]; then - /usr/bin/jabberd -c /etc/jabberd/jabber.xml -B >/dev/null 2>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - sleep 1 # wait on children - echo `get_pid` > /var/run/jabberd/jabberd.pid - add_daemon jabberd - sleep 1 - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Jabber daemon" - PID=`get_pid` - [ ! -z "$PID" ] && kill $PID &> /dev/null - sleep 2 - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/jabberd/jabberd.pid &> /dev/null - rm_daemon jabberd - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD index 66a55c829..df1bab8c3 100644 --- a/community/jshon/PKGBUILD +++ b/community/jshon/PKGBUILD @@ -1,17 +1,15 @@ -# $Id: PKGBUILD 77050 2012-10-03 23:55:24Z kkeen $ +# $Id: PKGBUILD 80521 2012-11-23 18:22:00Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=jshon -pkgver=20120914 +pkgver=20121122 pkgrel=1 pkgdesc="A json parser for the shell." arch=('i686' 'x86_64' 'mips64el') url="http://kmkeen.com/jshon/" license=('MIT') depends=('jansson') -makedepends=() -optdepends=() source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('4b1cae2237db068ee4738789286a0409') +md5sums=('b66f6b23b510fc2cb571dcb69121b24c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/kcm-fcitx/PKGBUILD b/community/kcm-fcitx/PKGBUILD new file mode 100644 index 000000000..be4430d4e --- /dev/null +++ b/community/kcm-fcitx/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 80515 2012-11-23 11:59:16Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: poplarch <poplarch@gmail.com> + +pkgname=kcm-fcitx +pkgver=0.4.1 +pkgrel=2 +pkgdesc="KDE Config Module for Fcitx" +arch=('i686' 'x86_64') +url="https://github.com/fcitx/kcm-fcitx" +license=('GPL') +depends=('fcitx>=4.2.6' 'kdebase-runtime') +makedepends=('cmake' 'intltool' 'automoc4') +source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +md5sums=('1a2a9802edf6df79d3883c362ba487f0') + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 40a4dff43..df48d5fb4 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 77647 2012-10-13 11:43:46Z allan $ +# $Id: PKGBUILD 80567 2012-11-25 17:21:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive pkgver=0.9.2 -pkgrel=4 +pkgrel=6 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64' 'mips64el') # http://download.kde.org/stable/kdenlive/ url="http://www.kdenlive.org/" license=('GPL') -depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz' - 'libqzeitgeist') +depends=('kdebase-runtime' 'mlt' 'qjson' 'libqzeitgeist') makedepends=('automoc4' 'cmake' 'gettext' 'mesa' 'glu') -optdepends=('recordmydesktop' - 'dvdauthor' - 'mkisolinux' - 'xine-ui') +optdepends=('recordmydesktop: screen capture' + 'dvdauthor: dvd creation' + 'dvgrab: firewire capture' + 'xine-ui: dvd preview' + 'cdrkit: dvd iso image creation') install=kdenlive.install options=('docs') source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.bz2) diff --git a/community/keepassx/PKGBUILD b/community/keepassx/PKGBUILD index 5c5b073d7..6600013ce 100644 --- a/community/keepassx/PKGBUILD +++ b/community/keepassx/PKGBUILD @@ -1,22 +1,29 @@ -# $Id: PKGBUILD 65610 2012-02-21 09:36:40Z spupykin $ -# Maintainer: Alexander Fehr <pizzapunk gmail com> +# $Id: PKGBUILD 80120 2012-11-16 16:43:09Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Greg Bouzakis <gregbouzakis@gmail.com> +# Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Philipp Giebel <arch@ambience-design.net> pkgname=keepassx pkgver=0.4.3 -pkgrel=2 -pkgdesc="Cross platform password manager" +pkgrel=3 +pkgdesc='Password manager' arch=('i686' 'x86_64' 'mips64el') -url="http://www.keepassx.org/" +url='http://www.keepassx.org' license=('GPL2') -depends=('qt' 'libxtst') -source=(http://downloads.sourceforge.net/keepassx/keepassx-$pkgver.tar.gz) +depends=('libxtst' 'qt' 'shared-mime-info') +install=keepassx.install +source=(http://downloads.sourceforge.net/keepassx/$pkgname-$pkgver.tar.gz) md5sums=('1df67bb22b2e08df49f09e61d156f508') build() { - cd "$srcdir/keepassx-$pkgver" + cd $srcdir/$pkgname-$pkgver + sed -i '1,1i#include <unistd.h>' src/lib/random.cpp + qmake + make +} - qmake PREFIX=/usr - make - make INSTALL_ROOT="$pkgdir" install +package() { + cd $srcdir/$pkgname-$pkgver + make INSTALL_ROOT=$pkgdir install } diff --git a/community/keepassx/keepassx.install b/community/keepassx/keepassx.install new file mode 100644 index 000000000..6210bd0ab --- /dev/null +++ b/community/keepassx/keepassx.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/keybinder2/PKGBUILD b/community/keybinder2/PKGBUILD new file mode 100644 index 000000000..e28e6d131 --- /dev/null +++ b/community/keybinder2/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> +pkgname=('libkeybinder2' 'python2-keybinder2') +pkgbase=keybinder2 +_offname=keybinder +pkgver=0.3.0 +pkgrel=1 +pkgdesc='Library for registering global keyboard shortcuts' +arch=('i686' 'x86_64') +url='http://kaizer.se/wiki/keybinder/' +license=('GPL') +makedepends=('pygtk') +options=(!libtool) +source=(http://kaizer.se/publicfiles/${_offname}/${_offname}-${pkgver}.tar.gz) +sha256sums=('42863ca0174d568a8c02c6fb243fee1681823825e8bcb1718c51611d8e9793bb') + +build() { + cd "${srcdir}/${_offname}-${pkgver}" + export PYTHON=/usr/bin/python2 + ./configure \ + --prefix=/usr \ + --disable-lua + make +} + +package_libkeybinder2() { + pkgdesc='Library for registering global keyboard shortcuts' + depends=('gtk2') + + cd "${srcdir}/${_offname}-${pkgver}" + make DESTDIR="${pkgdir}/" install + rm -rf ${pkgdir}/usr/lib/python2.7 +} + +package_python2-keybinder2() { + pkgdesc='Library for registering global keyboard shortcuts - Python 2 bindings' + depends=('libkeybinder2' 'pygtk') + provides=('python-keybinder') + + cd "${srcdir}/${_offname}-${pkgver}" + make DESTDIR="${pkgdir}/" install + rm -rf ${pkgdir}/usr/lib/{girepository-1.0,libkeybinder*,pkgconfig} + rm -rf ${pkgdir}/usr/{include,share} +} diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD index c35adf1c2..330a87a86 100644 --- a/community/kicad/PKGBUILD +++ b/community/kicad/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77648 2012-10-13 11:43:53Z allan $ +# $Id: PKGBUILD 80124 2012-11-16 17:08:40Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Marq Schneider <queueRAM@gmail.com> @@ -6,13 +6,13 @@ pkgname=kicad pkgver=20120119 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2} _pkgbzr=3256 -pkgrel=3 +pkgrel=4 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools" arch=('i686' 'x86_64') url="http://iut-tice.ujf-grenoble.fr/kicad/" license=('GPL') depends=('glu' 'wxgtk' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('boost' 'cmake' 'zlib' 'mesa') +makedepends=('cmake' 'zlib' 'mesa') optdepends=('kicad-docs-bzr: for documentation' 'kicad-library-bzr: for footprints') install=kicad.install @@ -26,6 +26,9 @@ build() { patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch" + # FS#31559 + sed -i 's/-O2/-O1/' CMakeLists.txt + # build and install kicad mkdir -p build/Release cd build/Release diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD index b7a0e6b30..e9cbc21d4 100644 --- a/community/kid3/PKGBUILD +++ b/community/kid3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73475 2012-07-08 09:30:25Z ibiru $ +# $Id: PKGBUILD 78979 2012-10-28 15:58:04Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> pkgname=kid3 -pkgver=2.1 -pkgrel=4 +pkgver=2.2 +pkgrel=1 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://kid3.sourceforge.net/" @@ -14,18 +14,12 @@ makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl') options=('!makeflags') install=$pkgname.install changelog=$pkgname.changelog -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" - 'ffmpeg-0.11.diff') -sha256sums=('8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225' - '76ab3c119817a0e1f26e368afb757488c3865ff634771d4d176e729492991a54') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('edd665103d10e78542e99eac88f409c2dcfa9d257c0f774f91a006c55db92443') build() { cd ${pkgname}-${pkgver} - # fix error building with latest ffmpeg - # http://kid3.git.sourceforge.net/git/gitweb.cgi?p=kid3/kid3;a=commit;h=2a91bff2810281e58948f478e9396c73e5c6154a - patch -Np1 -i ${srcdir}/ffmpeg-0.11.diff - cd ${srcdir} mkdir build diff --git a/community/kid3/kid3.changelog b/community/kid3/kid3.changelog index 8c440c611..1e516d68b 100644 --- a/community/kid3/kid3.changelog +++ b/community/kid3/kid3.changelog @@ -1,3 +1,9 @@ +2012-10-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * kid3 2.2-1 + +2012-06-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * kid3 2.1-4 ffmpeg 0.11 rebuild + 2012-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * kid3 2.1-1 diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD index 8b78ad08f..e62a48a96 100644 --- a/community/klavaro/PKGBUILD +++ b/community/klavaro/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 73539 2012-07-09 10:19:45Z spupykin $ +# $Id: PKGBUILD 79909 2012-11-14 16:40:39Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=klavaro pkgver=1.9.5 -pkgrel=2 +pkgrel=3 pkgdesc="Free touch typing tutor program" arch=('i686' 'x86_64' 'mips64el') url="http://klavaro.sourceforge.net/" diff --git a/community/kleansweep/PKGBUILD b/community/kleansweep/PKGBUILD index ed39fecf1..c6783590d 100644 --- a/community/kleansweep/PKGBUILD +++ b/community/kleansweep/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=6 pkgdesc="Allows you to reclaim disk space by finding unneeded files" license=("GPL") url="http://linux.bydg.org/~yogin/" -arch=(i686 x86_64 'mips64el') +arch=(i686 x86_64) depends=('kdelibs3') makedepends=('scons') options=('libtool') diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD index d41a7ee87..cf19be57b 100644 --- a/community/knemo/PKGBUILD +++ b/community/knemo/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 67170 2012-03-05 08:41:38Z lcarlier $ +# $Id: PKGBUILD 79688 2012-11-11 05:39:50Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com> pkgname=knemo -pkgver=0.7.3 -pkgrel=3 +pkgver=0.7.5 +pkgrel=1 pkgdesc="The KDE Network Monitor" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde-apps.org/content/show.php?content=12956" license=('GPL') -depends=('kdebase-workspace' 'wireless_tools' 'iw' 'libnl1' - 'gtk-update-icon-cache') +depends=('kdebase-workspace' 'wireless_tools' 'iw' 'gtk-update-icon-cache') makedepends=('cmake' 'automoc4') install=${pkgname}.install options=('libtool') source=("http://www.kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.bz2") -md5sums=('24b5ec27b862ed7026ff643193952b78') +md5sums=('fc316e8492d97ffc00fc2e2c6caf136d') build() { cd ${srcdir} diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD index 07f068037..e34dd78f6 100644 --- a/community/ktoblzcheck/PKGBUILD +++ b/community/ktoblzcheck/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78201 2012-10-17 10:24:34Z allan $ +# $Id: PKGBUILD 80490 2012-11-22 19:42:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> pkgname=ktoblzcheck -pkgver=1.39 -pkgrel=3 +pkgver=1.40 +pkgrel=1 pkgdesc="A library to check account numbers and bank codes of German banks" arch=(i686 x86_64 'mips64el') url="http://ktoblzcheck.sourceforge.net" @@ -14,7 +14,7 @@ depends=('gcc-libs' 'python') optdepends=('perl') source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz ktoblzcheck-python3.patch) -md5sums=('ef5efd6e2c31aaf6405060ec477c200c' +md5sums=('fe29ec3ef8b48adf0302fd9d2607580b' 'a81a697bb3aaeffb7fac0ad7d9166e3f') build() { diff --git a/community/kyotocabinet/PKGBUILD b/community/kyotocabinet/PKGBUILD new file mode 100644 index 000000000..34cb5c73a --- /dev/null +++ b/community/kyotocabinet/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 80585 2012-11-26 11:05:40Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Alexander Duscheleit <jinks@archlinux.us> +# Contributor: Joaquim Pedro (osmano807) <osmano807@gmail.com> + +pkgname=kyotocabinet +pkgver=1.2.76 +pkgrel=1 +pkgdesc="a modern implementation of DBM in C++" +arch=('i686' 'x86_64') +url="http://fallabs.com/kyotocabinet" +license=('LGPL3') +makedepends=('gcc>=3.1' 'make' 'pkgconfig' 'zlib') +depends=('zlib' 'gcc-libs') +source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz") + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make install DESTDIR="$pkgdir/" +} +sha512sums=('278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a') diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index 8d1f24767..c8140872e 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77496 2012-10-11 11:35:28Z spupykin $ +# $Id: PKGBUILD 80760 2012-12-03 10:07:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') -pkgver=1.0.2 +pkgver=1.0.4 _pkgsubver=0 pkgrel=1 url='http://www.lazarus.freepascal.org/' @@ -15,7 +15,7 @@ makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz" 'lazcontrols2.diff') -md5sums=('738ee29686de71cd599b468eabf034e8' +md5sums=('1075f1d79a4e01784b2bbbcf4209a732' '288bca6ad5ade79deec34c3602daaaa9') build() { diff --git a/community/lib32-libphobos-ldc/PKGBUILD b/community/lib32-libphobos-ldc/PKGBUILD deleted file mode 100644 index d33790daf..000000000 --- a/community/lib32-libphobos-ldc/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 72029 2012-06-06 11:58:40Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -pkgname=lib32-libphobos-ldc -pkgver=20120917 -pkgrel=1 -pkgdesc="libphobos for ldc (32-bit)" -arch=('x86_64') -url="http://www.dsource.org/projects/ldc" -license=('BSD') -depends=('llvm' 'libconfig') -makedepends=('git' 'cmake') -source=() -md5sums=() - -_gitroot=git://github.com/ldc-developers/ldc.git -_gitname=ldc -_gitbranch=master - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin - msg "The local files are updated." - else - git clone --branch "$_gitbranch" "$_gitroot" "$_gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone --recursive "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - - mkdir build && cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINCLUDE_INSTALL_DIR=/usr/include/d/std-ldc \ - -DMULTILIB=ON \ - .. - make -} - -package() { - cd "$srcdir/$_gitname-build" - - cd build - make DESTDIR=$pkgdir install - cd .. - - # We don't want anything but the 32-bit libs - rm -rf $pkgdir/usr/{share,lib,include,bin} $pkgdir/etc - - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community/lib32-mpg123/PKGBUILD b/community/lib32-mpg123/PKGBUILD deleted file mode 100644 index 80a486faa..000000000 --- a/community/lib32-mpg123/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 73581 2012-07-10 16:06:46Z svenstaro $ -# Maintainer: Hugo Doria <hugo@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -_pkgbasename=mpg123 -pkgname=lib32-$_pkgbasename -pkgver=1.14.3 -pkgrel=1 -pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3 (32-bit)" -arch=('x86_64') -url="http://sourceforge.net/projects/mpg123" -license=('GPL2' 'LGPL2.1') -depends=('lib32-glibc' 'lib32-libtool' 'lib32-alsa-lib' $_pkgbasename) -makedepends=('lib32-sdl' gcc-multilib libtool-multilib) -optdepends=('lib32-sdl: for additional audio support') -options=('libtool') -source=(http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('443473ffae67b57bbf95c8ed63f0c7c9') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - ./configure --prefix=/usr --with-audio="alsa sdl" --with-cpu=i586 --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/community/libaccounts-glib/PKGBUILD b/community/libaccounts-glib/PKGBUILD new file mode 100644 index 000000000..5ff11d482 --- /dev/null +++ b/community/libaccounts-glib/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 79487 2012-11-06 04:11:07Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=libaccounts-glib +pkgver=1.3 +pkgrel=1 +pkgdesc="Glib-based client library for accessing the online accounts database" +arch=('i686' 'x86_64' 'mips64el') +url="http://code.google.com/p/accounts-sso/" +license=('LGPL') +depends=('dbus-glib' 'libxml2' 'sqlite3') +makedepends=('python2-gobject') +options=('!libtool') +source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz + fix-docdir.patch + make-tests-optional.patch) +sha1sums=('a2bd07082e9e9235103051f6574b154182745aee' + '94291a58dbbd36f524538adbf6d0c5a55024a34c' + '35732dc134c32af6ad1684d6388bad8ffe3f4dcc') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Use the standard docdir location + # http://code.google.com/p/accounts-sso/issues/detail?id=123 + patch -Np1 -i "$srcdir/fix-docdir.patch" + + # Build tests optionally + # http://code.google.com/p/accounts-sso/issues/detail?id=124 + patch -Np1 -i "$srcdir/make-tests-optional.patch" + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static \ + PYTHON=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # Install GI overrides for python 3 as well + install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides" + ln -s ../../../../python2.7/site-packages/gi/overrides/Accounts.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Accounts.py" + + # We don't have Backup Framework on Arch Linux + rm -r "$pkgdir/usr/share/backup-framework" +} diff --git a/community/libaccounts-glib/fix-docdir.patch b/community/libaccounts-glib/fix-docdir.patch new file mode 100644 index 000000000..a535000ec --- /dev/null +++ b/community/libaccounts-glib/fix-docdir.patch @@ -0,0 +1,12 @@ +diff -Naur -i libaccounts-glib-1.3.orig/Makefile.am libaccounts-glib-1.3/Makefile.am +--- libaccounts-glib-1.3.orig/Makefile.am 2012-03-13 15:18:32.000000000 +0100 ++++ libaccounts-glib-1.3/Makefile.am 2012-10-16 21:38:42.156352344 +0200 +@@ -12,7 +12,7 @@ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libaccounts-glib.pc + +-libaccountsdocdir = ${prefix}/doc/reference ++libaccountsdocdir = ${docdir} + libaccountsdoc_DATA= README COPYING AUTHORS ChangeLog INSTALL NEWS + + backupconfdir = ${prefix}/share/backup-framework/applications diff --git a/community/libaccounts-glib/make-tests-optional.patch b/community/libaccounts-glib/make-tests-optional.patch new file mode 100644 index 000000000..a5c3d1ba5 --- /dev/null +++ b/community/libaccounts-glib/make-tests-optional.patch @@ -0,0 +1,68 @@ +commit c34f64423776d214fc5a24b76c7c606119988d7e +Author: David King <david.king@canonical.com> +Date: Mon Oct 22 08:12:40 2012 +0100 + + Make tests optional at configure time + + http://code.google.com/p/accounts-sso/issues/detail?id=124 + +diff --git a/Makefile.am b/Makefile.am +index 97979a6..358a923 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,10 @@ +-SUBDIRS = libaccounts-glib docs tests tools ++SUBDIRS = libaccounts-glib docs tools + if ENABLE_PYTHON + SUBDIRS += pygobject + endif ++if ENABLE_TESTS ++SUBDIRS += tests ++endif + + ACLOCAL_AMFLAGS = -I m4 + +diff --git a/configure.ac b/configure.ac +index cbaf8d5..50b95ea 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,25 @@ PKG_CHECK_MODULES( + AC_SUBST(LIBACCOUNTS_CFLAGS) + AC_SUBST(LIBACCOUNTS_LIBS) + +-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) ++# Build tests. ++ ++CHECK_REQUIRED="check >= 0.9.4" ++ ++AC_ARG_ENABLE([tests], ++ [AS_HELP_STRING([--disable-tests], [build with testing support disabled])]) ++ ++AS_IF([test "x$enable_tests" != "xno"], ++ [PKG_CHECK_EXISTS([$CHECK_REQUIRED], [have_check=yes], [have_check=no])], ++ [have_check=no]) ++ ++AS_IF([test "x$have_check" = "xyes"], ++ [PKG_CHECK_MODULES([CHECK], [$CHECK_REQUIRED]) ++ AC_SUBST([CHECK_CFLAGS]) ++ AC_SUBST([CHECK_LIBS])], ++ [AS_IF([test "x$enable_tests" = "xyes"], ++ [AC_MSG_ERROR([tests enabled but required dependencies were not found])])]) ++ ++AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_check" = "xyes"]) + + AC_ISC_POSIX + AC_PROG_CC +diff --git a/tests/Makefile.am b/tests/Makefile.am +index db5aa3f..f6c8dbf 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -7,7 +7,7 @@ dist_check_SCRIPTS = \ + check_SCRIPTS = accounts-glib-test.sh + + accounts_glib_testsuite_SOURCES = check_ag.c +-accounts_glib_testsuite_CFLAGS = $(CHECK_FLAGS) -I$(top_srcdir) ++accounts_glib_testsuite_CFLAGS = $(CHECK_CFLAGS) -I$(top_srcdir) + accounts_glib_testsuite_LDADD = \ + $(CHECK_LIBS) \ + $(LIBACCOUNTS_LIBS) \ diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD new file mode 100644 index 000000000..552c0bd88 --- /dev/null +++ b/community/libaccounts-qt/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 80669 2012-11-29 00:01:42Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgbase=libaccounts-qt +_pkgbase=accounts-qt +pkgname=('libaccounts-qt' 'libaccounts-qt-doc') +pkgver=1.3 +pkgrel=1 +pkgdesc="Qt-based client library for accessing the online accounts database" +arch=('i686' 'x86_64' 'mips64el') +url="http://code.google.com/p/accounts-sso/" +license=('LGPL') +depends=('qt' 'libaccounts-glib') +makedepends=('doxygen' 'graphviz' 'ttf-dejavu') +source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2) +sha1sums=('26fd2734b2a0462ef6271164a17a3e85073dd5b1') + +build() { + cd "$srcdir/$_pkgbase-$pkgver" + + # Do not install tests + echo 'INSTALLS =' >>tests/accountstest.pro + + qmake PREFIX=/usr LIBDIR=/usr/lib + make +} + +package_libaccounts-qt() { + cd "$srcdir/$_pkgbase-$pkgver" + + make INSTALL_ROOT="$pkgdir" install + + # Split out documentation + mv "$pkgdir/usr/share/doc" "$srcdir" +} + +package_libaccounts-qt-doc() { + pkgdesc="Developer documention of signon" + depends=() + options=('!emptydirs') + + mkdir -p "$pkgdir/usr/share" + mv "$srcdir/doc" "$pkgdir/usr/share" +} diff --git a/community/libconfig/PKGBUILD b/community/libconfig/PKGBUILD deleted file mode 100644 index aff83cb5a..000000000 --- a/community/libconfig/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 55398 2011-09-11 21:17:02Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Roman Kyrylych <roman@archlinux.org> -# Contributor: scippio <scippio@seznam.cz> - -pkgname=libconfig -pkgver=1.4.8 -pkgrel=1 -pkgdesc="C/C++ Configuration File Library" -arch=('i686' 'x86_64' 'mips64el') -url="http://hyperrealm.com/libconfig/libconfig.html" -license=('LGPL') -depends=('gcc-libs' 'texinfo') -install=libconfig.install -options=('!libtool' '!emptydirs' 'zipman') -source=(http://www.hyperrealm.com/libconfig/$pkgname-$pkgver.tar.gz) -md5sums=('36788da452e9fcfc8efb7661ef5d31ef') - -build() { - cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr - make - make DESTDIR=${pkgdir} install - rm ${pkgdir}/usr/share/info/dir -} diff --git a/community/libconfig/libconfig.install b/community/libconfig/libconfig.install deleted file mode 100644 index c03d5f7fa..000000000 --- a/community/libconfig/libconfig.install +++ /dev/null @@ -1,18 +0,0 @@ -infodir=/usr/share/info -filelist=(libconfig.info.gz) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/community/libdesktop-agnostic/PKGBUILD b/community/libdesktop-agnostic/PKGBUILD new file mode 100644 index 000000000..9513ef819 --- /dev/null +++ b/community/libdesktop-agnostic/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 79732 2012-11-11 19:02:50Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=libdesktop-agnostic +pkgver=0.3.92 +pkgrel=5 +pkgdesc="Provides an extensible config API, a unified virtual fs API, and a desktop item editor for GLib-based projects" +arch=('i686' 'x86_64' 'mips64el') +url="https://launchpad.net/libdesktop-agnostic" +license=('GPL' 'LGPL') +depends=('pygtk') +makedepends=('intltool' 'vala' 'gconf' 'gobject-introspection') +optdepends=('gconf: gconf configuration backend') +options=('!libtool') +backup=(etc/xdg/libdesktop-agnostic/desktop-agnostic.ini) +source=(https://launchpad.net/$pkgname/0.4/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('42374d226a21d57637f97173f6b105a1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + export PYTHON=/usr/bin/python2 + + python2 ./waf configure --prefix=/usr --sysconfdir=/etc \ + --config-backends=gconf,keyfile \ + --vfs-backends=gio \ + --desktop-entry-backends=gio,glib + python2 ./waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + python2 ./waf install --destdir="$pkgdir" +} diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD index 6378227b4..bea44e452 100644 --- a/community/libee/PKGBUILD +++ b/community/libee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69124 2012-04-09 15:33:25Z jelle $ +# $Id: PKGBUILD 80464 2012-11-22 10:27:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Brian Knox <taotetek@gmail.com> pkgname=libee -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="event expression library inspired by CEE" url="http://www.libee.org/" @@ -14,7 +14,7 @@ makedepends=() optdepends=() options=(!libtool) source=("http://www.libee.org/files/download/libee-$pkgver.tar.gz") -md5sums=('257a23d5cc8f211fb99464a462bc92cd') +md5sums=('7bbf4160876c12db6193c06e2badedb2') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/libesmtp/PKGBUILD b/community/libesmtp/PKGBUILD index cb6999ace..c0501f961 100644 --- a/community/libesmtp/PKGBUILD +++ b/community/libesmtp/PKGBUILD @@ -5,7 +5,7 @@ pkgname=libesmtp pkgver=1.0.6 -pkgrel=2 +pkgrel=2.1 pkgdesc='A library to manage posting mail to a preconfigured MTA.' arch=('i686' 'x86_64' 'mips64el') url='http://www.stafford.uklinux.net/libesmtp/' diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index 51a064c9a..99c911799 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78526 2012-10-20 09:33:25Z heftig $ +# $Id: PKGBUILD 78771 2012-10-24 12:21:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s@gmail.com> # Contributor: damir <damir@archlinux.org> pkgname=libextractor -pkgver=0.6.3 -pkgrel=8 +pkgver=1.0.1 +pkgrel=2 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64" 'mips64el') license=('GPL') @@ -21,9 +21,9 @@ optdepends=('flac: flac support' 'libvorbis: ogg/vorbis support') options=('!libtool' '!makeflags') install=libextractor.install -source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) -md5sums=('7004ff6be06e400050f0ad7016140981' - '81f95c31831dde62428a98ae32464c51') +source=("http://ftp.gnu.org/gnu/libextractor/${pkgname}-${pkgver}.tar.gz"{,.sig}) +md5sums=('593c40670fd7fc8c3ae7adc3df557f64' + 'ef9bfeb3ade063dc9a5b29b2afd0732e') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/libextractor/libextractor.install b/community/libextractor/libextractor.install index 1cf51e095..27002d556 100644 --- a/community/libextractor/libextractor.install +++ b/community/libextractor/libextractor.install @@ -1,5 +1,5 @@ infodir=usr/share/info -filelist=(extractor.info.gz) +filelist=(libextractor.info.gz) post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index 981d50cef..969cb6ecb 100755 --- a/community/libfbclient/PKGBUILD +++ b/community/libfbclient/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72429 2012-06-14 12:17:07Z lcarlier $ +# $Id: PKGBUILD 80240 2012-11-18 10:30:33Z andrea $ # Maintainer: Carlier Laurent <lordheavym@gmail.com> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=libfbclient -pkgver=2.5.1.26351 -pkgrel=3 +pkgver=2.5.2.26539 +pkgrel=1 pkgdesc="Client library for Firebird." arch=('i686' 'x86_64') url="http://www.firebirdsql.org/" @@ -13,7 +13,7 @@ depends=('gcc-libs' 'icu') options=('!makeflags') source=(http://downloads.sourceforge.net/firebird/Firebird-$pkgver-0.tar.bz2 LICENSE) -md5sums=('1772fba4f09c8fc84d989282405f90fd' +md5sums=('adf2d2f9d48a53dc6c490ba1e44631fd' '0d61798861e159c85dbdf0f30fe2f2ce') build() { @@ -31,13 +31,15 @@ build() { package() { cd $srcdir/Firebird-$pkgver-0 - mkdir -p $pkgdir/usr/{bin,share/firebird} + mkdir -p $pkgdir/usr/{bin,share/{firebird,licenses/$pkgname}} + cp -R gen/firebird/{lib,include} $pkgdir/usr rm -f $pkgdir/usr/lib/libedit.a + install -m644 gen/firebird/*.msg $pkgdir/usr/share/firebird install -m755 gen/firebird/bin/fb_config $pkgdir/usr/bin - mkdir -p $srcdir/usr/share/licenses/$pkgname/ - install -D -m644 ${srcdir}/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -m644 ${srcdir}/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + # Add libgds support FS#30062 FS#30282 cd $pkgdir/usr/lib ln -s libfbclient.so libgds.so.0 diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index bf8aba504..113c5ab6b 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 76525 2012-09-21 15:37:33Z bpiotrowski $ +# $Id: PKGBUILD 80049 2012-11-15 19:06:07Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=libfm -pkgver=1.0.1 -pkgrel=1 -pkgdesc="A library for file management" -url="http://pcmanfm.sourceforge.net/" +pkgver=1.1.0 +pkgrel=3.1 +pkgdesc='Library for file management' +url='http://pcmanfm.sourceforge.net/' arch=('i686' 'x86_64' 'mips64el') license=('GPL') groups=('lxde') @@ -16,7 +16,7 @@ options=('!libtool') install=libfm.install depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils' 'vala') source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz) -md5sums=('7fb406f38f99c9171661f72fa6d4da7f') +md5sums=('a5bc8b8291cf810c659bfb3af378b5de') build() { cd $srcdir/$pkgname-$pkgver @@ -31,4 +31,8 @@ build() { package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install + + # Temporary fix to FS#32361 + rm $pkgdir/usr/include/libfm + mv $pkgdir/usr/include/libfm-1.0/ $pkgdir/usr/include/libfm } diff --git a/community/libgalago-gtk/PKGBUILD b/community/libgalago-gtk/PKGBUILD deleted file mode 100644 index ac572d64a..000000000 --- a/community/libgalago-gtk/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 66197 2012-02-23 03:08:10Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=libgalago-gtk -pkgver=0.5.0 -pkgrel=4 -pkgdesc="GTK+ widgets for the Galago presence framework" -arch=(i686 x86_64 'mips64el') -url="http://www.galago-project.org" -options=('!libtool') -license=('LGPL') -depends=('gtk2' 'libgalago') -source=(http://www.galago-project.org/files/releases/source/libgalago-gtk/libgalago-gtk-$pkgver.tar.gz) -md5sums=('810f7922ac37ca87d61a0fb0cd830b8b') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/share/autopackage -} diff --git a/community/libgalago/PKGBUILD b/community/libgalago/PKGBUILD deleted file mode 100644 index 10e899497..000000000 --- a/community/libgalago/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 66196 2012-02-23 03:07:22Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=libgalago -pkgver=0.5.2 -pkgrel=4 -pkgdesc="The Galago presence library" -arch=(i686 x86_64 'mips64el') -url="http://www.galago-project.org" -options=('!libtool') -license=("LGPL") -depends=('dbus-glib') -source=(http://www.galago-project.org/files/releases/source/libgalago/libgalago-$pkgver.tar.gz - libgalago-mkinstalldirs.patch) -md5sums=('7ec92f2ecba1309ac4b71b4b4d8d0a0d' - '3b38fecc5421ca338363b9ae1d218b7e') - -build() { - cd $srcdir/libgalago-$pkgver - patch -p0 -i ../libgalago-mkinstalldirs.patch - ./configure --prefix=/usr --disable-tests - make - make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/share/autopackage -} diff --git a/community/libgalago/libgalago-mkinstalldirs.patch b/community/libgalago/libgalago-mkinstalldirs.patch deleted file mode 100644 index 87c42fc00..000000000 --- a/community/libgalago/libgalago-mkinstalldirs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- po/Makefile.in.in.org 2007-01-25 15:14:01.000000000 +0300 -+++ po/Makefile.in.in 2007-01-25 15:15:11.000000000 +0300 -@@ -29,7 +29,7 @@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - MKINSTALLDIRS = @MKINSTALLDIRS@ --mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(MKINSTALLDIRS)" ;; esac` -+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) - - CC = @CC@ - GMSGFMT = @GMSGFMT@ diff --git a/community/libgda3/PKGBUILD b/community/libgda3/PKGBUILD deleted file mode 100644 index d96d84690..000000000 --- a/community/libgda3/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 61951 2012-01-11 15:22:01Z stephane $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=libgda3 -pkgver=3.1.5 -pkgrel=11 -pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnome-db.org/Download" -license=('GPL') -depends=('glib2' 'libxslt' 'popt' 'rarian' 'db' 'gnome-vfs' - 'libmysqlclient' 'postgresql-libs>=8.4.1' 'libldap' 'unixodbc' 'sqlite3') -makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'util-linux-ng') -options=('!libtool' '!distcc') -source=(http://ftp.acc.umu.se/pub/GNOME/sources/libgda/3.1/libgda-$pkgver.tar.bz2) -md5sums=('eb7da5286a112e7cff3111c89fba4456') - -build() { - cd "$srcdir/libgda-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package(){ - cd "$srcdir/libgda-$pkgver" - make DESTDIR=$pkgdir install - cd "$pkgdir" && find -name \*..so -exec rename '..so' '.a' {} \; -} diff --git a/community/libgeotiff/PKGBUILD b/community/libgeotiff/PKGBUILD index b1fc40bb0..fe4316fc1 100644 --- a/community/libgeotiff/PKGBUILD +++ b/community/libgeotiff/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 63640 2012-02-05 12:02:48Z ibiru $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 78993 2012-10-28 17:33:39Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=libgeotiff -pkgver=1.3.0 -pkgrel=2 +pkgver=1.4.0 +pkgrel=1 pkgdesc="A TIFF based interchange format for georeferenced raster imagery" arch=('i686' 'x86_64' 'mips64el') -license=('custom') url="http://www.remotesensing.org/geotiff" +license=('custom') depends=('libtiff' 'proj' 'libjpeg>=7') options=('!makeflags' '!libtool') +changelog=$pkgname.changelog source=(ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/$pkgname-$pkgver.tar.gz) -md5sums=('6ac3c22e44711e9a3add9044e40b9527') +sha256sums=('d0acb8d341fd6a8f2c673456e09fdb8f50f91e3166ac934719fe05b30d328329') build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make + cd ${srcdir}/$pkgname-$pkgver + + ./configure --prefix=/usr + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -D -m644 LICENSE "$pkgdir/usr/share/licenses/libgeotiff/LICENSE" + cd ${srcdir}/$pkgname-$pkgver + + make DESTDIR=${pkgdir} install + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/libgeotiff/LICENSE } diff --git a/community/libgeotiff/libgeotiff.changelog b/community/libgeotiff/libgeotiff.changelog new file mode 100644 index 000000000..e49948e98 --- /dev/null +++ b/community/libgeotiff/libgeotiff.changelog @@ -0,0 +1,2 @@ +2012-10-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * libgeotiff 1.4.0-1 diff --git a/community/libgooglepinyin/PKGBUILD b/community/libgooglepinyin/PKGBUILD new file mode 100644 index 000000000..bac38b86c --- /dev/null +++ b/community/libgooglepinyin/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Author: CSSlayer <wengxt@gmail.com> +# Contributor: Yangtse <yangtsesu@gmail.com> + +pkgname=libgooglepinyin +pkgver=0.1.2 +pkgrel=1 +pkgdesc="A fork from google pinyin on android" +arch=('i686' 'x86_64') +url="http://code.google.com/p/libgooglepinyin" +license=('APACHE') +depends=('gcc-libs') +makedepends=('cmake') +source=(http://libgooglepinyin.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) + +build() { + cd "${srcdir}" + + msg "Starting make..." + + rm -rf "${srcdir}/build" + cp -rf "${srcdir}/${pkgname}-${pkgver}" "$srcdir/build" + cd "${srcdir}/build" + + cmake -DCMAKE_INSTALL_PREFIX=/usr . \ + -DENABLE_STATIC=Off +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} + +md5sums=('d697aba08fdc0fe15c9d7b6096ca3b28') diff --git a/community/libhx/PKGBUILD b/community/libhx/PKGBUILD index 22ea11bbe..e43bb8af0 100644 --- a/community/libhx/PKGBUILD +++ b/community/libhx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74564 2012-07-30 14:15:35Z spupykin $ +# $Id: PKGBUILD 80149 2012-11-16 20:29:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Max Roder <maxroder@web.de> # Contributor: Nathan Owe <ndowens.aur at gmail dot com> pkgname='libhx' -pkgver=3.13 +pkgver=3.14 pkgrel=1 pkgdesc='A library providing queue, tree, I/O and utility functions' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=() options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/libHX-${pkgver}.tar.xz") -md5sums=('3cfb6983e2e7eea20f295c5f2c2c9b03') +md5sums=('a2a2dd32aaff33234e53517c6afd694a') build() { cd ${srcdir}/libHX-${pkgver} diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index b0edb06ba..0522a68cb 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75876 2012-09-04 15:28:30Z spupykin $ +# $Id: PKGBUILD 78757 2012-10-24 10:01:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=libmediainfo -pkgver=0.7.60 +pkgver=0.7.61 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 libmediainfo-0.7.50-libmms.patch) -md5sums=('f2a8e921814fc188ada7a236c8a2073e' +md5sums=('371519c1c24e4de84448d6624fc41aa8' '2f4b21cc250f663d52b497dedb963e3b') build() { diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 787a66f65..9dc92493a 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75878 2012-09-04 15:29:17Z spupykin $ +# $Id: PKGBUILD 80762 2012-12-03 10:11:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,8 +6,8 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.22 -pkgrel=1 +pkgver=0.9.23 +pkgrel=2 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libmicrohttpd/" @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('a90cb23e3087146fabc49a370c192de2') +md5sums=('efd038d93836adc0149beaa1c2927f61') build() { cd ${pkgname}-${pkgver} diff --git a/community/libmicrohttpd/libmicrohttpd.install b/community/libmicrohttpd/libmicrohttpd.install index dc0d2b996..7129b1754 100644 --- a/community/libmicrohttpd/libmicrohttpd.install +++ b/community/libmicrohttpd/libmicrohttpd.install @@ -1,5 +1,5 @@ infodir=usr/share/info -filelist=(microhttpd.info microhttpd-tutorial.info) +filelist=(libmicrohttpd.info libmicrohttpd-tutorial.info) post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/community/libnet/PKGBUILD b/community/libnet/PKGBUILD deleted file mode 100644 index 420d437f7..000000000 --- a/community/libnet/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 68329 2012-03-21 20:31:50Z andrea $ -# Maintainer: -# Contributor: damir <damir@archlinux.org> - -pkgname=libnet -pkgver=1.1.5 -pkgrel=2 -pkgdesc="A library which provides API for commonly used low-level net functions" -arch=('i686' 'x86_64' 'mips64el') -url="http://sourceforge.net/projects/libnet-dev/" -license=('BSD') -depends=('glibc' 'sh') -options=('!libtool') -source=("http://downloads.sourceforge.net/libnet-dev/${pkgname}-${pkgver}.tar.gz") -md5sums=('a9bc1d75a610efcfee200d3e28d8eb8f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make CFLAGS="${CFLAGS} -fPIC" -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm644 doc/COPYING \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community/libnetfilter_cthelper/PKGBUILD b/community/libnetfilter_cthelper/PKGBUILD index 0cca5f479..fbbe5992d 100644 --- a/community/libnetfilter_cthelper/PKGBUILD +++ b/community/libnetfilter_cthelper/PKGBUILD @@ -5,7 +5,7 @@ pkgname=libnetfilter_cthelper pkgver=1.0.0 pkgrel=1 pkgdesc='Library for the connection tracking helper infrastructure' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://www.netfilter.org/projects/libnetfilter_cthelper/' license=('GPL2') depends=('libmnl') diff --git a/community/libpaper/PKGBUILD b/community/libpaper/PKGBUILD index 2c827773c..87b060b06 100644 --- a/community/libpaper/PKGBUILD +++ b/community/libpaper/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 67411 2012-03-11 13:41:08Z cbrannon $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 79303 2012-11-02 14:41:55Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: royrocks <royrocks13@gmail.com> pkgname=libpaper pkgver=1.1.24 -pkgrel=2 -pkgdesc="Library for handling paper characteristics" -arch=('i686' 'x86_64' 'mips64el') -url="http://packages.debian.org/unstable/source/libpaper" +pkgrel=3 +pkgdesc='Library for handling paper characteristics' +arch=('x86_64' 'i686' 'mips64el') +url='http://packages.debian.org/unstable/source/libpaper' license=('GPL') -source=(http://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_${pkgver}.tar.gz) -md5sums=('5bc87d494ba470aba54f6d2d51471834') +source=("http://ftp.de.debian.org/debian/pool/main/libp/$pkgname/${pkgname}_$pkgver+nmu2.tar.gz") +sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver+nmu2 ./configure --prefix=/usr \ --mandir=$pkgdir/usr/share/man \ --sysconfdir=/etc @@ -21,6 +22,8 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver+nmu2 make prefix=$pkgdir/usr install } + +# vim:set ts=2 sw=2 et: diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD new file mode 100644 index 000000000..5fa6043b9 --- /dev/null +++ b/community/libpinyin/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 80277 2012-11-19 05:28:17Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Yangtse <yangtsesu@gmail.com> +# Contributor: WU Jun <quark at lihdd dot net> + +pkgname=libpinyin +pkgver=0.8.0 +pkgrel=1 +pkgdesc="Library to deal with pinyin." +arch=('i686' 'x86_64') +url="https://github.com/libpinyin/libpinyin" +license=('GPL') +depends=('db' 'glib2') +options=(!libtool) +source=("https://github.com/downloads/libpinyin/libpinyin/${pkgname}-lite-${pkgver}.tar.gz" + 'https://github.com/downloads/libpinyin/libpinyin/model.text.tar.gz') +noextract=("model.text.tar.gz") + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + cp "${srcdir}/model.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/" + sed -i '/wget.*model\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am + + aclocal && libtoolize --force && autoheader && automake -a && autoconf + ./configure --prefix=/usr && make +} + +package() { + cd "${srcdir}/libpinyin-$pkgver" + make DESTDIR="${pkgdir}" install +} +md5sums=('e53cc51355a79acf187d768befbfcff8' + '59be0e37b0834e41be9786d3b2fcc129') diff --git a/community/libpng12/PKGBUILD b/community/libpng12/PKGBUILD new file mode 100644 index 000000000..968cd9123 --- /dev/null +++ b/community/libpng12/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 79866 2012-11-14 07:22:13Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: dorphell <archlinux.org: dorphell> +# Contributor: Travis Willard <archlinux.org: travis> +# Contributor: Douglas Soares de Andrade <archlinux.org: douglas> +# Contributor: Jesse Jaara <gmail.com: jesse.jaara> + +pkgname=libpng12 +_realname=libpng +pkgver=1.2.50 +pkgrel=2 +pkgdesc="A collection of routines used to create PNG format graphics files" +arch=('i686' 'x86_64') +url="http://www.libpng.org/pub/png/libpng.html" +license=('custom') +depends=('zlib') +options=('!libtool') +source=("http://sourceforge.net/projects/libpng/files/libpng-${pkgver}.tar.xz" + "http://sourceforge.net/projects/apng/files/libpng/libpng12/libpng-${pkgver}-apng.patch.gz") + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + + patch -Np0 -i "${srcdir}/libpng-${pkgver}-apng.patch" + + libtoolize --force --copy + aclocal + autoconf + automake --add-missing + + ./configure --prefix=/usr + + make ECHO=echo +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + + make ECHO=echo DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/share" + rm -rf "${pkgdir}/usr/bin/libpng-config" + rm -rf "${pkgdir}/usr/lib/"{libpng.so,libpng.a} + rm -fr "${pkgdir}/usr/lib/pkgconfig/libpng.pc" + rm -rf "${pkgdir}/usr/include/"{pngconf.h,png.h} + +} + +md5sums=('a3e00fccbfe356174ab515b5c00641c7' + 'b06ac3f6a6f982abc2036359665e82a9') diff --git a/community/libquvi/PKGBUILD b/community/libquvi/PKGBUILD deleted file mode 100644 index d9a21c4c2..000000000 --- a/community/libquvi/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 70444 2012-05-07 08:28:44Z lfleischer $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> - -pkgname=libquvi -pkgver=0.4.1 -pkgrel=1 -pkgdesc='Library for parsing video download links.' -arch=('i686' 'x86_64' 'mips64el') -url='http://quvi.sourceforge.net/' -license=('LGPL') -depends=('libquvi-scripts' 'curl' 'lua') -conflicts=('quvi<0.4.0') -options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.gz"{,.sig}) -md5sums=('a5fa8860c23655a529b3166f6e25c83a' - 'cc7f15518f8ab2fc134bc64f0e9d584b') - -build() { - cd "${pkgname}-${pkgver}" - - ./configure --prefix=/usr - make -} - -package() { - cd "${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/librime/PKGBUILD b/community/librime/PKGBUILD new file mode 100644 index 000000000..5448efe84 --- /dev/null +++ b/community/librime/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 80591 2012-11-26 15:20:56Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: GONG Chen <chen dot sst at gmail dot com> +# Contributor: 網軍總司令 + +pkgname=librime +pkgver=0.9.4 +pkgrel=3 +pkgdesc="Rime input method engine" +arch=('i686' 'x86_64') +url="http://code.google.com/p/rimeime/" +license=('GPL3') +depends=('boost>=1.46' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp') +optdepends=('brise: Rime schema repository') +makedepends=('cmake') +source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz") + +build() { + cd "${srcdir}/$pkgname" + make +} + +package() { + cd "${srcdir}/$pkgname" + make DESTDIR="$pkgdir" install +} + +md5sums=('c917d52ddc5483147d0409de9dafc8af') diff --git a/community/librsync/PKGBUILD b/community/librsync/PKGBUILD index 0a0a4c435..720de9a1a 100644 --- a/community/librsync/PKGBUILD +++ b/community/librsync/PKGBUILD @@ -5,7 +5,7 @@ pkgname=librsync pkgver=0.9.7 -pkgrel=6 +pkgrel=6.1 pkgdesc="A free software library that implements the rsync remote-delta algorithm (rdiff)" arch=('i686' 'x86_64' 'mips64el') url="http://librsync.sourceforge.net/" diff --git a/community/libsignon-glib/PKGBUILD b/community/libsignon-glib/PKGBUILD new file mode 100644 index 000000000..3baa4fc14 --- /dev/null +++ b/community/libsignon-glib/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 79489 2012-11-06 04:11:17Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=libsignon-glib +pkgver=1.7 +pkgrel=1 +pkgdesc="GLib-based client library for applications handling account authentication through the Online Accounts Single Sign-On service" +arch=('i686' 'x86_64' 'mips64el') +url="http://code.google.com/p/accounts-sso/" +license=('LGPL') +depends=('signon') +makedepends=('python2-gobject') +options=('!libtool') +source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz + fix-docdir.patch + make-tests-optional.patch) +sha1sums=('e461c952c015e5b375ca3f12fac5a8ae1ba4646e' + '56ffd1502dcb754797dc95c0eb80ab23374aee2d' + '327dde1944c8adc27d8bd413399a4366b3560901') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Use the standard docdir location + # http://code.google.com/p/accounts-sso/issues/detail?id=123 + patch -Np1 -i "$srcdir/fix-docdir.patch" + + # Build tests optionally + # http://code.google.com/p/accounts-sso/issues/detail?id=124 + patch -Np1 -i "$srcdir/make-tests-optional.patch" + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static \ + PYTHON=python2 + make -j1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # Install GI overrides for python 3 as well + install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides" + ln -s ../../../../python2.7/site-packages/gi/overrides/Signon.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Signon.py" +} diff --git a/community/libsignon-glib/fix-docdir.patch b/community/libsignon-glib/fix-docdir.patch new file mode 100644 index 000000000..b42c7faf8 --- /dev/null +++ b/community/libsignon-glib/fix-docdir.patch @@ -0,0 +1,12 @@ +diff -Naur libsignon-glib-1.6.orig/Makefile.am libsignon-glib-1.6/Makefile.am +--- libsignon-glib-1.6.orig/Makefile.am 2012-08-13 10:09:23.000000000 +0200 ++++ libsignon-glib-1.6/Makefile.am 2012-10-16 22:04:28.805736477 +0200 +@@ -11,7 +11,7 @@ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libsignon-glib.pc + +-libsignondocdir = ${prefix}/doc/reference ++libsignondocdir = ${docdir} + libsignondoc_DATA= README COPYING AUTHORS ChangeLog INSTALL NEWS + + EXTRA_DIST = \ diff --git a/community/libsignon-glib/make-tests-optional.patch b/community/libsignon-glib/make-tests-optional.patch new file mode 100644 index 000000000..cc1e72848 --- /dev/null +++ b/community/libsignon-glib/make-tests-optional.patch @@ -0,0 +1,61 @@ +commit 65e1948097695f26aa13f4104336a8a76a678b87 +Author: David King <david.king@canonical.com> +Date: Tue Oct 30 09:24:27 2012 +0000 + + Make tests optional at configure time + + http://code.google.com/p/accounts-sso/issues/detail?id=124 + +diff --git a/Makefile.am b/Makefile.am +index 86b3a55..5740d45 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,12 +2,16 @@ ACLOCAL_AMFLAGS = -I m4 + DISTCHECK_CONFIGURE_FLAGS = \ + --enable-gtk-doc \ + --enable-introspection=yes +-SUBDIRS = libsignon-glib docs tests ++SUBDIRS = libsignon-glib docs + + if ENABLE_PYTHON + SUBDIRS += pygobject + endif + ++if ENABLE_TESTS ++SUBDIRS += tests ++endif ++ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libsignon-glib.pc + +diff --git a/configure.ac b/configure.ac +index af5e663..d09661e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -19,7 +19,25 @@ PKG_CHECK_MODULES( + AC_SUBST(DEPS_CFLAGS) + AC_SUBST(DEPS_LIBS) + +-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) ++# Build tests. ++ ++CHECK_REQUIRED="check >= 0.9.4" ++ ++AC_ARG_ENABLE([tests], ++ [AS_HELP_STRING([--disable-tests], [build with testing support disabled])]) ++ ++AS_IF([test "x$enable_tests" != "xno"], ++ [PKG_CHECK_EXISTS([$CHECK_REQUIRED], [have_check=yes], [have_check=no])], ++ [have_check=no]) ++ ++AS_IF([test "x$have_check" = "xyes"], ++ [PKG_CHECK_MODULES([CHECK], [$CHECK_REQUIRED]) ++ AC_SUBST([CHECK_CFLAGS]) ++ AC_SUBST([CHECK_LIBS])], ++ [AS_IF([test "x$enable_tests" = "xyes"], ++ [AC_MSG_ERROR([tests enabled but required dependencies were not found])])]) ++ ++AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_check" = "xyes"]) + + AC_ISC_POSIX + AC_PROG_CC diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD index 84963ea83..6b3a0f420 100644 --- a/community/libuser/PKGBUILD +++ b/community/libuser/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71616 2012-05-31 09:49:00Z spupykin $ +# $Id: PKGBUILD 80627 2012-11-27 13:52:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Dziedzic < gostrc at gmail > pkgname=libuser -pkgver=0.57.6 +pkgver=0.58 pkgrel=1 pkgdesc='A standardized interface for manipulating and administering user and group accounts.' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('python2' 'glib2' 'popt') options=('!libtool') backup=('etc/libuser.conf') source=("https://fedorahosted.org/releases/l/i/libuser/libuser-${pkgver}.tar.xz") -md5sums=('4a6410e51664570610da1b9a830ac8ec') +md5sums=('1fc3ef3f3a3955b2d78562ff4daed793') build() { cd ${pkgname}-${pkgver} diff --git a/community/libview/PKGBUILD b/community/libview/PKGBUILD deleted file mode 100644 index 8cedfcc3b..000000000 --- a/community/libview/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 66207 2012-02-23 03:21:57Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=libview -pkgver=0.6.6 -pkgrel=2 -pkgdesc="A collection of widgets that were developed at VMware" -arch=('i686' 'x86_64' 'mips64el') -url="http://view.sourceforge.net" -options=('!libtool') -license=('MIT') -depends=('gtkmm' 'libsigc++') -source=(http://downloads.sf.net/sourceforge/view/libview-$pkgver.tar.gz) -md5sums=('f50f7cb04a4918e52a1707014dde47d2') - -build() { - cd $srcdir/libview-$pkgver - ./autogen.sh --prefix=/usr - make - make DESTDIR=$pkgdir install - install -D COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING -} diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 8c35c0f67..bc8c7b1b5 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76586 2012-09-24 09:56:46Z spupykin $ +# $Id: PKGBUILD 80336 2012-11-20 10:54:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.10.2 -pkgrel=1 +pkgver=1.0.0 +pkgrel=4 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -36,11 +36,11 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd-guests.conf.d libvirt.tmpfiles.d openbsd-netcat-default.patch) -md5sums=('a5e50860d9da238ba270b528411c4a0d' +md5sums=('7c8b006de7338e30866bb56738803b21' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' - '8297b1be794a24cc77f66af9380ace59' - 'bc2971dacdbac967fc3474e50affc345' + '0ee5b6c58590ff392a266f20f7928d1f' + '0a96ed876ffb1fcb9dff5a9b3a609c1e' '8d98e62915785686b0b6c8c070628392' '456723b41903d3aaa7ec948c1feea265') @@ -54,7 +54,7 @@ build() { sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done - patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch +# patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch export LDFLAGS=-lX11 export RADVD=/usr/sbin/radvd @@ -62,6 +62,9 @@ build() { --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ --with-init-script=systemd make -j1 + sed -i 's|/etc/sysconfig/libvirtd|/etc/conf.d/libvirtd|' daemon/libvirtd.service + sed -i 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' tools/libvirt-guests.service + sed -i 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' tools/libvirt-guests.service } package() { @@ -83,10 +86,14 @@ package() { install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf mv $pkgdir/lib/* $pkgdir/usr/lib/ + sed -i \ + 's|After=.*|After=syslog.target network.target libvirtd.service|' \ + $pkgdir/usr/lib/systemd/system/libvirt-guests.service + rm -rf \ $pkgdir/var/run \ - $pkgdir/etc/rc.d/init.d \ $pkgdir/etc/sysconfig \ + $pkgdir/etc/rc.d/init.d \ $pkgdir/lib \ $pkgdir/etc/sysctl.d } diff --git a/community/libvirt/libvirt.install b/community/libvirt/libvirt.install index 3881386d2..32c28d559 100644 --- a/community/libvirt/libvirt.install +++ b/community/libvirt/libvirt.install @@ -1,4 +1,5 @@ _libvirt_setup() { + systemd-tmpfiles --create libvirt.conf rm -f /usr/lib/python?.?/site-packages/libvirt.pyc echo ">>> To use libvirt as a non-root user:" echo ">>> Use polkit to grant access." @@ -16,16 +17,16 @@ post_install() { echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon" echo ">>> booting." echo "" - /bin/true } post_upgrade() { _libvirt_setup || return 1 - echo ">>> To finish the upgrade, restart libvirtd by running the command:" - echo ">>> '/etc/rc.d/libvirtd restart' as root or rebooting." + echo ">>> To finish the upgrade, restart libvirtd by:" + echo ">>> 'systemctl restart libvirtd' as root (systemd) or" + echo ">>> '/etc/rc.d/libvirtd restart' as root (initscripts) or" + echo ">>> rebooting." echo ">>> You may also need to run 'rm -rf ~/.libvirt'" echo "" - /bin/true } post_remove() { @@ -34,5 +35,4 @@ post_remove() { echo ">>> It can be removed by running 'groupdel libvirt' as root." echo "" depmod -a - /bin/true } diff --git a/community/libvirt/libvirtd-guests.conf.d b/community/libvirt/libvirtd-guests.conf.d index 02a933715..dd987611b 100644 --- a/community/libvirt/libvirtd-guests.conf.d +++ b/community/libvirt/libvirtd-guests.conf.d @@ -8,4 +8,4 @@ LIBVIRTD_BYPASS_CACHE="" LIBVIRTD_START_DELAY=0 -LIBVIRTD_SHUTDOWN_TIMEOUT=3 +LIBVIRTD_SHUTDOWN_TIMEOUT=60 diff --git a/community/libvirt/libvirtd-guests.rc.d b/community/libvirt/libvirtd-guests.rc.d index 670b5431a..3100b34fb 100755 --- a/community/libvirt/libvirtd-guests.rc.d +++ b/community/libvirt/libvirtd-guests.rc.d @@ -1,8 +1,32 @@ #!/bin/bash -. /etc/conf.d/libvirtd-guests -. /etc/rc.conf -. /etc/rc.d/functions +source /etc/conf.d/libvirtd-guests +[ -f /etc/rc.conf ] && source /etc/rc.conf + +if [ -f /etc/rc.d/functions ]; then + . /etc/rc.d/functions +else + stat_busy() { + echo "$*" + } + + stat_fail() { + echo "FAIL" + } + + stat_done() { + echo "DONE" + } + + add_daemon() { + true + } + + rm_daemon() { + true + } +fi + LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list" @@ -104,7 +128,7 @@ libvirt_start_all() { if [ -f $LIBVIRTD_LISTFILE ]; then for i in `cat $LIBVIRTD_LISTFILE`; do - name='libvirt_domname $i' + name=`libvirt_domname $i` stat_busy "Starting/resuming libvirtd/$name guest" libvirt_start "$i" [ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail diff --git a/community/libvisual-projectm/PKGBUILD b/community/libvisual-projectm/PKGBUILD deleted file mode 100644 index 976b3cbff..000000000 --- a/community/libvisual-projectm/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 62640 2012-01-23 02:32:15Z lfleischer $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=libvisual-projectm -pkgver=2.0.1 -pkgrel=3 -pkgdesc='ProjectM XMMS plugin.' -arch=('i686' 'x86_64' 'mips64el') -url='http://projectm.sourceforge.net/' -license=('GPL') -depends=('projectm>=2.0.1' 'libvisual' 'sdl') -makedepends=('pkgconfig' 'cmake' 'libxext') -options=('!libtool') -source=("http://downloads.sourceforge.net/projectm/projectM_libvisual-${pkgver}-Source.tar.gz" - 'libvisual-projectm-gcc-4.6.patch') -md5sums=('35e09b09210d48b437e3574bd00b15a8' - 'a1fa2fd4fc85b1f27e32d400e17a3196') - -build() { - cd "${srcdir}" - - # fix build failure with GCC 4.6 (taken from SVN, revision 1355) - (cd "projectM_libvisual-${pkgver}-Source" && patch -p3 -i ../libvisual-projectm-gcc-4.6.patch) - - mkdir build && cd build - - cmake "../projectM_libvisual-${pkgver}-Source" \ - -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch b/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch deleted file mode 100644 index 0e1234f83..000000000 --- a/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk/src/projectM-libvisual/actor_projectM.cpp 2009/02/20 19:07:44 1210 -+++ trunk/src/projectM-libvisual/actor_projectM.cpp 2011/05/06 12:04:58 1355 -@@ -209,7 +209,7 @@ - * we aren't with projectm, so just ignore :) */ - extern "C" VisPalette *lv_projectm_palette (VisPluginData *plugin) - { -- return NULL; -+ return (VisPalette *) NULL; - } - - /* This is where the real rendering happens! This function is what we call, many times diff --git a/community/libwebp/PKGBUILD b/community/libwebp/PKGBUILD deleted file mode 100644 index e6172aaa0..000000000 --- a/community/libwebp/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Jon Nordby <jononor@gmail.com> - -pkgname=libwebp -pkgver=0.2.0 -pkgrel=1 -pkgdesc="WebP library and conversion tools" -arch=('x86_64' 'i686' 'mips64el') -url="http://code.google.com/intl/en/speed/webp/" -license=('BSD') -depends=('libpng' 'libjpeg') -options=('!libtool') -source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha256sums=('aa7d5e162826362c79d7c36d41484042ab7460dc08dc33d4ea6823a0c77d4bfb') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/libxdg-basedir/PKGBUILD b/community/libxdg-basedir/PKGBUILD index 116b633a7..1a5bb14d6 100644 --- a/community/libxdg-basedir/PKGBUILD +++ b/community/libxdg-basedir/PKGBUILD @@ -3,7 +3,7 @@ pkgname=libxdg-basedir pkgver=1.2.0 -pkgrel=1 +pkgrel=1.1 pkgdesc="An implementation of the XDG Base Directory specifications." arch=('i686' 'x86_64' 'mips64el') url="http://n.ethz.ch/student/nevillm/download/libxdg-basedir" diff --git a/community/libyaml/PKGBUILD b/community/libyaml/PKGBUILD index 40ed21c74..fed2b6dbb 100644 --- a/community/libyaml/PKGBUILD +++ b/community/libyaml/PKGBUILD @@ -4,7 +4,7 @@ pkgname=libyaml pkgver=0.1.4 -pkgrel=2 +pkgrel=2.1 pkgdesc="YAML 1.1 library" arch=('i686' 'x86_64' 'mips64el') url="http://pyyaml.org/wiki/LibYAML" diff --git a/community/lilv/PKGBUILD b/community/lilv/PKGBUILD deleted file mode 100644 index abe83fdc4..000000000 --- a/community/lilv/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 72423 2012-06-14 07:57:59Z speps $ -# Maintainer: speps <speps at aur dot archlinux dot org> - -pkgname=lilv -pkgver=0.14.2 -pkgrel=1 -pkgdesc="A library to make the use of LV2 plugins as simple as possible for applications." -arch=(i686 x86_64 mips64el) -url="http://drobilla.net/software/$pkgname/" -license=('custom:ISC') -depends=('python2' 'sratom' 'jack') -makedepends=('swig') -optdepends=('bash-completion: auto-complete words') -source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('1aea6761f3e44007c0fb4eb20630655d') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - export PYTHON="/usr/bin/python2" - - # remove ldconfig - sed -i "/ldconfig/d" wscript - - python2 ./waf configure --prefix=/usr \ - --mandir=/usr/share/man \ - --configdir=/etc \ - --dyn-manifest \ - --bindings - python2 ./waf -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - DESTDIR="$pkgdir" python2 ./waf install - - # license - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index 37fb3c64b..1fcea5c41 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 77506 2012-10-11 12:11:13Z spupykin $ +# $Id: PKGBUILD 79775 2012-11-12 09:26:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=lilypond -pkgver=2.16.0 -pkgrel=2 +pkgver=2.16.1 +pkgrel=1 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64' 'mips64el') url="http://lilypond.org" @@ -16,10 +16,8 @@ makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' 'gsfonts' 'texi2html') options=('emptydirs') install=lilypond.install -source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz - texlive-workaround.patch) -md5sums=('c4637d5f3e485c529c2d98fe372c41fe' - 'ff32863f3eed67ac744e50bc4fc67a87') +source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz) +md5sums=('3a87363ba287d2958ee9414c3c16bbb2') build() { cd "$srcdir/$pkgname-$pkgver" @@ -31,7 +29,6 @@ build() { done rm -rf python/out/ -# patch -p1 <$srcdir/texlive-workaround.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr make diff --git a/community/lilyterm/PKGBUILD b/community/lilyterm/PKGBUILD index a80797e7b..e1078e9d1 100644 --- a/community/lilyterm/PKGBUILD +++ b/community/lilyterm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72085 2012-06-08 12:19:07Z kkeen $ +# $Id: PKGBUILD 80564 2012-11-25 16:09:33Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: TDY <tdy@gmx.com> # Contributor: DonVla <donvla@users.sourceforge.net> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=lilyterm -pkgver=0.9.9.1 +pkgver=0.9.9.2 pkgrel=1 pkgdesc="A light and easy to use libvte based X terminal emulator" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ license=('GPL3') depends=('vte') makedepends=('gettext' 'intltool' 'pkgconfig>=0.16') source=(http://lilyterm.luna.com.tw/file/$pkgname-$pkgver.tar.gz) -md5sums=('2ba6e18ed7c17463d5451338ca5229a5') +md5sums=('d68dd29ce4894f765adba1efd470f90e') build() { cd "$srcdir/lilyterm-$pkgver" @@ -30,3 +30,4 @@ package() { install -Dm644 COPYING \ "$pkgdir/usr/share/licenses/lilyterm/COPYING" } + diff --git a/community/linuxtv-dvb-apps/PKGBUILD b/community/linuxtv-dvb-apps/PKGBUILD index 3efdf75d6..268ac07de 100644 --- a/community/linuxtv-dvb-apps/PKGBUILD +++ b/community/linuxtv-dvb-apps/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 62806 2012-01-27 05:32:06Z jconder $ +# $Id: PKGBUILD 80369 2012-11-21 04:04:30Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Camille Moncelier <pix@devlife.org> pkgname=linuxtv-dvb-apps -pkgver=1465 +pkgver=1486 pkgrel=1 -_hgrev=69fc03702a64 +_hgrev=3fc7dfa68484 pkgdesc='Viewer programs for DVB cards' arch=('i686' 'x86_64' 'mips64el') url='http://www.linuxtv.org/' license=('GPL') source=("http://linuxtv.org/hg/dvb-apps/archive/$_hgrev.tar.bz2") -sha256sums=('4c32fd895d826254779f1020f69a1978ea3c0130440f82f7b18e2d8e5378804a') +sha256sums=('60cfd45fe7417a4445a7814ce6e645ddaad0f8e934015c09d53eb93c8739b35a') build() { cd "dvb-apps-$_hgrev" diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD index 5a287a701..e278ff74d 100644 --- a/community/lmms/PKGBUILD +++ b/community/lmms/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66380 2012-02-24 11:46:22Z lfleischer $ +# $Id: PKGBUILD 80173 2012-11-17 12:51:55Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> # Contributor: Mateusz Herych <heniekk@gmail.com> @@ -6,7 +6,7 @@ pkgname=lmms pkgver=0.4.13 -pkgrel=1 +pkgrel=2 pkgdesc='The Linux MultiMedia Studio.' arch=('i686' 'x86_64' 'mips64el') url='http://lmms.sourceforge.net/' @@ -17,21 +17,24 @@ optdepends=('wine: VST support (experimental)' 'fftw: SpectrumAnalyzer plugin' 'stk: STK instruments plugins' 'pulseaudio: PulseAudio output') -makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk') -[[ $CARCH = i686 ]] && makedepends+=('wine') +makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk' 'wine') provides=('lmms-extras') conflicts=('lmms-extras') options=('!libtool' '!makeflags') install=lmms.install -source=("http://downloads.sourceforge.net/sourceforge/lmms/${pkgname}-${pkgver}.tar.bz2") -md5sums=('80db0dc5263041d443f474220410991f') +source=("http://downloads.sourceforge.net/sourceforge/lmms/${pkgname}-${pkgver}.tar.bz2" + zynaddsubfx_unlink.patch) +md5sums=('80db0dc5263041d443f474220410991f' + 'd2ea78ac0cf2979505f140c6845617cf') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake - cmake . -DCMAKE_INSTALL_PREFIX=/usr + patch -Np1 -i ../zynaddsubfx_unlink.patch + + cmake . -DCMAKE_INSTALL_PREFIX=/usr -USE=vst make } @@ -39,4 +42,3 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="${pkgdir}" install } - diff --git a/community/lmms/zynaddsubfx_unlink.patch b/community/lmms/zynaddsubfx_unlink.patch new file mode 100644 index 000000000..6b2521f55 --- /dev/null +++ b/community/lmms/zynaddsubfx_unlink.patch @@ -0,0 +1,10 @@ +--- lmms-0.4.13_orig/plugins/zynaddsubfx/LocalZynAddSubFx.cpp 2012-04-08 13:01:25.951925761 +0200 ++++ lmms-0.4.13_test/plugins/zynaddsubfx/LocalZynAddSubFx.cpp 2012-04-08 13:08:32.841905201 +0200 +@@ -23,6 +23,7 @@ + */ + + #include <lmmsconfig.h> ++#include <unistd.h> + + #include "LocalZynAddSubFx.h" + diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD index ae3b5b636..abdf94d70 100644 --- a/community/luajit/PKGBUILD +++ b/community/luajit/PKGBUILD @@ -1,35 +1,29 @@ -# $Id: PKGBUILD 78428 2012-10-18 04:30:04Z bpiotrowski $ +# $Id: PKGBUILD 79833 2012-11-13 17:51:21Z bpiotrowski $ # Maintainer: Chris Brannon <chris@the-brannons.com> # Maintainer: Bartłomiej Piotrowski # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Anders Bergh <anders1@gmail.com> -pkgname=luajit -pkgver=2.0.0b11 -pkgrel=3 +pkgname=luajit +pkgver=2.0.0 +pkgrel=1 pkgdesc='A Just-In-Time Compiler for Lua' arch=('i686' 'x86_64' 'mips64el') url='http://luajit.org/' license=('MIT') depends=('gcc-libs') -source=(http://luajit.org/download/LuaJIT-${pkgver/b/-beta}.tar.gz - Makefile.patch) -md5sums=('824aa2684a11e3cc3abe87350a7b6139' - 'c9dff2a84424fa0af322379a5f115fb7') +source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz) +md5sums=('97a2b87cc0490784f54b64cfb3b8f5ad') build() { - cd $srcdir/LuaJIT-${pkgver/b/-beta} - patch -Np0 -i $srcdir/Makefile.patch + cd $srcdir/LuaJIT-$pkgver make PREFIX=/usr } package() { - cd $srcdir/LuaJIT-${pkgver/b/-beta} + cd $srcdir/LuaJIT-$pkgver make install DESTDIR=$pkgdir PREFIX=/usr - install -Dm644 $srcdir/LuaJIT-${pkgver/b/-beta}/COPYRIGHT \ + install -Dm644 $srcdir/LuaJIT-$pkgver/COPYRIGHT \ $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT - - # Poor man's slot system - ln -s /usr/share/$pkgname $pkgdir/usr/share/$pkgname-${pkgver/b/-beta} } diff --git a/community/luasql/PKGBUILD b/community/luasql/PKGBUILD new file mode 100644 index 000000000..54aff4c20 --- /dev/null +++ b/community/luasql/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 61380 2011-12-29 16:34:45Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Anders Bergh <anders1@gmail.com> + +pkgname=luasql-mysql +pkgver=2.2.0 +pkgrel=1 +pkgdesc="MySQL module for Lua" +arch=('i686' 'x86_64') +url="http://www.keplerproject.org/luasql/" +license=('MIT') +depends=('lua' 'libmysqlclient') +source=(https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz) +md5sums=('59d72db444c6369c936d4f03694db6b7') + +build() { + cd "$srcdir/luasql-$pkgver" + make T=mysql PREFIX=/usr DRIVER_LIBS="$(mysql_config --libs)" \ + DRIVER_INCS="$(mysql_config --include) -fPIC" + install -Dm644 src/mysql.so $pkgdir/usr/lib/lua/5.1/luasql/mysql.so + install -Dm644 doc/us/license.html $pkgdir/usr/share/licenses/$pkgname/license.html +} diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index 8f5c27e83..3ccb9e0fc 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77594 2012-10-13 06:46:05Z allan $ +# $Id: PKGBUILD 78933 2012-10-27 23:44:52Z ebelanger $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=luminancehdr pkgver=2.3.0 -pkgrel=3 +pkgrel=4 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64' 'mips64el') url='http://qtpfsgui.sourceforge.net/' @@ -20,14 +20,14 @@ source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/lumin sha256sums=('dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676') build() { - cd ${srcdir}/luminance-hdr-${pkgver} + cd "${srcdir}/luminance-hdr-${pkgver}" cmake -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd ${srcdir}/luminance-hdr-${pkgver} + cd "${srcdir}/luminance-hdr-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index 704adc119..5ad24ef05 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 78368 2012-10-17 15:33:35Z stativ $ +# $Id: PKGBUILD 78934 2012-10-27 23:44:55Z ebelanger $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=luxrays pkgver=1.1 _pkgver=589aa5dac899 -pkgrel=2 -epoch=0 +pkgrel=3 pkgdesc="Accelerate the ray intersection process by using GPUs" arch=('i686' 'x86_64') url="http://www.luxrender.net/" diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index be12d5880..34aabbc87 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78304 2012-10-17 13:34:29Z stativ $ +# $Id: PKGBUILD 78935 2012-10-27 23:44:58Z ebelanger $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Initial contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> pkgname=luxrender pkgver=1.1 _pkgver=4b4289cda943 -pkgrel=2 +pkgrel=3 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64') url="http://www.luxrender.net/" diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD index acb86e5ae..618c70728 100644 --- a/community/lxc/PKGBUILD +++ b/community/lxc/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 74427 2012-07-28 09:35:36Z spupykin $ +# $Id: PKGBUILD 80003 2012-11-15 11:55:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Zucchelli <zukka77@gmail.com> # Contributor: Jonathan Liu <net147@gmail.com> # Maintainer: Jon Nordby <jononor@gmail.com> pkgname=lxc -pkgver=0.8.0_rc2 -pkgrel=1 +pkgver=0.8.0 +epoch=1 +pkgrel=2 pkgdesc="Linux Containers" arch=('i686' 'x86_64' 'mips64el') url="http://lxc.sourceforge.net/" depends=('bash' 'perl') license=('LGPL') source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz") -md5sums=('9bd6988542fd7dd198d056ef3a2db9f6') +md5sums=('7304fa57146ce687f749b5df876bb20d') build() { cd "$srcdir/$pkgname-${pkgver/_/-}" - ./configure \ --prefix=/usr \ --localstatedir=/var \ --libexecdir=/usr/bin \ --sysconfdir=/etc \ + --disable-apparmor \ --disable-doc make } diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 9da1bb987..ac04031fa 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 76688 2012-09-26 21:14:05Z bpiotrowski $ +# $Id: PKGBUILD 79125 2012-10-30 23:07:13Z heftig $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=15 +pkgrel=18 pkgdesc='Lightweight X11 Display Manager' arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/lxdm/" license=('GPL') groups=('lxde') -depends=('gtk2' 'xorg-server' 'consolekit') +depends=('gtk2' 'xorg-server') makedepends=('intltool') install=${pkgname}.install backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' @@ -19,17 +19,8 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch - greeter-session.patch pam-env-vars.patch rc.d lxdm-pam service) -md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' - 'a1e3c46a8bef691bc544028f5b6cfe22' - 'baed9055e8825a5511712bc095197519' - 'c50dd01b715b0a236407d48066191601' - 'd2e4a4a22ee2aa1a986be154c647b6c6' - '28475239d0c8b4fd778ec49f5ec72962' - '4c1d43e81e9a256e8d1ea7686c24b3d3' - '705f394052fdd0dec22e95321d170de0' - '9a76cae5b3a0fcbb6116fa08c7a587b5' - 'e8cc66eb1a2405d2d9d184a727cbd9d8') + greeter-session.patch pam-env-vars.patch industrial-greeterui.patch + rc.d lxdm-pam service) build() { cd $srcdir/$pkgname-$pkgver @@ -44,6 +35,7 @@ build() { patch -Np0 -i $srcdir/lxdm.patch patch -Np0 -i $srcdir/lxdm.conf.patch patch -Np0 -i $srcdir/Xsession.patch + patch -Np0 -i $srcdir/industrial-greeterui.patch } @@ -62,3 +54,16 @@ package() { # avoid conflict with filesystem>=2012.06 rm -r $pkgdir/var/run } + +md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' + 'a1e3c46a8bef691bc544028f5b6cfe22' + 'baed9055e8825a5511712bc095197519' + 'c50dd01b715b0a236407d48066191601' + 'd2e4a4a22ee2aa1a986be154c647b6c6' + '28475239d0c8b4fd778ec49f5ec72962' + '4c1d43e81e9a256e8d1ea7686c24b3d3' + '2c4afdbe3532be4f90d8f6240d352766' + '705f394052fdd0dec22e95321d170de0' + '9cc734228696a3c6f06d91bba61b03c1' + 'e8cc66eb1a2405d2d9d184a727cbd9d8') + diff --git a/community/lxdm/industrial-greeterui.patch b/community/lxdm/industrial-greeterui.patch new file mode 100644 index 000000000..a2a366809 --- /dev/null +++ b/community/lxdm/industrial-greeterui.patch @@ -0,0 +1,13 @@ +--- data/themes/Industrial/greeter.ui.orig 2012-05-09 23:54:03.743980613 -0300 ++++ data/themes/Industrial/greeter.ui 2012-05-10 00:26:20.340687396 -0300 +@@ -201,7 +201,9 @@ + </packing> + </child> + <child> +- <object class="GtkComboBoxEntry" id="keyboard"/> ++ <object class="GtkComboBoxEntry" id="keyboard"> ++ <property name="text_column">0</property> ++ </object> + <packing> + <property name="expand">False</property> + <property name="position">3</property> diff --git a/community/lxdm/lxdm-pam b/community/lxdm/lxdm-pam index b13b0d528..57f33b221 100644 --- a/community/lxdm/lxdm-pam +++ b/community/lxdm/lxdm-pam @@ -6,4 +6,5 @@ account required pam_unix.so session required pam_limits.so session required pam_unix.so password required pam_unix.so --session optional pam_systemd.so +-session optional pam_loginuid.so +-session optional pam_systemd.so diff --git a/community/lxlauncher/PKGBUILD b/community/lxlauncher/PKGBUILD index 85de2af9b..b1ff3ede2 100644 --- a/community/lxlauncher/PKGBUILD +++ b/community/lxlauncher/PKGBUILD @@ -1,27 +1,28 @@ -#$Id: PKGBUILD 52832 2011-07-28 23:39:16Z angvp $ -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> +# $Id: PKGBUILD 80054 2012-11-15 19:13:49Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + pkgname=lxlauncher pkgver=0.2.2 -pkgrel=1.1 -pkgdesc="Launcher for Asus EeePC (part of LXDE)" +pkgrel=2.1 +pkgdesc='Open source clone of the Asus launcher for EeePC' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -url="http://lxde.org/" +url='http://lxde.org/' groups=('lxde') depends=('gtk2' 'startup-notification' 'gnome-menus' 'menu-cache' 'intltool') makedepends=('pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz) md5sums=('16df627447838b170a72cc3a9ee21497') build() { - cd "$srcdir/$pkgname-$pkgver" - autoreconf - ./configure --sysconfdir=/etc --prefix=/usr - make + cd $srcdir/$pkgname-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/community/lxmenu-data/PKGBUILD b/community/lxmenu-data/PKGBUILD index cdb8fc741..8819f6ad0 100644 --- a/community/lxmenu-data/PKGBUILD +++ b/community/lxmenu-data/PKGBUILD @@ -4,7 +4,7 @@ pkgname=lxmenu-data pkgver=0.1.2 -pkgrel=1 +pkgrel=1.1 pkgdesc="freedesktop.org desktop menus for LXDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD index 7e37715c5..d38befb84 100644 --- a/community/lxpanel/PKGBUILD +++ b/community/lxpanel/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 72336 2012-06-12 05:13:20Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# $Id: PKGBUILD 80057 2012-11-15 19:23:02Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxpanel pkgver=0.5.10 -pkgrel=1 -pkgdesc="Panel of the LXDE Desktop" +pkgrel=2.1 +pkgdesc='Lightweight X11 desktop panel for LXDE' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -url="http://lxde.org/" +url='http://lxde.org/' groups=('lxde') depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data' 'libwnck') makedepends=('wireless_tools') optdepends=('wireless_tools: netstat plugin') -source=(http://ftp.de.debian.org/debian/pool/main/l/$pkgname/${pkgname}_${pkgver}.orig.tar.xz) -md5sums=('86a87723ec15274d4c0fe191e8a2fa52') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz) +md5sums=('1bf3cce2a2d01c211f6897c42e8dd0bc') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver - CFLAGS+=" -lgmodule-2.0" ./configure --sysconfdir=/etc --prefix=/usr - make + CFLAGS+=' -lgmodule-2.0' ./configure --sysconfdir=/etc --prefix=/usr + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/community/lxsession/PKGBUILD b/community/lxsession/PKGBUILD index 0deb4855c..12443da90 100644 --- a/community/lxsession/PKGBUILD +++ b/community/lxsession/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 53453 2011-08-03 19:42:00Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# $Id: PKGBUILD 80231 2012-11-18 09:34:03Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxsession pkgver=0.4.6.1 -pkgrel=1.1 -pkgdesc="Session manager of the LXDE Desktop (light version)" +pkgrel=3 +pkgdesc='Lightweight X11 session manager' arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') url="http://lxde.org/" +license=('GPL2') groups=('lxde') depends=('gtk2' 'dbus') makedepends=('pkgconfig' 'intltool') replaces=('lxde-settings-daemon' 'lxsession-lite') conflicts=('lxsession-lite' 'lxde-settings-daemon') -source=(http://downloads.sourceforge.net/lxde/lxsession-${pkgver}.tar.gz) -md5sums=('e456b64c5ab3652a4dec661ec706dc6e') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz + lxsession-0.4.6.1-logind-support.patch) +md5sums=('e456b64c5ab3652a4dec661ec706dc6e' + '7459321f5dc263493837768dcb03f852') build() { - cd "$srcdir/lxsession-$pkgver" - ./configure --sysconfdir=/etc --prefix=/usr - make + cd $srcdir/$pkgname-$pkgver + patch -Np2 -i $srcdir/lxsession-0.4.6.1-logind-support.patch + ./configure --sysconfdir=/etc --prefix=/usr + make } package() { - cd "$srcdir/lxsession-$pkgver" - make DESTDIR="$pkgdir" install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/community/lxsession/lxsession-0.4.6.1-logind-support.patch b/community/lxsession/lxsession-0.4.6.1-logind-support.patch new file mode 100644 index 000000000..44829e615 --- /dev/null +++ b/community/lxsession/lxsession-0.4.6.1-logind-support.patch @@ -0,0 +1,608 @@ +--- src/lxsession-0.4.6.1/lxsession-logout/dbus-interface.c 2011-07-27 21:26:36.000000000 +0200 ++++ src/lxsession-0.4.6.1/lxsession-logout-logind/dbus-interface.c 2012-11-13 17:26:30.807070976 +0100 +@@ -51,13 +51,20 @@ + char * dbus_HAL_Reboot(void); + char * dbus_HAL_Suspend(void); + char * dbus_HAL_Hibernate(void); ++gboolean dbus_logind_CanPowerOff(void); ++gboolean dbus_logind_CanReboot(void); ++gboolean dbus_logind_CanSuspend(void); ++gboolean dbus_logind_CanHibernate(void); ++char * dbus_logind_PowerOff(void); ++char * dbus_logind_Reboot(void); ++char * dbus_logind_Suspend(void); ++char * dbus_logind_Hibernate(void); ++char * dbus_LXDE_Logout(void); + /* End FORWARDS */ + + /* Connect to the system bus. Once a connection is made, it is saved for reuse. */ +-static DBusConnection * dbus_connect(void) ++static DBusConnection * dbus_connect_system(void) + { +- if ((dbus_context.connection == NULL) && ( ! dbus_context.connection_tried)) +- { + DBusError error; + dbus_error_init(&error); + dbus_context.connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); +@@ -67,16 +74,57 @@ + dbus_error_free(&error); + } + dbus_context.connection_tried = TRUE; +- } + + return dbus_context.connection; + } + ++static DBusConnection * dbus_connect_session(void) ++{ ++ DBusError error; ++ dbus_error_init(&error); ++ dbus_context.connection = dbus_bus_get(DBUS_BUS_SESSION, &error); ++ if (dbus_context.connection == NULL) ++ { ++ g_warning(G_STRLOC ": Failed to connect to the session message bus: %s", error.message); ++ dbus_error_free(&error); ++ } ++ dbus_context.connection_tried = TRUE; ++ ++ return dbus_context.connection; ++} ++ ++ + /* Send a message. */ +-static DBusMessage * dbus_send_message(DBusMessage * message, char * * error_text) ++static DBusMessage * dbus_send_message_system(DBusMessage * message, char * * error_text) + { + /* Get a connection handle. */ +- DBusConnection * connection = dbus_connect(); ++ DBusConnection * connection = dbus_connect_system(); ++ if (connection == NULL) ++ return FALSE; ++ ++ /* Send the message. */ ++ DBusError error; ++ dbus_error_init(&error); ++ DBusMessage * reply = dbus_connection_send_with_reply_and_block(connection, message, DBUS_TIMEOUT, &error); ++ dbus_message_unref(message); ++ if (reply == NULL) ++ { ++ if ((error.name == NULL) || (strcmp(error.name, DBUS_ERROR_NO_REPLY) != 0)) ++ { ++ if (error_text != NULL) ++ *error_text = g_strdup(error.message); ++ g_warning(G_STRLOC ": DBUS: %s", error.message); ++ } ++ dbus_error_free(&error); ++ } ++ return reply; ++} ++ ++/* Send a message. */ ++static DBusMessage * dbus_send_message_session(DBusMessage * message, char * * error_text) ++{ ++ /* Get a connection handle. */ ++ DBusConnection * connection = dbus_connect_session(); + if (connection == NULL) + return FALSE; + +@@ -132,6 +180,36 @@ + } + return result; + } ++ ++/* Read a result for a method that returns a string encoded boolean. */ ++static gboolean dbus_read_result_sboolean(DBusMessage * reply) ++{ ++ gboolean result = FALSE; ++ char* string_result; ++ if (reply != NULL) ++ { ++ /* Get the string result. */ ++ DBusError error; ++ dbus_error_init(&error); ++ dbus_bool_t status = dbus_message_get_args( ++ reply, ++ &error, ++ DBUS_TYPE_STRING, &string_result, ++ DBUS_TYPE_INVALID); ++ if ( ! status) ++ { ++ g_warning(G_STRLOC ": DBUS: %s", error.message); ++ dbus_error_free(&error); ++ } ++ else ++ { ++ if (!strcmp(string_result, "yes")) ++ result = TRUE; ++ } ++ dbus_message_unref(reply); ++ } ++ return result; ++} + #endif + + /*** ConsoleKit mechanism ***/ +@@ -152,7 +230,7 @@ + static gboolean dbus_ConsoleKit_query(const char * const query) + { + #ifdef HAVE_DBUS +- return dbus_read_result_boolean(dbus_send_message(dbus_ConsoleKit_formulate_message(query), NULL)); ++ return dbus_read_result_boolean(dbus_send_message_system(dbus_ConsoleKit_formulate_message(query), NULL)); + #else + return FALSE; + #endif +@@ -163,7 +241,7 @@ + { + #ifdef HAVE_DBUS + char * error = NULL; +- dbus_read_result_void(dbus_send_message(dbus_ConsoleKit_formulate_message(command), &error)); ++ dbus_read_result_void(dbus_send_message_system(dbus_ConsoleKit_formulate_message(command), &error)); + return error; + #else + return NULL; +@@ -225,7 +303,7 @@ + DBUS_TYPE_INVALID); + + /* Send the message. */ +- DBusMessage * reply = dbus_send_message(message, NULL); ++ DBusMessage * reply = dbus_send_message_system(message, NULL); + if (reply == NULL) + return FALSE; + +@@ -252,7 +330,7 @@ + { + #ifdef HAVE_DBUS + char * error = NULL; +- dbus_read_result_void(dbus_send_message(dbus_UPower_formulate_command(command), &error)); ++ dbus_read_result_void(dbus_send_message_system(dbus_UPower_formulate_command(command), &error)); + return error; + #else + return NULL; +@@ -329,7 +407,7 @@ + DBusMessage * message = dbus_HAL_formulate_string_property_query(property); + if (message == NULL) + return FALSE; +- DBusMessage * reply = dbus_send_message(message, NULL); ++ DBusMessage * reply = dbus_send_message_system(message, NULL); + if (reply == NULL) + return FALSE; + dbus_message_unref(reply); +@@ -343,7 +421,7 @@ + static gboolean dbus_HAL_boolean_query(const char * const property) + { + #ifdef HAVE_DBUS +- return dbus_read_result_boolean(dbus_send_message(dbus_HAL_formulate_boolean_property_query(property), NULL)); ++ return dbus_read_result_boolean(dbus_send_message_system(dbus_HAL_formulate_boolean_property_query(property), NULL)); + #else + return FALSE; + #endif +@@ -367,7 +445,7 @@ + + /* Send the message and wait for a reply. */ + char * error = NULL; +- dbus_read_result_void(dbus_send_message(message, &error)); ++ dbus_read_result_void(dbus_send_message_system(message, &error)); + return error; + #else + return NULL; +@@ -421,3 +499,185 @@ + { + return dbus_HAL_command("Hibernate"); + } ++ ++/*** logind mechanism ***/ ++ ++#ifdef HAVE_DBUS ++/* Formulate a message to the logind Manager interface to query a property. */ ++static DBusMessage * dbus_logind_formulate_query(const char * const query) ++{ ++ return dbus_message_new_method_call( ++ "org.freedesktop.login1", ++ "/org/freedesktop/login1", ++ "org.freedesktop.login1.Manager", ++ query); ++} ++ ++/* Formulate a message to the logind Manager interface. */ ++static DBusMessage * dbus_logind_formulate_message(const char * const method) ++{ ++ static dbus_bool_t interactive = FALSE; ++ DBusMessage * message = dbus_message_new_method_call( ++ "org.freedesktop.login1", ++ "/org/freedesktop/login1", ++ "org.freedesktop.login1.Manager", ++ method); ++ if (message != NULL) ++ dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &interactive, DBUS_TYPE_INVALID); ++ return message; ++} ++#endif ++ ++/* Send a specified query to the logind interface and process a boolean result. */ ++static gboolean dbus_logind_query(const char * const query) ++{ ++#ifdef HAVE_DBUS ++ return dbus_read_result_sboolean(dbus_send_message_system(dbus_logind_formulate_query(query), NULL)); ++#else ++ return FALSE; ++#endif ++} ++ ++/* Send a specified command to the logind interface and process a void result. */ ++static char * dbus_logind_command(const char * const command) ++{ ++#ifdef HAVE_DBUS ++ char * error = NULL; ++ dbus_read_result_void(dbus_send_message_system(dbus_logind_formulate_message(command), &error)); ++ return error; ++#else ++ return NULL; ++#endif ++} ++ ++/* Read the can-poweroff property of logind. */ ++gboolean dbus_logind_CanPowerOff(void) ++{ ++ return dbus_logind_query("CanPowerOff"); ++} ++ ++/* Read the can-reboot property of logind. */ ++gboolean dbus_logind_CanReboot(void) ++{ ++ return dbus_logind_query("CanReboot"); ++} ++ ++/* Read the can-suspend property of logind. */ ++gboolean dbus_logind_CanSuspend(void) ++{ ++ return dbus_logind_query("CanSuspend"); ++} ++ ++/* Read the can-hibernate property of logind. */ ++gboolean dbus_logind_CanHibernate(void) ++{ ++ return dbus_logind_query("CanHibernate"); ++} ++ ++/* Invoke the PowerOff method on logind. */ ++char * dbus_logind_PowerOff(void) ++{ ++ return dbus_logind_command("PowerOff"); ++} ++ ++/* Invoke the Reboot method on logind. */ ++char * dbus_logind_Reboot(void) ++{ ++ return dbus_logind_command("Reboot"); ++} ++ ++/* Invoke the Suspend method on logind. */ ++char * dbus_logind_Suspend(void) ++{ ++ return dbus_logind_command("Suspend"); ++} ++ ++/* Invoke the Hibernate method on logind. */ ++char * dbus_logind_Hibernate(void) ++{ ++ return dbus_logind_command("Hibernate"); ++} ++ ++/*** LXDE mechanism ***/ ++ ++#ifdef HAVE_DBUS ++/* Formulate a message to the LXDE Session Manager interface. */ ++static DBusMessage * dbus_LXDE_formulate_message(const char * const query) ++{ ++ return dbus_message_new_method_call( ++ "org.lxde.SessionManager", ++ "/org/lxde/SessionManager", ++ "org.lxde.SessionManager", ++ query); ++} ++#endif ++ ++/* Send a specified message to the LXDE interface and process a boolean result. */ ++static gboolean dbus_LXDE_query(const char * const query) ++{ ++#ifdef HAVE_DBUS ++ return dbus_read_result_boolean(dbus_send_message_session(dbus_LXDE_formulate_message(query), NULL)); ++#else ++ return FALSE; ++#endif ++} ++ ++/* Send a specified message to the LXDE interface and process a void result. */ ++static char * dbus_LXDE_command(const char * const command) ++{ ++#ifdef HAVE_DBUS ++ char * error = NULL; ++ dbus_read_result_void(dbus_send_message_session(dbus_LXDE_formulate_message(command), &error)); ++ return error; ++#else ++ return NULL; ++#endif ++} ++ ++/* Invoke the Logout method on LXDE. */ ++char * dbus_LXDE_Logout(void) ++{ ++ return dbus_LXDE_command("Logout"); ++} ++ ++/*** Lightdm mechanism ***/ ++ ++#ifdef HAVE_DBUS ++/* Formulate a message to the Lightdm interface. */ ++static DBusMessage * dbus_Lightdm_formulate_message(const char * const query) ++{ ++ return dbus_message_new_method_call( ++ "org.freedesktop.DisplayManager", ++ g_getenv ("XDG_SEAT_PATH"), ++ "org.freedesktop.DisplayManager.Seat", ++ query); ++} ++#endif ++ ++/* Send a specified message to the Lightdm interface and process a boolean result. */ ++static gboolean dbus_Lightdm_query(const char * const query) ++{ ++#ifdef HAVE_DBUS ++ return dbus_read_result_boolean(dbus_send_message_session(dbus_Lightdm_formulate_message(query), NULL)); ++#else ++ return FALSE; ++#endif ++} ++ ++/* Send a specified message to the Lightdm interface and process a void result. */ ++static char * dbus_Lightdm_command(const char * const command) ++{ ++#ifdef HAVE_DBUS ++ char * error = NULL; ++ dbus_read_result_void(dbus_send_message_session(dbus_Lightdm_formulate_message(command), &error)); ++ return error; ++#else ++ return NULL; ++#endif ++} ++ ++/* Invoke the Logout method on LXDE. */ ++char * dbus_Lightdm_SwitchToGreeter(void) ++{ ++ return dbus_Lightdm_command("SwitchToGreeter"); ++} +--- src/lxsession-0.4.6.1/lxsession-logout/dbus-interface.h 2011-07-27 21:26:36.000000000 +0200 ++++ src/lxsession-0.4.6.1/lxsession-logout-logind/dbus-interface.h 2012-11-13 17:26:30.807070976 +0100 +@@ -44,4 +44,18 @@ + extern char * dbus_HAL_Suspend(void); + extern char * dbus_HAL_Hibernate(void); + ++/* Interface to logind for shutdown, reboot, suspend, and hibernate. */ ++extern gboolean dbus_logind_CanPowerOff(void); ++extern gboolean dbus_logind_CanRestart(void); ++extern char * dbus_logind_PowerOff(void); ++extern char * dbus_logind_Restart(void); ++extern gboolean dbus_logind_CanSuspend(void); ++extern gboolean dbus_logind_CanHibernate(void); ++extern char * dbus_logind_Suspend(void); ++extern char * dbus_logind_Hibernate(void); ++ ++extern char * dbus_LXDE_Logout(void); ++ ++extern char * dbus_Lightdm_SwitchToGreeter(); ++ + #endif +--- src/lxsession-0.4.6.1/lxsession-logout/lxsession-logout.c 2011-07-27 21:26:36.000000000 +0200 ++++ src/lxsession-0.4.6.1/lxsession-logout-logind/lxsession-logout.c 2012-11-13 17:26:30.807070976 +0100 +@@ -69,12 +69,21 @@ + int reboot_HAL : 1; /* Reboot is available via HAL */ + int suspend_HAL : 1; /* Suspend is available via HAL */ + int hibernate_HAL : 1; /* Hibernate is available via HAL */ ++ int shutdown_logind : 1; /* Shutdown is available via logind */ ++ int reboot_logind : 1; /* Reboot is available via logind */ ++ int suspend_logind : 1; /* Suspend is available via logind */ ++ int hibernate_logind : 1; /* Hibernate is available via logind */ + int switch_user_GDM : 1; /* Switch User is available via GDM */ +- int switch_user_KDM : 1; /* Switch User is available via KDM */ ++ int switch_user_LIGHTDM : 1; /* Switch User is available via GDM */ ++ int switch_user_KDM : 1; /* Switch User is available via LIGHTDM */ + int ltsp : 1; /* Shutdown and reboot is accomplished via LTSP */ ++ ++ int lock_screen : 1; /* Lock screen available */ ++ + } HandlerContext; + + static gboolean lock_screen(void); ++static const gchar* determine_lock_screen(void); + static gboolean verify_running(const char * display_manager, const char * executable); + static void logout_clicked(GtkButton * button, HandlerContext * handler_context); + static void change_root_property(GtkWidget* w, const char* prop_name, const char* value); +@@ -93,13 +102,32 @@ + */ + static gboolean lock_screen(void) + { +- if (!g_spawn_command_line_async("lxlock", NULL)) ++ const gchar* program = determine_lock_screen(); ++ ++ if (program) + { ++ g_spawn_command_line_async(program, NULL); + return TRUE; + } + return FALSE; + } + ++static const gchar* determine_lock_screen(void) ++{ ++ const gchar* program = NULL; ++ ++ if (g_find_program_in_path("xdg-screensaver")) ++ { ++ program = "xdg-screensaver lock"; ++ } ++ else if (g_find_program_in_path("lxlock")) ++ { ++ program = "lxlock"; ++ } ++ return program; ++} ++ ++ + /* Verify that a program is running and that an executable is available. */ + static gboolean verify_running(const char * display_manager, const char * executable) + { +@@ -187,6 +215,8 @@ + error_result = dbus_ConsoleKit_Stop(); + else if (handler_context->shutdown_HAL) + error_result = dbus_HAL_Shutdown(); ++ else if (handler_context->shutdown_logind) ++ error_result = dbus_logind_PowerOff(); + + if (error_result != NULL) + gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result); +@@ -208,6 +238,8 @@ + error_result = dbus_ConsoleKit_Restart(); + else if (handler_context->reboot_HAL) + error_result = dbus_HAL_Reboot(); ++ else if (handler_context->reboot_logind) ++ error_result = dbus_logind_Reboot(); + + if (error_result != NULL) + gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result); +@@ -225,6 +257,8 @@ + error_result = dbus_UPower_Suspend(); + else if (handler_context->suspend_HAL) + error_result = dbus_HAL_Suspend(); ++ else if (handler_context->suspend_logind) ++ error_result = dbus_logind_Suspend(); + + if (error_result != NULL) + gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result); +@@ -242,6 +276,8 @@ + error_result = dbus_UPower_Hibernate(); + else if (handler_context->hibernate_HAL) + error_result = dbus_HAL_Hibernate(); ++ else if (handler_context->hibernate_logind) ++ error_result = dbus_logind_Hibernate(); + + if (error_result != NULL) + gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result); +@@ -258,6 +294,17 @@ + g_spawn_command_line_sync("gdmflexiserver --startnew", NULL, NULL, NULL, NULL); + else if (handler_context->switch_user_KDM) + g_spawn_command_line_sync("kdmctl reserve", NULL, NULL, NULL, NULL); ++ else if (handler_context->switch_user_LIGHTDM) ++ dbus_Lightdm_SwitchToGreeter(); ++ gtk_main_quit(); ++} ++ ++/* Handler for "clicked" signal on Lock button. */ ++static void lock_screen_clicked(GtkButton * button, HandlerContext * handler_context) ++{ ++ gtk_label_set_text(GTK_LABEL(handler_context->error_label), NULL); ++ ++ lock_screen(); + gtk_main_quit(); + } + +@@ -435,6 +482,28 @@ + handler_context.hibernate_HAL = TRUE; + } + ++ /* Initialize capabilities of the logind mechanism. */ ++ if (!handler_context.shutdown_available && dbus_logind_CanPowerOff()) ++ { ++ handler_context.shutdown_available = TRUE; ++ handler_context.shutdown_logind = TRUE; ++ } ++ if (!handler_context.reboot_available && dbus_logind_CanReboot()) ++ { ++ handler_context.reboot_available = TRUE; ++ handler_context.reboot_logind = TRUE; ++ } ++ if (!handler_context.suspend_available && dbus_logind_CanSuspend()) ++ { ++ handler_context.suspend_available = TRUE; ++ handler_context.suspend_logind = TRUE; ++ } ++ if (!handler_context.hibernate_available && dbus_logind_CanHibernate()) ++ { ++ handler_context.hibernate_available = TRUE; ++ handler_context.hibernate_logind = TRUE; ++ } ++ + /* If we are under GDM, its "Switch User" is available. */ + if (verify_running("gdm", "gdmflexiserver")) + { +@@ -442,6 +511,34 @@ + handler_context.switch_user_GDM = TRUE; + } + ++ /* If we are under GDM3, its "Switch User" is available. */ ++ if (verify_running("gdm3", "gdmflexiserver")) ++ { ++ handler_context.switch_user_available = TRUE; ++ handler_context.switch_user_GDM = TRUE; ++ } ++ ++ /* lightdm also use gdmflexiserver */ ++ if (verify_running("lightdm", "gdmflexiserver")) ++ { ++ handler_context.switch_user_available = TRUE; ++ handler_context.switch_user_GDM = TRUE; ++ } ++ ++ /* lightdm also use gdmflexiserver */ ++ if (verify_running("lightdm", "gdmflexiserver")) ++ { ++ handler_context.switch_user_available = TRUE; ++ handler_context.switch_user_GDM = TRUE; ++ } ++ ++ /* lightdm can also be find by the env */ ++ if (g_getenv("XDG_SEAT_PATH")) ++ { ++ handler_context.switch_user_available = TRUE; ++ handler_context.switch_user_LIGHTDM = TRUE; ++ } ++ + /* If we are under KDM, its "Switch User" is available. */ + if (verify_running("kdm", "kdmctl")) + { +@@ -451,7 +548,18 @@ + + /* LTSP support */ + if (g_getenv("LTSP_CLIENT")) ++ { + handler_context.ltsp = TRUE; ++ handler_context.shutdown_available = TRUE; ++ handler_context.reboot_available = TRUE; ++ } ++ ++ /* Lock screen */ ++ const gchar* very_lock_screen = determine_lock_screen(); ++ if (very_lock_screen) ++ { ++ handler_context.lock_screen = TRUE; ++ } + + /* Make the button images accessible. */ + gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), PACKAGE_DATA_DIR "/lxsession/images"); +@@ -596,6 +704,17 @@ + gtk_box_pack_start(GTK_BOX(controls), switch_user_button, FALSE, FALSE, 4); + } + ++ /* Create the Lock Screen button. */ ++ if (handler_context.lock_screen && !handler_context.ltsp) ++ { ++ GtkWidget * lock_screen_button = gtk_button_new_with_mnemonic(_("L_ock Screen")); ++ GtkWidget * image = gtk_image_new_from_icon_name("system-lock-screen", GTK_ICON_SIZE_BUTTON); ++ gtk_button_set_image(GTK_BUTTON(lock_screen_button), image); ++ gtk_button_set_alignment(GTK_BUTTON(lock_screen_button), 0.0, 0.5); ++ g_signal_connect(G_OBJECT(lock_screen_button), "clicked", G_CALLBACK(lock_screen_clicked), &handler_context); ++ gtk_box_pack_start(GTK_BOX(controls), lock_screen_button, FALSE, FALSE, 4); ++ } ++ + /* Create the Logout button. */ + GtkWidget * logout_button = gtk_button_new_with_mnemonic(_("_Logout")); + GtkWidget * image = gtk_image_new_from_icon_name("system-log-out", GTK_ICON_SIZE_BUTTON); diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index c9e0d4941..26810e5ee 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76741 2012-09-28 19:41:57Z spupykin $ +# $Id: PKGBUILD 80294 2012-11-19 14:11:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=2.1.0 -pkgrel=1 +pkgrel=3 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" arch=('i686' 'x86_64' 'mips64el') url="http://mapnik.org/" @@ -20,7 +20,7 @@ optdepends=('libxslt: Web Map Service' 'apache: Web Map Service' 'mod_fastcgi: Web Map Service - or:' 'mod_fcgid: Web Map Service - or:' - 'mod_wsgi: Web Map Service') + 'mod_wsgi2: Web Map Service') makedepends=('scons' 'boost') install="mapnik.install" source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2") diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD index 6d7d9549c..91b606f4c 100644 --- a/community/mariadb/PKGBUILD +++ b/community/mariadb/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 76117 2012-09-11 15:49:50Z bpiotrowski $ +# $Id: PKGBUILD 80718 2012-11-30 22:24:36Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') -pkgver=5.5.27 +pkgver=5.5.28.a +_pkgver=${pkgver/.a/a} pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://mariadb.org/" makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') -source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz +source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$_pkgver.tar.gz service rc.d tmpfiles.conf) -md5sums=('ad6f3239a1d5af0a667e30f7c0b05037' +md5sums=('a2d20a040ef1e49944a4ffe65ed7fefa' '9e7aa0fa646f48662df569259061fcef' '3bb5a9a96340feb0184bc057ee6e330b' '32f30449d3111714fe190931d08fdb8c') @@ -26,7 +27,7 @@ build() { CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ - cmake ../${pkgbase}-${pkgver} \ + cmake ../${pkgbase}-${_pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ @@ -67,7 +68,7 @@ package_libmariadbclient(){ pkgdesc="MariaDB client libraries" depends=('openssl') conflicts=('libmysqlclient') - provides=("libmysqlclient=${pkgver}") + provides=("libmysqlclient=${_pkgver}") cd "${srcdir}"/build for dir in include libmysql libmysqld libservices; do @@ -78,7 +79,7 @@ package_libmariadbclient(){ install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/ install -d "${pkgdir}"/usr/share/man/man1 for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 done } @@ -86,7 +87,7 @@ package_mariadb-clients() { pkgdesc="MariaDB client tools" depends=('libmariadbclient') conflicts=('mysql-clients') - provides=("mysql-clients=${pkgver}") + provides=("mysql-clients=${_pkgver}") cd "${srcdir}"/build make -C client DESTDIR="${pkgdir}" install @@ -94,7 +95,7 @@ package_mariadb-clients() { # install man pages install -d "${pkgdir}"/usr/share/man/man1 for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 done # provided by mariadb @@ -107,7 +108,7 @@ package_mariadb() { install=mariadb.install depends=('mariadb-clients') conflicts=('mysql') - provides=("mysql=${pkgver}") + provides=("mysql=${_pkgver}") optdepends=('perl-dbi' 'perl-dbd-mysql') options=('emptydirs') diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index d96c9bcbf..7707de2df 100755 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 76011 2012-09-08 21:04:59Z ttopper $ +# $Id: PKGBUILD 79365 2012-11-03 16:31:24Z ttopper $ # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=mathomatic -pkgver=16.0.3 +pkgver=16.0.5 pkgrel=1 -pkgdesc="General purpose Computer Algebra System written in C" +pkgdesc='General purpose Computer Algebra System written in C' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://mathomatic.orgserve.de/math/" @@ -18,7 +18,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial' 'rlwrap: for readline editing' 'gnuplot: for plotting') source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2) -md5sums=('0bd4b73e364d05b7a5b855f19c91b6bd') +md5sums=('dd04913a98a5073b56f3bc78a01820f3') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD deleted file mode 100644 index f9a330bf9..000000000 --- a/community/mc/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 74048 2012-07-18 14:20:54Z schuay $ -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Maintainer: schuay <jakob.gruber@gmail.com> - -pkgname=mc -pkgver=4.8.4 -pkgrel=1 -pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.ibiblio.org/mc/" -license=('GPL') -depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang') -makedepends=('libxt' 'libx11') -optdepends=('p7zip: support for 7zip archives' - 'mtools: a+ extfs' - 'cdparanoia: audio extfs' - 'gawk: hp48+ extfs' - 'cdrkit: iso9660 extfs' - 'perl: needed by several extfs scripts' - 'python-boto: s3+ extfs' - 'python2-pytz: s3+ extfs' - 'p7zip: u7z extfs' - 'unace: uace extfs' - 'unarj: uarj extfs' - 'cabextract: ucab extfs' - 'unrar: urar extfs' - 'zip: uzip extfs') -options=('!emptydirs' '!makeflags') -backup=('etc/mc/edit.indent.rc' - 'etc/mc/edit.spell.rc' - 'etc/mc/filehighlight.ini' - 'etc/mc/mcedit.menu' - 'etc/mc/mc.ext' - 'etc/mc/mc.keymap' - 'etc/mc/mc.menu' - 'etc/mc/sfs.ini') -source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2") - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \ - --enable-background --enable-charset --enable-largefile \ - --with-edit --with-gpm-mouse --with-mmap --enable-vfs-smb \ - --with-screen=slang --with-subshell --with-vfs --with-x \ - --without-debug --without-gnome --without-included-gettext \ - --libexecdir=/usr/lib - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - # Fix FS#15177 - sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/uzip" - - sed 's#/usr/bin/env python#/usr/bin/python2#' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" -} - -md5sums=('a8edb8226cb25869f925ecce043faf1e') diff --git a/community/mc/changeset_8607bcc1.diff b/community/mc/changeset_8607bcc1.diff deleted file mode 100644 index 071d6159e..000000000 --- a/community/mc/changeset_8607bcc1.diff +++ /dev/null @@ -1,22 +0,0 @@ -Index: src/vfs/cpio/cpio.c
-===================================================================
---- src/vfs/cpio/cpio.c (revision 764cdf2497ac1fe79b4237e9c75d600f7d868351)
-+++ src/vfs/cpio/cpio.c (revision 8607bcc103ce2f9449b6b9736a9709cdb62a7178)
-@@ -250,5 +250,5 @@
- mc_close (fd);
- s = g_strconcat (super->name, decompress_extension (type), (char *) NULL);
-- tmp_vpath = vfs_path_from_str (s);
-+ tmp_vpath = vfs_path_from_str_flags (s, VPF_NO_CANON);
- fd = mc_open (tmp_vpath, O_RDONLY);
- vfs_path_free (tmp_vpath);
-Index: src/vfs/tar/tar.c
-===================================================================
---- src/vfs/tar/tar.c (revision 764cdf2497ac1fe79b4237e9c75d600f7d868351)
-+++ src/vfs/tar/tar.c (revision 8607bcc103ce2f9449b6b9736a9709cdb62a7178)
-@@ -317,5 +317,5 @@
- mc_close (result);
- s = g_strconcat (archive->name, decompress_extension (type), (char *) NULL);
-- tmp_vpath = vfs_path_from_str (s);
-+ tmp_vpath = vfs_path_from_str_flags (s, VPF_NO_CANON);
- result = mc_open (tmp_vpath, O_RDONLY);
- vfs_path_free (tmp_vpath);
diff --git a/community/mcabber/PKGBUILD b/community/mcabber/PKGBUILD index 7841831ab..4c6923e21 100644 --- a/community/mcabber/PKGBUILD +++ b/community/mcabber/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 66233 2012-02-23 05:07:48Z spupykin $ +# $Id: PKGBUILD 79621 2012-11-09 00:24:34Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: 3ED <kas1987@o2.pl> pkgname=mcabber pkgver=0.10.1 -pkgrel=2 -pkgdesc="a small Jabber console client, includes features: SSL, PGP, MUC, UTF8" +pkgrel=4 +pkgdesc="A small Jabber console client, includes features: SSL, PGP, MUC, UTF8" arch=('i686' 'x86_64' 'mips64el') url="http://www.lilotux.net/~mikael/mcabber/" license=('GPL') -depends=('ncurses' 'glib2' 'loudmouth' 'gpgme' 'libotr' 'aspell') -makedepends=('pkgconfig') +depends=('ncurses' 'glib2' 'loudmouth' 'gpgme' 'libotr3' 'aspell') +makedepends=('pkg-config') options=('!libtool') source=(http://www.lilotux.net/~mikael/mcabber/files/$pkgname-${pkgver/_/-}.tar.bz2) md5sums=('fe96beab30f535d5d6270fd1719659b4') build() { - cd ${srcdir}/$pkgname-${pkgver/_/-} + cd "${srcdir}"/$pkgname-${pkgver/_/-} + + sed -i 's|lotr|lotr3|' configure + sed -i 's|libotr/version.h|libotr3/version.h|' configure + sed -i 's|#include <libotr|#include <libotr3|' mcabber/otr.h ./configure --prefix=/usr --enable-hgcset \ --mandir=/usr/share/man \ @@ -26,12 +30,12 @@ build() { } package() { - cd ${srcdir}/$pkgname-${pkgver/_/-} + cd "${srcdir}"/$pkgname-${pkgver/_/-} - make DESTDIR=${pkgdir} install - mkdir -p ${pkgdir}/usr/share/mcabber/example + make DESTDIR="${pkgdir}" install + mkdir -p "${pkgdir}"/usr/share/mcabber/example msg "Copying mcabberrc.example to usr/share/mcabber/example/mcabberrc" - cp -a ${srcdir}/$pkgname-${pkgver/_/-}/mcabberrc.example \ - ${pkgdir}/usr/share/mcabber/example/mcabberrc + cp -a "${srcdir}"/$pkgname-${pkgver/_/-}/mcabberrc.example \ + "${pkgdir}"/usr/share/mcabber/example/mcabberrc } diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD index 9d60906c3..6de98e94e 100644 --- a/community/mcelog/PKGBUILD +++ b/community/mcelog/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 77126 2012-10-05 11:04:13Z spupykin $ +# $Id: PKGBUILD 78891 2012-10-26 13:18:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Thomas Mudrunka <harvie@@email..cz> # Maintainer: Thomas Mudrunka <harvie@@email..cz> pkgname=mcelog pkgver=1.0pre3 -pkgrel=4 +pkgrel=5 pkgdesc="Print machine check event log from x86-64 kernel" url="http://freshmeat.net/projects/mcelog/" license=("GPL") arch=('i686' 'x86_64' 'mips64el') options=('docs') +backup=('etc/mcelog/mcelog.conf') #source=("ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/${pkgname}-${pkgver}.tar.gz" source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz" "${pkgname}.rc" "mcelog.service") md5sums=('b42f2214de6f4feb992556149edc67fa' 'f039a77d7bde3518d3d695b144816e8a' - '4e563f1124c09b3368532d37f9f4bba3') + 'a8859012781f017624bbfe61c9d700bb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/mcelog/mcelog.service b/community/mcelog/mcelog.service index 62d8cbed0..c689bee77 100644 --- a/community/mcelog/mcelog.service +++ b/community/mcelog/mcelog.service @@ -2,15 +2,9 @@ Description=Machine Check Exception Logging Daemon After=syslog.target -# FIXME - due to upstream kernel bug always start the mcelog process -# twice using the following ExecStartPre hack. This needs fixing. -# There is a bug filed against systemd for the ExecStartPre bit -# since it is not possible to specify that the ExecStarPre bit -# is allowed and expected to fail without aborting the daemon. - [Service] -ExecStartPre=/etc/mcelog/mcelog.setup -ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground +PIDFile=/var/run/mcelog.pid +ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground --pidfile /var/run/mcelog.pid StandardOutput=syslog [Install] diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 1f58d64b5..e4c12194e 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75882 2012-09-04 15:30:42Z spupykin $ +# $Id: PKGBUILD 78761 2012-10-24 10:02:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui -pkgver=0.7.60 +pkgver=0.7.61 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('ed1e1baf50ac101ef5c41b6b32ada36e') +md5sums=('46fd776968ec1047cd2a5056a906cdf2') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index fb6895c14..ed5af89c5 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75880 2012-09-04 15:30:01Z spupykin $ +# $Id: PKGBUILD 78759 2012-10-24 10:01:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo -pkgver=0.7.60 +pkgver=0.7.61 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('ed1e1baf50ac101ef5c41b6b32ada36e') +md5sums=('46fd776968ec1047cd2a5056a906cdf2') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD index 7a3096254..4b7cb8f4f 100644 --- a/community/mediaproxy/PKGBUILD +++ b/community/mediaproxy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78383 2012-10-17 15:54:17Z spupykin $ +# $Id: PKGBUILD 80024 2012-11-15 14:41:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=mediaproxy pkgver=2.5.2 -pkgrel=3 +pkgrel=4 pkgdesc="Open-source media proxy for OpenSER" url="http://mediaproxy.ag-projects.com/" arch=('i686' 'x86_64' 'mips64el') @@ -25,8 +25,12 @@ md5sums=('840de8f52e656991be728c15ec30bb5e' build() { cd $srcdir/mediaproxy-$pkgver - install -D -m0755 $srcdir/mediaproxy.init $pkgdir/etc/rc.d/mediaproxy + + sed -i "s|libraries = get_link_libraries(),|libraries = ['netfilter_conntrack', 'ip4tc'],|g" setup.py + python2 setup.py install --root=$pkgdir + + install -D -m0755 $srcdir/mediaproxy.init $pkgdir/etc/rc.d/mediaproxy install -Dm0644 $srcdir/$pkgname-dispatcher.service $pkgdir/usr/lib/systemd/system/$pkgname-dispatcher.service install -Dm0644 $srcdir/$pkgname-relay.service $pkgdir/usr/lib/systemd/system/$pkgname-relay.service install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index a76a0e2f2..cfbdcca9c 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77649 2012-10-13 11:43:58Z allan $ +# $Id: PKGBUILD 78936 2012-10-27 23:45:03Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest pkgver=3.6.0.3 -pkgrel=4 +pkgrel=5 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/megaglest/" @@ -20,7 +20,7 @@ md5sums=('5a4a2429435031d9f9cc5d9535a9de9d' build() { cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ - patch -Np1 < $srcdir/lol.patch + patch -Np1 < "$srcdir/lol.patch" [[ -d build ]] && rm -r build mkdir build && cd build diff --git a/community/menu-cache/PKGBUILD b/community/menu-cache/PKGBUILD index 8195b8f16..1c6e9ad24 100644 --- a/community/menu-cache/PKGBUILD +++ b/community/menu-cache/PKGBUILD @@ -1,30 +1,36 @@ -# $Id: PKGBUILD 71029 2012-05-22 05:52:34Z bpiotrowski $ +# $Id: PKGBUILD 80045 2012-11-15 18:59:35Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=menu-cache -pkgver=0.3.3 +pkgver=0.4.0 pkgrel=1 pkgdesc='Caching mechanism for freedesktop.org compliant menus' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -url="http://lxde.org/" +url='http://lxde.org/' groups=('lxde') depends=('intltool' 'glib2') options=('!libtool') makedepends=('pkgconfig') -source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz) -md5sums=('a14b0b162cd64d56c16bf6af16f3a47f') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz + menu-cache-gen.h) +md5sums=('c63029a6c65e370ed5d9409f30265950' + '4edc9545b9640ee7698324d3f9683dc7') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/menu-cache --disable-static - make + cd $srcdir/$pkgname-$pkgver + + install -m644 $srcdir/menu-cache-gen.h menu-cache-gen/ + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/menu-cache \ + --disable-static + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/community/menu-cache/menu-cache-gen.h b/community/menu-cache/menu-cache-gen.h new file mode 100644 index 000000000..7d9be4207 --- /dev/null +++ b/community/menu-cache/menu-cache-gen.h @@ -0,0 +1,8 @@ +#ifndef __MENU_CACHE_GEN_H__ +#define __MENU_CACHE_GEN_H__ 1 +G_BEGIN_DECLS + +guint32 menu_cache_get_de_flag (const char* de_name); + +G_END_DECLS +#endif
\ No newline at end of file diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index bfab30b7c..1b30e5a9e 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76712 2012-09-27 13:47:42Z bpiotrowski $ +# $Id: PKGBUILD 79131 2012-10-30 23:51:10Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -8,7 +8,7 @@ pkgname=midori pkgver=0.4.7 -pkgrel=2 +pkgrel=3 pkgdesc='Lightweight web browser based on Gtk WebKit' arch=('x86_64' 'i686' 'mips64el') url='http://www.twotoasts.de/index.php?/pages/midori_summary.html' @@ -19,15 +19,20 @@ makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support') options=('!emptydirs') source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 - 0.4.7-private-mode.patch) + 0.4.7-private-mode.patch + fix-copying.patch) md5sums=('06db7b88a41e9b2265728960d5e98f35' - 'b2f21a853038662fd0e6c2274ed9dfb7') + 'b2f21a853038662fd0e6c2274ed9dfb7' + '4bf3a0af4edc9ad6c4d46fc9676d9eb0') build() { cd $srcdir/$pkgname-$pkgver - # fs#31641 - patch -Np1 -i $srcdir/0.4.7-private-mode.patch + # FS#31641 + patch -s -Np1 -i ../0.4.7-private-mode.patch + + # FS#32229 + patch -s -Np1 -i ../fix-copying.patch > /dev/null || true # python2 export PYTHON=/usr/bin/python2 diff --git a/community/midori/fix-copying.patch b/community/midori/fix-copying.patch new file mode 100644 index 000000000..ab3581900 --- /dev/null +++ b/community/midori/fix-copying.patch @@ -0,0 +1,63 @@ +diff --git a/midori/midori-browser.c b/midori/midori-browser.c +index 28aca95..b33e2e4 100644 +--- a/midori/midori-browser.c ++++ b/midori/midori-browser.c +@@ -1041,7 +1041,7 @@ midori_browser_save_uri (MidoriBrowser* browser, + GtkWidget* dialog; + const gchar* title = midori_view_get_display_title (view); + gchar* filename; +- GList* resources = midori_view_get_subresources (view); ++ GList* resources = midori_view_get_resources (view); + gboolean file_only = TRUE; + GtkWidget* checkbox = NULL; + +diff --git a/midori/midori-view.c b/midori/midori-view.c +index 37cc78f..2c71f55 100644 +--- a/midori/midori-view.c ++++ b/midori/midori-view.c +@@ -1993,21 +1993,22 @@ midori_web_view_menu_image_new_tab_activate_cb (GtkWidget* widget, + } + + GList* +-midori_view_get_subresources (MidoriView* view) ++midori_view_get_resources (MidoriView* view) + { + WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view); + WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view); + WebKitWebDataSource* data_source = webkit_web_frame_get_data_source (frame); +- return webkit_web_data_source_get_subresources (data_source); ++ GList* resources = webkit_web_data_source_get_subresources (data_source); ++ return g_list_prepend (resources, webkit_web_data_source_get_main_resource (data_source)); + } + + static GString* + midori_view_get_data_for_uri (MidoriView* view, + const gchar* uri) + { +- GList* resources = midori_view_get_subresources (view); ++ GList* resources = midori_view_get_resources (view); + GList* list; +- GString* result; ++ GString* result = NULL; + + for (list = resources; list; list = g_list_next (list)) + { +@@ -2032,7 +2033,8 @@ midori_view_clipboard_get_image_cb (GtkClipboard* clipboard, + MidoriView* view = MIDORI_VIEW (g_object_get_data (user_data, "view")); + WebKitHitTestResult* hit_test = user_data; + gchar* uri = katze_object_get_string (hit_test, "image-uri"); +- /* if (gtk_selection_data_targets_include_image (selection_data, TRUE)) */ ++ ++ if (gtk_targets_include_image(&selection_data->target, 1, TRUE)) + { + GString* data = midori_view_get_data_for_uri (view, uri); + if (data != NULL) +@@ -2052,7 +2054,7 @@ midori_view_clipboard_get_image_cb (GtkClipboard* clipboard, + else + g_warn_if_reached (); + } +- /* if (gtk_selection_data_targets_include_text (selection_data)) */ ++ if (gtk_targets_include_text(&selection_data->target, 1)) + gtk_selection_data_set_text (selection_data, uri, -1); + g_free (uri); + } diff --git a/community/mingw32-binutils/PKGBUILD b/community/mingw32-binutils/PKGBUILD index d5d575891..b49f31b03 100644 --- a/community/mingw32-binutils/PKGBUILD +++ b/community/mingw32-binutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61841 2012-01-08 20:30:41Z spupykin $ +# $Id: PKGBUILD 80285 2012-11-19 12:16:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> # Contributor: mosra <mosra@centrum.cz> pkgname=mingw32-binutils -pkgver=2.22 +pkgver=2.23.1 pkgrel=1 _uprel=1 arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ pkgdesc="A set of programs to assemble and manipulate binary and object files (m depends=('glibc' 'zlib') license=(GPL) source=(https://downloads.sourceforge.net/project/mingw/MinGW/Base/binutils/binutils-$pkgver/binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma) -md5sums=('35419c797be081e081a664f95c3d3361') +md5sums=('5d76604f545b151230d1c86e1b8cfab3') build() { [ $NOEXTRACT -eq 1 ] || tar --lzma -xf binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD index 694a30ae6..73f13fce9 100644 --- a/community/mingw32-gcc-base/PKGBUILD +++ b/community/mingw32-gcc-base/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 76624 2012-09-25 09:56:18Z spupykin $ +# $Id: PKGBUILD 79594 2012-11-08 15:25:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> pkgname=mingw32-gcc-base -pkgver=4.7.0 +pkgver=4.7.2 _w32apiver=3.17 _runtimever=3.20 _uprel=1 _upw32rel=1 -pkgrel=2 +pkgrel=1 arch=(i686 x86_64) pkgdesc="A C cross-compiler for building Windows executables on Linux" depends=(mingw32-binutils) @@ -21,7 +21,7 @@ source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge http://downloads.sourceforge.net/project/mingw/MinGW/Base/w32api/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma http://downloads.sourceforge.net/project/mingw/MinGW/Base/mingw-rt/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz gcc-1-mingw-float.patch) -md5sums=('9a4ecdacdc6dc83a4a43ef0693e2295d' +md5sums=('bc2d1828dd6c53683600545ca6a901e1' '89e5800096aa334009f98e7c1743d825' '26c0886cc60729b94956cc6d81cd076c' '2407123c35c0aa92ee5ffc27decca9a7') diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD index e782b7643..b3c07a59b 100644 --- a/community/mingw32-gcc/PKGBUILD +++ b/community/mingw32-gcc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75205 2012-08-16 01:56:28Z allan $ +# $Id: PKGBUILD 79591 2012-11-08 15:24:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> pkgname=mingw32-gcc -pkgver=4.7.0 -pkgrel=2 +pkgver=4.7.2 +pkgrel=1 _uprel=1 arch=(i686 x86_64 mips64el) pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux" @@ -17,7 +17,7 @@ url="http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/" license=(GPL LGPL) source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma gcc-1-mingw-float.patch) -md5sums=('9a4ecdacdc6dc83a4a43ef0693e2295d' +md5sums=('bc2d1828dd6c53683600545ca6a901e1' '2407123c35c0aa92ee5ffc27decca9a7') build() diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index 7ff2dd8be..b72d9c712 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76403 2012-09-17 10:17:02Z spupykin $ +# $Id: PKGBUILD 79502 2012-11-06 11:19:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -7,28 +7,29 @@ pkgname=minidlna pkgver=1.0.25 -pkgrel=2 +pkgrel=4 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/minidlna/" license=('GPL') depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite') -conflicts=('minidlna-cvs') backup=('etc/minidlna.conf' 'etc/conf.d/minidlna') +install=minidlna.install changelog=changelog source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz minidlna.rc minidlna.service minidlna.tmpfiles) md5sums=('d966256baf2f9b068b9de871ab5dade5' - 'c9863d5703e0a8469cc200f2739567e7' + '1b92f88905abe8f719585d48f4b25a49' '1903ed9ceee43b8bb86146b9ad8eb50c' '26de27b12d6a37c47d9714107d07aac9') build() { cd "$srcdir/$pkgname-$pkgver" sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh + find -type f -name '*.c' -exec sed -i '1,1i#include </usr/include/time.h>' {} \; make } diff --git a/community/minidlna/minidlna.install b/community/minidlna/minidlna.install new file mode 100644 index 000000000..c9cdc0f13 --- /dev/null +++ b/community/minidlna/minidlna.install @@ -0,0 +1,7 @@ +post_install() { + systemd-tmpfiles --create minidlna.conf +} + +post_upgrade() { + systemd-tmpfiles --create minidlna.conf +} diff --git a/community/minidlna/minidlna.rc b/community/minidlna/minidlna.rc index c79975ed1..dd5910544 100755 --- a/community/minidlna/minidlna.rc +++ b/community/minidlna/minidlna.rc @@ -3,6 +3,7 @@ . /etc/rc.conf . /etc/rc.d/functions . /etc/conf.d/minidlna +. /etc/minidlna.conf daemon_name=minidlna diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD index 1ff3f4d5b..f346ed2ac 100644 --- a/community/miredo/PKGBUILD +++ b/community/miredo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72790 2012-06-22 12:50:59Z dreisner $ +# $Id: PKGBUILD 79082 2012-10-30 09:54:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=miredo pkgver=1.2.5 -pkgrel=2 +pkgrel=3 pkgdesc="Teredo client and server." arch=('i686' 'x86_64' 'mips64el') url="http://www.remlab.net/miredo/" @@ -23,7 +23,7 @@ md5sums=('5114debbf9fcab5d292176e4548f8cd1' 'd1b655d7a851cdb46c91c3418ed1962f' 'c5a9be5c3175fecec387f1710bfd2788' '319aba1ae06349b76cb25fda0dba60a9' - '3216d47d5aa979706b17b72d8b6e19b0') + 'abd7d8831cab7f3ea6d0d4e51b8f8f6a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/miredo/miredo.service b/community/miredo/miredo.service index 299a887de..d28803efd 100644 --- a/community/miredo/miredo.service +++ b/community/miredo/miredo.service @@ -3,7 +3,6 @@ Description=Teredo IPv6 Tunneling Daemon After=network.target [Service] -ExecStartPre=/usr/sbin/miredo-checkconf /etc/miredo/miredo.conf ExecStart=/usr/sbin/miredo -f ExecReload=/bin/kill -HUP $MAINPID diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index aeb555ecc..460532db8 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,28 +1,24 @@ -# $Id: PKGBUILD 68994 2012-04-07 09:57:09Z ttopper $ +# $Id: PKGBUILD 80731 2012-12-01 17:21:44Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Daniel Hommel <dhommel@gmail.com> pkgname=mksh -pkgver=R40f +pkgver=R41 pkgrel=1 -pkgdesc="The MirBSD Korn Shell - an enhanced version of the public domain ksh" -url="http://mirbsd.de/mksh" -license=("custom") -makedepends=('cpio') +pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' +url='https://www.mirbsd.org/mksh.htm' +license=('custom') arch=('i686' 'x86_64' 'mips64el') install=mksh.install -source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.cpio.gz" - "https://www.mirbsd.org/TaC-mksh.txt") +source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.tgz" + 'https://www.mirbsd.org/TaC-mksh.txt') depends=('gcc-libs') -md5sums=('22c9570660c2efadf36de7b620d06966' - '0016ef61a990bcd763604da7ae2beb25') +md5sums=('70eca50d9340412714ef09b7060ebde9' + '124164b14263f5ee09d2135fffce7282') build() { - cd "$srcdir" - # makepkg can't extract cpio files - cpio -mid < "$pkgname-$pkgver.cpio" - cd "$srcdir/$pkgname" + sh Build.sh -r -c lto ./test.sh gzip -n9 mksh.1 diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD deleted file mode 100644 index d4c360b30..000000000 --- a/community/mldonkey/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 75327 2012-08-19 20:51:39Z cbrannon $ -# Maintainer: Chris Brannon <cmbrannon79@gmail.com> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> - -pkgname=mldonkey -pkgver=3.1.3 -pkgrel=1 -pkgdesc="A multi-network P2P client" -arch=('i686' 'x86_64' 'mips64el') -url="http://mldonkey.sourceforge.net/" -license=('GPL') -depends=('desktop-file-utils' 'file' 'gd' 'bzip2') -makedepends=('lablgtk2' 'librsvg' 'ocaml') -optdepends=('librsvg: GUI support' - 'libx11: GUI support') -backup=('etc/conf.d/mldonkey') -install=mldonkey.install -source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2 - mldonkeyd - mldonkey.conf) -md5sums=('671f60467a918a9b7c2affef63ff5c25' - '9e90003a012cf17b548dcc647961ffa6' - '1f86d92db51c62cded0e6f3833057dee') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --enable-gui=newgui2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/$pkgname-$pkgver/icons/rsvg/type_source_normal.svg" \ - "$pkgdir/usr/share/icons/mldonkey.svg" - - install -Dm755 "$srcdir/mldonkeyd" "$pkgdir/etc/rc.d/mldonkey" - install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey" - install -Dm644 "distrib/mldonkey.desktop" \ - "$pkgdir/usr/share/applications/mldonkey.desktop" -} diff --git a/community/mldonkey/mldonkey.conf b/community/mldonkey/mldonkey.conf deleted file mode 100644 index 24a25af74..000000000 --- a/community/mldonkey/mldonkey.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Username under which the daemon will run (mandatory) -MLDUSER="" - -# Parameters to be passed to the daemon (default is empty) -PARAMS="" diff --git a/community/mldonkey/mldonkey.install b/community/mldonkey/mldonkey.install deleted file mode 100644 index dd8ea0407..000000000 --- a/community/mldonkey/mldonkey.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - if [ -f /etc/mldonkey.conf ]; then - mv /etc/mldonkey.conf /etc/conf.d/mldonkey - cat << EOM - -==> mldonkey post upgrade message: -==> /etc/mldonkey.conf has been moved in /etc/conf.d/mldonkey - -EOM - fi -} - -# vim:set ts=2 sw=2 et: diff --git a/community/mldonkey/mldonkeyd b/community/mldonkey/mldonkeyd deleted file mode 100644 index 533aa751c..000000000 --- a/community/mldonkey/mldonkeyd +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/mldonkey - -if [ -z $MLDUSER ] ; then - echo "Unable to run MLDonkey. You must set a user in /etc/conf.d/mldonkey ." - exit 2 -fi - -if [ -z "$(getent passwd "$MLDUSER")" ]; then - # Perhaps we should create the account for the user? - echo "You must create the account $MLDUSER in order to run mldonkey." - echo "Please create the account manually, and try again." - exit 2 -fi - -MLDGROUPID=$(getent passwd "$MLDUSER" |cut -d':' -f4) -MLDGROUP=$(getent group $MLDGROUPID |cut -d':' -f1) -USERDIR=$(getent passwd $MLDUSER | cut -d: -f6) - -if [ ! -d $USERDIR ]; then - echo "Unable to run MLDonkey. Home directory for ${MLDUSER} does not exist." - exit 2 -fi - -PIDDIR="/var/run/mldonkey" -PIDFILE="$PIDDIR/mlnet.pid" - -getPID() { - echo $(pgrep -u "$MLDUSER" mlnet 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting MLDonkey" - if [ ! -d $PIDDIR ]; then - install -d -m755 -o "$MLDUSER" -g "$MLDGROUP" $PIDDIR - fi - if [ "$(stat -c %U $PIDDIR)" != "$MLDUSER" ]; then - chown -R "$MLDUSER:$MLDGROUP" $PIDDIR - fi - [ -z $PID ] && su $MLDUSER -s /bin/sh -c "/usr/bin/mlnet -pid $PIDDIR $PARAMS -log_to_syslog true &> /tmp/mldonkey.log &" - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon mldonkey - stat_done - fi - ;; - stop) - stat_busy "Stopping MLDonkey" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f $PIDFILE &>/dev/null - rm_daemon mldonkey - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index a21be6376..1a8045db8 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75787 2012-08-31 10:39:46Z spupykin $ +# $Id: PKGBUILD 79557 2012-11-07 13:12:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -8,25 +8,29 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') pkgver=0.8.2 -pkgrel=1 +pkgrel=3 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.mltframework.org" license=('GPL') makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg' 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('c7a8c4ca7485bb615cbcf851d8742a1c') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + ffmpeg.patch) +md5sums=('c7a8c4ca7485bb615cbcf851d8742a1c' + 'c28b4691d1715432d4de0055f4e2f5eb') build() { # mlt cd "$srcdir/mlt-$pkgver" + patch -p1 <$srcdir/ffmpeg.patch + [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2= # SSE2=--disable-sse2 msg "SSE2=$SSE2" - ./configure --prefix=/usr --enable-gpl \ + ./configure --prefix=/usr --enable-gpl --enable-gpl3 \ --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/Qt \ --avformat-vdpau \ --avformat-swscale $SSE2 diff --git a/community/mlt/ffmpeg.patch b/community/mlt/ffmpeg.patch new file mode 100644 index 000000000..7bd4903db --- /dev/null +++ b/community/mlt/ffmpeg.patch @@ -0,0 +1,29 @@ +diff -wbBur mlt-0.8.2/src/modules/avformat/consumer_avformat.c mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c +--- mlt-0.8.2/src/modules/avformat/consumer_avformat.c 2012-08-28 20:25:58.000000000 +0400 ++++ mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c 2012-11-06 16:03:07.269782436 +0400 +@@ -237,11 +237,7 @@ + mlt_properties_set_data( properties, "acodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL ); + mlt_properties_set_data( doc, "audio_codecs", codecs, 0, NULL, NULL ); + while ( ( codec = av_codec_next( codec ) ) ) +-#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) +- if ( ( codec->encode || codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO ) +-#else +- if ( codec->encode && codec->type == CODEC_TYPE_AUDIO ) +-#endif ++ if ( ( codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO ) + { + snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) ); + mlt_properties_set( codecs, key, codec->name ); +@@ -261,11 +257,7 @@ + mlt_properties_set_data( properties, "vcodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL ); + mlt_properties_set_data( doc, "video_codecs", codecs, 0, NULL, NULL ); + while ( ( codec = av_codec_next( codec ) ) ) +-#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) +- if ( (codec->encode || codec->encode2) && codec->type == CODEC_TYPE_VIDEO ) +-#else +- if ( codec->encode && codec->type == CODEC_TYPE_VIDEO ) +-#endif ++ if ( (codec->encode2) && codec->type == CODEC_TYPE_VIDEO ) + { + snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) ); + mlt_properties_set( codecs, key, codec->name ); diff --git a/community/mod_wsgi/PKGBUILD b/community/mod_wsgi/PKGBUILD new file mode 100644 index 000000000..22c403936 --- /dev/null +++ b/community/mod_wsgi/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 79940 2012-11-15 00:36:52Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Ryan Coyner <rcoyner@gmail.com> + +pkgname=mod_wsgi +pkgver=3.4 +pkgrel=2 +pkgdesc='Python WSGI adapter module for Apache' +arch=('x86_64' 'i686') +url='http://www.modwsgi.org/' +license=('APACHE') +depends=('apache' 'python') +makedepends=('setconf') +install=mod_wsgi.install +source=("http://modwsgi.googlecode.com/files/$pkgname-$pkgver.tar.gz") +sha256sums=('ae85c98e9e146840ab3c3e4490e6774f9bef0f99b9f679fca786b2adb5b4b6e8') + +build() { + cd "$srcdir/$pkgbase-$pkgver" + + ./configure --prefix=/usr \ + --with-apxs=/usr/sbin/apxs \ + --with-python=/usr/bin/python + setconf Makefile LDLIBS '-lpython3 -lpthread -ldl -lutil -lm' + make +} + +package() { + cd "$srcdir/$pkgbase-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/mod_wsgi/mod_wsgi.install b/community/mod_wsgi/mod_wsgi.install new file mode 100644 index 000000000..d26d61631 --- /dev/null +++ b/community/mod_wsgi/mod_wsgi.install @@ -0,0 +1,14 @@ +post_install() { +/bin/cat << ENDOFMESSAGE +==> +==> +==> To install mod_wsgi, add the following line in +==> /etc/httpd/conf/httpd.conf file : +==> +==> LoadModule wsgi_module modules/mod_wsgi.so +==> +==> and restart/reload Apache. +==> +==> +ENDOFMESSAGE +} diff --git a/community/mod_wsgi2/PKGBUILD b/community/mod_wsgi2/PKGBUILD new file mode 100644 index 000000000..b408192d8 --- /dev/null +++ b/community/mod_wsgi2/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 80683 2012-11-29 03:29:49Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Ryan Coyner <rcoyner@gmail.com> + +pkgname=mod_wsgi2 +pkgver=3.4 +pkgrel=2 +pkgdesc='Python2 WSGI adapter module for Apache' +arch=('x86_64' 'i686') +url='http://www.modwsgi.org/' +license=('APACHE') +depends=('apache' 'python2') +conflicts=('mod_wsgi') +install=$pkgname.install +source=("http://modwsgi.googlecode.com/files/mod_wsgi-$pkgver.tar.gz") +sha256sums=('ae85c98e9e146840ab3c3e4490e6774f9bef0f99b9f679fca786b2adb5b4b6e8') + +build() { + cd "$srcdir/mod_wsgi-$pkgver" + + ./configure --prefix=/usr \ + --with-apxs=/usr/sbin/apxs \ + --with-python=/usr/bin/python2 + make +} + +package() { + cd "$srcdir/mod_wsgi-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/mod_wsgi2/mod_wsgi2.install b/community/mod_wsgi2/mod_wsgi2.install new file mode 100644 index 000000000..d26d61631 --- /dev/null +++ b/community/mod_wsgi2/mod_wsgi2.install @@ -0,0 +1,14 @@ +post_install() { +/bin/cat << ENDOFMESSAGE +==> +==> +==> To install mod_wsgi, add the following line in +==> /etc/httpd/conf/httpd.conf file : +==> +==> LoadModule wsgi_module modules/mod_wsgi.so +==> +==> and restart/reload Apache. +==> +==> +ENDOFMESSAGE +} diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 049527180..088cecc83 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 76844 2012-10-01 05:33:09Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# $Id: PKGBUILD 80638 2012-11-28 05:32:45Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Mathias Stearn <mathias@10gen.com> # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.2.0 -pkgrel=2 +pkgver=2.2.2 +pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64' 'mips64el') url='http://www.mongodb.org' @@ -20,14 +21,9 @@ install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' 'mongodb.conf' 'mongodb.service' 'SConscript.client.patch' 'boost1.50.patch') -md5sums=('832bdb6cc659176fd8d6b16a660ccfc6' - '9c67e00f4626ad761a8f7d4e037a54d7' - '4839fe1d638187ca3226e8267b947318' - '96ab4517b48974ce0e566d9746a75a4f' - 'a9529e2a6e392ffecef7a9178394c814' - 'da8a9d78e4a38d1ed8e92a210d4b5ba7') build() { + # fucking mongo aint no fun to package export SCONSFLAGS="$MAKEFLAGS" cd mongodb-src-r${pkgver} @@ -66,6 +62,13 @@ package() { install -dm755 $pkgdir/var/log/mongodb # the earlier SConscript patch actually gives us some trouble on x86_64 so we need to hack it out again - mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ - rm -r ${pkgdir}/usr/lib64 + mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ || true + rm -r ${pkgdir}/usr/lib64 || true + } +md5sums=('697c448271358545a8a40a973f88edf4' + '9c67e00f4626ad761a8f7d4e037a54d7' + '4839fe1d638187ca3226e8267b947318' + '96ab4517b48974ce0e566d9746a75a4f' + 'a9529e2a6e392ffecef7a9178394c814' + 'da8a9d78e4a38d1ed8e92a210d4b5ba7') diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD index 8768a69b5..c10219857 100644 --- a/community/monit/PKGBUILD +++ b/community/monit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76973 2012-10-02 18:27:38Z jlichtblau $ +# $Id: PKGBUILD 79004 2012-10-28 18:41:19Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Marco Bartholomew <marco@marcobartholomew.com> pkgname=monit pkgver=5.5 -pkgrel=1 +pkgrel=2 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system" arch=('i686' 'x86_64' 'mips64el') url="http://mmonit.com/monit/" @@ -14,9 +14,10 @@ depends=('openssl') backup=('etc/monitrc') changelog=$pkgname.changelog source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \ - monitd) + monitd monit.service) sha256sums=('8276b060b3f0e6453c9748d421dec044ddae09d3e4c4666e13472aab294d7c53' - 'b235b2fdeec49015d6b74f028d161b289663692f9ee2d2d78cf52d8db87ca496') + 'b235b2fdeec49015d6b74f028d161b289663692f9ee2d2d78cf52d8db87ca496' + 'cf607209e9e5d39e708152dc181525570371fab750f828e890e2b6a00b81ebc4') build() { cd ${srcdir}/$pkgname-$pkgver @@ -33,4 +34,6 @@ package() { install -D -m755 ${srcdir}/monitd ${pkgdir}/etc/rc.d/monitd install -D -m700 monitrc ${pkgdir}/etc/monitrc + + install -D -m644 ${srcdir}/$pkgname.service ${pkgdir}/usr/lib/systemd/system/$pkgname.service } diff --git a/community/monit/monit.changelog b/community/monit/monit.changelog index 7c26c1a39..07cea8e3d 100644 --- a/community/monit/monit.changelog +++ b/community/monit/monit.changelog @@ -1,4 +1,7 @@ 2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * monit 5.5-2 systemd .service file added + +2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * monit 5.5-1 2012-05-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> diff --git a/community/monit/monit.service b/community/monit/monit.service new file mode 100644 index 000000000..775435a4a --- /dev/null +++ b/community/monit/monit.service @@ -0,0 +1,13 @@ +[Unit] +Description=Pro-active monitoring utility for unix systems +After=network.target + +[Service] +Type=simple +ExecStart=/usr/bin/monit -I +ExecStop=/usr/bin/monit quit +ExecReload=/usr/bin/monit reload + +[Install] +WantedBy=multi-user.target + diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 5fca87a8a..34065c2e8 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,63 +1,66 @@ -# $Id: PKGBUILD 74686 2012-08-02 07:31:37Z bpiotrowski $ +# $Id: PKGBUILD 80198 2012-11-17 14:50:42Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 pkgver=20120729 -pkgrel=1 -pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project" +pkgrel=2 +pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project' arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.mplayer2.org/" install=$pkgname.install depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss' - 'libdvdnav' 'libdvdread' 'libjpeg' 'libmad' 'libpulse' 'libtheora' + 'libdvdnav' 'libdvdread' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') if [ "$CARCH" != "mips64el" ]; then depends+=('libgl' 'libvdpau' 'lirc-utils') fi -makedepends=('mesa' 'unzip' 'python') +makedepends=('mesa' 'unzip' 'python' 'python-docutils') [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') options=(!emptydirs) -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('53a266106f4c0dd687af3f807727812c') +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz + mplayer2-20120729-fix-vf_lavc-compilation.patch + mplayer2-20120729-libquvi-support.patch) +md5sums=('53a266106f4c0dd687af3f807727812c' + 'b1e9188001d31b066488aa35401b62bc' + 'd5a23b19d1f84399526bd0dd9bae0e90') build() { - cd "${srcdir}"/$pkgname-$pkgver - - sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop - find -type f -exec sed -e 's/python3/python/' -i {} \; - - case $CARCH in - mips64el) ;; - *86*) extra=--enable-runtime-cpudetection;; - esac - - ./configure --prefix=/usr --confdir=/etc/mplayer \ - --enable-translation --language=all \ - --enable-joystick \ - --disable-speex \ - --disable-openal \ - --disable-libdv \ - --disable-musepack \ - $extra \ - --disable-mga - make + cd $srcdir/$pkgname-$pkgver + + patch -Np1 -i $srcdir/mplayer2-20120729-libquvi-support.patch + patch -Np1 -i $srcdir/mplayer2-20120729-fix-vf_lavc-compilation.patch + + sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop + find -type f -exec sed -e 's/python3/python/' -i {} \; + + [ "$CARCH" != "mips64el" ] && extra="--enable-runtime-cpudetection" + + ./configure --prefix=/usr --confdir=/etc/mplayer \ + --enable-translation --language=all \ + --enable-joystick \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + $extra + make } package() { - cd "${srcdir}"/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install - make DESTDIR="${pkgdir}" install - install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/ - install -dm755 "${pkgdir}"/usr/share/mplayer/ - ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf + install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/ + install -dm755 $pkgdir/usr/share/mplayer/ + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf $pkgdir/usr/share/mplayer/subfont.ttf - install -dm755 "${pkgdir}"/usr/share/applications/ - install -m 644 etc/mplayer.desktop "${pkgdir}"/usr/share/applications/ + install -dm755 $pkgdir/usr/share/applications/ + install -m 644 etc/mplayer.desktop $pkgdir/usr/share/applications/ } diff --git a/community/mplayer2/mplayer2-20120729-fix-vf_lavc-compilation.patch b/community/mplayer2/mplayer2-20120729-fix-vf_lavc-compilation.patch new file mode 100644 index 000000000..a50161305 --- /dev/null +++ b/community/mplayer2/mplayer2-20120729-fix-vf_lavc-compilation.patch @@ -0,0 +1,31 @@ +From f5e0365c8e76e2ef797027134f1819e613764d7e Mon Sep 17 00:00:00 2001 +From: Anton Khirnov <anton@khirnov.net> +Date: Wed, 19 Sep 2012 12:00:01 +0000 +Subject: vf_lavc: fix compilation with latest libav + +Remove a pointless and broken check for avctx->codec->encode. + +1) The check does not test for anything useful. +2) AVCodecContext.encode is a private field and is not supposed to be + accessed from outside of lavc. +2a) AVCodecContext.encode does not exist anymore in latest libavcodec, + so this block fails to build. +--- +diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c +index b2c1dd7..65e93a1 100644 +--- a/libmpcodecs/vf_lavc.c ++++ b/libmpcodecs/vf_lavc.c +@@ -76,11 +76,6 @@ static int config(struct vf_instance *vf, + return 0; + } + +- if (lavc_venc_context.codec->encode == NULL) { +- mp_msg(MSGT_VFILTER,MSGL_ERR,"avcodec init failed (ctx->codec->encode == NULL)!\n"); +- return 0; +- } +- + return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES); + } + +-- +cgit v0.9 diff --git a/community/mplayer2/mplayer2-20120729-libquvi-support.patch b/community/mplayer2/mplayer2-20120729-libquvi-support.patch new file mode 100644 index 000000000..f27fa690d --- /dev/null +++ b/community/mplayer2/mplayer2-20120729-libquvi-support.patch @@ -0,0 +1,277 @@ +From 37c124805c00ae0f2570c95f9543e39ce69793a6 Mon Sep 17 00:00:00 2001 +From: wm4 <wm4@mplayer2.org> +Date: Fri, 02 Mar 2012 19:24:34 +0000 +Subject: quvi: Add support for streaming sites using libquvi + +This enables playing URLs from libquvi supported streaming sites +directly, e.g. "mplayer http://www.youtube.com/watch?v=...." + +Anything opened with mplayer is checked with libquvi. If it looks like +a URL of a supported streaming site, libquvi is used to extract the +media URL, which is then passed to the lower level mplayer code +instead of the HTML URL. Hopefully the libquvi URL checker works well +enough that it doesn't cause any problems with normal URLs, files, or +whatever else mplayer's stream layer accepts. + +Add the --quvi-format option. The option value is directly passed +to libquvi as requested format. The only values that seem to work for +any streaming site seem to be "best" (best quality) and "default" +(lowest quality). The mplayer option defaults to "best" (overriding +libquvi's default). + +Outstanding issues: +- Does libquvi checking every opened file really not cause problems? + Should there be a runtime option to disable libquvi use? + (Probably not an issue.) +- Should we check/set the supported protocol? By default libquvi has + support for all protocols enabled. In the worst case, it might + return an URL using a protocol not supported by mplayer, even though + it could extract URLs with other protocols too. + (Probably not an issue.) +- Somehow export metadata (like media title) to the mplayer frontend? +--- +diff --git a/cfg-mplayer.h b/cfg-mplayer.h +index 5440de9..d8d556a 100644 +--- a/cfg-mplayer.h ++++ b/cfg-mplayer.h +@@ -517,6 +517,8 @@ const m_option_t common_opts[] = { + + OPT_MAKE_FLAGS("hr-mp3-seek", hr_mp3_seek, 0), + ++ OPT_STRING("quvi-format", quvi_format, 0), ++ + { "rawaudio", (void *)&demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + { "rawvideo", (void *)&demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + +diff --git a/configure b/configure +index 5c1e288..18bc404 100755 +--- a/configure ++++ b/configure +@@ -335,6 +335,7 @@ Optional features: + --enable-winsock2_h enable winsock2_h [autodetect] + --enable-smb enable Samba (SMB) input [autodetect] + --enable-live enable LIVE555 Streaming Media [disable] ++ --enable-libquvi enable libquvi [autodetect] + --enable-nemesi enable Nemesi Streaming Media [autodetect] + --disable-vcd disable VCD support [autodetect] + --disable-bluray disable Blu-ray support [autodetect] +@@ -650,6 +651,7 @@ _pvr=auto + networking=yes + _winsock2_h=auto + _smb=auto ++_libquvi=auto + _joystick=no + _xvid=auto + _libnut=auto +@@ -1009,6 +1011,8 @@ for ac_option do + --disable-winsock2_h) _winsock2_h=no ;; + --enable-smb) _smb=yes ;; + --disable-smb) _smb=no ;; ++ --enable-libquvi) _libquvi=yes ;; ++ --disable-libquvi) _libquvi=no ;; + --enable-joystick) _joystick=yes ;; + --disable-joystick) _joystick=no ;; + --enable-xvid) _xvid=yes ;; +@@ -3610,6 +3614,19 @@ else + fi + echores "$_smb" + ++echocheck "libquvi support" ++if test "$_libquvi" = auto ; then ++ _libquvi=no ++ if pkg_config_add libquvi ; then ++ _libquvi=yes ++ fi ++fi ++if test "$_libquvi" = yes; then ++ def_libquvi="#define CONFIG_LIBQUVI 1" ++else ++ def_libquvi="#undef CONFIG_LIBQUVI" ++fi ++echores "$_libquvi" + + ######### + # VIDEO # +@@ -6325,6 +6342,7 @@ LIBNEMESI = $_nemesi + LIBNUT = $_libnut + LIBPOSTPROC = $libpostproc + LIBSMBCLIENT = $_smb ++LIBQUVI = $_libquvi + LIBTHEORA = $_theora + LIRC = $_lirc + LIVE555 = $_live +@@ -6668,6 +6686,7 @@ $def_live + $def_nemesi + $def_networking + $def_smb ++$def_libquvi + $def_socklen_t + $def_vstream + +diff --git a/options.h b/options.h +index 48f5c53..89324bd 100644 +--- a/options.h ++++ b/options.h +@@ -78,6 +78,7 @@ typedef struct MPOpts { + char **audio_lang; + char **sub_lang; + int hr_mp3_seek; ++ char *quvi_format; + + char *audio_stream; + int audio_stream_cache; +diff --git a/stream/open.c b/stream/open.c +index ce0a415..91e9ae2 100644 +--- a/stream/open.c ++++ b/stream/open.c +@@ -26,12 +26,14 @@ + + #include "config.h" + #include "mp_msg.h" ++#include "talloc.h" + + #ifdef __FreeBSD__ + #include <sys/cdrio.h> + #endif + + #include "m_option.h" ++#include "options.h" + #include "stream.h" + #include "libmpdemux/demuxer.h" + +@@ -42,6 +44,62 @@ char* cdrom_device=NULL; + char* dvd_device=NULL; + int dvd_title=0; + ++#ifdef CONFIG_LIBQUVI ++ ++#include <quvi/quvi.h> ++ ++static const char *resolve_quvi(const char *url, struct MPOpts *opts) ++{ ++ char *media_title, *media_url; ++ quvi_media_t m; ++ QUVIcode rc; ++ quvi_t q; ++ ++ rc = quvi_init(&q); ++ if (rc != QUVI_OK) ++ return NULL; ++ ++ // Don't try to use quvi on an URL that's not directly supported, since ++ // quvi will do a network access anyway in order to check for HTTP ++ // redirections etc. ++ // The documentation says this will fail on "shortened" URLs. ++ if (quvi_supported(q, (char *)url) != QUVI_OK) { ++ quvi_close(&q); ++ return NULL; ++ } ++ ++ mp_msg(MSGT_OPEN, MSGL_INFO, "[quvi] Checking URL...\n"); ++ ++ // Can use quvi_query_formats() to get a list of formats like this: ++ // "fmt05_240p|fmt18_360p|fmt34_360p|fmt35_480p|fmt43_360p|fmt44_480p" ++ // (This example is youtube specific.) ++ // That call requires an extra net access. quvi_next_media_url() doesn't ++ // seem to do anything useful. So we can't really do anything useful ++ // except pass through the user's format setting. ++ quvi_setopt(q, QUVIOPT_FORMAT, opts->quvi_format ++ ? opts->quvi_format : "best"); ++ ++ rc = quvi_parse(q, (char *)url, &m); ++ if (rc != QUVI_OK) { ++ mp_msg(MSGT_OPEN, MSGL_ERR, "[quvi] %s\n", quvi_strerror(q, rc)); ++ quvi_close(&q); ++ return NULL; ++ } ++ ++ quvi_getprop(m, QUVIPROP_PAGETITLE, &media_title); ++ quvi_getprop(m, QUVIPROP_MEDIAURL, &media_url); ++ ++ mp_msg(MSGT_OPEN, MSGL_INFO, "[quvi] Site media title: '%s'\n", ++ media_title); ++ media_url = talloc_strdup(NULL, media_url); ++ ++ quvi_parse_close(&m); ++ quvi_close(&q); ++ ++ return media_url; ++} ++#endif ++ + // Open a new stream (stdin/file/vcd/url) + + stream_t* open_stream(const char *filename, struct MPOpts *options, +@@ -59,7 +117,16 @@ if(!filename) { + return NULL; + } + +-//============ Open STDIN or plain FILE ============ ++ const char *resolved = NULL; ++ ++#ifdef CONFIG_LIBQUVI ++ resolved = resolve_quvi(filename, options); ++#endif ++ ++ if (resolved) ++ filename = resolved; + +- return open_stream_full(filename,STREAM_READ,options,file_format); ++ stream_t *res = open_stream_full(filename,STREAM_READ,options,file_format); ++ talloc_free((void *)resolved); ++ return res; + } +-- +cgit v0.9 +From 86f7fe1ba61a465fb25bc30deaaa4fcf12600a43 Mon Sep 17 00:00:00 2001 +From: wm4 <wm4@nowhere> +Date: Sun, 02 Sep 2012 18:45:11 +0000 +Subject: configure: add version check for libquvi + +I do not know what exactly is the minimum working version. Require the +latest version currently released, which is about half a year old. +--- +diff --git a/configure b/configure +index 2cf7aff..6a3298f 100755 +--- a/configure ++++ b/configure +@@ -3445,7 +3445,7 @@ echores "$_smb" + echocheck "libquvi support" + if test "$_libquvi" = auto ; then + _libquvi=no +- if pkg_config_add libquvi ; then ++ if pkg_config_add 'libquvi >= 0.4.1' ; then + _libquvi=yes + fi + fi +-- +cgit v0.9 +diff --git a/cfg-mplayer.h b/cfg-mplayer.h +index b889661..8b07091 100644 +--- a/cfg-mplayer.h ++++ b/cfg-mplayer.h +@@ -485,7 +485,7 @@ const m_option_t common_opts[] = { + + OPT_MAKE_FLAGS("hr-mp3-seek", hr_mp3_seek, 0), + +- OPT_STRING("quvi-format", quvi_format, 0), ++ OPT_STRING("quvi-format", quvi_format, 0, OPTDEF_STR("best")), + + { "rawaudio", (void *)&demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + { "rawvideo", (void *)&demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, +diff --git a/stream/open.c b/stream/open.c +index 91e9ae2..16d0dc3 100644 +--- a/stream/open.c ++++ b/stream/open.c +@@ -76,8 +76,7 @@ static const char *resolve_quvi(const char *url, struct MPOpts *opts) + // That call requires an extra net access. quvi_next_media_url() doesn't + // seem to do anything useful. So we can't really do anything useful + // except pass through the user's format setting. +- quvi_setopt(q, QUVIOPT_FORMAT, opts->quvi_format +- ? opts->quvi_format : "best"); ++ quvi_setopt(q, QUVIOPT_FORMAT, opts->quvi_format); + + rc = quvi_parse(q, (char *)url, &m); + if (rc != QUVI_OK) { +-- +cgit v0.9 diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index c0ea3d86c..e5cdbec00 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73778 2012-07-15 13:21:04Z arodseth $ +# $Id: PKGBUILD 78951 2012-10-27 23:57:00Z ebelanger $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: yosh64 <yosh64.at.gmail.dot.com> pkgname=mtpaint pkgver=3.40 -pkgrel=4 +pkgrel=5 pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork" arch=('i686' 'x86_64' 'mips64el') url="http://mtpaint.sourceforge.net/" diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD index 3cbac92fc..ff3cf3c67 100644 --- a/community/multipath-tools/PKGBUILD +++ b/community/multipath-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75262 2012-08-17 10:00:23Z bpiotrowski $ +# $Id: PKGBUILD 80194 2012-11-17 14:32:27Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas S Hatch <thatch45 ar gmail dot com> # Contributor: Michael P <ptchinster@archlinux.us> @@ -6,7 +6,7 @@ pkgname=multipath-tools pkgver=0.4.9 -pkgrel=10 +pkgrel=11 pkgdesc='Multipath tools for Linux' arch=('i686' 'x86_64' 'mips64el') url="http://christophe.varoqui.free.fr/" @@ -14,7 +14,7 @@ license=('GPL') depends=('bash' 'libaio' 'device-mapper') backup=('etc/multipath.conf' 'etc/multipath.conf.annotated') install=multipath-tools.install -options=(!emptydirs) +options=(!emptydirs !strip) source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2 rc.d service multipath.conf multipath.conf.annotated fix-build.patch buffer-overflows.patch log_enquery_overflow.patch @@ -50,4 +50,6 @@ package() { install -Dm644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated install -Dm755 rc.d "$pkgdir"/etc/rc.d/multipathd install -Dm644 service "$pkgdir"/usr/lib/systemd/system/multipathd.service + + find $pkgdir -type f -exec sed 's/sbin/bin/g' -i {} \; } diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 4a9e0c106..28612f39e 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78022 2012-10-16 04:42:30Z jconder $ +# $Id: PKGBUILD 80156 2012-11-16 23:35:58Z ioni $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.26.0 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') diff --git a/community/nautilus-sound-converter/PKGBUILD b/community/nautilus-sound-converter/PKGBUILD index 51702f449..00157594d 100644 --- a/community/nautilus-sound-converter/PKGBUILD +++ b/community/nautilus-sound-converter/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68972 2012-04-06 16:41:18Z bgyorgy $ +# $Id: PKGBUILD 79481 2012-11-06 03:41:36Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=nautilus-sound-converter pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Nautilus extension to convert audio files formats" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/nautilus-sound-converter/" @@ -14,6 +14,7 @@ optdepends=('gstreamer0.10-good-plugins: Extra media codecs' 'gstreamer0.10-ugly-plugins: Extra media codecs' 'gstreamer0.10-bad-plugins: Extra media codecs' 'gstreamer0.10-ffmpeg: Extra media codecs') +conflicts=('totem>=3.6.0') options=('!libtool') install=$pkgname.install source=(http://nautilus-sound-converter.googlecode.com/files/$pkgname-$pkgver.tar.xz) diff --git a/community/ncmpcpp/PKGBUILD b/community/ncmpcpp/PKGBUILD index 5891c13d4..2dd5819df 100644 --- a/community/ncmpcpp/PKGBUILD +++ b/community/ncmpcpp/PKGBUILD @@ -1,33 +1,38 @@ -# $Id: PKGBUILD 74221 2012-07-23 03:07:58Z allan $ +# $Id: PKGBUILD 80358 2012-11-20 16:00:53Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski -# Contributor: Mateusz Herych <heniekk@gmail.com> +# Contributor: graysky <graysky AT archlinux DOT us> +# Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Army <uli[dot]armbruster[at]gmail[dot]com> pkgname=ncmpcpp pkgver=0.5.10 -pkgrel=2 -pkgdesc="An almost exact clone of ncmpc with some new features." +pkgrel=4 +pkgdesc='Almost exact clone of ncmpc with some new features' arch=('i686' 'x86_64' 'mips64el') -url="http://unkart.ovh.org/ncmpcpp/" +url='http://ncmpcpp.rybczak.net/' license=('GPL') -depends=('curl' 'libmpdclient' 'taglib' 'ncurses') +depends=('curl' 'libmpdclient' 'taglib' 'ncurses' 'fftw') install=ncmpcpp.install -source=(http://unkart.ovh.org/ncmpcpp/${pkgname}-${pkgver}.tar.bz2) +source=(http://ncmpcpp.rybczak.net/stable/$pkgname-$pkgver.tar.bz2) md5sums=('298ed66325bcfe358e37e186c7ea4861') build() { - cd "$srcdir/${pkgname}-${pkgver}" + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr \ - --enable-unicode \ --enable-clock \ - --with-taglib \ --enable-outputs \ - --with-curl + --enable-unicode \ + --enable-visualizer \ + --with-curl \ + --with-fftw \ + --with-taglib make } package() { - cd "$srcdir/${pkgname}-${pkgver}" + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install - make DESTDIR="$pkgdir" install + make -C extras/ + install -Dm755 extras/artist_to_albumartist $pkgdir/usr/bin/ } diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index 49ec571c1..641b13b5f 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75745 2012-08-30 17:41:15Z arodseth $ +# $Id: PKGBUILD 79336 2012-11-03 04:08:33Z bgyorgy $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: jordz <jordz@archlinux.us> pkgname=nemiver pkgver=0.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="C/C++ debugger for GNOME" arch=('x86_64' 'i686') license=('GPL') diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD index d03528a26..b0fee1ae2 100644 --- a/community/nestopia/PKGBUILD +++ b/community/nestopia/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77858 2012-10-15 10:08:57Z spupykin $ +# $Id: PKGBUILD 80697 2012-11-29 16:17:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com> # Contributor: robb_force <robb_force@holybuffalo.net> pkgname=nestopia -pkgver=1.42 -pkgrel=4 +pkgver=1.43 +pkgrel=1 pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' url='http://0ldsk00l.ca/nestopia.html' license=('GPL') @@ -14,12 +14,13 @@ depends=('sdl' 'alsa-lib' 'gtk3' 'glu') makedepends=('unzip' 'mesa') source=("$pkgname-$pkgver.tar.gz::https://github.com/rdanbrook/nestopia/tarball/$pkgver" "build-fix.patch") -md5sums=('ce7ffba59f19c764f08546e015777172' +md5sums=('c73d45015eb16b9870a620a188a23275' '49dc5a51243a023b47f25ff3d6aabd89') build() { cd ${srcdir}/rdanbrook-nestopia-* patch -p1 <$srcdir/build-fix.patch + export LDFLAGS=-lX11 make PREFIX=/usr -j1 } diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 62ffecfaa..40c3e359e 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 76652 2012-09-25 18:40:48Z bpiotrowski $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> +# $Id: PKGBUILD 80209 2012-11-17 16:39:31Z bpiotrowski $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> _cfgdir=/etc/nginx _tmpdir=/var/lib/nginx pkgname=nginx -pkgver=1.2.4 -pkgrel=1 -pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" +pkgver=1.2.5 +pkgrel=2 +pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64' 'mips64el') -depends=('pcre' 'zlib' 'openssl') +depends=('pcre' 'zlib' 'openssl' 'geoip') makedepends=('passenger') optdepends=('passenger') url="http://nginx.org" @@ -31,7 +31,7 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz rc.d service nginx.logrotate) -md5sums=('a7c9a515f632c8cbb07ab67392208088' +md5sums=('4f5a55187a3d45fa37d99d07ddd90800' 'f62c7c9b5a53471d4666a4c49ad363fb' '62d494d23aef31d0b867161f9fffa6eb' 'b38744739022876554a0444d92e6603b') @@ -57,17 +57,16 @@ build() { --with-ipv6 --with-pcre-jit \ --with-file-aio \ --with-http_dav_module \ + --with-http_geoip_module \ --with-http_gzip_static_module \ --with-http_realip_module \ --with-http_ssl_module \ --with-http_stub_status_module \ --add-module=/usr/lib/passenger/ext/nginx \ #--with-http_mp4_module \ - #--with-http_realip_module \ #--with-http_addition_module \ #--with-http_xslt_module \ #--with-http_image_filter_module \ - #--with-http_geoip_module \ #--with-http_sub_module \ #--with-http_flv_module \ #--with-http_random_index_module \ diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 59db457f8..782423088 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77604 2012-10-13 08:08:33Z bpiotrowski $ +# $Id: PKGBUILD 80635 2012-11-27 18:58:23Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,34 +8,33 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.8.12 +pkgver=0.8.15 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') url='http://nodejs.org/' license=('MIT') -depends=('openssl' 'python2') #'v8') +depends=('openssl' 'python2' 'v8') checkdepends=('curl') # curl used for check() options=('!emptydirs') source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -md5sums=('2d053e4d08e6b44747ed2f519a8b20be') +md5sums=('6cb31180b07475db103e694f65e8bb9b') build() { cd node-v${pkgver} msg 'Fixing for python2 name' - find -type f -exec sed -e 's_^#!/usr/bin/env python$_&2_' -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' -e 's_^#!/usr/bin/python$_&2_' -e "s_'python'_'python2'_" -i {} \; - find test -type f -exec sed -e "s|python |python2 |" -i {} \; - sed -i "s|python |python2 |" Makefile - + find -type f -exec sed \ + -e 's_^#!/usr/bin/env python$_&2_' \ + -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' \ + -e 's_^#!/usr/bin/python$_&2_' \ + -e "s_'python'_'python2'_" -i {} \; + find test/ -type f -exec sed 's_python _python2 _' -i {} \; export PYTHON=python2 ./configure \ --prefix=/usr \ - --shared-openssl \ -# --shared-v8 \ -# --shared-v8-libpath=/usr/lib \ -# --shared-v8-includes=/usr/include + --shared-openssl make } diff --git a/community/noip/PKGBUILD b/community/noip/PKGBUILD index 1d9afbe5d..66a10d0c0 100644 --- a/community/noip/PKGBUILD +++ b/community/noip/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 67996 2012-03-16 23:45:15Z giovanni $ +# $Id: PKGBUILD 79265 2012-11-02 00:34:36Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Daenyth # Contributor: Lyle Putnam <lcputnam@amerytel.net> -# Maintainer: Daenyth pkgname=noip pkgver=2.1.9 -pkgrel=3 -pkgdesc="A Dynamic DNS Client Updater for no-ip.com services" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.no-ip.com/downloads.php?page=linux" +pkgrel=4 +pkgdesc='Dynamic DNS Client Updater for no-ip.com services' +arch=('x86_64' 'i686' 'mips64el') +url='http://www.no-ip.com/downloads.php?page=linux' license=('GPL') -backup=('etc/no-ip2.conf') +depends=('bash') +#backup=('etc/no-ip2.conf') install=noip.install -# Note that they have the one file for the current release, so if the md5sum breaks, it means they updated. -source=("http://www.no-ip.com/client/linux/noip-duc-linux.tar.gz" - 'noip-rc.d') -md5sums=('3b0f5f2ff8637c73ab337be403252a60' - '63253de6f4d847015d111e5e5b20f2cf') +source=('http://www.no-ip.com/client/linux/noip-duc-linux.tar.gz' + 'noip-rc.d' + 'noip2.service') +sha256sums=('82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593' + '95bbebf584e0bc33186fb95f76a85bbd103fcea8ca073c7e4d36a811c3ac5d5d' + '624553d92d69bb76cb457a056a7722dc051b5bbd17ea0e622b5cc08909019ea5') build() { cd $srcdir/$pkgname-$pkgver-1 @@ -23,12 +26,15 @@ build() { # Their Makefile is fucking horrid, do it by hand instead sed -i '/^#define CONFIG_FILEPATH/s/PREFIX//' noip2.c sed -i '/^#define CONFIG_FILENAME/s/PREFIX//' noip2.c - gcc -Wall $CLFAGS $LDFLAGS -g -Dlinux -DPREFIX="/usr" noip2.c -o noip2 + cc -Wall $CFLAGS $LDFLAGS -g -Dlinux -DPREFIX=/usr noip2.c -o noip2 } package() { cd $srcdir/$pkgname-$pkgver-1 install -Dm755 noip2 $pkgdir/usr/bin/noip2 - install -Dm755 $srcdir/noip-rc.d $pkgdir/etc/rc.d/noip + install -Dm755 ../noip-rc.d $pkgdir/etc/rc.d/noip + install -Dm644 ../noip2.service $pkgdir/usr/lib/systemd/system/noip2.service } + +# vim:set ts=2 sw=2 et: diff --git a/community/noip/noip.install b/community/noip/noip.install index 8e0252a4b..1207f20e4 100644 --- a/community/noip/noip.install +++ b/community/noip/noip.install @@ -1,11 +1,6 @@ -# arg 1: the new package version post_install() { - echo "" - echo "####################################################" - echo "# IMPORTANT! #" - echo "# BEFORE running noip2 YOU MUST CONFIGURE IT! #" - echo "# To configure noip2 run the command \"noip2 -C -Y\" #" - echo "####################################################" - echo "" - sleep 2 + echo + echo 'Before running noip2 you must configure it.' + echo 'To configure noip2 run the command "noip2 -C -Y"' + echo } diff --git a/community/noip/noip2.service b/community/noip/noip2.service new file mode 100644 index 000000000..2ad0ba867 --- /dev/null +++ b/community/noip/noip2.service @@ -0,0 +1,10 @@ +[Unit] +Description=No-IP Dynamic DNS Update Client +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/noip2 -c /etc/no-ip2.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/notify-osd/PKGBUILD b/community/notify-osd/PKGBUILD new file mode 100644 index 000000000..431581ae0 --- /dev/null +++ b/community/notify-osd/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 79663 2012-11-10 19:03:29Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Johannes Pfau <johannespfau at gmail dot com> + +pkgname=notify-osd +pkgver=0.9.34 +pkgrel=1 +pkgdesc="Canonical's on-screen-display notification agent, implementing the freedesktop.org Desktop Notifications Specification with semi-transparent click-through bubbles" +arch=('i686' 'x86_64') +url="https://launchpad.net/notify-osd" +license=('GPL') +depends=('libwnck3' 'dbus-glib' 'dconf' 'gsettings-desktop-schemas') +makedepends=('libnotify') +provides=('notification-daemon') +install=$pkgname.install +source=(http://launchpad.net/$pkgname/precise/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('18d9a95467daac570789fb7893011595') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ + --disable-static --disable-schemas-compile + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # Remove readme file from non-standard location + rm "$pkgdir/usr/share/notify-osd/icons/hicolor/scalable/status/README" +} diff --git a/community/notify-osd/notify-osd.install b/community/notify-osd/notify-osd.install new file mode 100644 index 000000000..f8470c77c --- /dev/null +++ b/community/notify-osd/notify-osd.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index c29a0054a..e56fa63ec 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70297 2012-05-03 22:44:04Z spupykin $ +# $Id: PKGBUILD 79563 2012-11-07 15:09:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20120504 +pkgver=20121107 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" @@ -23,8 +23,9 @@ _gitroots=("git://notion.git.sourceforge.net/gitroot/notion/notion" "git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama" "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents" "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr" + "git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux" "git://notion.git.sourceforge.net/gitroot/notion/contrib") -#source=(https://downloads.sourceforge.net/project/notion/notion-3-2011102900-src.tar.bz2) +md5sums=() md5sums=() build() { @@ -47,7 +48,7 @@ build() { # copy to notion-build rm -rf ${srcdir}/notion-build cp -r ${srcdir}/notion ${srcdir}/notion-build - for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr mod_notionflux notion-doc; do cp -r ${srcdir}/$i ${srcdir}/notion-build/ done @@ -58,23 +59,14 @@ build() { -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \ -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \ -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \ - -i system.mk + -i system-autodetect.mk make INCLUDES=-I${srcdir}/notion-build - # doc workaround - for i in ioncore mod_tiling mod_query de mod_menu mod_dock mod_sp mod_statusbar; do - (cd $i && make _exports_doc) - done - # build doc and modules for i in mod_xinerama mod_xkbevents mod_xrandr; do (cd $i && make -j1 TOPDIR=.. all) done - mkdir notion-doc/notionconf-onepage - mkdir notion-doc/notionnotes-onepage - (cd notion-doc && make -j1 TOPDIR=.. all) || true - sed -i 's|mod_query.exec_on_merr|mod\\_query.exec\\_on\\_merr|g' notion-doc/ioncore.exports (cd notion-doc && make -j1 TOPDIR=.. all) } diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD new file mode 100644 index 000000000..837d08626 --- /dev/null +++ b/community/notmuch/PKGBUILD @@ -0,0 +1,97 @@ +# $Id: PKGBUILD 80453 2012-11-21 23:29:49Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: fauno <fauno at kiwwwi.com.ar> +# Contributor: Olivier Ramonat <olivier at ramonat dot fr> +# Contributor: Richard Murri <admin@richardmurri.com> + +pkgbase=notmuch +pkgname=('notmuch' 'notmuch-mutt' 'notmuch-runtime') +pkgver=0.14 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://notmuchmail.org/" +license=('GPL3') +makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc') +options=(!distcc !makeflags) +source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz") +md5sums=('5eb3f225d3eb37862932f6baa5780d15') + +build() { + cd "$srcdir/${pkgname}-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc + make + (cd "${srcdir}/$pkgname-${pkgver}/contrib/${pkgname}-mutt" + make ${pkgname}-mutt.1) + + cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver" + + cd bindings/ruby + ruby extconf.rb + make + + cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2} + + cd "$srcdir/${pkgname}-${pkgver}/bindings/python" + env LD_LIBRARY_PATH="." python setup.py build + + cd "$srcdir/${pkgname}-${pkgver}/bindings/python2" + find "." -name '*.py' -print0 |xargs -0 \ + sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \ + -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,' + env LD_LIBRARY_PATH="." python2 setup.py build + +} + +package_notmuch-runtime(){ + pkgdesc="Runtime for notmuch and notmuch-mutt" + depends=('xapian-core' 'gmime' 'talloc') + cd "$srcdir/${pkgname}-$pkgver" + make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install + + install -Dm644 notmuch "$pkgdir/usr/sbin/notmuch" + + mkdir -p "$pkgdir"/usr/share/vim/vimfiles/{plugin,syntax} + + make -C vim prefix="$pkgdir/usr/share/vim/vimfiles" install + + # Remove conflicting zsh completion + rm -r ${pkgdir}/usr/share/zsh +} + + +package_notmuch(){ + pkgdesc="Notmuch is not much of an email program" + depends=('notmuch-runtime') + optdepends=('emacs: for using the emacs interface' + 'vim: for using the vim interface' + 'python2: for using the python2 bindings' + 'ruby: for using the ruby bindings' + 'gnupg: for email encryption') + + cd "$srcdir/${pkgname}-$pkgver" + + # Install python bindings + cd "$srcdir/${pkgname}-${pkgver}/bindings/python2" + env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root="$pkgdir" + + cd "$srcdir/${pkgname}-${pkgver}/bindings/python" + env LD_LIBRARY_PATH="." python setup.py install --prefix=/usr --root="$pkgdir" + + # Install ruby bindings + cd "$srcdir/${pkgname}-${pkgver}/bindings/ruby" + sed -i -e 's,/site_ruby,,g' Makefile + make prefix="${pkgdir}/usr" install + +} + +package_notmuch-mutt(){ + pkgdesc="The mail indexer" + depends=('notmuch-runtime' 'perl-mailtools' 'perl-mail-box' 'perl-term-readline-gnu' 'perl-string-shellquote' 'perl-file-which') + cd "$srcdir/$pkgbase-runtime-$pkgver" + + install -Dm755 "contrib/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname" + install -Dm644 "contrib/$pkgname/${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz" +} + +#vim: set filetype=PKGBUILD sw=4 ts=4 et diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index 01f0e6550..e6924173f 100644 --- a/community/nsd/PKGBUILD +++ b/community/nsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74423 2012-07-28 07:26:34Z bisson $ +# $Id: PKGBUILD 79243 2012-11-01 17:25:44Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=nsd -pkgver=3.2.13 -pkgrel=2 +pkgver=3.2.14 +pkgrel=1 pkgdesc='Authoritative only, high performance and simple DNS server' url='http://www.nlnetlabs.nl/nsd/' license=('BSD') @@ -14,7 +14,7 @@ makedepends=('flex') arch=('i686' 'x86_64' 'mips64el') source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'service') -sha1sums=('2cb44f75e9686fd73c7ee9765857a36a8fe5bca9' +sha1sums=('78390145ec392b520d88c19fc99c544dd1426959' '1cfa2d7254139be50f11753d4e07281ed2af36eb') install=install diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD index ae9e07fad..a730c20b3 100644 --- a/community/ntop/PKGBUILD +++ b/community/ntop/PKGBUILD @@ -1,35 +1,31 @@ -# $Id: PKGBUILD 75300 2012-08-18 10:30:18Z lfleischer $ +# $Id: PKGBUILD 79619 2012-11-08 23:54:27Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=ntop -pkgver=5.0 -pkgrel=2 +pkgver=5.0.1 +pkgrel=1 pkgdesc='A network traffic probe that shows the network usage.' arch=('i686' 'x86_64' 'mips64el') url='http://www.ntop.org/' license=('GPL') depends=('libevent' 'libpcap' 'gd' 'glibc' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua') -makedepends=('subversion' 'ca-certificates') +makedepends=('subversion' 'wget' 'ca-certificates') options=('!libtool' '!makeflags') install='ntop.install' source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz" 'ntop' 'ntop.conf.d' 'ntop.service') -md5sums=('e4115a6609fd2def2dce177772f9a789' +md5sums=('01710b6925a8a5ffe1a41b8b512ebd69' '7b0d7bb57432e768ff387e9f7236f87c' '6a9371de1dcf31d8ef13a4cf349c02b3' - 'bcb2bcfb4b573babdee7d9321591e3e3') + '0e149d20f881600e8387d850ac268483') build() { cd "${srcdir}/${pkgname}-${pkgver}" - echo 't' | svn export -r 5614 'https://svn.ntop.org/svn/ntop/trunk/nDPI/' - tar -czvf nDPI-svn5614.tar.gz nDPI - - ./autogen.sh --noconfig - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --disable-snmp + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --disable-snmp make } diff --git a/community/ntop/ntop.service b/community/ntop/ntop.service index 20a9c66f9..c18a2c83a 100644 --- a/community/ntop/ntop.service +++ b/community/ntop/ntop.service @@ -6,7 +6,7 @@ After=syslog.target network.target [Service] Environment=LANG=C -ExecStart=/usr/sbin/ntop -i eth0 -w 3000 +ExecStart=/usr/bin/ntop -i eth0 -w 3000 Type=simple StandardError=syslog diff --git a/community/nvdock/PKGBUILD b/community/nvdock/PKGBUILD deleted file mode 100644 index cd8728d08..000000000 --- a/community/nvdock/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 59826 2011-11-30 20:47:00Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Matthew Sharpe <matt.sharpe@gmail.com> - -pkgname=nvdock -pkgver=1.02 -pkgrel=4 -pkgdesc="A tray icon for easy launching of the NVIDIA control panel" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.opsat.net/user/bob/projects/nvdock" -license=('BSD') -depends=('gtk2') -makedepends=('glib') -source=("http://bobmajdakjr.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") -md5sums=('e18c4eeff936dc3b671fd8b5a9bb5145') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - install -D -m755 build/nvdock "${pkgdir}/usr/bin/nvdock" - install -D -m644 data/nvdock.png "${pkgdir}/usr/share/pixmaps/nvdock.png" - install -D -m644 data/nvdock.desktop "${pkgdir}/usr/share/applications/nvdock.desktop" - - # Install license - install -D COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD index 7fe814c91..df45494ad 100644 --- a/community/oath-toolkit/PKGBUILD +++ b/community/oath-toolkit/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 77539 2012-10-11 23:18:29Z seblu $ +# $Id: PKGBUILD 78852 2012-10-25 22:57:45Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: L42y <423300@gmail.com> pkgname=oath-toolkit -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc='OATH one-time password toolkit' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/oath-toolkit/' license=('GPL3') -depends=('glibc' 'pam' 'libxml2') +depends=('glibc' 'pam' 'xmlsec') options=('!libtool') source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('2da5d9211062dfd746539c783185fae1') +md5sums=('529e5995ae0d95a94daa16f9b9c25e3c') build() { cd $pkgname-$pkgver @@ -21,6 +21,11 @@ build() { make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD index 9b72ec7f5..a9ec80086 100644 --- a/community/onboard/PKGBUILD +++ b/community/onboard/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78453 2012-10-18 21:14:21Z bgyorgy $ +# $Id: PKGBUILD 79142 2012-10-31 02:45:48Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=onboard -pkgver=0.98.1 -pkgrel=2 +pkgver=0.98.2 +pkgrel=1 pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/onboard" @@ -14,19 +14,11 @@ optdepends=('at-spi2-atk: auto-show when editing text' 'mousetweaks: hover click with mouse') options=('!emptydirs') install=$pkgname.install -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz - 1012_1011.diff - 1013_1012.diff) -md5sums=('107e031b429329b71deb67c9b90195d6' - '4323f43510003850e127cd0fefdd3e4c' - '6c7751ecd92532844ecb7e65e4f4746b') +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('7b44ab2873ca7b76ff1d9ab0b3398487') -package() { +build() { cd "$srcdir/$pkgname-$pkgver" - # Python 3.3 compatibility fixes - patch -Np0 -i "$srcdir/1012_1011.diff" - patch -Np0 -i "$srcdir/1013_1012.diff" - python3 setup.py install --root=$pkgdir/ --optimize=1 } diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD deleted file mode 100644 index b32c0a973..000000000 --- a/community/open-vm-tools-modules/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 72483 2012-06-15 13:20:41Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Krzysztof Raczkowski <raczkow@gmail.com> - -pkgname=open-vm-tools-modules -pkgver=2012.05.21 -_pkgsubver=724730 -pkgrel=1 -pkgdesc="kernel modules for the open source implementation of VMware Tools" -arch=('i686' 'x86_64' 'mips64el') -url="http://open-vm-tools.sourceforge.net/" -license=('GPL') -makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers') -depends=("linux") -install=$pkgname.install -options=('!strip') -source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz" - "modprobe.conf") -md5sums=('91affb5b23db8abceff930613845f434' - 'ac9b8e3cb798f5056ca92767ec705117') - -build() { - _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` - KERNEL_RELEASE=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version` - - cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" - sed -i 's|proc-3.2.8|procps|g' configure - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr \ - --without-x --with-kernel-release=$KERNEL_RELEASE - - cd modules - make modules -j1 -} - -package() { - _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` - depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`") - KERNEL_VERSION=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version` - msg "Kernel = $KERNEL_VERSION" - - cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" - mkdir -p $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/ - for MOD in `find -type f -name '*.ko'`; do - install -Dm644 $MOD $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/ - done - gzip $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/*.ko - - install -D -m 644 ${srcdir}/modprobe.conf ${pkgdir}/etc/modprobe.d/${pkgname}.conf - sed -i "s|extramodules-.*-ARCH|extramodules-3.${_kernver}-ARCH|" $startdir/$pkgname.install -} diff --git a/community/open-vm-tools-modules/modprobe.conf b/community/open-vm-tools-modules/modprobe.conf deleted file mode 100644 index b72fcc61a..000000000 --- a/community/open-vm-tools-modules/modprobe.conf +++ /dev/null @@ -1,2 +0,0 @@ -#VMware net driver -install pcnet32 /sbin/modprobe -q --ignore-install vmxnet; /sbin/modprobe -q --ignore-install pcnet32 ; /bin/true; diff --git a/community/open-vm-tools-modules/open-vm-tools-modules.install b/community/open-vm-tools-modules/open-vm-tools-modules.install deleted file mode 100644 index b8f6dd618..000000000 --- a/community/open-vm-tools-modules/open-vm-tools-modules.install +++ /dev/null @@ -1,23 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.3-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) - echo ">>> Enabling vmxnet driver in /etc/modprobe.d/open-vm-tools-modules.conf" - echo ">>> (this will disable pcnet32 driver)" - echo ">>>" - echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually" - echo ">>> disable loading of pcnet32 driver" - echo ">>>" -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.3-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.3-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) - echo ">>>" - echo ">>> Remember to un-blacklist pcnet32 driver" - echo ">>>" -} diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD deleted file mode 100644 index 32f291c36..000000000 --- a/community/open-vm-tools/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 72492 2012-06-15 13:37:19Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Krzysztof Raczkowski <raczkow@gmail.com> - -pkgname=open-vm-tools -pkgver=2012.05.21 -_pkgsubver=724730 -pkgrel=1 -pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" -arch=('i686' 'x86_64') -url="http://open-vm-tools.sourceforge.net/" -license=('LGPL') -depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps-ng' 'uriparser' 'libsigc++' 'libxss') -makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse' 'libxtst') -optdepends=('gtkmm' 'libnotify' 'libxtst' 'fuse' 'libsm') -options=('docs' '!libtool') -install=$pkgname.install -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}.tar.gz - scripts-network.patch - scripts-network-FS19541.patch - open-vm-tools-X11Bool.patch - open-vm-tools.conf.d - open-vm-tools.rc.d - tools.conf - vmware-guestd - xautostart.conf) -md5sums=('91affb5b23db8abceff930613845f434' - 'b8f68fef3d388489e40dba581b6da18a' - '199508b0d3fe6fa9b726d09170bf51f1' - '8c333a979578bdc0c3134c1dd6bb7353' - '79b0a14d86191fee70a4639da8bd7785' - '67cb83a9e5a4dd016c1a1da2863ca36d' - 'b55d15e2c4be396aad709aeca91033d3' - '1b9ae908fce4c623269f100ee9bdfdef' - '75a25d83417e683957321f97a00f8465') - -build() { - cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" - - [ -f Makefile ] || CUSTOM_PROCPS_NAME="procps" ./configure --prefix=/usr --without-kernel-modules - make -} - -package() { - cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" - - make install DESTDIR="$pkgdir" - install -Dm0644 vmware-user-suid-wrapper/vmware-user.desktop $pkgdir/usr/share/applications/vmware-user.desktop - install -D -m 755 scripts/common/vmware-xdg-detect-de "$pkgdir"/usr/bin/vmware-xdg-detect-de - chmod 07755 "$pkgdir"/usr/bin/vmware-user-suid-wrapper - - cd "$pkgdir" - patch -p1 -i "$srcdir"/scripts-network.patch etc/vmware-tools/scripts/vmware/network - patch -p1 -i "$srcdir"/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network - - install -Dm0755 "$srcdir"/open-vm-tools.rc.d "$pkgdir"/etc/rc.d/open-vm-tools - install -Dm0644 "$srcdir"/open-vm-tools.conf.d "$pkgdir"/etc/conf.d/open-vm-tools - install -Dm0644 "$srcdir"/tools.conf "$pkgdir"/etc/vmware-tools/tools.conf - install -Dm0644 "$srcdir"/xautostart.conf "$pkgdir"/etc/vmware-tools/xautostart.conf - install -Dm0644 "$srcdir"/vmware-guestd "$pkgdir"/etc/pam.d/vmware-guestd - rm -rf "$pkgdir"/usr/etc - - ln -fs /usr/sbin/mount.vmhgfs "$pkgdir"/sbin/mount.vmhgfs - - cd "$pkgdir" && find -type f -exec sh -c "file {} | grep ELF >/dev/null && echo {} && chrpath -d {}" \; -} diff --git a/community/open-vm-tools/open-vm-tools-X11Bool.patch b/community/open-vm-tools/open-vm-tools-X11Bool.patch deleted file mode 100644 index f12581807..000000000 --- a/community/open-vm-tools/open-vm-tools-X11Bool.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -wbBur open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h ---- open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h 2010-08-24 19:59:22.000000000 +0000 -+++ open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h 2010-08-30 09:38:48.000000000 +0000 -@@ -83,8 +83,11 @@ - - /* STRICT ANSI means the Xserver build and X defines Bool differently. */ - #if !defined(__STRICT_ANSI__) || defined(__FreeBSD__) || defined(__MINGW32__) -+# ifndef _XTYPEDEF_BOOL -+# define _XTYPEDEF_BOOL - typedef char Bool; - #endif -+#endif - - #ifndef FALSE - #define FALSE 0 diff --git a/community/open-vm-tools/open-vm-tools.conf.d b/community/open-vm-tools/open-vm-tools.conf.d deleted file mode 100644 index 83f7864e8..000000000 --- a/community/open-vm-tools/open-vm-tools.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# Enable support for Drag'n'Drop -VM_DRAG_AND_DROP="yes" - -# vmware-guestd settings -GUESTD_BIN="/usr/sbin/vmware-guestd" -PIDFILE="/var/run/vmware-guestd.pid" diff --git a/community/open-vm-tools/open-vm-tools.install b/community/open-vm-tools/open-vm-tools.install deleted file mode 100644 index 88d9b88e6..000000000 --- a/community/open-vm-tools/open-vm-tools.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - [ ! -d "/mnt/hgfs" ] && mkdir /mnt/hgfs - echo ">>>" - echo ">>> You can mount VMware Shared Folders via:" - echo ">>> mount -t vmhgfs .host:/ /mnt/hgfs" - echo ">>>" - echo ">>> or by adding this line to /etc/fstab:" - echo ">>> .host:/ /mnt/hgfs vmhgfs defaults 0 0" - echo ">>>" -} diff --git a/community/open-vm-tools/open-vm-tools.rc.d b/community/open-vm-tools/open-vm-tools.rc.d deleted file mode 100644 index 0c9221489..000000000 --- a/community/open-vm-tools/open-vm-tools.rc.d +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/open-vm-tools ] && . /etc/conf.d/open-vm-tools - -PID=`pidof -o %PPID /usr/bin/vmtoolsd` -case "$1" in - start) - stat_busy "Starting Open Virtual Machine Tools" - - if [ "$VM_DRAG_AND_DROP" == "yes" ]; then - VMBLOCK=`grep -w vmblock /proc/modules` - [ -z "$VMBLOCK" ] && modprobe vmblock - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - - DND_TMPDIR="/tmp/VMwareDnD" - if [ ! -d "$DND_TMPDIR" ]; then - mkdir $DND_TMPDIR - chmod 1777 $DND_TMPDIR - fi - - mount -t vmblock none /proc/fs/vmblock/mountPoint - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - fi - - - for m in vmhgfs vmsync; do - VMMOD=`grep -w $m /proc/modules` - [ -z "$VMMOD" ] && \ - { modprobe $m - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi; } - done - - - [ -z "$PID" ] && /usr/bin/vmtoolsd --background $PIDFILE - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon open-vm-tools - stat_done - fi - ;; - stop) - stat_busy "Stopping Open Virtual Machine Tools" - [ ! -z "$PID" ] && kill $PID &>/dev/null -# if [ $? -gt 0 ]; then -# stat_fail -# exit 1 -# fi - - for m in vmhgfs vmsync vmci; do - VMMOD=`grep -w $m /proc/modules` - [ ! -z "$VMMOD" ] && rmmod $m - if [ $? -gt 0 ]; then - stat_fail - exit 4 - fi - done - - if [ "$VM_DRAG_AND_DROP" == "yes" ]; then - MOUNTPOINT=`grep -w "none /proc/fs/vmblock/mountPoint vmblock" /proc/modules` - [ -z "$MOUNTPOINT" ] && umount /proc/fs/vmblock/mountPoint - if [ $? -gt 0 ]; then - stat_fail - exit 5 - fi - - DND_TMPDIR="/tmp/VMwareDnD" - rm -r $DND_TMPDIR - - VMBLOCK=`grep -w vmblock /proc/modules` - [ ! -z "$VMBLOCK" ] && rmmod vmblock - if [ $? -gt 0 ]; then - stat_fail - exit 6 - fi - fi - - rm_daemon open-vm-tools - stat_done - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/open-vm-tools/scripts-network-FS19541.patch b/community/open-vm-tools/scripts-network-FS19541.patch deleted file mode 100644 index 5fcb33ba8..000000000 --- a/community/open-vm-tools/scripts-network-FS19541.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- network.orig 2011-11-09 18:42:28.000000000 +0400 -+++ network 2011-11-09 18:46:22.000000000 +0400 -@@ -76,7 +76,7 @@ - else - echo `date` "[rescue_nic] activating $nic ..." - -- ifup $nic -+ ifconfig $nic up - exitCode=`expr $exitCode \| $?` - fi - done < $activeList -@@ -105,7 +105,7 @@ - # `which' may be a bit noisy, so we'll shush it. - dbusSend=`which dbus-send 2>/dev/null` - rc=$? -- if [ $rc = 0 ]; then -+ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then - # NetworkManager 0.8.0 - $dbusSend --system --print-reply \ - --dest=org.freedesktop.NetworkManager \ -@@ -154,7 +154,7 @@ - # `which' may be a bit noisy, so we'll shush it. - dbusSend=`which dbus-send 2>/dev/null` - rc=$? -- if [ $rc = 0 ]; then -+ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then - # NetworkManager 0.8.0 - $dbusSend --system --print-reply \ - --dest=org.freedesktop.NetworkManager \ -@@ -203,7 +203,7 @@ - - # XXX Are these really necessary? If so, we should have seen customer - # complaints by now. -- which ifup >/dev/null 2>&1 || Panic "ifup not in search path." -+# which ifup >/dev/null 2>&1 || Panic "ifup not in search path." - which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path." - - case "$1" in diff --git a/community/open-vm-tools/scripts-network.patch b/community/open-vm-tools/scripts-network.patch deleted file mode 100644 index 44c7e6dcb..000000000 --- a/community/open-vm-tools/scripts-network.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- network.org 2012-03-17 22:20:11.000000000 +0400 -+++ network 2012-03-17 22:18:47.000000000 +0400 -@@ -34,51 +34,6 @@ - - - # --# find_networking_script -- --# --# Searches common Linux distro init/rc paths to find a singular network --# services script. --# --# Result: --# Returns a valid networking script path on success or "error" on failure. --# --# Side effects: --# None. --# -- --find_networking_script() { -- local script="error" -- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do -- if [ -d "$dir/rc0.d" ] && -- [ -d "$dir/rc1.d" ] && -- [ -d "$dir/rc2.d" ] && -- [ -d "$dir/rc3.d" ] && -- [ -d "$dir/rc4.d" ] && -- [ -d "$dir/rc5.d" ] && -- [ -d "$dir/rc6.d" ]; then -- -- # Now find the appropriate networking script. -- if [ -d "$dir/init.d" ]; then -- if [ -x "$dir/init.d/network" ]; then -- script="$dir/init.d/network" -- elif [ -x "$dir/init.d/networking" ]; then -- script="$dir/init.d/networking" -- fi -- else -- if [ -x "$dir/network" ]; then -- script="$dir/network" -- elif [ -x "$dir/networking" ]; then -- script="$dir/networking" -- fi -- fi -- fi -- done -- -- echo "$script" --} -- -- --# - # run_network_script -- - # - # Finds out how to run the system's script used to control networking, and -@@ -87,17 +42,7 @@ - # - run_network_script() - { -- script=`find_networking_script` -- [ "$script" != "error" ] || Panic "Cannot find system networking script." -- -- # Using SysV "service" if it exists, otherwise fall back to run the script directly -- service=`which service 2>/dev/null` -- if [ $? = 0 -a -n "$service" ]; then -- serviceName=`basename "$script"` -- "$service" "$serviceName" "$1" -- else -- "$script" "$1" -- fi -+ /etc/rc.d/network "$1" - } - - diff --git a/community/open-vm-tools/tools.conf b/community/open-vm-tools/tools.conf deleted file mode 100644 index 0bb2681b1..000000000 --- a/community/open-vm-tools/tools.conf +++ /dev/null @@ -1 +0,0 @@ -bindir = "/usr/bin" diff --git a/community/open-vm-tools/vmware-guestd b/community/open-vm-tools/vmware-guestd deleted file mode 100644 index f8ea34fc0..000000000 --- a/community/open-vm-tools/vmware-guestd +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_unix2.so shadow nullok -auth required pam_unix_auth.so shadow nullok -account sufficient pam_unix2.so -account required pam_unix_acct.so diff --git a/community/open-vm-tools/xautostart.conf b/community/open-vm-tools/xautostart.conf deleted file mode 100644 index 829f379ce..000000000 --- a/community/open-vm-tools/xautostart.conf +++ /dev/null @@ -1,6 +0,0 @@ -gnome-panel -ksmserver -startkde -kwrapper -panel -xfce4-panel diff --git a/community/openbsd-netcat/PKGBUILD b/community/openbsd-netcat/PKGBUILD index 0ec2d4194..ff18b9fa1 100644 --- a/community/openbsd-netcat/PKGBUILD +++ b/community/openbsd-netcat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76590 2012-09-24 09:58:51Z spupykin $ +# $Id: PKGBUILD 80338 2012-11-20 10:54:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname="openbsd-netcat" pkgver=1.105 -pkgrel=4 +pkgrel=5 _patch=7 pkgdesc="TCP/IP swiss army knife. OpenBSD variant." arch=('i686' 'x86_64' 'mips64el') @@ -12,6 +12,8 @@ url="http://packages.debian.org/sid/netcat-openbsd" license=('BSD') depends=('libbsd') makedepends=('gcc' 'make') +provides=('netcat') +conflicts=('gnu-netcat') source=("http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}.orig.tar.gz" "http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}-${_patch}.debian.tar.gz") md5sums=('7e67b22f1ad41a1b7effbb59ff28fca1' @@ -30,8 +32,9 @@ build() { package() { cd $srcdir/netcat-openbsd-${pkgver} - install -Dm0755 nc $pkgdir/usr/bin/nc.openbsd - install -Dm0644 nc.1 $pkgdir/usr/share/man/man1/nc.openbsd.1 + install -Dm0755 nc $pkgdir/usr/bin/nc + ln -s nc $pkgdir/usr/bin/netcat + install -Dm0644 nc.1 $pkgdir/usr/share/man/man1/nc.1 install -dm0755 $pkgdir/usr/share/licenses/$pkgname/ head -n28 netcat.c | tail -n+2 >$pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/opencc/PKGBUILD b/community/opencc/PKGBUILD new file mode 100644 index 000000000..ae94dce10 --- /dev/null +++ b/community/opencc/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 79884 2012-11-14 13:43:08Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgname=opencc +pkgver=0.3.0 +pkgrel=1 +pkgdesc="Library for Open Chinese Convert" +arch=('i686' 'x86_64') +url="http://code.google.com/p/opencc/" +license=('Apache') +depends=('glibc') +makedepends=('cmake') +source=("http://opencc.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} +md5sums=('84462870e5d491da24bb33a5fb494911') diff --git a/community/openclonk/PKGBUILD b/community/openclonk/PKGBUILD new file mode 100644 index 000000000..c3aebc93c --- /dev/null +++ b/community/openclonk/PKGBUILD @@ -0,0 +1,41 @@ +$Id: PKGBUILD 80496 2012-11-22 21:30:12Z jsteel $ +# Maintainer: Jonathan Steel <mail at jsteel dot org> +# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Wesley <rudirennsau at hotmail dot com> + +pkgname=openclonk +pkgver=5.3.2 +pkgrel=1 +pkgdesc="A multiplayer-action-tactic-skill game" +arch=('i686' 'x86_64') +url="http://openclonk.org" +license=('custom') +conflicts=('openclonk-hg') +depends=('gtk2' 'glew' 'sdl_mixer' 'libxpm' 'hicolor-icon-theme' 'libupnp') +makedepends=('cmake' 'boost' 'imagemagick' 'mesa') +install=$pkgname.install +source=(http://hg.openclonk.org/$pkgname/archive/$pkgname-release-$pkgver-src.tar.gz) +md5sums=('0d43b03f10c8af7a9022f023b21bb1b3') + +build() { + cd "$srcdir"/$pkgname-release-$pkgver-src + + [[ -d build ]] && rm -rf build + mkdir build && cd build + + cmake ../ -DCMAKE_INSTALL_PREFIX=/usr + + make +} + +package() { + cd "$srcdir"/$pkgname-release-$pkgver-src/build + + make DESTDIR="$pkgdir" install + + install -Dm644 clonk.png "$pkgdir"/usr/share/pixmaps/clonk.png + + cd .. + install -dm755 "$pkgdir"/usr/share/licenses/$pkgname + install -m644 licenses/*.txt "$pkgdir"/usr/share/licenses/$pkgname +} diff --git a/community/openclonk/openclonk.install b/community/openclonk/openclonk.install new file mode 100644 index 000000000..f1aa7421c --- /dev/null +++ b/community/openclonk/openclonk.install @@ -0,0 +1,7 @@ +post_install() { + gtk-update-icon-cache -qf /usr/share/icons/hicolor +} + +post_remove() { + post_install +} diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index 8bfab528d..6e11bf0f4 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 78344 2012-10-17 14:52:24Z spupykin $ +# $Id: PKGBUILD 78840 2012-10-25 13:10:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim -pkgver=2.6.7 -pkgrel=2 +pkgver=2.7.0 +pkgrel=1 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) url="http://www.opendkim.org/" license=('BSD' 'custom:Sendmail') depends=("db" "openssl") makedepends=("libmilter") -options=(!libtool) +options=(!libtool !emptydirs) backup=(etc/conf.d/opendkim) install=opendkim.install source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz opendkim.conf opendkim.rc opendkim.service) -md5sums=('8dd327c1c3f3ffdbc436ef7df877940e' +md5sums=('ec3f38e6b612c58cd3b4dabfd923274a' '3e2bb1058ac0662f01e675aa6ac7ee8f' '093f5c098a45cc68753f97e45a5b374c' 'bc1b73856bc1941faaa4842e00437cb5') @@ -49,9 +49,6 @@ package() { install -Dm644 "$srcdir/opendkim.conf" "$pkgdir/etc/conf.d/opendkim" install -Dm755 "$srcdir/opendkim.rc" "$pkgdir/etc/rc.d/opendkim" - # Remove empty dirs - rmdir "$pkgdir/usr/share/man/man1" "$pkgdir/usr/share/man/man3" - # License mkdir -p "$pkgdir/usr/share/licenses/opendkim" for f in LICENSE LICENSE.Sendmail; do diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index d76723397..070f0c8cf 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 77692 2012-10-13 14:45:45Z svenstaro $ +# $Id: PKGBUILD 78937 2012-10-27 23:45:06Z ebelanger $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio pkgver=1.0.9 -pkgrel=3 +pkgrel=4 pkgdesc="A library for reading and writing images, including classes, utilities, and applications." arch=(i686 x86_64) url="http://www.openimageio.org/" license=('custom') depends=('openexr' 'boost-libs' 'jasper' 'glew') -makedepends=('cmake' 'qt' 'python2' 'boost') +makedepends=('cmake' 'qt' 'python2' 'boost' 'mesa') optdepends=('qt: iv image viewer' 'python2: bindings support') source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) @@ -21,16 +21,14 @@ build() { [[ -d build ]] && rm -r build mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. + cmake -DCMAKE_INSTALL_PREFIX=/usr -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages .. make } package() { cd "$srcdir"/$_pkgname*/src/build - make DESTDIR=$pkgdir install - - mv $pkgdir/usr/lib/python $pkgdir/usr/lib/python2.7 + make DESTDIR="$pkgdir" install # license cd ../.. diff --git a/community/openmotif/PKGBUILD b/community/openmotif/PKGBUILD index bc72582c1..a502f732d 100644 --- a/community/openmotif/PKGBUILD +++ b/community/openmotif/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75562 2012-08-27 08:58:52Z spupykin $ +# $Id: PKGBUILD 78895 2012-10-26 13:57:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Enrico Morelli <morelli@cerm.unifi.it> pkgname=openmotif -pkgver=2.3.3 -pkgrel=2 +pkgver=2.3.4 +pkgrel=1 pkgdesc="Open Motif" arch=('i686' 'x86_64' 'mips64el') url="http://www.motifzone.org/" @@ -13,34 +13,14 @@ depends=(libxext libxp libxft libxt libxmu libpng libjpeg) makedepends=(xbitmaps xproto printproto xextproto automake) conflicts=(lesstif) options=('!libtool') -#source=(http://www.motifzone.org/files/public_downloads/openmotif/2.3/$pkgver/openmotif-$pkgver.tar.gz) -source=(ftp://ftp.ics.com/openmotif/2.3/$pkgver/openmotif-$pkgver.tar.gz) -md5sums=('fd27cd3369d6c7d5ef79eccba524f7be') +source=("http://downloads.sourceforge.net/project/motif/Motif%20$pkgver%20Source%20Code/motif-$pkgver-src.tgz") +md5sums=('612bb8127d0d31da6e5474edf8a5c247') build() { - _automakever=1.11 - - cd $srcdir/openmotif-$pkgver - - sed -i 's|.*demos.*||g' Makefile.in Makefile.am - sed -i 's|doc \\|doc|g' Makefile.in Makefile.am - sed -i 's#if (!png_check_sig(sig, 8))#if (png_sig_cmp(sig, 0, 8))#' lib/Xm/Png.c - - ln -s -f /usr/share/automake-${_automakever}/compile compile - ln -s -f /usr/share/libtool/config/config.guess config.guess - ln -s -f /usr/share/libtool/config/config.sub config.sub - ln -s -f /usr/share/automake-${_automakever}/depcomp depcomp - ln -s -f /usr/share/automake-${_automakever}/install-sh install-sh - ln -s -f /usr/share/automake-${_automakever}/missing missing - ln -s -f /usr/share/libtool/config/ltmain.sh ltmain.sh - touch NEWS AUTHORS - - [ $NOEXTRACT -eq 1 ] || autoreconf -i - [ $CARCH == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" - [ $NOEXTRACT -eq 1 ] || ./configure --with-x --prefix=/usr + cd $srcdir/motif-$pkgver + export LDFLAGS="-lX11" + [ -x configure ] || ./autogen.sh --prefix=/usr + [ -f Makefile ] || ./configure --prefix=/usr make -j1 - make DESTDIR=$pkgdir install - # cleanup - (cd $pkgdir/usr/share/man/man3/ && mv Shell.3 OpenMotif-Shell.3) } diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD index 8411524c9..0f701c4a7 100644 --- a/community/openntpd/PKGBUILD +++ b/community/openntpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75378 2012-08-21 16:04:24Z dreisner $ +# $Id: PKGBUILD 80248 2012-11-18 11:40:59Z jelle $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Mark Rosenstand <mark@borkware.net> # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch) @@ -6,12 +6,13 @@ pkgname=openntpd pkgver=3.9p1 -pkgrel=19 +pkgrel=21 pkgdesc="Free, easy to use implementation of the Network Time Protocol." url="http://www.openntpd.org/" arch=('x86_64' 'i686' 'mips64el') license=('BSD') depends=('openssl') +conflicts=('ntp') backup=('etc/ntpd.conf' 'etc/conf.d/openntpd') install=$pkgname.install source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz diff --git a/community/openntpd/openntpd.install b/community/openntpd/openntpd.install index 4f42aeb1f..dd2bf4a4f 100644 --- a/community/openntpd/openntpd.install +++ b/community/openntpd/openntpd.install @@ -1,24 +1,15 @@ -createuser() { - if ! getent group ntp >/dev/null; then - groupadd -g 87 ntp - fi - - if ! getent passwd ntp >/dev/null; then - useradd -g ntp -u 87 -d /var/empty -s /bin/false -c 'Network Time Protocol' ntp - fi -} - post_install() { - createuser - systemd-tmpfiles --create openntpd.conf -} + getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null + getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null -post_upgrade() { - createuser + systemd-tmpfiles --create openntpd.conf + true } post_remove() { - userdel ntp >/dev/null + getent passwd ntp &>/dev/null && userdel ntp >/dev/null + getent group ntp &>/dev/null && groupdel ntp >/dev/null + true } # vim: ts=2 sw=2 et ft=sh diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD index a30f719a8..6b0884c55 100644 --- a/community/openocd/PKGBUILD +++ b/community/openocd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 77217 2012-10-07 07:16:10Z bpiotrowski $ +# $Id: PKGBUILD 79223 2012-11-01 10:24:39Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Matthias Bauch <matthias.bauch@gmail.com> # Contributor: Laszlo Papp <djszapi2 at gmail com> # Contributor: Samuel Tardieu <sam@rfc1149.net> pkgname=openocd -pkgver=0.6.0 -pkgrel=2 +pkgver=0.6.1 +pkgrel=1 pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices' arch=('i686' 'x86_64') url='http://openocd.berlios.de' @@ -14,8 +14,8 @@ license=('GPL') depends=('libftdi') options=(!strip !libtool) install=openocd.install -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('824cbe192ca2c79055b6ae82579123cf') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('946421efc2414ff89bdaf3f588b230f8') _features=(parport ft2232_libftdi amtjtagaccel ep93xxat91rm9200gw16012 presto_libftdi usbprog oocd_trace jlink vsllink rlink arm-jtag-ew buspirate stlink) diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index 17f8d3473..5233250fd 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78328 2012-10-17 14:22:01Z spupykin $ +# $Id: PKGBUILD 78612 2012-10-22 09:08:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=opensips @@ -26,7 +26,7 @@ options=('!emptydirs' 'zipman' '!makeflags' 'docs') source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz opensips.init opensips.service) -md5sums=('9fa0f8b7c58668ff4669e5c54bf4c00a' +md5sums=('ec3d0f13bf8198a74aed91e5c38ec445' '685fbe00826df1285b410d4610dcbb0c' '0d80ef75b5c10324e6db790b7741c2eb') diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index 0c4037221..8e079fdc9 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75307 2012-08-18 21:49:24Z lcarlier $ +# $Id: PKGBUILD 80243 2012-11-18 10:31:01Z andrea $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=openttd -pkgver=1.2.2 -pkgrel=1 +pkgver=1.2.3 +pkgrel=2 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64' 'mips64el') url='http://www.openttd.org' @@ -13,7 +13,7 @@ install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") -sha256sums=('57b105ab03d0275e190107fd1d54255f0c25d8b24d41d15ed2702534bab31f95') +sha256sums=('d228798f7d4804b7ead186ec19082f0e6c83cfc2dbf625ddab1d22048117fd08') build() { cd ${pkgname}-${pkgver} diff --git a/community/optipng/PKGBUILD b/community/optipng/PKGBUILD index 48c7ed414..815575c27 100644 --- a/community/optipng/PKGBUILD +++ b/community/optipng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76515 2012-09-21 06:14:03Z lfleischer $ +# $Id: PKGBUILD 79534 2012-11-06 20:25:17Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=optipng -pkgver=0.7.3 +pkgver=0.7.4 pkgrel=1 pkgdesc='Compresses PNG files to a smaller size, without losing any information.' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url='http://optipng.sourceforge.net/' license=('ZLIB') depends=('glibc') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('ceceb66b4d2e1f632ea6786a0adafd11') +md5sums=('8853d89aaf859065e95dcdf98b6bed73') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/os-prober/PKGBUILD b/community/os-prober/PKGBUILD index 535f14ba1..ebaa922de 100644 --- a/community/os-prober/PKGBUILD +++ b/community/os-prober/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76031 2012-09-09 10:59:08Z tredaelli $ +# $Id: PKGBUILD 79823 2012-11-13 13:48:38Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: darkcoder <mario_vazq@hotmail.com> pkgname=os-prober -pkgver=1.55 +pkgver=1.56 pkgrel=1 pkgdesc="Utility to detect other OSes on a set of drives" url="http://joey.kitenet.net/code/os-prober/" @@ -11,8 +11,8 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL3') depends=('sh') source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.gz) -md5sums=('a516bc304a10345d2116d5b9b70bacc3') -sha512sums=('dde7f648f0f54906b936ddf05b02166f44b0a9c64291fffa5390b7d96b434a9937577ff22f55dce0711e14775cd7d88c391feb8dd0a8b17d0a6235e91ae4b5d9') +md5sums=('bd9c1a7fc49a2499d79977cf2c1ec68d') +sha256sums=('88a79a04617f4ecbeb9c4d318cd9cf8fcb4ae7a724bd503942354011c7da5719') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index efa138d53..01483e7fc 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -5,19 +5,19 @@ pkgname=paraview pkgver=3.14.1 -pkgrel=1 +pkgrel=2 pkgdesc='Parallel Visualization Application using VTK' arch=('i686' 'x86_64' 'mips64el') url='http://www.paraview.org' license=('custom') depends=('qt' 'python2' 'libgl' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' - 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'libcgns2' + 'libmysqlclient' 'openmpi' 'boost-libs' 'libcgns2' # export as avi support #'ffmpeg' # The following is a list of libraries we explicitly tell cmake to use the system library of 'hdf5' 'freetype2' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'expat' 'libxml2' 'libtheora' ) -makedepends=('cmake' 'desktop-file-utils' 'boost') +makedepends=('cmake' 'desktop-file-utils' 'boost' 'mesa') source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}-Source.tar.gz" 'paraview.png' 'paraview.desktop' diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 4661a416f..8b5d0ee43 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76937 2012-10-02 14:00:19Z spupykin $ +# $Id: PKGBUILD 80699 2012-11-29 16:18:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=4.8.0 +pkgver=4.10.0 #_rel=stable _rel=devel pkgrel=1 @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('c00ed8867dcf69255452a2e1267906ec') +md5sums=('aab3d07aecfe821a792421fb4fb88a4f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pawm/PKGBUILD b/community/pawm/PKGBUILD index c2ba3afe9..dae4106da 100644 --- a/community/pawm/PKGBUILD +++ b/community/pawm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66194 2012-02-23 02:43:04Z spupykin $ +# $Id: PKGBUILD 78889 2012-10-26 13:02:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=pawm @@ -6,7 +6,8 @@ pkgver=2.3.0 pkgrel=2 pkgdesc="Puto Amo Window Manager is a full featured window manager, but without useless bells and whistles" arch=('i686' 'x86_64' 'mips64el') -url="http://www.pleyades.net/pawm/" +#url="http://www.pleyades.net/pawm/" +url="https://sites.google.com/site/pleyadestest/david/projects/pawm" license=("GPL") depends=('libxft' 'libxpm' 'libxrandr') makedepends=('cmake') diff --git a/community/pax-utils/PKGBUILD b/community/pax-utils/PKGBUILD index a270f69c3..c8755a098 100644 --- a/community/pax-utils/PKGBUILD +++ b/community/pax-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69966 2012-04-27 11:58:38Z tredaelli $ +# $Id: PKGBUILD 79825 2012-11-13 13:54:15Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: sh0 <mee@sh0.org> # Contributor: Maxwel <msg.maxwel@gmail.com> pkgname=pax-utils -pkgver=0.3.0 +pkgver=0.5 pkgrel=1 pkgdesc='ELF related utils for ELF 32/64 binaries that can check files for security relevant properties' url='http://hardened.gentoo.org/pax-utils.xml' @@ -13,7 +13,7 @@ license=('GPL') depends=('bash' 'libcap') checkdepends=('python') source=("http://distfiles.gentoo.org/distfiles/${pkgname}-${pkgver}.tar.xz") -md5sums=('f0c6577977472a327aa39adf1012f150') +sha256sums=('1ba4f5e8680449c18841db2397aca320527fb06628b4ad9212e42f5e01de833b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD index 9d7439643..fec340497 100644 --- a/community/pcmanfm/PKGBUILD +++ b/community/pcmanfm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76527 2012-09-21 15:38:13Z bpiotrowski $ +# $Id: PKGBUILD 79229 2012-11-01 10:32:52Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=pcmanfm -pkgver=1.0.1 +pkgver=1.1.0 pkgrel=1 pkgdesc="An extremely fast and lightweight file manager" arch=('i686' 'x86_64' 'mips64el') @@ -16,17 +16,17 @@ depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') makedepends=('intltool' 'pkgconfig') install=$pkgname.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz) -md5sums=('f373ee514bae37b53b152d02ac465058') +md5sums=('af0cff78690e658f3c06ceabf27bc71a') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver ./configure --sysconfdir=/etc --prefix=/usr - make LDFLAGS="-lm $LDFLAGS" + make LDFLAGS+=' -lm' } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver make DESTDIR="$pkgdir" install sed -e 's|x-directory/normal|inode/directory|' -i $pkgdir/usr/share/applications/pcmanfm.desktop diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD new file mode 100644 index 000000000..f404607e9 --- /dev/null +++ b/community/pdns-recursor/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 80083 2012-11-15 22:19:08Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=pdns-recursor +pkgver=3.3 +pkgrel=4 +pkgdesc='PowerDNS recursor' +url='http://www.powerdns.com' +license=('GPL') +arch=('x86_64' 'i686') +depends=('gcc-libs') # 'lua') +makedepends=('boost') +backup=('etc/powerdns/recursor.conf') +source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2" + 'pdns-recursor.rc' + 'pdns-recursor.service') +sha256sums=('7b62d97f2bb02bb0ba366dabb5e504338b949a572b9062ec2198012fc3b525bc' + '7ff45a2da128e82da409f123f8346cc085b57337d6d44a9fd76d17024898b1ca' + 'c5849127cb42b578ff4c38ee6ad39e109bb749ce8b0147ac3619af90803b6875') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Disabled Lua while waiting for upstream support for lua 5.2 + #LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua make + LUA=0 make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -d -m755 "$pkgdir/etc/rc.d" + mv "$pkgdir/etc/powerdns/recursor.conf-dist" "$pkgdir/etc/powerdns/recursor.conf" + install -m755 "$srcdir/pdns-recursor.rc" "$pkgdir/etc/rc.d/pdns-recursor" + rm -r "$pkgdir/etc/init.d" + install -Dm644 "$srcdir/pdns-recursor.service" \ + "$pkgdir/usr/lib/systemd/system/pdns-recursor.service" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/pdns-recursor/pdns-recursor.rc b/community/pdns-recursor/pdns-recursor.rc new file mode 100644 index 000000000..992f0b086 --- /dev/null +++ b/community/pdns-recursor/pdns-recursor.rc @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting PowerDNS recursor" + ! /usr/sbin/rec_control ping > /dev/null 2>&1 && /usr/sbin/pdns_recursor --daemon + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pdns-recursor + stat_done + fi + ;; + stop) + stat_busy "Stopping PowerDNS recursor" + rec_control quit > /dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pdns-recursor + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/pdns-recursor/pdns-recursor.service b/community/pdns-recursor/pdns-recursor.service new file mode 100644 index 000000000..8f4404e1d --- /dev/null +++ b/community/pdns-recursor/pdns-recursor.service @@ -0,0 +1,10 @@ +[Unit] +Description=PowerDNS recursing nameserver +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/pdns_recursor --daemon + +[Install] +WantedBy=multi-user.target diff --git a/community/pdns/2.9.18-default-mysql-options.patch b/community/pdns/2.9.18-default-mysql-options.patch new file mode 100755 index 000000000..a9048e13e --- /dev/null +++ b/community/pdns/2.9.18-default-mysql-options.patch @@ -0,0 +1,13 @@ +diff -Nur pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc pdns-2.9.18/modules/gmysqlbackend/smysql.cc +--- pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc 2005-04-23 23:40:15.000000000 +0200 ++++ pdns-2.9.18/modules/gmysqlbackend/smysql.cc 2005-07-17 10:38:35.363597586 +0200 +@@ -15,6 +15,9 @@ + const string &password) + { + mysql_init(&d_db); ++#if MYSQL_VERSION_ID > 32349 ++ mysql_options(&d_db, MYSQL_READ_DEFAULT_GROUP, "client"); ++#endif + if (!mysql_real_connect(&d_db, host.empty() ? 0 : host.c_str(), + user.empty() ? 0 : user.c_str(), + password.empty() ? 0 : password.c_str(), diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD new file mode 100644 index 000000000..ca1450341 --- /dev/null +++ b/community/pdns/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 79811 2012-11-12 22:20:45Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Kevin Mihelich <kevin@archlinuxarm.org> + +pkgname=pdns +pkgver=3.1 +pkgrel=3 +pkgdesc="Modern, advanced and high performance authoritative-only nameserver" +arch=('x86_64' 'i686') +url='http://www.powerdns.com/' +license=('GPL') +depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmysqlclient' 'sqlite' 'libldap' 'lua' 'boost-libs') +makedepends=('boost') +provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') +replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') +conflicts=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') +install=pdns.install +options=('!makeflags' '!libtool') +backup=('etc/powerdns/pdns.conf') +source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.gz" + 'pdns.service' + 'pdns.rc' + 'pdns.conf') +sha256sums=('1400f7bd659207c0b1f4b8296092e559a7b7bf6a2434951970217d9af06922a1' + '2a60c4407bcfe19026ae77d3e3b7b477d5a0c6323c0bc78892e9d907003b442a' + '0457ffa2baa40518a03393e4f76964d9452c16aebbcb925582814f88367d62c2' + '91c8889f41fe9d6bc9478c3ad53a10f6725e36e10f05e8e9257f9d35c9e2bab6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + touch AUTHORS NEWS + libtoolize --force --copy + aclocal + autoconf + automake --add-missing + sed -i 's/BOOST/#BOOST/g' configure + ./configure --prefix=/usr \ + --sysconfdir=/etc/powerdns \ + --libexecdir=/usr/lib \ + --libdir=/usr/lib/powerdns \ + --mandir=/usr/share/man \ + --with-modules="" \ + --with-dynmodules="ldap pipe gmysql gpgsql gsqlite3 geo" \ + --disable-recursor \ + --disable-static + make \ + CXXFLAGS=" -lboost_serialization -lboost_program_options $CXXFLAGS" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -m755 -d "$pkgdir/etc/rc.d" + rm "$pkgdir/etc/powerdns/pdns.conf-dist" + install -m644 "$srcdir/pdns.conf" "$pkgdir/etc/powerdns/" + install -m755 "$srcdir/pdns.rc" "$pkgdir/etc/rc.d/pdns" + install -Dm644 "$srcdir/pdns.service" \ + "$pkgdir/usr/lib/systemd/system/pdns.service" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/pdns/pdns-2.9.22-gcc44.patch b/community/pdns/pdns-2.9.22-gcc44.patch new file mode 100644 index 000000000..35c1c7777 --- /dev/null +++ b/community/pdns/pdns-2.9.22-gcc44.patch @@ -0,0 +1,22 @@ +diff -ur pdns-2.9.22.orig/pdns/dnsparser.cc pdns-2.9.22/pdns/dnsparser.cc +--- pdns-2.9.22.orig/pdns/dnsparser.cc 2008-11-15 22:32:46.000000000 +0200 ++++ pdns-2.9.22/pdns/dnsparser.cc 2009-07-06 22:09:02.000000000 +0300 +@@ -16,6 +16,7 @@ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include <stdio.h> + #include "dnsparser.hh" + #include "dnswriter.hh" + #include <boost/lexical_cast.hpp> +diff -ur pdns-2.9.22.orig/pdns/rcpgenerator.cc pdns-2.9.22/pdns/rcpgenerator.cc +--- pdns-2.9.22.orig/pdns/rcpgenerator.cc 2008-11-15 23:20:27.000000000 +0200 ++++ pdns-2.9.22/pdns/rcpgenerator.cc 2009-07-06 22:07:26.000000000 +0300 +@@ -16,6 +16,7 @@ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include <stdio.h> + #include "rcpgenerator.hh" + #include "dnsparser.hh" + #include "misc.hh" diff --git a/community/pdns/pdns.conf b/community/pdns/pdns.conf new file mode 100644 index 000000000..fba6617a6 --- /dev/null +++ b/community/pdns/pdns.conf @@ -0,0 +1,281 @@ +# Autogenerated configuration file template +################################# +# allow-axfr-ips If disabled, DO allow zonetransfers from these IP addresses +# +# allow-axfr-ips= + +################################# +# allow-recursion List of netmasks that are allowed to recurse +# +allow-recursion=127.0.0.1 + +################################# +# allow-recursion-override Local data overrrides hosts on the internet +# +allow-recursion-override=yes + +################################# +# cache-ttl Seconds to store packets in the PacketCache +# +cache-ttl=60 + +################################# +# chroot If set, chroot to this directory for more security +# +chroot=/var/empty + +################################# +# config-dir Location of configuration directory (pdns.conf) +# +config-dir=/etc + +################################# +# config-name Name of this virtual configuration - will rename the binary image +# +# config-name= + +################################# +# control-console Debugging switch - don't use +# +# control-console=no + +################################# +# daemon Operate as a daemon +# +daemon=yes + +################################# +# default-soa-name name to insert in the SOA record if none set in the backend +# +# default-soa-name=a.misconfigured.powerdns.server + +################################# +# disable-axfr Disable zonetransfers but do allow TCP queries +# +# disable-axfr=no + +################################# +# disable-tcp Do not listen to TCP queries +# +# disable-tcp=no + +################################# +# distributor-threads Default number of Distributor (backend) threads to start +# +distributor-threads=3 + +################################# +# fancy-records Process URL and MBOXFW records +# +# fancy-records=no + +################################# +# guardian Run within a guardian process +# +guardian=yes + +################################# +# launch Which backends to launch and order to query them in +# +#launch= + +################################# +# lazy-recursion Only recurse if question cannot be answered locally +# +lazy-recursion=yes + +################################# +# load-modules Load this module - supply absolute or relative path +# +# load-modules= + +################################# +# local-address Local IP address to which we bind +# +local-address=127.0.0.1 + +################################# +# local-ipv6 Local IP address to which we bind +# +# local-ipv6= + +################################# +# local-port The port on which we listen +# +local-port=53 + +################################# +# log-dns-details If PDNS should log failed update requests +# +#log-dns-details=off + +################################# +# log-failed-updates If PDNS should log failed update requests +# +#log-failed-updates=off + +################################# +# logfile Logfile to use +# +# logfile=pdns.log + +################################# +# logging-facility Log under a specific facility +# +# logging-facility= + +################################# +# loglevel Amount of logging. Higher is more. Do not set below 3 +# +loglevel=3 + +################################# +# master Act as a master +# +# master=no + +################################# +# max-queue-length Maximum queuelength before considering situation lost +# +# max-queue-length=5000 + +################################# +# max-tcp-connections Maximum number of TCP connections +# +# max-tcp-connections=10 + +################################# +# module-dir Default directory for modules +# +module-dir=/usr/lib/powerdns + +################################# +# negquery-cache-ttl Seconds to store packets in the PacketCache +# +negquery-cache-ttl=60 + +################################# +# only-soa Make sure that no SOA serial is less than this number +# +# only-soa=org + +################################# +# out-of-zone-additional-processing Do out of zone additional processing +# +# out-of-zone-additional-processing=no + +################################# +# query-cache-ttl Seconds to store packets in the PacketCache +# +# query-cache-ttl=20 + +################################# +# query-logging Hint backends that queries should be logged +# +# query-logging=no + +################################# +# queue-limit Maximum number of milliseconds to queue a query +# +# queue-limit=1500 + +################################# +# receiver-threads Number of receiver threads to launch +# +# receiver-threads=1 + +################################# +# recursive-cache-ttl Seconds to store packets in the PacketCache +# +# recursive-cache-ttl=10 + +################################# +# recursor If recursion is desired, IP address of a recursing nameserver +# +#recursor= + +################################# +# setgid If set, change group id to this gid for more security +# +setgid=nobody + +################################# +# setuid If set, change user id to this uid for more security +# +setuid=nobody + +################################# +# skip-cname Do not perform CNAME indirection for each query +# +# skip-cname=no + +################################# +# slave Act as a slave +# +# slave=no + +################################# +# slave-cycle-interval Reschedule failed SOA serial checks once every .. seconds +# +# slave-cycle-interval=60 + +################################# +# smtpredirector Our smtpredir MX host +# +# smtpredirector=a.misconfigured.powerdns.smtp.server + +################################# +# soa-minimum-ttl Default SOA mininum ttl +# +# soa-minimum-ttl=3600 + +################################# +# soa-serial-offset Make sure that no SOA serial is less than this number +# +# soa-serial-offset=0 + +################################# +# socket-dir Where the controlsocket will live +# +socket-dir=/var/run + +################################# +# strict-rfc-axfrs Perform strictly rfc compliant axfrs (very slow) +# +# strict-rfc-axfrs=no + +################################# +# urlredirector Where we send hosts to that need to be url redirected +# +# urlredirector=127.0.0.1 + +################################# +# use-logfile Use a log file +# +use-logfile=no + +################################# +# webserver Start a webserver for monitoring +# +webserver=no + +################################# +# webserver-address IP Address of webserver to listen on +# +# webserver-address=127.0.0.1 + +################################# +# webserver-password Password required for accessing the webserver +# +# webserver-password= + +################################# +# webserver-port Port of webserver to listen on +# +# webserver-port=8081 + +################################# +# webserver-print-arguments If the webserver should print arguments +# +# webserver-print-arguments=no + diff --git a/community/pdns/pdns.install b/community/pdns/pdns.install new file mode 100644 index 000000000..f41b36b20 --- /dev/null +++ b/community/pdns/pdns.install @@ -0,0 +1,11 @@ +post_install() { + cat << 'EOM' +==> PowerDNS is built without recursor now. To use the recursor, +==> please install the pdns-recursor package and update the +==> configuration in /etc/powerdns/recursor.conf +EOM +} + +post_upgrade() { + post_install $1 +} diff --git a/community/bind-geodns/named b/community/pdns/pdns.rc index f250907b9..2f143ddae 100755..100644 --- a/community/bind-geodns/named +++ b/community/pdns/pdns.rc @@ -1,38 +1,32 @@ #!/bin/bash -NAMED_ARGS= -[ -f /etc/conf.d/named ] && . /etc/conf.d/named - . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /usr/sbin/named` case "$1" in start) stat_busy "Starting DNS" - - [ -d /var/run/named ] || { mkdir -p /var/run/named; chown 40:40 /var/run/named; } - [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} + ! /usr/sbin/pdns_control ping > /dev/null 2>&1 && /usr/sbin/pdns_server --daemon if [ $? -gt 0 ]; then stat_fail else - add_daemon named + add_daemon pdns stat_done fi ;; stop) stat_busy "Stopping DNS" - [ ! -z "$PID" ] && kill $PID &> /dev/null + pdns_control quit > /dev/null 2>&1 if [ $? -gt 0 ]; then stat_fail else - rm_daemon named + rm_daemon pdns stat_done fi ;; restart) $0 stop - sleep 1 + sleep 3 $0 start ;; *) diff --git a/community/pdns/pdns.service b/community/pdns/pdns.service new file mode 100644 index 000000000..1005c9f64 --- /dev/null +++ b/community/pdns/pdns.service @@ -0,0 +1,12 @@ +[Unit] +Description=PowerDNS Authorative Server +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/pdns_server --daemon --guardian=yes +ExecReload=/usr/bin/pdns_control cycle +ExecStop=/usr/bin/pdns_control quit + +[Install] +WantedBy=multi-user.target diff --git a/community/pekwm/PKGBUILD b/community/pekwm/PKGBUILD new file mode 100644 index 000000000..5d186c20a --- /dev/null +++ b/community/pekwm/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 80631 2012-11-27 14:08:01Z fyan $ +# Maintainer: +# Contributor: Kevin Piche <kevin@archlinux.org> +# Contributor: Eddie Lozon <almostlucky@attbi.com> + +pkgname=pekwm +pkgver=0.1.16 +pkgrel=1 +pkgdesc="A small, fast, functional, and flexible window manager" +arch=('i686' 'x86_64') +license=('GPL') +url='https://www.pekwm.org/projects/pekwm' +depends=('gcc-libs' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'libxpm' 'libxrandr') +backup=(etc/pekwm/autoproperties + etc/pekwm/autoproperties_typerules + etc/pekwm/config + etc/pekwm/config_system + etc/pekwm/keys + etc/pekwm/menu + etc/pekwm/mouse + etc/pekwm/mouse_click + etc/pekwm/mouse_sloppy + etc/pekwm/mouse_system + etc/pekwm/start + etc/pekwm/vars) +source=("http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2" + 'pekwm.desktop') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # Default settings: + # --enable-shape --enable-xinerama --enable-menus \ + # --enable-harbour --disable-debug --disable-pedantic \ + # --enable-xft --enable-image-xpm --enable-image-jpeg \ + # --enable-image-png --enable-xrandr + ./configure --prefix=/usr --sysconfdir=/etc + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/${pkgname}.desktop" \ + "${pkgdir}/usr/share/xsessions/${pkgname}.desktop" +} +# vim: ts=2 sw=2 et ft=sh +md5sums=('ec9bce332d0545c28f74ca4bf6b69cbb' + '5a78fc6653fbb0b7282ecf7f1f81e2c5') diff --git a/community/pekwm/pekwm.desktop b/community/pekwm/pekwm.desktop new file mode 100644 index 000000000..2f59528bd --- /dev/null +++ b/community/pekwm/pekwm.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Pekwm +Comment=The pekwm window manager +Exec=pekwm +# no icon yet, only the top three are currently used +Icon= +Type=Application diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index 69a2ff82e..9eaa21f02 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 78026 2012-10-16 09:34:44Z mtorromeo $ +# $Id: PKGBUILD 79088 2012-10-30 10:54:31Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.27_rel29.0 -pkgrel=1 -pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" +pkgver=5.5.28_rel29.1 +pkgrel=2 +pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64' 'mips64el') -depends=('mysql-clients' 'libaio') +depends=('mysql-clients' 'systemd-tools' 'libaio') conflicts=('mysql') provides=('mysql') optdepends=('perl-dbi' 'perl-dbd-mysql') @@ -19,11 +19,11 @@ options=('!libtool' 'emptydirs') backup=('etc/mysql/my.cnf') install=percona.install source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/source/Percona-Server-${pkgver/_/-}.tar.gz" - 'mysqld' + 'mysqld.rc' 'my.cnf' - 'mysqld-post' + 'mysqld-post.sh' 'mysqld.service' - 'tmpfiles.conf') + 'mysqld-tmpfile.conf') build() { cd "${srcdir}/Percona-Server-${pkgver/_/-}" @@ -34,22 +34,18 @@ build() { mkdir build cd build - # CFLAGS/CXXFLAGS as suggested upstream - CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fpermissive" \ - cmake "${srcdir}/Percona-Server-${pkgver/_/-}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ -DMYSQL_DATADIR=/var/lib/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ + -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ -DDEFAULT_CHARSET=utf8 \ -DDEFAULT_COLLATION=utf8_general_ci \ -DENABLED_LOCAL_INFILE=ON \ -DINSTALL_INFODIR=share/mysql/docs \ -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ + -DINSTALL_PLUGINDIR=lib/mysql/plugin \ -DINSTALL_SCRIPTDIR=bin \ -DINSTALL_INCLUDEDIR=include/mysql \ -DINSTALL_DOCREADMEDIR=share/mysql \ @@ -57,7 +53,7 @@ build() { -DINSTALL_MYSQLSHAREDIR=share/mysql \ -DINSTALL_DOCDIR=share/mysql/docs \ -DINSTALL_SHAREDIR=share/mysql \ - -DWITH_READLINE=OFF \ + -DWITH_READLINE=ON \ -DWITH_ZLIB=system \ -DWITH_SSL=system \ -DWITH_LIBWRAP=OFF \ @@ -72,7 +68,9 @@ build() { -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ -DWITH_FEDERATED_STORAGE_ENGINE=OFF \ - -DWITH_EXAMPLE_STORAGE_ENGINE=OFF + -DWITH_EXAMPLE_STORAGE_ENGINE=OFF \ + -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ + -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fpermissive" make } @@ -81,8 +79,11 @@ package() { cd "${srcdir}"/build make DESTDIR=${pkgdir} install - install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf - install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld + install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf + install -Dm755 "${srcdir}"/mysqld.rc "${pkgdir}"/etc/rc.d/mysqld + install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post + install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf + install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/mysqld.service # provided by libmysqlclient rm ${pkgdir}/usr/bin/mysql_config @@ -99,15 +100,11 @@ package() { rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 install -dm700 "${pkgdir}"/var/lib/mysql - - install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/mysqld.conf" - install -Dm644 "$srcdir/mysqld.service" "$pkgdir/usr/lib/systemd/system/mysqld.service" - install -Dm755 "$srcdir/mysqld-post" "$pkgdir/usr/bin/mysqld-post" } -sha256sums=('4ba9e3300d99bfdbf65dd1a00e51da5bddc1582e33a58219b5184075783889ce' +sha256sums=('2cacf3bd0f059c7ae3cb391bf2e4a2bdcbf490ed3465bfd4db9a02f0944f2d51' 'e875fac56f69634b4f1720aec3b952fc63903414e9345af630e5fd74b5373eb4' - '400e9a6e6517bbfe0971b65456dfacfb363cb54a644e4c2bacd373171611d5aa' + 'dd5dc155de468d4ab26971109861ae19b53574f28785bac5ff7b717fb65c0760' '4894d39605950d86841ad982e619daa6c8d5d60ca30928d7dbb582e8cb3ade32' 'ca10dec3cc162baede651980e675fd8094e55cb2403edffaa3d0865a6184553f' - 'f05a8d81dc3d4f2cabf96747b90d8392e0584db9e10b5b3211c21478d2d0d8c3') + 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60') diff --git a/community/percona-server/my.cnf b/community/percona-server/my.cnf index 9a41b4fc3..afdd6dc2c 100644 --- a/community/percona-server/my.cnf +++ b/community/percona-server/my.cnf @@ -17,15 +17,15 @@ # The following options will be passed to all MySQL clients [client] #password = your_password -port = 3306 -socket = /var/run/mysqld/mysqld.sock +port = 3306 +socket = /run/mysqld/mysqld.sock # Here follows entries for some specific programs # The MySQL server [mysqld] -port = 3306 -socket = /var/run/mysqld/mysqld.sock +port = 3306 +socket = /run/mysqld/mysqld.sock datadir = /var/lib/mysql skip-external-locking key_buffer_size = 16M @@ -42,7 +42,7 @@ myisam_sort_buffer_size = 8M # All interaction with mysqld must be made via Unix sockets or named pipes. # Note that using this option without enabling named pipes on Windows # (via the "enable-named-pipe" option) will render mysqld useless! -# +# skip-networking # Replication Master Server (default) diff --git a/community/percona-server/mysqld-post.sh b/community/percona-server/mysqld-post.sh new file mode 100644 index 000000000..8c404f4c4 --- /dev/null +++ b/community/percona-server/mysqld-post.sh @@ -0,0 +1,6 @@ +#!/bin/sh +while true; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 +done diff --git a/community/percona-server/mysqld-tmpfile.conf b/community/percona-server/mysqld-tmpfile.conf new file mode 100644 index 000000000..91638983f --- /dev/null +++ b/community/percona-server/mysqld-tmpfile.conf @@ -0,0 +1 @@ +d /run/mysqld 0755 mysql mysql -
\ No newline at end of file diff --git a/community/percona-server/mysqld.rc b/community/percona-server/mysqld.rc new file mode 100644 index 000000000..07f6b7e4c --- /dev/null +++ b/community/percona-server/mysqld.rc @@ -0,0 +1,77 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +getPID() { + echo $(pgrep -u mysql mysqld 2>/dev/null); +} + +case "$1" in + start) + stat_busy "Starting Percona Server" + [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null + if [ -z "$(getPID)" ]; then + /usr/bin/mysqld_safe --user=mysql &>/dev/null & + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + timeo=30 + while [ $timeo -gt 0 ]; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 + let timeo=${timeo}-1 + done + if [ $timeo -eq 0 ]; then + stat_fail + exit 1 + else + echo $(getPID) > /var/run/mysqld/mysqld.pid + add_daemon mysqld + stat_done + fi + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping Percona Server" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f /var/run/mysqld/mysqld.pid &>/dev/null + rm_daemon mysqld + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/percona-server/percona.install b/community/percona-server/percona.install index 20b6f2932..55f7cacee 100644 --- a/community/percona-server/percona.install +++ b/community/percona-server/percona.install @@ -1,8 +1,10 @@ post_install(){ groupadd -g 89 mysql &>/dev/null useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - /usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql - chown -R mysql:mysql /var/lib/mysql &>/dev/null + usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql + chown -R mysql:mysql var/lib/mysql &>/dev/null + + usr/bin/systemd-tmpfiles --create mysqld.conf } post_upgrade(){ diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 08aad6fad..8eca794f0 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,51 +1,26 @@ -# $Id: PKGBUILD 74622 2012-07-31 19:56:30Z ebelanger $ +# $Id: PKGBUILD 80212 2012-11-17 17:48:39Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous -pkgver=0.6.1 -pkgrel=16 +pkgver=0.7.0 +pkgrel=1 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64' 'mips64el') url="http://performous.org/" license=('GPL') -depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg') -#depends=('boost-libs>=1.48' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \ -# 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') -makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.50') +depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'librsvg' 'ffmpeg') # opencv +makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.50' 'mesa') optdepends=('performous-freesongs: free songs for performous') -source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2 - boost-filesystem-v3.patch - ffmpeg-0.11.patch - png15.patch - fix-boost-1.50-xtime.patch) -md5sums=('451a759de77984b5a699e91107fe52e2' - '42a8c825d80b0de16bd5752d2a80e585' - '07e52e926595d053155bbfb7168e308f' - '89157d5e21b0efd09fcbeee299d23c7e' - '6b43ab7f1c3e2cacd3540242634eabb3') +source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2) +md5sums=('60f3f72b51a630a4aa996484aedb9526') build() { - cd ${srcdir}/Performous-${pkgver}-Source - - # fix to built against boost 1.46 and later, upstream (git) now support v3 - patch -Np1 -i ../boost-filesystem-v3.patch - # fix with ffmpeg-0.11 - patch -Np1 -i ../ffmpeg-0.11.patch - # fix for libpng 1.5 - patch -Np1 -i ../png15.patch - # fix glib2.0 building - # #error "Only <glib.h> can be included directly." - sed -i -e 's#/gconvert.h#.h#g' game/unicode.cc - # boost 1.50 fix - patch -Np1 -i ../fix-boost-1.50-xtime.patch + cd ${srcdir}/performous-${pkgver} mkdir -p build cd build - # fix config loading with libxml++ - export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} - cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr .. @@ -53,7 +28,7 @@ build() { } package() { - cd ${srcdir}/Performous-${pkgver}-Source/build + cd ${srcdir}/performous-${pkgver}/build make DESTDIR="$pkgdir" install } diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD index 78023c43b..acd7959e3 100644 --- a/community/perl-params-validate/PKGBUILD +++ b/community/perl-params-validate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71825 2012-06-02 10:31:58Z bluewind $ +# $Id: PKGBUILD 79319 2012-11-02 19:11:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-params-validate -pkgver=1.06 -pkgrel=3 +pkgver=1.07 +pkgrel=1 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Params-Validate" @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('perl' 'perl-module-implementation') options=('!emptydirs') source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz") -md5sums=('4f7a281269cd30d7c3994ba5acb50857') +md5sums=('7cb0e18bd547f3ba9c492712d1795ac6') build() { cd Params-Validate-${pkgver} diff --git a/community/perl-term-readline-gnu/PKGBUILD b/community/perl-term-readline-gnu/PKGBUILD new file mode 100644 index 000000000..4a1ee0bc0 --- /dev/null +++ b/community/perl-term-readline-gnu/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 80447 2012-11-21 22:59:31Z dwallace $ +# CPAN Name : Term-ReadLine-Gnu +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: jason ryan <jasonwryan@gmail.com> +# Contributor: AUR Perl <aurperl@juster.info> +# Generator : CPANPLUS::Dist::Arch 1.15 + +pkgname=perl-term-readline-gnu +pkgver=1.20 +pkgrel=4 +pkgdesc="GNU Readline XS library wrapper" +arch=('i686' 'x86_64') +license=('PerlArtistic' 'GPL') +options=('!emptydirs') +depends=('perl>=5.7') +url='http://search.cpan.org/dist/Term-ReadLine-Gnu' +source=('http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.20.tar.gz' + 'termcap-bad-ncurses-good.patch') +md5sums=('fa33510193b89a2ada74fcef00816322' + 'a000706b89792f822b5ec20baa370910') +_distdir="${srcdir}/Term-ReadLine-Gnu-1.20" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + patch --forward -p1 < "${srcdir}/termcap-bad-ncurses-good.patch" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + cd "$_distdir" + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + make test + ) +} + +package() { + cd "$_distdir" + make install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + diff --git a/community/perl-term-readline-gnu/termcap-bad-ncurses-good.patch b/community/perl-term-readline-gnu/termcap-bad-ncurses-good.patch new file mode 100644 index 000000000..7fee6013c --- /dev/null +++ b/community/perl-term-readline-gnu/termcap-bad-ncurses-good.patch @@ -0,0 +1,18 @@ +--- Term-ReadLine-Gnu-1.20/Makefile.PL 2010-05-02 06:37:55.000000000 -0400 ++++ Term-ReadLine-Gnu-1.20-patched/Makefile.PL 2011-07-30 16:16:54.000000000 -0400 +@@ -58,8 +58,13 @@ + # know why AIX prefers curses. + # libtermcap.a on HPUX cannot be used for dynamically linked binary. + # Old Cygwin may require setting false (0). +- my $PREFER_CURSES = $Config{osname} eq 'aix' || $Config{osname} eq 'hpux' +- || $Config{osname} eq 'cygwin'; ++ # my $PREFER_CURSES = $Config{osname} eq 'aix' || $Config{osname} eq 'hpux' ++ # || $Config{osname} eq 'cygwin'; ++ ++ # Hack for ArchLinux by Justin Davis <aurperl@juster.us> ++ # Don't use termcap! readline is linked with ncurses so I know it's ++ # available. termcap causes this module to crash for some people. ++ my $PREFER_CURSES = 1; + my $TERMCAP_LIB = (! $PREFER_CURSES && &search_lib('-ltermcap')) + || &search_lib('-lncurses') + || &search_lib('-lcurses'); diff --git a/community/pianobar/PKGBUILD b/community/pianobar/PKGBUILD index 685342446..49680db24 100644 --- a/community/pianobar/PKGBUILD +++ b/community/pianobar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75011 2012-08-11 17:31:57Z dwallace $ +# $Id: PKGBUILD 80751 2012-12-03 03:27:47Z dwallace $ # Maintainer: Daniel Wallace < danielwallace at gtmanfred dot com> # Contributor: Mitch Bigelow <ipha00@gmail.com> # Contributor: Patrick Palka <patrick@parcs.ath.cx> pkgname=pianobar -pkgver=2012.06.24 +pkgver=2012.12.01 pkgrel=1 pkgdesc="console-based frontend for Pandora" url="http://6xq.net/0017" @@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('MIT') depends=('libao' 'faad2' 'libmad' 'gnutls' 'json-c' 'libgcrypt') source=(http://6xq.net/projects/pianobar/$pkgname-$pkgver.tar.bz2) -sha256sums=('a80307dcfc8786c28d6025f54820664eca0cf26f888bd608c95d486762f908aa') +sha256sums=('a3909f796e7cef21b19d98282f332ecbcf9b2c60a2af22a0a2ce01e9c4d9f515') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/pidgin-hotkeys/PKGBUILD b/community/pidgin-hotkeys/PKGBUILD new file mode 100644 index 000000000..bd2130cab --- /dev/null +++ b/community/pidgin-hotkeys/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 80723 2012-12-01 13:56:24Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: detto <detto-brumm@freenet.de> + +pkgname=pidgin-hotkeys +pkgver=0.2.4 +pkgrel=2 +pkgdesc="A Pidgin plugin that allows you to define global hotkeys." +arch=('i686' 'x86_64') +url="http://pidgin-hotkeys.sourceforge.net" +license=('GPL') +depends=('pidgin') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "pidgin-hotkeys.patch") +md5sums=('553aae7319861af9e8716bfe0ba45c30' + '0726353af56270164d7af88470722dd0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + patch -Np0 -i ../pidgin-hotkeys.patch + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/pidgin-hotkeys/pidgin-hotkeys.patch b/community/pidgin-hotkeys/pidgin-hotkeys.patch new file mode 100644 index 000000000..427295981 --- /dev/null +++ b/community/pidgin-hotkeys/pidgin-hotkeys.patch @@ -0,0 +1,24 @@ +--- src/hotkeys.c 2007-06-22 20:37:00.000000000 +0200 ++++ src/hotkeys.c 2008-04-18 16:08:46.000000000 +0200 +@@ -152,15 +152,19 @@ + + if ((l = get_pending_list(1))) + { +- pidgin_conv_present_conversation((PurpleConversation *)l->data); ++ PurpleConversation *conv = l->data; ++ pidgin_conv_present_conversation(conv); + + #ifdef GDK_WINDOWING_X11 + { + GtkWindow *gtkwindow; ++ PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); + +- gtkwindow = GTK_WINDOW(pidgin_conv_get_window(PIDGIN_CONVERSATION((PurpleConversation *)l->data))->window); ++ gtkwindow = GTK_WINDOW(pidgin_conv_get_window(PIDGIN_CONVERSATION(conv))->window); + /*gtk_window_present(gtkwindow);*/ + hacky_active_window(GTK_WIDGET(gtkwindow)); ++ ++ pidgin_conv_window_switch_gtkconv(gtkconv->win, gtkconv); + } + #endif + g_list_free(l); diff --git a/community/pidgin-libnotify/PKGBUILD b/community/pidgin-libnotify/PKGBUILD index 602168012..c56be9118 100644 --- a/community/pidgin-libnotify/PKGBUILD +++ b/community/pidgin-libnotify/PKGBUILD @@ -4,7 +4,7 @@ pkgname=pidgin-libnotify pkgver=0.14 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') pkgdesc="pidgin plugin that enables popups when someone logs in or messages you." url="http://gaim-libnotify.sourceforge.net/" @@ -14,16 +14,22 @@ makedepends=('libtool' 'intltool') replaces=('gaim-libnotify') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/gaim-libnotify/$pkgname-$pkgver.tar.gz language_fixes.patch - pidgin-libnotify-0.14-libnotify-0.7.patch) -md5sums=('bfb5368b69c02d429b2b17c00a6673c0' - 'e9bdbb3c7faa61f062fc64277457b6c0' - '05538625f14d9f2c12adae5fa6a1fa26') + pidgin-libnotify-0.14-libnotify-0.7.patch pidgin-libnotify-showbutton.patch) build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/language_fixes.patch" - patch -p0 -i "$srcdir/pidgin-libnotify-0.14-libnotify-0.7.patch" + patch -Np1 -i "$srcdir/language_fixes.patch" + patch -Np0 -i "$srcdir/pidgin-libnotify-0.14-libnotify-0.7.patch" + patch -Np0 -i "$srcdir/pidgin-libnotify-showbutton.patch" + ./configure --prefix=/usr --disable-deprecated --disable-static make +} +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +md5sums=('bfb5368b69c02d429b2b17c00a6673c0' + 'e9bdbb3c7faa61f062fc64277457b6c0' + '05538625f14d9f2c12adae5fa6a1fa26' + 'efe1e86aa1e0bc9f7d20efe7f34ad4a7') diff --git a/community/pidgin-libnotify/pidgin-libnotify-showbutton.patch b/community/pidgin-libnotify/pidgin-libnotify-showbutton.patch new file mode 100644 index 000000000..1f84e6025 --- /dev/null +++ b/community/pidgin-libnotify/pidgin-libnotify-showbutton.patch @@ -0,0 +1,10 @@ +--- src/pidgin-libnotify.c.orig 2007-10-01 20:52:38.000000000 +1000 ++++ src/pidgin-libnotify.c 2007-10-01 20:53:20.000000000 +1000 +@@ -307,6 +307,7 @@ + g_hash_table_insert (buddy_hash, contact, notification); + + g_object_set_data (G_OBJECT(notification), "contact", contact); ++ g_object_set_data (G_OBJECT(notification), "buddy", buddy); + + g_signal_connect (notification, "closed", G_CALLBACK(closed_cb), NULL); + diff --git a/community/pidgin-otr/PKGBUILD b/community/pidgin-otr/PKGBUILD index 3cfaae4ac..38cfbd399 100644 --- a/community/pidgin-otr/PKGBUILD +++ b/community/pidgin-otr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70766 2012-05-16 13:08:20Z lfleischer $ +# $Id: PKGBUILD 79622 2012-11-09 00:24:37Z ebelanger $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,17 +6,17 @@ # Contributor: Marcel Wysocki <maci@satgnu.net> pkgname=pidgin-otr -pkgver=3.2.1 +pkgver=4.0.0 pkgrel=1 pkgdesc='Off-the-Record Messaging plugin for Pidgin.' arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://www.cypherpunks.ca/otr/' -depends=('libotr>=3.2.0' 'pidgin' 'perlxml') +depends=('libotr>=4.0.0' 'pidgin' 'perlxml') makedepends=('intltool') source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz"{,.asc}) -md5sums=('4c3f73cca729555ff46c09e789ef6896' - 'e9a6d699768bd888f086e697ad984aa7') +md5sums=('eadb953376acc474e56041d4c12aa2c8' + '8c70a2fc6f5f0480f32178742ba96498') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/pion-net/PKGBUILD b/community/pion-net/PKGBUILD index d2511597a..c34b2b733 100644 --- a/community/pion-net/PKGBUILD +++ b/community/pion-net/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74005 2012-07-18 01:08:15Z ibiru $ +# $Id: PKGBUILD 80245 2012-11-18 10:31:18Z andrea $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: David Watzke <david@watzke.cz> pkgname=pion-net pkgver=4.0.12 -pkgrel=3 +pkgrel=4 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" url="http://www.pion.org/projects/pion-network-library" arch=('i686' 'x86_64') diff --git a/community/pkgfile/0001-update-fix-use-after-free.patch b/community/pkgfile/0001-update-fix-use-after-free.patch new file mode 100644 index 000000000..4494224c5 --- /dev/null +++ b/community/pkgfile/0001-update-fix-use-after-free.patch @@ -0,0 +1,27 @@ +From 60559a15e170ad49b388ee442eb2ccbe483bc9aa Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Mon, 19 Nov 2012 19:50:47 -0500 +Subject: [PATCH] update: fix use after free + +mark the address space as unread so that we don't attempt a double free +on a repo download failure during the final cleanup. +--- + src/update.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/update.c b/src/update.c +index c2e76e5..0b4fb8a 100644 +--- a/src/update.c ++++ b/src/update.c +@@ -552,7 +552,7 @@ static int add_repo_download(CURLM *multi, struct repo_t *repo) + } else { + curl_multi_remove_handle(multi, repo->curl); + FREE(repo->url); +- free(repo->data); ++ FREE(repo->data); + repo->buflen = 0; + repo->server_idx++; + } +-- +1.8.0 + diff --git a/community/pkgfile/PKGBUILD b/community/pkgfile/PKGBUILD index ecaea96b8..73be9ebf8 100644 --- a/community/pkgfile/PKGBUILD +++ b/community/pkgfile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76836 2012-10-01 01:25:40Z dreisner $ +# $Id: PKGBUILD 80498 2012-11-23 00:24:41Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pkgfile -pkgver=6 -pkgrel=1 +pkgver=7 +pkgrel=2 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64' 'mips64el') url="http://github.com/falconindy/pkgfile" @@ -11,19 +11,30 @@ license=('MIT') depends=('libarchive' 'curl' 'pcre' 'pacman') conflicts=('pkgtools<24-2') makedepends=('perl') -source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} + '0001-update-fix-use-after-free.patch') install=pkgfile.install -md5sums=('75139dd8441d60ee7682d900b610e189' - '75cca8e3c0198fa98e32b54fd5e936e6') +md5sums=('f1dc0052b1c21597ea2fa0f0ce05608c' + '28599a9b6e56860a9cba1c95ec797551' + 'a4f505d080795fd0c10fd1d93b4520f6') build() { cd "$pkgname-$pkgver" + + patch -Np1 <"$srcdir/0001-update-fix-use-after-free.patch" + ./configure make + + # generate a license file + sed '/\*\//q' src/pkgfile.c >LICENSE } package() { - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim: ft=sh syn=sh diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index fa8b45e8b..f06ad27b3 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,10 +1,12 @@ -# $Id: PKGBUILD 73814 2012-07-15 22:19:23Z cbrannon $ +# $Id: PKGBUILD 79309 2012-11-02 16:29:05Z spupykin $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: phrakture <aaronmgriffin--gmail--com> # Contributor: Fazlul Shahriar # Contributor: Chris Brannon <cmbrannon79@gmail.com> + pkgname=plan9port -pkgver=20120715 -pkgrel=1 +pkgver=20121022 +pkgrel=2 pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems" arch=('i686' 'x86_64' 'mips64el') url="http://swtch.com/plan9port/" @@ -13,18 +15,30 @@ depends=(xorg-server libxt libxext sh fuse) optdepends=('python2: for the codereview script') provides=('plan9') install=plan9.install +options=(!zipman) source=(http://swtch.com/$pkgname/$pkgname-$pkgver.tgz plan9.sh) +sha256sums=('1293b5d2e46d0d6f7be2adbdb285ce278a25c77e88b5cd7c230e16a47d0f8638' + '0247c4446497359d305aaec069b07180fbf79ce4fa5191464cd9ebb8c7f0228d') + +build() { + cd "$srcdir/plan9" + + ./INSTALL -b +} -build() -{ - install -Dm755 "$srcdir/plan9.sh" "$pkgdir/etc/profile.d/plan9.sh" || return 1 +package() { + cd "$srcdir/plan9" - install -dm755 "$pkgdir/opt" "$pkgdir/usr/share/doc/$pkgname" || return 1 - mv "$srcdir/plan9" "$pkgdir/opt" + install -Dm755 ../plan9.sh $pkgdir/etc/profile.d/plan9.sh + mkdir -p "$pkgdir/opt" + cp -r $srcdir/plan9 $pkgdir/opt/ + + mkdir -p $pkgdir/usr/share/doc/$pkgname cd "$pkgdir/opt/plan9" - ./INSTALL || return 1 - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" || return 1 + ./INSTALL -c -r "$pkgdir/opt/plan9" + + install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE # Don't need these under /opt/plan9. rm -rf .hg/ @@ -33,21 +47,26 @@ build() rm -f config install.log install.sum install.txt configure Makefile INSTALL \ LICENSE - borkedfiles=`grep -r "$pkgdir"/opt/plan9 * | grep -v Binary | cut -d\: -f1` - for f in $borkedfiles; do - echo "fixing hardcoded paths in $f" - sed -i "s@$pkgdir/opt/plan9@/opt/plan9@" $f || return 1 + msg2 "Fixing hardcoded paths..." + for f in `grep -H -r "$pkgdir/opt/plan9" | cut -d: -f1`; do + echo -n "\t$f" + [ -e "$f" ] && sed -i "s:$pkgdir/opt/plan9:/opt/plan9:" "$f" || true done find "$pkgdir" -name '*.py' -print0 |xargs -0 \ - sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \ + sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/python2,' \ -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,' - for i in CHANGES CONTRIBUTORS README TODO - do - install -m644 $i "$pkgdir/usr/share/doc/$pkgname" || return 1 + for i in CHANGES CONTRIBUTORS README TODO; do + install -m644 $i "$pkgdir/usr/share/doc/$pkgname" rm -f $i done + + echo "==> Decompressing plan9 man pages" + for i in `find /opt/plan9/man -type f`; do + if [ ${i##*.} = "gz" ]; then +# echo " ${i%%.*}..." + gunzip $i + fi + done } -md5sums=('1e0698aa5f652a1a47227be2b25fa8fd' - '9695eb15a247e23140e8a35ff52a5c20') diff --git a/community/plan9port/plan9.install b/community/plan9port/plan9.install index 63b8dd0da..5c76552f3 100644 --- a/community/plan9port/plan9.install +++ b/community/plan9port/plan9.install @@ -1,42 +1,21 @@ -pre_install() { - /bin/true -} - post_install() { - echo "==> Decompressing plan9 man pages" - for i in `find /opt/plan9/man -type f`; do - if [ ${i##*.} = "gz" ]; then -# echo " ${i%%.*}..." - gunzip $i - fi - done - echo "" echo "==> In order to use Plan9 specific apps, run them" echo " as arguments to the '9' script, i.e. '9 date'" echo "==> Please log off or 'source /etc/profile.d/plan9.sh'" echo "==> Run '9 man 1 intro | less' to begin" source /etc/profile.d/plan9.sh - /bin/true -} - -pre_upgrade() { - post_remove - /bin/true } post_upgrade() { post_install - /bin/true } -pre_remove() { - /bin/true +pre_upgrade() { + post_remove } post_remove() { #we had to unpack them so they won't get removed.... rm -rf /opt/plan9/man - /bin/true } - diff --git a/community/pmount/PKGBUILD b/community/pmount/PKGBUILD new file mode 100644 index 000000000..8bac8e37c --- /dev/null +++ b/community/pmount/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 80203 2012-11-17 15:45:57Z eric $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=pmount +pkgver=0.9.23 +pkgrel=4 +pkgdesc="mount removable devices as normal user" +arch=(i686 x86_64) +license=('GPL2') +url="http://pmount.alioth.debian.org/" +backup=('etc/pmount.allow') +depends=('sysfsutils>=2.0.0-1' 'bash' 'util-linux') +makedepends=('intltool') +source=(https://alioth.debian.org/frs/download.php/3310/pmount-0.9.23.tar.bz2) +md5sums=('db19f5bf3151b1b41705ec7bafa439d3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-hal \ + --with-cryptsetup-prog=/usr/sbin/cryptsetup + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/pmtools/PKGBUILD b/community/pmtools/PKGBUILD deleted file mode 100644 index df01eb04e..000000000 --- a/community/pmtools/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 66151 2012-02-23 02:17:26Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sebastian Pohle <naitsabes@imapmail.org> - -pkgname=pmtools -pkgver=20101124 -pkgrel=2 -pkgdesc="A small collection of ACPI power management test and investigation tools" -arch=('i686' 'x86_64' 'mips64el') -url="http://acpi.sourceforge.net/dsdt/index.php" -license=('GPL2') -depends=('perl') -#source=(http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils/$pkgname-$pkgver.tar.bz2) -source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.bz2) -md5sums=('45e62eae9aca4fce84cb102c117f5796') - -build() { - cd $srcdir/$pkgname - patch -p1 <<EOF -diff -wbBur pmtools/turbostat/Makefile pmtools.my/turbostat/Makefile ---- pmtools/turbostat/Makefile 2010-11-24 05:36:50.000000000 +0000 -+++ pmtools.my/turbostat/Makefile 2010-11-24 16:42:05.000000000 +0000 -@@ -1,3 +1,5 @@ -+all: turbostat -+ - turbostat : turbostat.c - - clean : -EOF - - make - (cd madt && make) - - install -D -m755 acpidump/acpidump $pkgdir/usr/sbin/acpidump - install -D -m755 acpixtract/acpixtract $pkgdir/usr/sbin/acpixtract - install -D -m755 madt/madt $pkgdir/usr/sbin/madt - install -D -m755 pmtest/pmtest $pkgdir/usr/sbin/pmtest - install -D -m755 turbostat/turbostat $pkgdir/usr/sbin/turbostat -} diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD index 800463c0e..47b7f460d 100644 --- a/community/polipo/PKGBUILD +++ b/community/polipo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75176 2012-08-14 19:38:14Z ttopper $ +# $Id: PKGBUILD 80790 2012-12-03 18:01:33Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Jelle van der Waa <jelle vdwaa nl> # Contributor: Thomas Holmquist <thomas@vorget.com> @@ -7,7 +7,7 @@ pkgname=polipo pkgver=1.0.4.1 -pkgrel=7 +pkgrel=9 pkgdesc="A small and fast caching web proxy." arch=('i686' 'x86_64' 'mips64el') url="http://www.pps.jussieu.fr/~jch/software/polipo/" @@ -16,12 +16,11 @@ depends=('bash') makedepends=('texinfo') install=polipo.install source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz" - "polipo.cron" "polipo.rc.d" "polipo.conf.d" "polipo.service") + "polipo.rc.d" "polipo.conf.d" "polipo.service") md5sums=('bfc5c85289519658280e093a270d6703' - 'bac0e1a871964c931eb5f7a369b3243c' '7406aad26807fb3a4e5f7b01ecb97a59' '685aa0c6070dee11c701932d23afcc6a' - 'e96b164de3488afc7ab28b2edbe90fd1') + '143ef45db99dc745b6c3a606847be9fe') build() { cd "$srcdir/$pkgname-$pkgver" @@ -34,9 +33,9 @@ package() { make PREFIX="$pkgdir/usr" \ MANDIR="$pkgdir/usr/share/man" \ INFODIR="$pkgdir/usr/share/info" \ - LOCAL_ROOT="$pkgdir/usr/share/polipo/www" \ - DISK_CACHE_ROOT="$pkgdir/var/cache/polipo" \ - install + LOCAL_ROOT="$pkgdir/usr/share/polipo/www" \ + DISK_CACHE_ROOT="$pkgdir/var/cache/polipo" \ + install # install config files @@ -48,7 +47,6 @@ package() { # install daemon scripts / cron install -Dm 755 $srcdir/polipo.rc.d $pkgdir/etc/rc.d/polipo - install -Dm 755 $srcdir/polipo.cron $pkgdir/usr/share/polipo/polipo.cron install -Dm 644 $srcdir/polipo.service $pkgdir/usr/lib/systemd/system/polipo.service install -Dm 644 $srcdir/polipo.conf.d $pkgdir/etc/conf.d/polipo.conf } diff --git a/community/polipo/polipo.service b/community/polipo/polipo.service index 057d1c3c2..a4c0f6d94 100644 --- a/community/polipo/polipo.service +++ b/community/polipo/polipo.service @@ -1,11 +1,11 @@ [Unit] Description=Polipo Proxy Server +After=network.target [Service] -Type=oneshot +Type=forking ExecStart=/usr/bin/polipo daemonise=true logFile="/var/log/polipo.log" User=nobody -RemainAfterExit=yes [Install] WantedBy=multi-user.target diff --git a/community/portmidi/PKGBUILD b/community/portmidi/PKGBUILD deleted file mode 100644 index 033f881a6..000000000 --- a/community/portmidi/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 62694 2012-01-24 20:35:44Z lfleischer $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: SpepS <dreamspepser at yahoo dot it> -# Contributor: Denis Martinez <deuns.martinez AT gmail DOT com> - -pkgname=portmidi -pkgver=217 -pkgrel=3 -pkgdesc="Platform independent library for real-time MIDI input/output." -arch=('i686' 'x86_64' 'mips64el') -url='http://portmedia.sourceforge.net/' -license=('GPL') -depends=('alsa-lib') -makedepends=('cmake' 'java-environment') -source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip" - 'portmidi-217-build-fix.patch') -md5sums=('03f46fd3947e2ef4c8c465baaf832241' - '59cb428b29a33bab3bb5811cda479a9b') - -build() { - cd "${srcdir}/${pkgname}" - - sed -i "s#/usr/local#/usr#" */CMakeLists.txt pm_python/setup.py - mkdir -p pm_java/Release - - # build fix for "pm_java/CMakeLists.txt" (fixes FS#27118) - patch -p1 -i ../portmidi-217-build-fix.patch - - cmake . -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \ - -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \ - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release - - make -} - -package() { - cd "${srcdir}/${pkgname}" - - make DESTDIR="${pkgdir}" install - - # Fix missing symlink for libporttime.so (FS#21528). - mv "${pkgdir}/usr/lib/libportmidi_s.a" "${pkgdir}/usr/lib/libportmidi.a" - ln -s "/usr/lib/libportmidi.so" "${pkgdir}/usr/lib/libporttime.so" - ln -s "/usr/lib/libportmidi.a" "${pkgdir}/usr/lib/libporttime.a" -} diff --git a/community/portmidi/portmidi-217-build-fix.patch b/community/portmidi/portmidi-217-build-fix.patch deleted file mode 100644 index 3e2dfef29..000000000 --- a/community/portmidi/portmidi-217-build-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -rup portmidi.orig/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt ---- portmidi.orig/pm_java/CMakeLists.txt 2009-11-04 16:20:44.000000000 +0100 -+++ portmidi/pm_java/CMakeLists.txt 2012-01-24 21:13:08.513182169 +0100 -@@ -15,13 +15,11 @@ if(UNIX) - add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class - COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java - MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java -- DEPENDS pmdefaults/PmDefaults.java -- WORKING_DIRECTORY pm_java) -+ DEPENDS pmdefaults/PmDefaults.java) - add_custom_command(OUTPUT pmdefaults/PmDefaults.class - COMMAND javac -classpath . pmdefaults/PmDefaults.java - MAIN_DEPENDENCY pmdefaults/PmDefaults.java -- DEPENDS pmdefaults/PmDefaultsFrame.java -- WORKING_DIRECTORY pm_java) -+ DEPENDS pmdefaults/PmDefaultsFrame.java) - add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar - COMMAND cp pmdefaults/portmusic_logo.png . - COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar -@@ -31,8 +29,7 @@ if(UNIX) - COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} - COMMAND rm portmusic_logo.png - MAIN_DEPENDENCY pmdefaults/PmDefaults.class -- DEPENDS ${PMDEFAULTS_ALL_CLASSES} -- WORKING_DIRECTORY pm_java) -+ DEPENDS ${PMDEFAULTS_ALL_CLASSES}) - add_custom_target(pmdefaults_target ALL - DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) - # message(STATUS "add_custom_target: pmdefaults.jar") diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD index bf0af6acd..2b93da6e3 100644 --- a/community/powertop/PKGBUILD +++ b/community/powertop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75422 2012-08-22 21:05:18Z seblu $ +# $Id: PKGBUILD 78981 2012-10-28 15:59:46Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Xilon <xilonmu@gmail.com> pkgname=powertop -pkgver=2.1 +pkgver=2.1.1 pkgrel=1 pkgdesc='A tool to diagnose issues with power consumption and power management' arch=('i686' 'x86_64' 'mips64el') @@ -12,18 +12,20 @@ url='https://01.org/powertop/' license=('GPL2') depends=('gcc-libs' 'libnl' 'ncurses' 'pciutils') changelog=$pkgname.changelog -source=("https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.gz") -sha256sums=('3dd4816cca4167063b78d2d7772aff8dc58377d0ed74bf11862412a8a80d2698') +source=($pkgname-$pkgver.tar.gz::https://github.com/fenrus75/powertop/tarball/v2.1.1) +#https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.gz) +sha256sums=('e925230cc9006dbc226aec4dea389b97a0f906a7997b33aca40a1d6bc7568dc4') build() { - cd $pkgname-$pkgver + cd ${srcdir}/*-$pkgname-* + ./autogen.sh ./configure --prefix=/usr make } package() { - cd $pkgname-$pkgver + cd ${srcdir}/*-$pkgname-* - make DESTDIR="$pkgdir" install + make DESTDIR=${pkgdir} install } diff --git a/community/powertop/powertop.changelog b/community/powertop/powertop.changelog index 581da010b..9a53fc3d3 100644 --- a/community/powertop/powertop.changelog +++ b/community/powertop/powertop.changelog @@ -1,3 +1,6 @@ +2012-10-28 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org> + * powertop 2.1.1-1 + 2012-08-22 Sébastien Luttringer (seblu) <seblu@aur.archlinux.org> * powertop 2.1-1 diff --git a/community/prboom/PKGBUILD b/community/prboom/PKGBUILD deleted file mode 100644 index 03f53784e..000000000 --- a/community/prboom/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 77655 2012-10-13 11:44:28Z allan $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Thayer Williams <thayer@archlinux.org> -# Contributor: dale <dale@archlinux.org> - -pkgname=prboom -pkgver=2.5.0 -pkgrel=7 -pkgdesc='A game engine which provides a program to play Doom levels.' -url='http://prboom.sourceforge.net/' -license=('GPL2') -arch=('i686' 'x86_64' 'mips64el') -depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu') -makedepends=('mesa') -source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz" - 'libpng-1.4.patch') -md5sums=('a8a15f61fa2626ab98051ab2703378c4' - 'ba53474db8e747035ca2320a445e4ae0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 < ../libpng-1.4.patch - - ./configure --prefix=/usr --disable-i386-asm - sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - diff --git a/community/prboom/libpng-1.4.patch b/community/prboom/libpng-1.4.patch deleted file mode 100644 index a2215e37b..000000000 --- a/community/prboom/libpng-1.4.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c ---- prboom-2.5.0-orig/src/SDL/i_sshot.c 2010-01-24 23:26:03.000000000 -0500 -+++ prboom-2.5.0/src/SDL/i_sshot.c 2010-01-24 23:28:42.000000000 -0500 -@@ -231,7 +231,7 @@ - if (fp) - { - png_struct *png_ptr = png_create_write_struct( -- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); -+ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); - - if (png_ptr) - { -@@ -279,7 +279,7 @@ - break; - } - } -- png_destroy_write_struct(&png_ptr, png_infopp_NULL); -+ png_destroy_write_struct(&png_ptr, NULL); - } - fclose(fp); - } diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD index c1e828318..ff82d567b 100644 --- a/community/privoxy/PKGBUILD +++ b/community/privoxy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76058 2012-09-10 08:26:06Z lfleischer $ +# $Id: PKGBUILD 80122 2012-11-16 17:01:01Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@hoetzel.info> # Contributor: basilburn (basilburn), Paul Bredbury (brebs) pkgname=privoxy pkgver=3.0.19 -pkgrel=6 +pkgrel=7 pkgdesc='A web proxy with advanced filtering capabilities.' arch=('i686' 'x86_64' 'mips64el') url='http://www.privoxy.org' @@ -33,7 +33,7 @@ build() { autoheader autoconf - ./configure --prefix=/usr --sysconfdir=/etc/privoxy + ./configure --prefix=/usr --sysconfdir=/etc/privoxy --enable-compression make } diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD index 217efe81e..d6226ccf0 100644 --- a/community/projectm/PKGBUILD +++ b/community/projectm/PKGBUILD @@ -1,38 +1,41 @@ -# $Id: PKGBUILD 75395 2012-08-21 20:06:54Z ebelanger $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# $Id: PKGBUILD 78939 2012-10-27 23:45:21Z ebelanger $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgbase=projectm pkgname=('projectm' 'libvisual-projectm') pkgver=2.1.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://projectm.sourceforge.net/' license=('LGPL') makedepends=('cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext') -source=("http://downloads.sourceforge.net/${pkgname}/projectM-complete-${pkgver}-Source.tar.gz") -md5sums=('debf30f7ce94ff0102f06fbb0cc4e92b') +source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz") +sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee') build() { - cd "${srcdir}/projectM-complete-${pkgver}-Source/src" + cd $srcdir/projectM-complete-$pkgver-Source/src cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DINCLUDE-PROJECTM-QT=OFF \ -DINCLUDE-PROJECTM-PULSEAUDIO=OFF -DINCLUDE-PROJECTM-TEST=OFF make } package_projectm() { - pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.' + pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering' depends=('ftgl' 'glew' 'gtkglext') - cd "${srcdir}/projectM-complete-${pkgver}-Source/src/libprojectM" - make DESTDIR="${pkgdir}" install - install -m644 fonts/Vera.ttf "${pkgdir}/usr/share/projectM/fonts/Vera.ttf" + cd $srcdir/projectM-complete-$pkgver-Source/src/libprojectM + make DESTDIR=$pkgdir install + install -m644 fonts/Vera.ttf $pkgdir/usr/share/projectM/fonts/Vera.ttf } package_libvisual-projectm() { - pkgdesc='ProjectM XMMS plugin.' + pkgdesc='ProjectM XMMS plugin' depends=("projectm>=$pkgver" 'libvisual' 'sdl') - cd "${srcdir}/projectM-complete-${pkgver}-Source/src/projectM-libvisual" - make DESTDIR="${pkgdir}" install + cd $srcdir/projectM-complete-$pkgver-Source/src/projectM-libvisual + make DESTDIR=$pkgdir install } + +# vim:set ts=2 sw=2 et: diff --git a/community/psqlodbc/PKGBUILD b/community/psqlodbc/PKGBUILD index 3c790a4c6..34cb4bc18 100644 --- a/community/psqlodbc/PKGBUILD +++ b/community/psqlodbc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78481 2012-10-19 15:10:20Z spupykin $ +# $Id: PKGBUILD 79084 2012-10-30 09:55:07Z spupykin $ # Maintainer: # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux-br.org> # Contributor: Rick Rein <jeebusroxors@gmail.com> pkgname=psqlodbc pkgver=09.01.0200 -pkgrel=1 +pkgrel=2 pkgdesc="PostgreSQL ODBC driver" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -18,6 +18,7 @@ md5sums=('0f4ac0e6b0755af2452764db4cfe4e8f') build() { cd "$srcdir/$pkgname-$pkgver" + sed -i 's|#define DEFAULT_PGSOCKET_DIR.*|#define DEFAULT_PGSOCKET_DIR "/run/postgresql"|' socket.h ./configure --prefix=/usr make } diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index 8dc7976e6..7a7e9896e 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9682 +pkgver=9694 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64' 'mips64el') @@ -38,4 +38,4 @@ package() { mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox } -md5sums=('2a592b4c43d24504be327367008807f7') +md5sums=('f5e7b7b2a1bab3c939bb03e4ff8201c1') diff --git a/community/pylibacl/PKGBUILD b/community/pylibacl/PKGBUILD index 4d5cee098..8bc98b85d 100644 --- a/community/pylibacl/PKGBUILD +++ b/community/pylibacl/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 57855 2011-11-03 18:43:59Z lfleischer $ +# $Id: PKGBUILD 80486 2012-11-22 18:15:22Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> pkgname=pylibacl -pkgver=0.5.0 -pkgrel=2 +pkgver=0.5.1 +pkgrel=1 pkgdesc='A python extension module that allows you to manipulate the POSIX.1e ACLs.' arch=('i686' 'x86_64' 'mips64el') -url='http://pylibacl.sourceforge.net/' +url='http://pylibacl.k1024.org/' license=('GPL') depends=('python2') makedepends=('python2-distribute') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('b9d34da90e6da0813115071b3a1ab204') +source=("https://github.com/downloads/iustin/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('a429256345ffdc2cea57fd24da0d980d') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/python-cchardet/PKGBUILD b/community/python-cchardet/PKGBUILD new file mode 100644 index 000000000..ac36b156f --- /dev/null +++ b/community/python-cchardet/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 80436 2012-11-21 15:45:04Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> + +pkgname=python-cchardet +pkgver=0.3.2 +pkgrel=1 +_libname=${pkgname/python-/} +pkgdesc="Universal encoding detector faster than chardet." +url="http://pypi.python.org/pypi/cchardet/" +depends=('python') +makedepends=('cython' 'python-distribute') +license=('MIT') +arch=('i686' 'x86_64') +source=(http://pypi.python.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz) + +build() { + cd "$srcdir/$_libname-$pkgver" + python setup.py build +} + +package() { + cd "$srcdir/$_libname-$pkgver" + python setup.py install --root="$pkgdir" + install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst" +} + +sha256sums=('a3e92811d5a8aacd9ecfdb4ea9637ba801b9b18b7c779dbdf41d07bb48235a23') diff --git a/community/python-cjson/PKGBUILD b/community/python-cjson/PKGBUILD deleted file mode 100644 index 6c92e760c..000000000 --- a/community/python-cjson/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# $Id: PKGBUILD 66126 2012-02-23 01:35:30Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Lincoln de Sousa <lincoln@archlinux-br.org> - -pkgname=python-cjson -pkgver=1.0.5 -pkgrel=4 -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -pkgdesc="Fast JSON encoder/decoder for Python" -url="http://pypi.python.org/pypi/python-cjson/" -depends=('python2') -source=("http://pypi.python.org/packages/source/p/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('4d55b66ecdf0300313af9d030d9644a3') - -build() { - cd $srcdir/$pkgname-$pkgver - python2 setup.py install --root=$pkgdir -} diff --git a/community/python-fuse/PKGBUILD b/community/python-fuse/PKGBUILD deleted file mode 100644 index e46eef13a..000000000 --- a/community/python-fuse/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 65677 2012-02-21 21:14:06Z cbrannon $ -# Maintainer: Chris Brannon <cmbrannon79@gmail.com> -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Alexander Fehr <pizzapunk@gmail.com> - -pkgname=python-fuse -pkgver=0.2.1 -pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') -pkgdesc="Python bindings for FUSE" -url="http://fuse.sourceforge.net/wiki/index.php/FusePython" -license=('LGPL') -depends=('fuse' 'python2') -makedepends=('pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/fuse/fuse-python-${pkgver}.tar.gz) - -build() { - cd "$srcdir/fuse-python-$pkgver" - python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 -} -md5sums=('9d9c5c2311ac04291ce822dfece108f8') diff --git a/community/python-galago-gtk/PKGBUILD b/community/python-galago-gtk/PKGBUILD deleted file mode 100644 index e76658618..000000000 --- a/community/python-galago-gtk/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 63720 2012-02-05 12:09:04Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=python-galago-gtk -pkgver=0.5.0 -pkgrel=6 -pkgdesc="A library of simple functions that are optimized for various CPUs" -arch=('i686' 'x86_64' 'mips64el') -url="http://galago-project.org" -options=('!libtool') -license=('LGPL') -depends=('libgalago-gtk' 'pygtk' 'python-galago') -source=(http://galago-project.org/files/releases/source/galago-gtk-python/galago-gtk-python-$pkgver.tar.bz2) -md5sums=('3eb752eaa87d986bf272cf1266528c43') - -build() { - cd $srcdir/galago-gtk-python-$pkgver - ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install -} diff --git a/community/python-galago/PKGBUILD b/community/python-galago/PKGBUILD deleted file mode 100644 index b9d89f76d..000000000 --- a/community/python-galago/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 66142 2012-02-23 01:46:58Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=python-galago -pkgver=0.5.0 -pkgrel=5 -pkgdesc="A library of simple functions that are optimized for various CPUs" -arch=('i686' 'x86_64' 'mips64el') -url="http://galago-project.org" -options=('!libtool') -license=('LGPL') -depends=('libgalago' 'pygtk') -source=(http://galago-project.org/files/releases/source/galago-python/galago-python-$pkgver.tar.bz2) -md5sums=('27be31fcf2886aa21823caec15dc34aa') - -build() { - cd $srcdir/galago-python-$pkgver - ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install -} diff --git a/community/python-gnutls/PKGBUILD b/community/python-gnutls/PKGBUILD deleted file mode 100644 index 463cc832a..000000000 --- a/community/python-gnutls/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 74656 2012-08-01 13:54:54Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Hugo Doria <hugo@archlinux.org> -# Contributor: N3RD3X <n3rd3x@linuxmail.org> - -pkgname=python-gnutls -pkgver=1.2.4 -pkgrel=2 -pkgdesc="Python wrapper for the GNUTLS library" -arch=('i686' 'x86_64' 'mips64el') -url="http://cheeseshop.python.org/pypi/python-gnutls" -depends=('python2' 'gnutls') -license=('LGPL') -source=(http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz - gnutls3.patch) -md5sums=('e3536c421291a791869d875a41dcb26a' - '24bc95d9f5e71e9f5e180706cbb09248') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 <$srcdir/gnutls3.patch - python2 setup.py install --root=${pkgdir} -} diff --git a/community/python-gnutls/gnutls3.patch b/community/python-gnutls/gnutls3.patch deleted file mode 100644 index 5110de2f2..000000000 --- a/community/python-gnutls/gnutls3.patch +++ /dev/null @@ -1,271 +0,0 @@ -diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py ---- gnutls/library/functions.py 2011-08-19 04:48:14.000000000 +0100 -+++ gnutls.fixed/library/functions.py 2012-08-01 11:56:43.450975419 +0100 -@@ -4,7 +4,7 @@ - import sys - from ctypes import * - --from gnutls.library import libgnutls, libgnutls_extra -+from gnutls.library import libgnutls - from gnutls.library.types import * - - -@@ -121,14 +121,6 @@ - gnutls_certificate_get_peers.argtypes = [gnutls_session_t, POINTER(c_uint)] - gnutls_certificate_get_peers.restype = POINTER(gnutls_datum_t) - --gnutls_certificate_get_x509_cas = libgnutls.gnutls_certificate_get_x509_cas --gnutls_certificate_get_x509_cas.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crt_t)), POINTER(c_uint)] --gnutls_certificate_get_x509_cas.restype = None -- --gnutls_certificate_get_x509_crls = libgnutls.gnutls_certificate_get_x509_crls --gnutls_certificate_get_x509_crls.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crl_t)), POINTER(c_uint)] --gnutls_certificate_get_x509_crls.restype = None -- - gnutls_certificate_send_x509_rdn_sequence = libgnutls.gnutls_certificate_send_x509_rdn_sequence - gnutls_certificate_send_x509_rdn_sequence.argtypes = [gnutls_session_t, c_int] - gnutls_certificate_send_x509_rdn_sequence.restype = None -@@ -221,10 +213,6 @@ - gnutls_certificate_type_set_priority.argtypes = [gnutls_session_t, POINTER(c_int)] - gnutls_certificate_type_set_priority.restype = c_int - --gnutls_certificate_verify_peers = libgnutls.gnutls_certificate_verify_peers --gnutls_certificate_verify_peers.argtypes = [gnutls_session_t] --gnutls_certificate_verify_peers.restype = c_int -- - gnutls_certificate_verify_peers2 = libgnutls.gnutls_certificate_verify_peers2 - gnutls_certificate_verify_peers2.argtypes = [gnutls_session_t, POINTER(c_uint)] - gnutls_certificate_verify_peers2.restype = c_int -@@ -393,10 +381,6 @@ - gnutls_error_to_alert.argtypes = [c_int, POINTER(c_int)] - gnutls_error_to_alert.restype = c_int - --gnutls_extra_check_version = libgnutls_extra.gnutls_extra_check_version --gnutls_extra_check_version.argtypes = [c_char_p] --gnutls_extra_check_version.restype = c_char_p -- - gnutls_fingerprint = libgnutls.gnutls_fingerprint - gnutls_fingerprint.argtypes = [gnutls_digest_algorithm_t, POINTER(gnutls_datum_t), c_void_p, POINTER(size_t)] - gnutls_fingerprint.restype = c_int -@@ -409,10 +393,6 @@ - gnutls_global_init.argtypes = [] - gnutls_global_init.restype = c_int - --gnutls_global_init_extra = libgnutls_extra.gnutls_global_init_extra --gnutls_global_init_extra.argtypes = [] --gnutls_global_init_extra.restype = c_int -- - gnutls_global_set_log_function = libgnutls.gnutls_global_set_log_function - gnutls_global_set_log_function.argtypes = [gnutls_log_func] - gnutls_global_set_log_function.restype = None -@@ -461,86 +441,6 @@ - gnutls_hex_encode.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)] - gnutls_hex_encode.restype = c_int - --gnutls_ia_allocate_client_credentials = libgnutls_extra.gnutls_ia_allocate_client_credentials --gnutls_ia_allocate_client_credentials.argtypes = [POINTER(gnutls_ia_client_credentials_t)] --gnutls_ia_allocate_client_credentials.restype = c_int -- --gnutls_ia_allocate_server_credentials = libgnutls_extra.gnutls_ia_allocate_server_credentials --gnutls_ia_allocate_server_credentials.argtypes = [POINTER(gnutls_ia_server_credentials_t)] --gnutls_ia_allocate_server_credentials.restype = c_int -- --gnutls_ia_enable = libgnutls_extra.gnutls_ia_enable --gnutls_ia_enable.argtypes = [gnutls_session_t, c_int] --gnutls_ia_enable.restype = None -- --gnutls_ia_endphase_send = libgnutls_extra.gnutls_ia_endphase_send --gnutls_ia_endphase_send.argtypes = [gnutls_session_t, c_int] --gnutls_ia_endphase_send.restype = c_int -- --gnutls_ia_extract_inner_secret = libgnutls_extra.gnutls_ia_extract_inner_secret --gnutls_ia_extract_inner_secret.argtypes = [gnutls_session_t, c_char_p] --gnutls_ia_extract_inner_secret.restype = None -- --gnutls_ia_free_client_credentials = libgnutls_extra.gnutls_ia_free_client_credentials --gnutls_ia_free_client_credentials.argtypes = [gnutls_ia_client_credentials_t] --gnutls_ia_free_client_credentials.restype = None -- --gnutls_ia_free_server_credentials = libgnutls_extra.gnutls_ia_free_server_credentials --gnutls_ia_free_server_credentials.argtypes = [gnutls_ia_server_credentials_t] --gnutls_ia_free_server_credentials.restype = None -- --gnutls_ia_generate_challenge = libgnutls_extra.gnutls_ia_generate_challenge --gnutls_ia_generate_challenge.argtypes = [gnutls_session_t, size_t, c_char_p] --gnutls_ia_generate_challenge.restype = c_int -- --gnutls_ia_get_client_avp_ptr = libgnutls_extra.gnutls_ia_get_client_avp_ptr --gnutls_ia_get_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t] --gnutls_ia_get_client_avp_ptr.restype = c_void_p -- --gnutls_ia_get_server_avp_ptr = libgnutls_extra.gnutls_ia_get_server_avp_ptr --gnutls_ia_get_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t] --gnutls_ia_get_server_avp_ptr.restype = c_void_p -- --gnutls_ia_handshake = libgnutls_extra.gnutls_ia_handshake --gnutls_ia_handshake.argtypes = [gnutls_session_t] --gnutls_ia_handshake.restype = c_int -- --gnutls_ia_handshake_p = libgnutls_extra.gnutls_ia_handshake_p --gnutls_ia_handshake_p.argtypes = [gnutls_session_t] --gnutls_ia_handshake_p.restype = c_int -- --gnutls_ia_permute_inner_secret = libgnutls_extra.gnutls_ia_permute_inner_secret --gnutls_ia_permute_inner_secret.argtypes = [gnutls_session_t, size_t, c_char_p] --gnutls_ia_permute_inner_secret.restype = c_int -- --gnutls_ia_recv = libgnutls_extra.gnutls_ia_recv --gnutls_ia_recv.argtypes = [gnutls_session_t, c_char_p, size_t] --gnutls_ia_recv.restype = ssize_t -- --gnutls_ia_send = libgnutls_extra.gnutls_ia_send --gnutls_ia_send.argtypes = [gnutls_session_t, c_char_p, size_t] --gnutls_ia_send.restype = ssize_t -- --gnutls_ia_set_client_avp_function = libgnutls_extra.gnutls_ia_set_client_avp_function --gnutls_ia_set_client_avp_function.argtypes = [gnutls_ia_client_credentials_t, gnutls_ia_avp_func] --gnutls_ia_set_client_avp_function.restype = None -- --gnutls_ia_set_client_avp_ptr = libgnutls_extra.gnutls_ia_set_client_avp_ptr --gnutls_ia_set_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t, c_void_p] --gnutls_ia_set_client_avp_ptr.restype = None -- --gnutls_ia_set_server_avp_function = libgnutls_extra.gnutls_ia_set_server_avp_function --gnutls_ia_set_server_avp_function.argtypes = [gnutls_ia_server_credentials_t, gnutls_ia_avp_func] --gnutls_ia_set_server_avp_function.restype = None -- --gnutls_ia_set_server_avp_ptr = libgnutls_extra.gnutls_ia_set_server_avp_ptr --gnutls_ia_set_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t, c_void_p] --gnutls_ia_set_server_avp_ptr.restype = None -- --gnutls_ia_verify_endphase = libgnutls_extra.gnutls_ia_verify_endphase --gnutls_ia_verify_endphase.argtypes = [gnutls_session_t, c_char_p] --gnutls_ia_verify_endphase.restype = c_int -- - gnutls_init = libgnutls.gnutls_init - gnutls_init.argtypes = [POINTER(gnutls_session_t), gnutls_connection_end_t] - gnutls_init.restype = c_int -@@ -733,10 +633,6 @@ - gnutls_psk_free_server_credentials.argtypes = [gnutls_psk_server_credentials_t] - gnutls_psk_free_server_credentials.restype = None - --gnutls_psk_netconf_derive_key = libgnutls.gnutls_psk_netconf_derive_key --gnutls_psk_netconf_derive_key.argtypes = [c_char_p, c_char_p, c_char_p, POINTER(gnutls_datum_t)] --gnutls_psk_netconf_derive_key.restype = c_int -- - gnutls_psk_server_get_username = libgnutls.gnutls_psk_server_get_username - gnutls_psk_server_get_username.argtypes = [gnutls_session_t] - gnutls_psk_server_get_username.restype = c_char_p -@@ -857,10 +753,6 @@ - gnutls_session_enable_compatibility_mode.argtypes = [gnutls_session_t] - gnutls_session_enable_compatibility_mode.restype = None - --gnutls_session_get_client_random = libgnutls.gnutls_session_get_client_random --gnutls_session_get_client_random.argtypes = [gnutls_session_t] --gnutls_session_get_client_random.restype = c_void_p -- - gnutls_session_get_data = libgnutls.gnutls_session_get_data - gnutls_session_get_data.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)] - gnutls_session_get_data.restype = c_int -@@ -873,18 +765,10 @@ - gnutls_session_get_id.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)] - gnutls_session_get_id.restype = c_int - --gnutls_session_get_master_secret = libgnutls.gnutls_session_get_master_secret --gnutls_session_get_master_secret.argtypes = [gnutls_session_t] --gnutls_session_get_master_secret.restype = c_void_p -- - gnutls_session_get_ptr = libgnutls.gnutls_session_get_ptr - gnutls_session_get_ptr.argtypes = [gnutls_session_t] - gnutls_session_get_ptr.restype = c_void_p - --gnutls_session_get_server_random = libgnutls.gnutls_session_get_server_random --gnutls_session_get_server_random.argtypes = [gnutls_session_t] --gnutls_session_get_server_random.restype = c_void_p -- - gnutls_session_is_resumed = libgnutls.gnutls_session_is_resumed - gnutls_session_is_resumed.argtypes = [gnutls_session_t] - gnutls_session_is_resumed.restype = c_int -@@ -905,10 +789,6 @@ - gnutls_set_default_priority.argtypes = [gnutls_session_t] - gnutls_set_default_priority.restype = c_int - --gnutls_sign_algorithm_get_name = libgnutls.gnutls_sign_algorithm_get_name --gnutls_sign_algorithm_get_name.argtypes = [gnutls_sign_algorithm_t] --gnutls_sign_algorithm_get_name.restype = c_char_p -- - gnutls_sign_callback_get = libgnutls.gnutls_sign_callback_get - gnutls_sign_callback_get.argtypes = [gnutls_session_t, POINTER(c_void_p)] - gnutls_sign_callback_get.restype = gnutls_sign_func -@@ -937,14 +817,6 @@ - gnutls_transport_set_errno.argtypes = [gnutls_session_t, c_int] - gnutls_transport_set_errno.restype = None - --gnutls_transport_set_global_errno = libgnutls.gnutls_transport_set_global_errno --gnutls_transport_set_global_errno.argtypes = [c_int] --gnutls_transport_set_global_errno.restype = None -- --gnutls_transport_set_lowat = libgnutls.gnutls_transport_set_lowat --gnutls_transport_set_lowat.argtypes = [gnutls_session_t, c_int] --gnutls_transport_set_lowat.restype = None -- - gnutls_transport_set_ptr = libgnutls.gnutls_transport_set_ptr - gnutls_transport_set_ptr.argtypes = [gnutls_session_t, gnutls_transport_ptr_t] - gnutls_transport_set_ptr.restype = None -@@ -1501,10 +1373,6 @@ - gnutls_x509_privkey_sign_hash.argtypes = [gnutls_x509_privkey_t, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)] - gnutls_x509_privkey_sign_hash.restype = c_int - --gnutls_x509_privkey_verify_data = libgnutls.gnutls_x509_privkey_verify_data --gnutls_x509_privkey_verify_data.argtypes = [gnutls_x509_privkey_t, c_uint, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)] --gnutls_x509_privkey_verify_data.restype = c_int -- - gnutls_x509_rdn_get = libgnutls.gnutls_x509_rdn_get - gnutls_x509_rdn_get.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)] - gnutls_x509_rdn_get.restype = c_int -diff -ru gnutls/library/__init__.py gnutls.fixed/library/__init__.py ---- gnutls/library/__init__.py 2011-11-11 17:23:49.000000000 +0000 -+++ gnutls.fixed/library/__init__.py 2012-08-01 11:57:42.284290997 +0100 -@@ -53,6 +53,9 @@ - else: - raise RuntimeError('cannot find lib%s on this system' % name) - -+def do_nothing(*args, **kwargs): -+ pass -+ - - def initialize_gcrypt(): - from ctypes import c_void_p -@@ -104,7 +107,7 @@ - libgcrypt = load_library(name='gcrypt', version=11) - gcry_control = libgcrypt.gcry_control - else: -- gcry_control = libgnutls.gcry_control -+ gcry_control = do_nothing - - gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr)) - if system == 'cygwin': -@@ -117,12 +120,10 @@ - - - --libgnutls = load_library(name='gnutls', version=26) --libgnutls_extra = load_library(name='gnutls-extra', version=26) -+libgnutls = load_library(name='gnutls', version=28) - - initialize_gcrypt() - libgnutls.gnutls_global_init() --libgnutls_extra.gnutls_global_init_extra() - - - from gnutls.library import constants -@@ -136,9 +137,6 @@ - if functions.gnutls_check_version(__need_version__) is None: - version = functions.gnutls_check_version(None) - raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__)) --if functions.gnutls_extra_check_version(__need_version__) is None: -- version = functions.gnutls_extra_check_version(None) -- raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__)) - - - del get_system_name, library_locations, load_library, initialize_gcrypt diff --git a/community/python-imaging/PKGBUILD b/community/python-imaging/PKGBUILD deleted file mode 100644 index a664a1a98..000000000 --- a/community/python-imaging/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 75715 2012-08-29 11:05:01Z bisson $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: simo <simo@archlinux.org> - -pkgname=python-imaging -pkgver=1.1.7 -pkgrel=4 -pkgdesc="PIL. Provides image processing capabilities for python" -arch=('i686' 'x86_64') -url="http://www.pythonware.com/products/pil/index.htm" -license=('custom:"pil"') -depends=('python2' 'libjpeg' 'freetype2' 'lcms') -makedepends=('tk' 'sane') -optdepends=('tk' 'sane') -provides=("pil=${pkgver}") -conflicts=('pil') -replaces=('pil') -source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz) -md5sums=('fc14a54e1ce02a0225be8854bfba478e') - -build() { - cd "${srcdir}"/Imaging-${pkgver} - python2 setup.py build_ext - cd Sane - python2 setup.py build_ext -} - -package() { - cd "${srcdir}"/Imaging-${pkgver} - python2 setup.py install --root="${pkgdir}" --optimize=1 - - pushd Sane - python2 setup.py install --root="${pkgdir}" --optimize=1 - popd - - install -dm755 "${pkgdir}"/usr/include/python2.7/ - install -m644 -t "${pkgdir}"/usr/include/python2.7/ libImaging/*.h - - # do not have files ending in .py in /usr/bin - for f in pildriver pilprint pilconvert pilfile pilfont; do - mv "${pkgdir}"/usr/bin/${f}{.py,} - done - - # Install license - install -Dm644 "${srcdir}"/Imaging-${pkgver}/README \ - "${pkgdir}"/usr/share/licenses/${pkgname}/README -} diff --git a/community/python-lcms/PKGBUILD b/community/python-lcms/PKGBUILD deleted file mode 100644 index 0b406bd65..000000000 --- a/community/python-lcms/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 66131 2012-02-23 01:40:31Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Connor Behan <connor.behan@gmail.com> - -pkgname=python-lcms -pkgver=1.19 -_mver=1.19 -pkgrel=3 -pkgdesc="LittleCMS Python bindings" -arch=(i686 x86_64 'mips64el') -license=('CUSTOM') -depends=('libtiff' 'python2' 'lcms') -url="http://www.littlecms.com" -options=('!libtool') -source=(http://downloads.sourceforge.net/project/lcms/lcms/${_mver}/lcms-$pkgver.tar.gz) -md5sums=('8af94611baf20d9646c7c2c285859818') - -build() { - cd $srcdir/lcms-${_mver} - ./configure --prefix=/usr --with-python - make -} -package() { - cd $srcdir/lcms-${_mver} - make DESTDIR=$pkgdir install - install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING - rm -rf $pkgdir/usr/bin \ - $pkgdir/usr/include \ - $pkgdir/usr/lib/pkgconfig \ - $pkgdir/usr/lib/liblcms.* \ - $pkgdir/usr/share/man/man1/icc2ps.1 \ - $pkgdir/usr/share/man/man1/icclink.1 \ - $pkgdir/usr/share/man/man1/jpegicc.1 \ - $pkgdir/usr/share/man/man1/tifficc.1 \ - $pkgdir/usr/share/man/man1/wtpt.1 -} diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD new file mode 100644 index 000000000..d47ac8e7a --- /dev/null +++ b/community/python-matplotlib/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 80710 2012-11-30 12:11:12Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> + +pkgbase=python-matplotlib +pkgname=('python2-matplotlib' 'python-matplotlib') +pkgver=1.2.0 +pkgrel=6 +pkgdesc="A python plotting library, making publication quality plots" +arch=('i686' 'x86_64') +url='http://matplotlib.org' +license=('custom') +makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt' 'python-pytz' 'python-numpy' 'pyqt' + 'tk' 'python-cairo' 'python2-cairo' 'python-dateutil' 'python2-dateutil' + 'python-gobject' 'python2-gobject' 'python-pyparsing' 'python2-pyparsing' + 'pygtk' 'python-six' 'ghostscript' 'texlive-bin') +optdepends=('pygtk: for use with the GTK or GTKAgg backend' + 'tk: used by the TkAgg backend' + 'ghostscript: usetex dependencies' + 'texlive-bin: usetex dependencies') +source=("https://github.com/downloads/matplotlib/matplotlib/matplotlib-${pkgver}.tar.gz" + python-matplotlib-tk.patch) +sha1sums=('1d0c319b2bc545f1a7002f56768e5730fe573518' + '6f27ff74a7752700758d081d3235a61a89b8ea95') + +build() { + cd "${srcdir}"/matplotlib-${pkgver} + + patch -Np1 -i ../python-matplotlib-tk.patch + + # use system python-six + rm lib/six.py + + # remove internal copies of pyparsing + rm -r lib/matplotlib/pyparsing_py{2,3}.py + sed -i -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' lib/matplotlib/{mathtext,fontconfig_pattern}.py + + # For numpy 1.7 + sed -i '/include/s/numpy\/arrayobject.h/numpy\/oldnumeric.h/g' \ + src/*.{c,cpp,h} lib/matplotlib/delaunay/*.{cpp,h} lib/matplotlib/tri/*.h + + cd .. + cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3 + + # Build python2 + cd matplotlib-${pkgver} + for file in $(find . -name '*.py' -print); do + sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \ + -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file} + done + + python2 setup.py build + + # Build python3 + cd ../matplotlib-${pkgver}-py3 + for file in $(find . -name '*.py' -print); do + sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python3|" \ + -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python3|" ${file} + done + + python3 setup.py build +} + +package_python2-matplotlib() { + depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt' 'python2-dateutil' 'python2-pyparsing') + + cd "${srcdir}"/matplotlib-${pkgver} + python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr + + install -dm755 "${pkgdir}"/usr/share/licenses/python2-matplotlib + install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python2-matplotlib +} + +package_python-matplotlib() { + depends=('python-pytz' 'python-numpy' 'python-cairo' 'pyqt' 'python-dateutil' 'python-pyparsing') + cd "${srcdir}"/matplotlib-${pkgver}-py3 + python3 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr + + install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib + install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python-matplotlib +} diff --git a/community/python-matplotlib/python-matplotlib-tk.patch b/community/python-matplotlib/python-matplotlib-tk.patch new file mode 100644 index 000000000..10480195a --- /dev/null +++ b/community/python-matplotlib/python-matplotlib-tk.patch @@ -0,0 +1,35 @@ +diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py +--- matplotlib-1.2.0/setupext.py.orig 2012-11-23 14:50:48.954715965 -0200 ++++ matplotlib-1.2.0/setupext.py 2012-11-23 14:55:53.731727636 -0200 +@@ -898,12 +898,12 @@ def parse_tcl_config(tcl_lib_dir, tk_lib + + tcl_poss = [tcl_lib_dir, + os.path.normpath(os.path.join(tcl_lib_dir, '..')), +- "/usr/lib/tcl"+str(Tkinter.TclVersion), +- "/usr/lib"] ++ "@@libdir@@/tcl"+str(Tkinter.TclVersion), ++ "@@lib@@"] + tk_poss = [tk_lib_dir, + os.path.normpath(os.path.join(tk_lib_dir, '..')), +- "/usr/lib/tk"+str(Tkinter.TkVersion), +- "/usr/lib"] ++ "@@libdir@@/tk"+str(Tkinter.TkVersion), ++ "@@libdir@@"] + for ptcl, ptk in zip(tcl_poss, tk_poss): + tcl_config = os.path.join(ptcl, "tclConfig.sh") + tk_config = os.path.join(ptk, "tkConfig.sh") +@@ -974,10 +974,10 @@ def guess_tcl_config(tcl_lib_dir, tk_lib + return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver + + def hardcoded_tcl_config(): +- tcl_inc = "/usr/local/include" +- tk_inc = "/usr/local/include" +- tcl_lib = "/usr/local/lib" +- tk_lib = "/usr/local/lib" ++ tcl_inc = "/usr/include" ++ tk_inc = "/usr/include" ++ tcl_lib = "@@libdir@@" ++ tk_lib = "@@libdir@@" + return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk' + + def add_tk_flags(module): diff --git a/community/python2-matplotlib/setup.cfg b/community/python-matplotlib/setup.cfg index 778b04ccc..bed844776 100644 --- a/community/python2-matplotlib/setup.cfg +++ b/community/python-matplotlib/setup.cfg @@ -55,10 +55,10 @@ dateutil = False # otherwise skip silently. This is the default # behavior # -gtk = True -gtkagg = True -tkagg = True -wxagg = True +gtk = False +gtkagg = False +tkagg = False +wxagg = False macosx = False [rc_options] diff --git a/community/python-openbabel/PKGBUILD b/community/python-openbabel/PKGBUILD index af13b32f7..a685daf6f 100644 --- a/community/python-openbabel/PKGBUILD +++ b/community/python-openbabel/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 78233 2012-10-17 10:26:13Z allan $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 80457 2012-11-22 01:42:13Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Michal Bozon <bozonm@vscht.cz> -pkgname=python-openbabel -pkgver=2.3.1 -pkgrel=3 -pkgdesc="Python bindings of openbabel library" +pkgname=('python-openbabel' 'python2-openbabel') +pkgver=2.3.2 +pkgrel=1 +pkgdesc='Python bindings for the openbabel library' arch=('i686' 'x86_64' 'mips64el') -url="http://openbabel.org/wiki/Python" +url='http://openbabel.org/wiki/Python' license=('GPL') -depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen2') -makedepends=('swig' 'cmake') +depends=('gcc-libs' "openbabel=${pkgver}" 'eigen2') +makedepends=('swig' 'cmake' 'python-distribute' 'python2-distribute') options=('!libtool') -source=(http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz) -md5sums=('1f029b0add12a3b55582dc2c832b04f8') +source=("http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz") +sha256sums=('4eaca26679aa6cc85ebf96af19191472ac63ca442c36b0427b369c3a25705188') build() { - cd "${srcdir}/openbabel-$pkgver" + cp -r openbabel-$pkgver python2-openbabel-$pkgver + + cd $srcdir/openbabel-$pkgver # Create babelconfig.h cmake . @@ -29,10 +32,27 @@ build() { cd python sed -i '19i os.path.join("/usr/include/openbabel-2.0"),' setup.py - sed -i '20i os.path.join("/usr/include/eigen2"),' setup.py + sed -i '20i os.path.join("/usr/include/eigen2"),' setup.py + + cd $srcdir/python2-openbabel-$pkgver/scripts/python + sed -i '19i os.path.join("/usr/include/openbabel-2.0"),' setup.py + sed -i '20i os.path.join("/usr/include/eigen2"),' setup.py +} + +package_python-openbabel() { + depends+=('python') + + cd "$srcdir/openbabel-$pkgver/scripts/python" + + python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 } -package() { - cd "${srcdir}/openbabel-$pkgver/scripts/python" - python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 +package_python2-openbabel() { + depends+=('python2') + + cd "$srcdir/python2-openbabel-$pkgver/scripts/python" + + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 } + +# vim:set ts=2 sw=2 et: diff --git a/community/python-pybluez/PKGBUILD b/community/python-pybluez/PKGBUILD deleted file mode 100644 index de53afe0e..000000000 --- a/community/python-pybluez/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 66133 2012-02-23 01:41:16Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: cs-cam - me.at.camdaniel.com - -pkgname=python-pybluez -pkgver=0.18 -pkgrel=3 -pkgdesc="Python wrapper for the BlueZ Bluetooth stack" -arch=('i686' 'x86_64' 'mips64el') -url="http://code.google.com/p/pybluez/" -license=('GPL') -provides=('pybluez') -conflicts=('pybluez') -replaces=('pybluez') -depends=('python2' 'bluez') -source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz) -md5sums=('be8c8ce615c3189fda1aaf3d568314b2') - -build() { - cd $srcdir/PyBluez-$pkgver - python2 setup.py install --root=$pkgdir - ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so -} diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index 3b21e70d2..178451b58 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,37 +1,34 @@ -# $Id: PKGBUILD 78449 2012-10-18 18:07:43Z arodseth $ +# $Id: PKGBUILD 80655 2012-11-28 19:20:11Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Jelle van der Waa <jelle@vdwaa.nl> pkgbase=python-pymongo pkgname=('python-pymongo' 'python2-pymongo') -pkgver=2.3 -pkgrel=3 +pkgver=2.4 +pkgrel=1 pkgdesc='Python driver for MongoDB' arch=('x86_64' 'i686' 'mips64el') license=('APACHE') url='http://pypi.python.org/pypi/pymongo/' makedepends=('python-distribute' 'python2-distribute') source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") -sha256sums=('8e43fdd7ea8e2aa965791af1b6e24186248023c6fde70092d9631b1d9150b1dc') +sha256sums=('11d6a2934188eea6a6b6c55f3a0b1ac610175e6de92b0e5632bb8d90acb3d48d') build() { cd $srcdir - cp -a pymongo-$pkgver pymongo2-$pkgver } package_python2-pymongo() { depends=('python2') cd $srcdir/pymongo2-$pkgver - python2 setup.py install --root=$pkgdir --optimize=1 } package_python-pymongo() { depends=('python') cd $srcdir/pymongo-$pkgver - python setup.py install --root=$pkgdir --optimize=1 } diff --git a/community/python-pysqlite-legacy/PKGBUILD b/community/python-pysqlite-legacy/PKGBUILD deleted file mode 100644 index 39e0bf9cc..000000000 --- a/community/python-pysqlite-legacy/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 67757 2012-03-14 10:40:45Z giovanni $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor : Aaron Griffin <aaron.archlinux.org> - -pkgname=python-pysqlite-legacy -pkgver=1.0.1 -pkgrel=8 -pkgdesc="A Python DB-API 2.0 interface for the legacy SQLite 2" -arch=('i686' 'x86_64' 'mips64el') -url="http://initd.org/tracker/pysqlite" -license=('custom') -depends=('python2' 'sqlite2') -source=(http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/pysqlite-$pkgver.tar.gz) -md5sums=('4797b5ea7a3d96b87333e6b5af7b9979') - -build() -{ - cd ${srcdir}/pysqlite - python2 setup.py install --root=${pkgdir} -O1 - - # install custom license - install -Dm644 ${srcdir}/pysqlite/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD index 0ffc13383..0f7d53214 100644 --- a/community/python-pyzmq/PKGBUILD +++ b/community/python-pyzmq/PKGBUILD @@ -1,20 +1,47 @@ -# $Id: PKGBUILD 78250 2012-10-17 10:27:01Z allan $ +# $Id: PKGBUILD 80562 2012-11-25 15:29:31Z kkeen $ # Maintainer: Kyle Keen <keenerd at gmail dot com> -pkgname=python-pyzmq +pkgbase=python-pyzmq +pkgname=(python2-pyzmq python-pyzmq) pkgver=2.2.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Python3 bindings for zeromq, written in Cython" arch=(i686 x86_64 mips64el) url="http://www.zeromq.org/bindings:python" license=('LGPL') depends=(zeromq python) +makedepends=(python python2 zeromq) source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) md5sums=('f2f80709e84c8ac72d6671eee645d804') build() { + cd "$srcdir" + cp -a pyzmq-${pkgver} py2zmq-${pkgver} cd "$srcdir/pyzmq-$pkgver" # py3 errors added in 2.2.0.1 sed -i 's|except socket.error, e:|except socket.error as e:|' zmq/eventloop/ioloop.py sed -i 's|except gevent.Timeout, t:|except gevent.Timeout as t:|' zmq/green/core.py + cd "$srcdir/py2zmq-$pkgver" + sed -i 's|^#!/usr/bin/env python$|&2|' $(find ./ -name '*.py') +} + +package_python2-pyzmq() { + depends=(zeromq python2) + cd "$srcdir/py2zmq-$pkgver" + python2 setup.py install --root="$pkgdir" --optimize=0 +} + +package_python-pyzmq() { + depends=(zeromq python) + cd "$srcdir/pyzmq-$pkgver" python3 setup.py install --root="$pkgdir" --optimize=0 -} +} + +check() +{ + cd "$srcdir/pyzmq-$pkgver" + python3 setup.py build_ext --inplace + python3 setup.py test + cd "$srcdir/py2zmq-$pkgver" + python2 setup.py build_ext --inplace + python2 setup.py test +} diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 68f04fa70..a0426cee3 100755 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -7,15 +7,14 @@ pkgname=('python-scipy' 'python2-scipy') pkgver=0.11.0 -pkgrel=2 +pkgrel=4 pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64' 'mips64el') url="http://www.scipy.org/" license=('BSD') makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy') checkdepends=('python-nose' 'python2-nose') -source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz") -md5sums=('842c81d35fd63579c41a8ca21a2419b9') +source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz" "http://pkgbuild.com/~jelle/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch.xz") build() { unset LDFLAGS @@ -30,7 +29,8 @@ build() { # build for python3 cd scipy-${pkgver} - python setup.py config_fc --fcompiler=gnu95 build + patch -Np1 -i $srcdir/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch + python3 setup.py config_fc --fcompiler=gnu95 build # build for python2 cd ../scipy-${pkgver}-py2 @@ -59,7 +59,7 @@ package_python-scipy() { cd scipy-${pkgver} - python setup.py config_fc --fcompiler=gnu95 install \ + python3 setup.py config_fc --fcompiler=gnu95 install \ --prefix=/usr --root=${pkgdir} --optimize=1 install -Dm644 LICENSE.txt \ @@ -80,3 +80,5 @@ package_python2-scipy() { } # vim:set ts=2 sw=2 et: +md5sums=('842c81d35fd63579c41a8ca21a2419b9' + '20d41a597ebfb260d777597e431a7a20') diff --git a/community/python-vorbissimple/PKGBUILD b/community/python-vorbissimple/PKGBUILD deleted file mode 100644 index 3c51f9996..000000000 --- a/community/python-vorbissimple/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 66137 2012-02-23 01:44:22Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=python-vorbissimple -pkgver=0.0.2 -pkgrel=5 -pkgdesc="Python bindings for vorbissimple" -arch=('i686' 'x86_64' 'mips64el') -url="http://kamaelia.sourceforge.net" -license=('MPL') -depends=('python2' 'vorbissimple') -makedepends=('pyrex') -source=(http://downloads.sourceforge.net/kamaelia/vorbissimple-$pkgver.tar.gz) -md5sums=('332077b25a4c9547947ab0922361ffda') - -build() { - cd $srcdir/vorbissimple-$pkgver/python - sed -i 's#__new__#__cinit__#' vorbissimple.pyx - python2 setup.py install --root=$pkgdir -} diff --git a/community/python2-cchardet/PKGBUILD b/community/python2-cchardet/PKGBUILD new file mode 100644 index 000000000..c9c108873 --- /dev/null +++ b/community/python2-cchardet/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 80426 2012-11-21 14:15:53Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> + +pkgname=python2-cchardet +pkgver=0.3.2 +pkgrel=1 +_libname=${pkgname/python2-/} +pkgdesc="Universal encoding detector faster than chardet." +url="http://pypi.python.org/pypi/cchardet/" +depends=('python2') +makedepends=('cython2' 'python2-distribute') +license=('MIT') +arch=('i686' 'x86_64') +source=(http://pypi.python.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz) + +build() { + cd "$srcdir/$_libname-$pkgver" + find -type f -exec sed -i '1 s|python\s*$|python2|' {} + + python2 setup.py build +} + +package() { + cd "$srcdir/$_libname-$pkgver" + python2 setup.py install --root="$pkgdir" + install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst" +} + +sha256sums=('a3e92811d5a8aacd9ecfdb4ea9637ba801b9b18b7c779dbdf41d07bb48235a23') diff --git a/community/python2-cjson/PKGBUILD b/community/python2-cjson/PKGBUILD index 2d95793a4..dc386069e 100644 --- a/community/python2-cjson/PKGBUILD +++ b/community/python2-cjson/PKGBUILD @@ -5,7 +5,7 @@ pkgname=python2-cjson pkgver=1.0.5 pkgrel=5 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('LGPL') pkgdesc="Fast JSON encoder/decoder for Python" url="http://pypi.python.org/pypi/python-cjson/" diff --git a/community/python2-galago/PKGBUILD b/community/python2-galago/PKGBUILD deleted file mode 100644 index 6076c3a9e..000000000 --- a/community/python2-galago/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 66128 2012-02-23 01:37:06Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=python2-galago -pkgver=0.5.0 -pkgrel=6 -pkgdesc="A library of simple functions that are optimized for various CPUs" -arch=('i686' 'x86_64') -url="http://galago-project.org" -options=('!libtool') -license=('LGPL') -depends=('libgalago' 'pygtk') -source=(http://galago-project.org/files/releases/source/galago-python/galago-python-$pkgver.tar.bz2) -md5sums=('27be31fcf2886aa21823caec15dc34aa') - -build() { - cd $srcdir/galago-python-$pkgver - ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install -} diff --git a/community/python2-gevent/PKGBUILD b/community/python2-gevent/PKGBUILD index c35d3ac2b..c1944be02 100644 --- a/community/python2-gevent/PKGBUILD +++ b/community/python2-gevent/PKGBUILD @@ -1,9 +1,10 @@ # $Id: PKGBUILD 70305 2012-05-04 08:21:08Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Ralf Schmitt <ralf@systemexit.de> pkgname=python2-gevent -pkgver=0.13.7 +pkgver=0.13.8 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Python network library that uses greenlet and libevent for easy and scalable concurrency" @@ -26,5 +27,4 @@ package() { install -Dm0644 LICENSE.pyevent "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pyevent" } -md5sums=('c74004730c2543260b751b0aa782987c') -sha1sums=('2b9c63b84e21a36e244a7c825b9bdbaa98b7ec66') +md5sums=('ca9dcaa7880762d8ebbc266b11252960') diff --git a/community/python2-gnutls/PKGBUILD b/community/python2-gnutls/PKGBUILD index 3a7c86a04..55fa82220 100644 --- a/community/python2-gnutls/PKGBUILD +++ b/community/python2-gnutls/PKGBUILD @@ -7,7 +7,7 @@ pkgname=python2-gnutls pkgver=1.2.4 pkgrel=2 pkgdesc="Python wrapper for the GNUTLS library" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://cheeseshop.python.org/pypi/python-gnutls" depends=('python2' 'gnutls') license=('LGPL') diff --git a/community/python2-greenlet/PKGBUILD b/community/python2-greenlet/PKGBUILD index 38546a68d..d31643caa 100644 --- a/community/python2-greenlet/PKGBUILD +++ b/community/python2-greenlet/PKGBUILD @@ -1,9 +1,10 @@ # $Id: PKGBUILD 70305 2012-05-04 08:21:08Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Ralf Schmitt <ralf@systemexit.de> pkgname=python2-greenlet -pkgver=0.3.4 +pkgver=0.4.0 pkgrel=1 pkgdesc="python coroutine library" license=("MIT") @@ -12,9 +13,6 @@ depends=('python2') source=(http://pypi.python.org/packages/source/g/greenlet/greenlet-$pkgver.zip) arch=('i686' 'x86_64') -md5sums=('530a69acebbb0d66eb5abd83523d8272') -sha1sums=('1bff62c43e179d3f4866f31a8258a259c82b4803') - build() { cd "$srcdir/greenlet-$pkgver" python2 setup.py build @@ -25,3 +23,4 @@ package() { python2 setup.py install --root="$pkgdir" install -Dm0644 LICENSE.PSF "$pkgdir/usr/share/licenses/$pkgname/LICENSE.PSF" } +md5sums=('87887570082caadc08fb1f8671dbed71') diff --git a/community/python2-imaging/PKGBUILD b/community/python2-imaging/PKGBUILD index 49b368ada..a4c727873 100644 --- a/community/python2-imaging/PKGBUILD +++ b/community/python2-imaging/PKGBUILD @@ -8,7 +8,7 @@ pkgname=python2-imaging pkgver=1.1.7 pkgrel=5 pkgdesc="PIL. Provides image processing capabilities for python" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.pythonware.com/products/pil/index.htm" license=('custom:"pil"') depends=('python2' 'libjpeg' 'freetype2' 'lcms') diff --git a/community/python2-matplotlib/PKGBUILD b/community/python2-matplotlib/PKGBUILD deleted file mode 100644 index aff271ecf..000000000 --- a/community/python2-matplotlib/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 74044 2012-07-18 11:59:15Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> - -pkgname=python2-matplotlib -pkgver=1.1.1 -pkgrel=1 -pkgdesc="A python plotting library, making publication quality plots" -arch=('i686' 'x86_64' 'mips64el') -url="http://matplotlib.sourceforge.net/" -license=('custom') -backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc) -depends=('python2-dateutil' 'python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-pyqt') -optdepends=('pygtk: for use with the GTK or GTKAgg backend' - 'tk: used by the TkAgg backend' - 'wxpython: for use with the WXAgg backend') -makedepends=('pygtk' 'tk' 'wxpython') -provides=('matplotlib' "python-matplotlib=${pkgver}") -replaces=('python-matplotlib') -conflicts=('python-matplotlib') -source=("http://downloads.sourceforge.net/matplotlib/matplotlib-${pkgver}.tar.gz" - setup.cfg) -sha1sums=('e47ecb0c651961dbaba57fd172e3b770da197e84' - 'f074495fc965298e0372751b34c8edb319437c5f') - -build() { - cd "${srcdir}/matplotlib-${pkgver}" - - cp ../setup.cfg . - - # remove internal copy of pyparsing - rm lib/matplotlib/pyparsing.py - sed -i "s/matplotlib.pyparsing/pyparsing/g" lib/matplotlib/{mathtext,fontconfig_pattern}.py - - # remove internal copy of dateutil - rm -r lib/dateutil - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \ - -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file} - done - - python2 setup.py build -} - -package() { - cd "${srcdir}/matplotlib-${pkgver}" - python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr - - install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m 644 doc/users/license.rst "${pkgdir}/usr/share/licenses/${pkgname}" -} diff --git a/community/python2-pymongo/PKGBUILD b/community/python2-pymongo/PKGBUILD deleted file mode 100644 index 2a6bc249c..000000000 --- a/community/python2-pymongo/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Jelle va nder Waa <jelle@vdwaa.nl> -# Contributor: Piotr Husiatyński <phusiatynski@gmail.com> -# Contributor: lp76 <l.peduto@gmail.com> - -pkgname=python2-pymongo -pkgver=2.3 -pkgrel=1 -pkgdesc="Python driver for MongoDB" -license=("APACHE") -url="http://pypi.python.org/pypi/pymongo/" -depends=('python2') -makedepends=('python2-distribute' 'python2-nose') -source=(http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz) -arch=('i686' 'x86_64' 'mips64el') -md5sums=('0d342ad1506f983af671d0b0e0e1efec') - -package() { - cd $srcdir/pymongo-$pkgver - python2 setup.py install --root=$pkgdir --optimize=1 -} - -check() { - cd $srcdir/pymongo-$pkgver - # needs local mongodb server - python2 setup.py check -} diff --git a/community/python2-pyopencl/LICENSE.txt b/community/python2-pyopencl/LICENSE.txt deleted file mode 100644 index 3ce400f9d..000000000 --- a/community/python2-pyopencl/LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. diff --git a/community/python2-pyopencl/PKGBUILD b/community/python2-pyopencl/PKGBUILD deleted file mode 100644 index f1431c220..000000000 --- a/community/python2-pyopencl/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 74008 2012-07-18 01:08:34Z ibiru $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> - -pkgname=python2-pyopencl -pkgver=2012.1 -pkgrel=2 -pkgdesc="A complete, object-oriented language binding of OpenCL to Python" -arch=('i686' 'x86_64' 'mips64el') -url="http://mathema.tician.de/software/pyopencl" -license=('custom') -depends=('python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa' 'boost') -makedepends=('ctags' 'python2-distribute') -source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz" - 'LICENSE.txt') -sha1sums=('ef2460d5e9b883d8afe0ec47863a243b6f8ac7ff' - '2e6966b3d9b15603ce2c3ff79eeadd63c5d066b7') - -build() { - cd "${srcdir}/pyopencl-${pkgver}" - python2 ./configure.py --cl-enable-gl --no-use-shipped-boost - - python2 setup.py build -} - -package() { - cd "${srcdir}/pyopencl-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build - - install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community/python2-simplejson/PKGBUILD b/community/python2-simplejson/PKGBUILD index 1ec0a97b5..d300ee192 100644 --- a/community/python2-simplejson/PKGBUILD +++ b/community/python2-simplejson/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: David Moore <davidm@sjsoft.com> pkgname=python2-simplejson -pkgver=2.6.1 -pkgrel=3 +pkgver=2.6.2 +pkgrel=1 pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python" license=('MIT') arch=('i686' 'x86_64') @@ -18,13 +18,16 @@ replaces=('python-simplejson') changelog=$pkgname.changelog source=($pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver}) sha256sums=('484b4cf0a545fc59a19ea8eed3a957919a89be116804b53712ec63466d7c3a31') +sha256sums=('c57ecbcbaf7013df2d555436838acd78c9bb05c3e34ebe3d4de4d8102a0ac2a5') +sha256sums=('c57ecbcbaf7013df2d555436838acd78c9bb05c3e34ebe3d4de4d8102a0ac2a5') +sha256sums=('c57ecbcbaf7013df2d555436838acd78c9bb05c3e34ebe3d4de4d8102a0ac2a5') build() { cd ${srcdir}/simplejson-simplejson-* python2 setup.py install --root=${pkgdir} -# License + # License install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \ ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/python2-virtkey/PKGBUILD b/community/python2-virtkey/PKGBUILD deleted file mode 100644 index 086355031..000000000 --- a/community/python2-virtkey/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: codl <codl@aquageek.net> -# Contributor: Megamixman <Megamixman@gmail.com> - -pkgname=python2-virtkey -_pkgname=python-virtkey -pkgver=0.60.0 -pkgrel=3 -pkgdesc="Python extension for emulating keypresses and getting layout information from the X server" -arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/python-virtkey" -license=('LGPL') -depends=('python2' 'libxtst' 'gtk2') -replaces=('python-virtkey') -provides=('python-virtkey') -source=(http://launchpad.net/$_pkgname/${pkgver%.*}/$pkgver/+download/$_pkgname-$pkgver.tar.gz) -md5sums=('f4f6776f379bc635a29eac83a14fdde5') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - python2 setup.py build -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - - python2 setup.py install --root=$pkgdir/ --optimize=1 -} diff --git a/community/pyzy/PKGBUILD b/community/pyzy/PKGBUILD new file mode 100644 index 000000000..ec57c7f84 --- /dev/null +++ b/community/pyzy/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Kerrick Staley <mail@kerrickstaley.com> + +pkgname=pyzy +pkgver=1.0 +_commit="d7747466562cb8b4bc2934708e29b7643c7bedbc" +pkgrel=1 +pkgdesc='The Chinese PinYin and Bopomofo conversion library' +arch=('i686' 'x86_64') +url='https://github.com/pyzy/pyzy' +license=('LGPL') +depends=('glib2' 'sqlite' 'util-linux') +makedepends=('git' 'doxygen' 'gnome-common' 'python2') +options=('!libtool') + +__gitroot=git://github.com/pyzy/pyzy.git +__gitname=$pkgname + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $__gitname ] ; then + cd $__gitname && git pull origin + msg "The local files are updated." + else + git clone $__gitroot + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$__gitname-build" + git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build" + cd "$srcdir/$__gitname-build" + git checkout "$_commit" + + # replace python with python2; see https://github.com/hsumita/libpyzy/issues/1 + find . -name '*.py' -exec sed -ri '1s#(bin/|env )python#\1python2#' '{}' \; + + ./autogen.sh --prefix=/usr + make +} + +package() { + cd "$srcdir/$__gitname-build" + + make DESTDIR="$pkgdir" install +} diff --git a/community/qingy/PKGBUILD b/community/qingy/PKGBUILD index 60f79c942..38f687b9f 100644 --- a/community/qingy/PKGBUILD +++ b/community/qingy/PKGBUILD @@ -1,38 +1,39 @@ -# $Id: PKGBUILD 75441 2012-08-24 00:19:10Z ebelanger $ +# $Id: PKGBUILD 80226 2012-11-18 01:50:13Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qingy pkgver=1.0.0 -pkgrel=6 +pkgrel=7 pkgdesc="A DirectFB getty replacement" arch=('i686' 'x86_64' 'mips64el') url="http://qingy.sourceforge.net/" license=('GPL') depends=('directfb' 'openssl' 'libxss') makedepends=('emacs') -backup=('etc/qingy/settings' 'etc/qingy/welcomes') +backup=('etc/pam.d/qingy' 'etc/logrotate.d/qingy' 'etc/qingy/settings' 'etc/qingy/welcomes') options=('!libtool') install=qingy.install source=(http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}.tar.bz2 \ qingy.logrotate qingy@.service) sha1sums=('22ee505e935bf7ddcbd33e23f754a5a1ca082c81' '21676cf0b71334c666f7b3e4f3d8b4f319266c81' - '55cfd0b24c1dedd8aaea42fd03f5ec39a1be5e70') + '67f8fc1da5264cdaf79bd41a476451f4eef8f905') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's|/lib/security/||' media/pam/default/qingy XFREE=/usr/bin/Xorg XINIT=/usr/bin/xinit \ - ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc \ - --disable-optimizations --enable-pam \ - --disable-static-build --enable-gpm-lock --enable-emacs + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \ + --enable-emacs --disable-optimizations --disable-static make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/sbin" + ln -s ../usr/bin/qingy "${pkgdir}/sbin/qingy" install -D -m644 "${srcdir}/qingy.logrotate" "${pkgdir}/etc/logrotate.d/qingy" install -D -m644 "${srcdir}/qingy@.service" "${pkgdir}/usr/lib/systemd/system/qingy@.service" } diff --git a/community/qingy/qingy@.service b/community/qingy/qingy@.service index ce2156def..ef9e7bfc2 100644 --- a/community/qingy/qingy@.service +++ b/community/qingy/qingy@.service @@ -5,7 +5,8 @@ After=systemd-user-sessions.service plymouth-quit-wait.service [Service] Environment=TERM=linux -ExecStart=/sbin/qingy %I -n +ExecStart=/usr/bin/qingy %I -n +Type=idle Restart=always RestartSec=0 UtmpIdentifier=%I diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 3d9fe9505..facf82898 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77658 2012-10-13 11:44:51Z allan $ +# $Id: PKGBUILD 78685 2012-10-22 20:51:13Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.5.1 -pkgrel=2 +pkgver=1.5.3 +pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') url="http://www.qlandkarte.org/" @@ -18,7 +18,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd' +sha256sums=('9b535d70b362475a1a8f19a142ce03f83757ab442599e6439471e40b544ddc92' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index 47c05ab04..a905f4d0b 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2012-10-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.5.3-1 + 2012-09-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.5.1-1 diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 8a1ab1669..01d4b872f 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 75532 2012-08-26 20:15:34Z jlichtblau $ +#$Id: PKGBUILD 79921 2012-11-14 19:18:29Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.6.3 +pkgver=0.6.4 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ optdepends=('flac: native FLAC support' 'ffmpeg' 'libsamplerate' 'wavpack') install=$pkgname.install source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('98f5b8121d475ead81c788ec9d5346c8da537e342c0d99eaff08586af4c92ca8') +sha256sums=('3db8a38da74ed4a8551c9215f4984f83831d5a4602e1daaf42fcb48313a73372') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index 5d80b8321..4d1e9351a 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2012-11-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.6.4-1 + 2012-08-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.6.3-1 diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index ebbbb7e76..37dfaba92 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74977 2012-08-10 23:21:48Z svenstaro $ +# $Id: PKGBUILD 80545 2012-11-24 16:43:17Z svenstaro $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> @@ -7,9 +7,9 @@ # Contributor: delor <bartekpiech gmail com> pkgname="qtcreator" -pkgver=2.5.2 -_pkgver=2.5.2 -pkgrel=1 +pkgver=2.6.0 +_pkgver=2.6.0 +pkgrel=2 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64' 'mips64el') url='http://qt.nokia.com/products/developer-tools' @@ -26,32 +26,28 @@ optdepends=('qt-doc: for the integrated Qt documentation' 'bzr: for bazaar support' 'valgrind: for analyze support') install=qtcreator.install -source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz" - 'qtcreator.desktop' - 'fix-glsl-shit.patch') -md5sums=('4a9c09cdf4609753283c31451c84ceb8' - 'f1f4680b9838ff0b8f4cf11eb850d662' - '7453f6aabe2d61754490a874a26c087b') +source=("http://origin.releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz" + 'qtcreator.desktop') +md5sums=('9bf01098f84a0fe930b2718d11124204' + '82888d4be900e7833d768050a135cd37') build() { cd ${srcdir} - - patch -Np1 -d $srcdir/qt-creator-$_pkgver-src < $srcdir/fix-glsl-shit.patch [[ -d build ]] && rm -r build mkdir build && cd build qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro make + make docs } package() { cd ${srcdir}/build make INSTALL_ROOT="${pkgdir}/usr/" install + make INSTALL_ROOT="${pkgdir}/usr/" install_docs - install -Dm644 ${srcdir}/qtcreator.desktop \ - ${pkgdir}/usr/share/applications/qtcreator.desktop - install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT \ - ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT + install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop + install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT } diff --git a/community/qtcreator/qtcreator.desktop b/community/qtcreator/qtcreator.desktop index 0fd562bd9..0e8f73e64 100644 --- a/community/qtcreator/qtcreator.desktop +++ b/community/qtcreator/qtcreator.desktop @@ -1,10 +1,9 @@ [Desktop Entry] -Encoding=UTF-8 Exec=/usr/bin/qtcreator -Name=Qt-Creator +Name=Qt Creator GenericName=C++ IDE X-KDE-StartupNotify=true -Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png +Icon=/usr/share/icons/hicolor/512x512/apps/QtProject-qtcreator.png Terminal=false Type=Application -Categories=Qt;Development +Categories=Qt;Development; diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD index 7f7588299..d47a1edc8 100644 --- a/community/quassel/PKGBUILD +++ b/community/quassel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70378 2012-05-05 12:50:26Z jlichtblau $ +# $Id: PKGBUILD 79252 2012-11-01 19:02:54Z mtorromeo $ +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Vesa Kaihlavirta <vegai@iki.fi> pkgname=quassel pkgver=0.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="QT4 irc client with a separated core" arch=('i686' 'x86_64' 'mips64el') url="http://quassel-irc.org/" @@ -14,9 +14,11 @@ makedepends=('cmake' 'automoc4') install=quassel.install backup=(etc/conf.d/quassel) source=("http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2" + 'quassel.service' 'rc.quassel' 'quassel.conf') sha256sums=('a3515bd18e2b100eb9a72480e76b1faefaa5e84cdb236b6af1f05b477a1e9071' + '91a1aaae47d41c11aa418dd560039ddbbfb659e02b86379d8c4789c5ada362d3' '845e621448a51ec181554e9327bfcc3a3de1501ae8f70410f0b9b8991ac171b0' 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') @@ -37,10 +39,12 @@ build() { package() { cd build - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install - install -D ${srcdir}/rc.$pkgname \ - ${pkgdir}/etc/rc.d/$pkgname - install -D -m644 ${srcdir}/$pkgname.conf \ - ${pkgdir}/etc/conf.d/$pkgname + install -Dm644 "${srcdir}"/$pkgname.service \ + "${pkgdir}"/usr/lib/systemd/system/$pkgname.service + install -D "${srcdir}"/rc.$pkgname \ + "${pkgdir}"/etc/rc.d/$pkgname + install -Dm644 "${srcdir}"/$pkgname.conf \ + "${pkgdir}"/etc/conf.d/$pkgname } diff --git a/community/quassel/quassel.service b/community/quassel/quassel.service new file mode 100644 index 000000000..eff018899 --- /dev/null +++ b/community/quassel/quassel.service @@ -0,0 +1,12 @@ +[Unit] +Description=Quassel core service +After=network.target + +[Service] +Type=simple +User=quassel +Group=quassel +ExecStart=/usr/bin/quasselcore --configdir=/var/lib/quassel --listen=0.0.0.0 + +[Install] +WantedBy=multi-user.target diff --git a/community/qupzilla/PKGBUILD b/community/qupzilla/PKGBUILD index 680aa3393..8d0e09399 100644 --- a/community/qupzilla/PKGBUILD +++ b/community/qupzilla/PKGBUILD @@ -1,22 +1,30 @@ -# $Id: PKGBUILD 76491 2012-09-19 13:21:07Z speps $ +# $Id: PKGBUILD 80685 2012-11-29 04:01:25Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> _name=QupZilla pkgname=qupzilla pkgver=1.3.5 -pkgrel=2 +pkgrel=3 pkgdesc="Cross-platform QtWebKit browser" arch=(i686 x86_64) url="http://www.qupzilla.com/" license=('GPL3') depends=('qtwebkit') install="$pkgname.install" -source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/v$pkgver") -md5sums=('95d19c0e22c6dbf605b760125a4b7ef3') +source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/v$pkgver" + "https://github.com/QupZilla/qupzilla/commit/37da53731c6c92b4ece0bdb6e264472adf2f6d9.patch" + "https://github.com/QupZilla/qupzilla/commit/7a1bbd993d6f54d01b88a8d1f05bcfe0dec1c2b5.patch") +md5sums=('95d19c0e22c6dbf605b760125a4b7ef3' + 'c40fbec4f2d6877b6536834c45ec6323' + 'ace1933025c3fba757911336560b00d0') build() { cd "$srcdir/$_name-$pkgname-"* + # FS#32840 + patch -p1 -i "$srcdir/${source[1]##*/}" #624 - Don't crash on adblock menu when adblock is disabled. + patch -p1 -i "$srcdir/${source[2]##*/}" #652 - Infinite loop on bookmarking a page while history is empty + # enable webgl support export USE_WEBGL=true diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD deleted file mode 100644 index 78f927b0b..000000000 --- a/community/r8168-lts/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 75466 2012-08-25 13:58:38Z tpowa $ -# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> - -pkgname=r8168-lts -_pkgname=r8168 -pkgver=8.031.00 -pkgrel=5 -pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts" -url="http://www.realtek.com.tw" -license=("GPL") -arch=('i686' 'x86_64') -depends=('glibc' "linux-lts>=3.0" "linux-lts<3.1") -makedepends=("linux-lts-headers>=3.0" "linux-lts-headers<3.1") -source=(http://r8168.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) -install=$pkgname.install -md5sums=('ec1654f02e2dad930bbeb0210ddab7e5') -sha256sums=('5c617b3c08aca18d1eb24d33f77df40020eb64fb32c8e4008265e08b7ffe5779') - -_extramodules=extramodules-3.0-lts - -build() { - cd "$_pkgname-$pkgver" - local _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - make -C /usr/lib/modules/$_kernver/build \ - SUBDIRS="$srcdir/$_pkgname-$pkgver/src" \ - EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ - modules -} - -package() { - cd "$_pkgname-$pkgver" - install -Dm644 src/$_pkgname.ko "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} + -} diff --git a/community/r8168-lts/r8168-lts.install b/community/r8168-lts/r8168-lts.install deleted file mode 100644 index 2aab9e1e3..000000000 --- a/community/r8168-lts/r8168-lts.install +++ /dev/null @@ -1,17 +0,0 @@ -rebuild_module_dependencies() { - EXTRAMODULES='extramodules-3.0-lts' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - -post_install() { - rebuild_module_dependencies - echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:' - echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`' -} -post_upgrade() { - rebuild_module_dependencies -} - -post_remove() { - rebuild_module_dependencies -} diff --git a/community/radeontool/PKGBUILD b/community/radeontool/PKGBUILD index f30ae7313..4842a5ea7 100644 --- a/community/radeontool/PKGBUILD +++ b/community/radeontool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64970 2012-02-19 08:18:34Z lcarlier $ +# $Id: PKGBUILD 79686 2012-11-11 05:31:16Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym AT gmail DOT com> pkgname=radeontool -pkgver=1.6.2 -pkgrel=2 +pkgver=1.6.3 +pkgrel=1 pkgdesc="Lowlevel tools to tweak register and dump state on radeon GPUs" url="http://airlied.livejournal.com/" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('ZLIB') source=(http://people.freedesktop.org/~airlied/radeontool/${pkgname}-${pkgver}.tar.gz license.txt) depends=('libpciaccess') -md5sums=('535cf712cd609c361291dd59ca2664aa' +md5sums=('e4bd75da852840a02cb2290804abd717' 'cc74a55d8e998ca9a2537a0ab78bc582') build() { diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index 696a40dde..d773f779d 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73459 2012-07-08 00:19:18Z seblu $ +# $Id: PKGBUILD 80443 2012-11-21 20:47:43Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd -pkgver=1.9.1 +pkgver=1.9.2 pkgrel=1 pkgdesc='IPv6 Router Advertisement Daemon' url='http://www.litech.org/radvd/' @@ -16,7 +16,7 @@ source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" "$pkgname.rc" "$pkgname.conf" "$pkgname.service") -sha1sums=('8db7d69f5ca4ce3643f06866b4dbf634490f479a' +sha1sums=('5bc39b7bec0d73ffa443634c340e75b54867766c' '08dd01319682f4ef2e847d11aa375e0239c08c7a' '63ce41d790a0472e6b3b15928f6a71d1dbb7700d' '9cb6b2eaaf445fe8d17dfc50fde15709d4de7d1d') diff --git a/community/rapidsvn/PKGBUILD b/community/rapidsvn/PKGBUILD index 1dc174d75..7ff71322c 100644 --- a/community/rapidsvn/PKGBUILD +++ b/community/rapidsvn/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 61057 2011-12-21 11:53:59Z spupykin $ +# $Id: PKGBUILD 79429 2012-11-04 20:20:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: AqD <aquila.deus@gmail.com> # Contributor: TheMadsen <arch@themadsens.dk> pkgname=rapidsvn -pkgver=0.12.0 -pkgrel=5 +pkgver=0.12.1 +pkgrel=1 pkgdesc="A cross-platform GUI front-end for the Subversion revision system written in C++ using the wxWidgets framework." url='http://rapidsvn.tigris.org/' arch=('i686' 'x86_64' 'mips64el') @@ -14,14 +14,13 @@ license=('GPL') options=('!libtool') depends=('subversion' 'wxgtk') makedepends=('python2' 'automake' 'libtool') -#source=(http://www.rapidsvn.org/download/release/0.12/rapidsvn-$pkgver-1.tar.gz -source=(http://arch.p5n.pp.ru/~sergej/dl/rapidsvn-$pkgver-1svn20111221.tar.bz2 +source=(http://www.rapidsvn.org/download/release/$pkgver/rapidsvn-$pkgver.tar.gz $pkgname.desktop) -md5sums=('042173c66e980ac0773579accdcca92f' +md5sums=('8de3ca6da3ef6a27d59f959d1bbcd96b' '349e6d9729f88868902611bb1172f134') build() { - cd $srcdir/$pkgname-$pkgver-1 + cd $srcdir/$pkgname-$pkgver ./autogen.sh diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 4fc7f0d7b..36053c16b 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73107 2012-07-01 18:54:02Z spupykin $ +# $Id: PKGBUILD 79504 2012-11-06 11:20:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=recoll -pkgver=1.17.3 +pkgver=1.18.1 pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" arch=('i686' 'x86_64' 'mips64el') @@ -31,7 +31,7 @@ optdepends=('libxslt: for XML based formats (fb2,etc)' 'aspell-en: English stemming support') install=recoll.install source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('3e917193afbedc97e687d91963e079b7') +md5sums=('f0e4ba8fc988d67a92e15f6283a485a4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 66caacb8d..dadf3dd2a 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 76882 2012-10-01 15:26:16Z spupykin $ +# $Id: PKGBUILD 80794 2012-12-03 19:51:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.4.17 -pkgrel=2 +pkgver=2.6.7 +pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') url="http://redis.io/" -#url="http://code.google.com/p/redis" license=('BSD') depends=('bash') makedepends=('gcc>=3.1' 'make' 'pkgconfig') @@ -19,25 +18,25 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.service" "redis.logrotate") -md5sums=('f921ce282fb1780cb4a5646e242dadea' +md5sums=('9c3db210faff9fea3c17f2b71c2760f4' '8d843919d9f165e9a47e56cadb4ac2ed' '5ab9fdb200e15c13b450fda77fa030b6' '9e2d75b7a9dc421122d673fe520ef17f') build() { - cd "$srcdir/${pkgname}-${pkgver}" - CFLAGS="$CFLAGS -std=c99" make FORCE_LIBC_MALLOC=yes + cd "$srcdir/${pkgname}-${pkgver}" + make MALLOC=libc } package() { - cd "$srcdir/${pkgname}-${pkgver}" - mkdir -p $pkgdir/usr/bin - make INSTALL_BIN="$pkgdir/usr/bin" PREFIX=/usr install + cd "$srcdir/${pkgname}-${pkgver}" + mkdir -p $pkgdir/usr/bin + make INSTALL_BIN="$pkgdir/usr/bin" PREFIX=/usr install - install -D -m755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING" - install -D -m755 "$srcdir/redis.d" "$pkgdir/etc/rc.d/redis" - install -Dm644 "$srcdir"/redis.service "$pkgdir"/usr/lib/systemd/system/redis.service - install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis" - sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis/|;s|logfile stdout|logfile /var/log/redis.log| ' $srcdir/${pkgname}-${pkgver}/redis.conf - install -D -m644 "$srcdir/${pkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis.conf" + install -D -m755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING" + install -D -m755 "$srcdir/redis.d" "$pkgdir/etc/rc.d/redis" + install -Dm644 "$srcdir"/redis.service "$pkgdir"/usr/lib/systemd/system/redis.service + install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis" + sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis/|;s|logfile stdout|logfile /var/log/redis.log| ' $srcdir/${pkgname}-${pkgver}/redis.conf + install -D -m644 "$srcdir/${pkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis.conf" } diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD index 40f27a148..b06e34226 100644 --- a/community/redshift/PKGBUILD +++ b/community/redshift/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75297 2012-08-18 10:08:06Z lfleischer $ +# $Id: PKGBUILD 80160 2012-11-17 01:18:35Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Geoffrey Teale <tealeg@stop-squark> # Contributor: Mark, Huo Mian <markhuomian[at]gmail[dot]com> @@ -6,12 +6,12 @@ pkgname=redshift pkgver=1.7 -pkgrel=4 +pkgrel=5 pkgdesc='Adjusts the color temperature of your screen according to your surroundings.' arch=('i686' 'x86_64' 'mips64el') url='http://jonls.dk/redshift/' license=('GPL3') -depends=('gconf' 'libxxf86vm') +depends=('gconf' 'geoclue' 'libxxf86vm') optdepends=('pygtk: for gtk-redshift' 'pyxdg: for gtk-redshift' 'librsvg: for gtk-redshift') diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index 9881cfc15..4674a473b 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78531 2012-10-20 10:07:28Z andrea $ +# $Id: PKGBUILD 79425 2012-11-04 20:15:12Z plewis $ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net> pkgname=rekonq -pkgver=1.2 -pkgrel=2 +pkgver=1.3 +pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64' 'mips64el') url='http://rekonq.kde.org/' @@ -15,10 +15,10 @@ makedepends=('cmake' 'automoc4') optdepends=('qca-ossl: to use the sync handler') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('97d025df580813013643b8c51675a75d') +sha256sums=('8db67e674b3dd013a6511f9612829f958ca95a2d515f89fb999f5568bfed7ffb') build(){ - mkdir build + mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/community/renameutils/PKGBUILD b/community/renameutils/PKGBUILD new file mode 100644 index 000000000..143afa37b --- /dev/null +++ b/community/renameutils/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 80733 2012-12-01 17:49:39Z kkeen $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Patrik Hautala <phloyd@iki.fi> + +pkgname=renameutils +pkgver=0.12.0 +pkgrel=2 +pkgdesc="A set of programs designed to make renaming of files faster and less cumbersome" +arch=('i686' 'x86_64') +url="http://www.nongnu.org/renameutils/" +license=('GPL') +depends=('readline') +source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('cbd2f002027ccf5a923135c3f529c6d17fabbca7d85506a394ca37694a9eb4a3') + +build() { + cd "${srcdir}/$pkgname-$pkgver/src" + sed -i 's/($bindir)/$(bindir)/' Makefile.am + sed -i 's/($bindir)/$(bindir)/' Makefile.in + + cd "${srcdir}/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package () { + cd "${srcdir}/$pkgname-$pkgver" + + install -d "${pkgdir}/usr/bin" + make DESTDIR="${pkgdir}" install +} diff --git a/community/ripperx/PKGBUILD b/community/ripperx/PKGBUILD index 49a7d92dd..495bcf2f5 100644 --- a/community/ripperx/PKGBUILD +++ b/community/ripperx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65503 2012-02-21 06:43:37Z spupykin $ +# $Id: PKGBUILD 80016 2012-11-15 13:29:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=ripperx pkgver=2.7.3 -pkgrel=2 +pkgrel=3 pkgdesc="GTK program to rip and encode mp3 files" arch=(i686 x86_64 'mips64el') url="http://ripperx.sourceforge.net/" @@ -16,6 +16,13 @@ md5sums=('f07c55edf08a1cd57537f1b9379b4e4d') build() { cd $srcdir/ripperX-$pkgver LDFLAGS=-lm ./configure --prefix=/usr + sed -i 's|Icon=.*|Icon=ripperX.xpm|g' ripperX.desktop make +} + +package() { + cd $srcdir/ripperX-$pkgver make DESTDIR=$pkgdir install + install -Dm0644 ripperX.desktop $pkgdir/usr/share/applications/ripperX.desktop + install -Dm0644 ripperX.xpm $pkgdir/usr/share/icons/ripperX.xpm } diff --git a/community/rocksndiamonds/PKGBUILD b/community/rocksndiamonds/PKGBUILD index 0906105a0..52a52e4c1 100644 --- a/community/rocksndiamonds/PKGBUILD +++ b/community/rocksndiamonds/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 65505 2012-02-21 06:44:27Z spupykin $ +# $Id: PKGBUILD 78773 2012-10-24 12:38:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jacek Poplawski <jacekpoplawski@gmail.com> pkgname=rocksndiamonds pkgver=3.3.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="game similiar to Boulderdash with lots of levels" arch=(i686 x86_64 'mips64el') url="http://www.artsoft.org/rocksndiamonds/" license=('GPL') depends=('sdl' 'sdl_image' 'sdl_mixer' 'sdl_net' 'smpeg') makedepends=('unzip' 'p7zip') -source=(http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-$pkgver.tar.gz) -md5sums=('813ced99d54f89db7c593c518d197d18') +source=(http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-$pkgver.tar.gz + rocksndiamonds.desktop) +md5sums=('813ced99d54f89db7c593c518d197d18' + '18a3541db4d71feb0ad3b50ea4006738') build() { depends=('sdl' 'sdl_image' 'sdl_mixer' 'sdl_net' 'smpeg' 'rocksndiamonds-data') @@ -27,4 +29,6 @@ build() { install -d $pkgdir/usr/share/man/man1 cp $srcdir/rocksndiamonds-$pkgver/rocksndiamonds $pkgdir/usr/bin/rocksndiamonds cp $srcdir/rocksndiamonds-$pkgver/rocksndiamonds.1 $pkgdir/usr/share/man/man1 + + install -Dm0644 $srcdir/rocksndiamonds.desktop $pkgdir/usr/share/applications/rocksndiamonds.desktop } diff --git a/community/rocksndiamonds/rocksndiamonds.desktop b/community/rocksndiamonds/rocksndiamonds.desktop new file mode 100644 index 000000000..79de3f1d1 --- /dev/null +++ b/community/rocksndiamonds/rocksndiamonds.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Rocks'N'Diamonds +GenericName=Rocks'N'Diamonds +Comment=Arcade game +Exec=rocksndiamonds +Terminal=false +Type=Application +Categories=Application;Game; +StartupNotify=false diff --git a/community/rogue/PKGBUILD b/community/rogue/PKGBUILD new file mode 100644 index 000000000..98de5901e --- /dev/null +++ b/community/rogue/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 79577 2012-11-08 06:32:13Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +pkgname=rogue +pkgver=5.4.4 +pkgrel=2 +pkgdesc="The original dungeon crawl game." +arch=('i686' 'x86_64') +url="http://rogue.rogueforge.net/rogue-5-4/" +license=('custom') +depends=('ncurses') +provides=('rouge') # so the illiterate can find it in searches too +#source=(http://rogue.rogueforge.net/files/rogue5.4/$pkgname$pkgver-src.tar.gz) +source=(http://www.sourcefiles.org/Games/Role_Play/$pkgname$pkgver-src.tar.gz) +md5sums=('033288f46444b06814c81ea69d96e075') + +build() { + cd "$srcdir/$pkgname$pkgver" + ./configure + make + install -Dm755 rogue "$pkgdir/usr/bin/rogue" + install -Dm644 rogue.6 "$pkgdir/usr/share/man/man6/rogue.6" + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE.TXT" +} + diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index 551a9ad89..f155ac868 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77864 2012-10-15 10:12:56Z spupykin $ +# $Id: PKGBUILD 78940 2012-10-27 23:45:28Z ebelanger $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> pkgname=rss-glx pkgver=0.9.1 -pkgrel=11 +pkgrel=12 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64' 'mips64el') url="http://rss-glx.sourceforge.net/" diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 49830d433..a0f71f534 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 77498 2012-10-11 11:39:59Z spupykin $ +# $Id: PKGBUILD 80430 2012-11-21 14:28:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=6.4.2 -pkgrel=2 +pkgver=7.2.3 +pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') -depends=('zlib' 'libestr' 'libee') +depends=('zlib' 'libestr' 'libee' 'json-c') makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls') optdepends=('postgresql-libs: PostgreSQL Database Support' 'libmysqlclient: MySQL Database Support' @@ -22,7 +22,7 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' 'rsyslog.conf.d') -md5sums=('7de0124ec7d67ce2bfda0009ab1263ee' +md5sums=('81fd0f6c38e2005a1d2a9e6afff338c1' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' '18565f38a4445136446a31a3c95ffc3e') diff --git a/community/rtl-sdr/PKGBUILD b/community/rtl-sdr/PKGBUILD new file mode 100644 index 000000000..e3f275021 --- /dev/null +++ b/community/rtl-sdr/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 79669 2012-11-11 00:11:08Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Michael Düll <mail@akurei.me> + +pkgname=rtl-sdr +pkgver=20121111 +_commit="58a53039db2fdbeedc661bccd35476dfa23ff6cf" +pkgrel=1 +pkgdesc="Driver for Realtek RTL2832U, allowing general purpose software defined radio (SDR)." +arch=('i686' 'x86_64') +url="http://sdr.osmocom.org/trac/wiki/rtl-sdr" +license=('GPL') +depends=('libusb>=1.0') +makedepends=('git' 'cmake') +conflicts=('rtl-sdr-git') + +_gitroot="git://git.osmocom.org/rtl-sdr.git" +_gitname="rtl-sdr" + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build/" + git checkout "$_commit" + + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -Wno-dev ../ + make +} + +package() { + cd "$srcdir/$_gitname-build/build/" + make DESTDIR="$pkgdir" install + install -D -m644 "$srcdir/$_gitname-build/rtl-sdr.rules" "$pkgdir/usr/lib/udev/rules.d/10-rtl-sdr.rules" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD index e22f6e594..681e3500a 100644 --- a/community/rygel/PKGBUILD +++ b/community/rygel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 77776 2012-10-14 17:40:17Z bgyorgy $ +# $Id: PKGBUILD 80273 2012-11-18 23:53:28Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.16.1 +pkgver=0.16.3 pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ backup=('etc/rygel.conf') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c8ffc0492c60b1c66f13f3f72cbee622307225d7e4cb20b43e299601463cd28d') +sha256sums=('a0325afabb6a91cbe958864183adce80ad88bcaa0fc8f8ed3f434ee0d09935bf') build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,6 +29,12 @@ build() { make } +check() { + cd "$srcdir/$pkgname-$pkgver" + + make check +} + package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index 8a18e68ee..a591ea4c0 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76484 2012-09-19 03:50:08Z dwallace $ +# $Id: PKGBUILD 80799 2012-12-03 23:13:56Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=5.3 +pkgver=5.4 pkgrel=1 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' @@ -95,5 +95,5 @@ package() { } # vim :set ts=2 sw=2 et: -md5sums=('0de76f570c405ecfaa46839803978542' +md5sums=('2dea4a2ceea6d500f50260d2d6911bee' 'dc391f12b7d17dd37326343ec0e99bbd') diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index 96b120aa3..d9728ce84 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75798 2012-08-31 18:47:24Z spupykin $ +# $Id: PKGBUILD 80475 2012-11-22 15:02:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot pkgver=1.6.3 -pkgrel=1 +pkgrel=3 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') @@ -30,9 +30,9 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}. 'fix-bash-completion.patch') md5sums=('f6b1badef213ce8e9ef37bb3fc213390' 'a8d77cac806a0a9adef3f93cdbeb280a' - '1e34db5387c4e5de911e15d8a9208bdb' + '54239847f89b9a4772910415bde6276a' '5a3f7b839c7e0b8933748da7c5b6385b' - '06db41d42f9fce5449a28feb76ded556' + 'ddb2f09c02b24dab777110f9808472e1' 'f0d5d5b5e34a860f6f90b5628c680f46' 'af1da6edd8c8c0dafeeb2c2c4e0c840b' '5ba775d4f401e2c167414caa548b71e5') diff --git a/community/schroot/arch32-copyfiles b/community/schroot/arch32-copyfiles index 88f093ceb..f39ee48de 100644 --- a/community/schroot/arch32-copyfiles +++ b/community/schroot/arch32-copyfiles @@ -2,6 +2,5 @@ /etc/hosts /etc/passwd /etc/resolv.conf -/etc/rc.conf /etc/localtime /etc/locale.gen diff --git a/community/schroot/arch32-example b/community/schroot/arch32-example index 3f059e3c0..4781914b1 100644 --- a/community/schroot/arch32-example +++ b/community/schroot/arch32-example @@ -5,6 +5,6 @@ directory=/opt/arch32 #users=username groups=users root-groups=root -script-config=arch32/config +profile=arch32 personality=linux32 #aliases=32,i686 diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 980e52cdc..4d3645b42 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76433 2012-09-18 08:42:53Z arodseth $ +# $Id: PKGBUILD 78867 2012-10-26 09:46:22Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=3.2.2 +pkgver=3.2.3 pkgrel=1 pkgdesc='Editor with facilities for building and running programs' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') install=$pkgname.install source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -sha256sums=('9f17fe2a5dc294bd1077bf64f713bb06733eec271bab770841e55474e6c781c8') +sha256sums=('d0d324a5e420ff96db6cd1c6eeac23b6f4c046e7545e73c4625ab2add90e4a65') build() { cd "$srcdir" diff --git a/community/seahorse-nautilus/PKGBUILD b/community/seahorse-nautilus/PKGBUILD index efe700478..c6dd1e858 100644 --- a/community/seahorse-nautilus/PKGBUILD +++ b/community/seahorse-nautilus/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 77770 2012-10-14 16:18:22Z bgyorgy $ +# $Id: PKGBUILD 79156 2012-10-31 05:28:08Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=seahorse-nautilus -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="PGP encryption and signing for nautilus" arch=('i686' 'x86_64' 'mips64el') @@ -13,14 +13,11 @@ makedepends=('intltool') replaces=('seahorse-plugins') options=('!libtool') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - fix-schema.patch) -sha256sums=('edae97cf7bab38ed928e25a7805913977f892ec9b9120783d874cda07912519d' - '3c5a3fe557fc56d5d5cda12d4b4909f513260da9b439d8bbaca2bf42b4fd114c') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('912d9c1e84ad1e24af6308b84d622a72d9e1bdae71284ddbd6277fdb459c31d2') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/fix-schema.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile diff --git a/community/serd/PKGBUILD b/community/serd/PKGBUILD deleted file mode 100644 index 2cde48d68..000000000 --- a/community/serd/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 72424 2012-06-14 07:58:39Z speps $ -# Maintainer: speps <speps at aur dot archlinux dot org> - -pkgname=serd -pkgver=0.14.0 -pkgrel=1 -pkgdesc="A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples." -arch=(i686 x86_64 mips64el) -url="http://drobilla.net/software/$pkgname/" -license=('custom:ISC') -depends=('glibc') -makedepends=('python2') -source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('405b11ee92f3f19ce4a757ba34953886') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # remove ldconfig - sed -i "/ldconfig/d" wscript - - python2 ./waf configure --prefix=/usr \ - --mandir=/usr/share/man - python2 ./waf -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - DESTDIR="$pkgdir" python2 ./waf install - - # license - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index 356101672..7e0e90621 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74625 2012-07-31 19:56:49Z ebelanger $ +# $Id: PKGBUILD 78941 2012-10-27 23:45:33Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> pkgname=sfml pkgver=2.0rc1 -pkgrel=2 +pkgrel=3 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' arch=('i686' 'x86_64' 'mips64el') url='http://www.sfml-dev.org/' @@ -33,8 +33,6 @@ package() { install -Dm644 "$pkgdir/usr/share/SFML/cmake/Modules/FindSFML.cmake" "$pkgdir/usr/share/cmake-2.8/Modules/FindSFML.cmake" - install -Dm644 ../license.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - - make clean + install -Dm644 ../license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 58124460e..031e9bc08 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 70567 2012-05-11 20:13:47Z spupykin $ +# $Id: PKGBUILD 79739 2012-11-11 19:39:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.12.3 -pkgrel=1 +pkgver=0.13.1 +pkgrel=3 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" license=('LGPL2.1') depends=('libgee' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' 'rest' - 'desktop-file-utils' 'dconf' 'hicolor-icon-theme') -makedepends=('intltool' 'vala') + 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib' + 'gstreamer0.10-base-plugins' 'libgphoto2') +makedepends=('intltool' 'vala>=0.17.2') install=shotwell.install -source=("http://yorba.org/download/shotwell/0.12/shotwell-${pkgver}.tar.bz2") -md5sums=('de0e05350f8a7d557092489baf14d039') +source=("http://yorba.org/download/shotwell/0.13/shotwell-${pkgver}.tar.xz" + "no-libexec.patch") +md5sums=('71eb1346093705ca2b37c12a21994d14' + 'b4124e022c98b4382530e6fbcef965e2') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 <$srcdir/no-libexec.patch + ./configure --prefix=/usr \ --disable-schemas-compile \ --disable-desktop-update \ diff --git a/community/shotwell/no-libexec.patch b/community/shotwell/no-libexec.patch new file mode 100644 index 000000000..fe8960719 --- /dev/null +++ b/community/shotwell/no-libexec.patch @@ -0,0 +1,26 @@ +diff -Naur shotwell-0.13.1.orig/Makefile shotwell-0.13.1/Makefile +--- shotwell-0.13.1.orig/Makefile 2012-10-05 20:07:37.000000000 +0200 ++++ shotwell-0.13.1/Makefile 2012-10-31 22:27:30.382869896 +0100 +@@ -558,8 +558,8 @@ + mkdir -p $(DESTDIR)$(PREFIX)/bin + $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin + $(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(PREFIX)/bin +- mkdir -p $(DESTDIR)$(PREFIX)/libexec/shotwell +- $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/libexec/shotwell ++ mkdir -p $(DESTDIR)$(PREFIX)/lib/shotwell ++ $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/lib/shotwell + mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons + $(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons + mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps +diff -Naur shotwell-0.13.1.orig/src/AppDirs.vala shotwell-0.13.1/src/AppDirs.vala +--- shotwell-0.13.1.orig/src/AppDirs.vala 2012-10-05 19:56:07.000000000 +0200 ++++ shotwell-0.13.1/src/AppDirs.vala 2012-10-31 22:28:17.634388872 +0100 +@@ -109,7 +109,7 @@ + // not installed yet - use wherever we were run from + libexec_dir = get_exec_dir(); + } else { +- libexec_dir = File.new_for_path(Resources.PREFIX + "/libexec/shotwell"); ++ libexec_dir = File.new_for_path(Resources.PREFIX + "/lib/shotwell"); + } + } + diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 7d3850cfb..10f5da559 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75761 2012-08-30 21:03:36Z spupykin $ +# $Id: PKGBUILD 78965 2012-10-28 10:20:16Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil -pkgver=0.5.3 +pkgver=0.6.0 pkgrel=1 pkgdesc="WYSIWYG ebook editor" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('qtwebkit' 'boost-libs') makedepends=('cmake' 'gendesk' 'boost') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip") -md5sums=('83c1a5608a2ec59a83c86ccc1429b5cc') +md5sums=('5f85f06077c572a4105398569fe7dfe6') build() { cd "${srcdir}" diff --git a/community/signon-keyring-extension/PKGBUILD b/community/signon-keyring-extension/PKGBUILD new file mode 100644 index 000000000..7a7c1c182 --- /dev/null +++ b/community/signon-keyring-extension/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 79491 2012-11-06 04:11:27Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=signon-keyring-extension +_pkgname=keyring +pkgver=0.4 +pkgrel=1 +pkgdesc="GNOME keyring extension for signond" +arch=('i686' 'x86_64' 'mips64el') +url="https://launchpad.net/online-accounts-keyring-extension" +license=('LGPL') +depends=('signon' 'libgnome-keyring') +source=(https://launchpad.net/online-accounts-keyring-extension/trunk/$pkgver/+download/$_pkgname-$pkgver.tar.bz2) +md5sums=('4bbe5840cf0d5cfd142ba5ef262a38ed') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + # Do not install tests + echo 'INSTALLS =' >>tests/tests.pro + + qmake PREFIX=/usr LIBDIR=/usr/lib + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + make INSTALL_ROOT="$pkgdir" install +} diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD new file mode 100644 index 000000000..a1d895fc1 --- /dev/null +++ b/community/signon-plugin-oauth2/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 80671 2012-11-29 00:06:53Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=signon-plugin-oauth2 +_pkgname=signon-oauth2 +pkgver=0.13 +pkgrel=1 +pkgdesc="OAuth 2 plugin for signon" +arch=('i686' 'x86_64' 'mips64el') +url="http://code.google.com/p/accounts-sso/" +license=('LGPL') +depends=('signon-ui' 'qjson') +makedepends=('signon') +source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) +sha1sums=('74b4c31fcadf35b19c058c85b2e8f5566fcb281d') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + # Do not install tests and example + echo 'INSTALLS =' >>tests/tests.pro + echo 'INSTALLS =' >>example/example.pro + + qmake PREFIX=/usr LIBDIR=/usr/lib + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + make INSTALL_ROOT="$pkgdir" install +} diff --git a/community/signon-ui/Makefile b/community/signon-ui/Makefile new file mode 100644 index 000000000..3ede78507 --- /dev/null +++ b/community/signon-ui/Makefile @@ -0,0 +1,31 @@ +# Add here the language codes for the translated .po files: +LINGUAS = + +I18N_DOMAIN = signon-ui + +PO_FILES = $(addsuffix .po, $(LINGUAS)) +MO_FILES = $(addsuffix .mo, $(LINGUAS)) + +DEL_FILE = rm -f +INSTALL = /usr/bin/install -c -m 644 +MKDIR = mkdir -p + +all: $(MO_FILES) + +install: all + for lang in $(LINGUAS); do \ + dir=$(INSTALL_ROOT)/usr/share/locale/$$lang/LC_MESSAGES; \ + $(MKDIR) $$dir; \ + $(INSTALL) $$lang.mo $$dir/$(I18N_DOMAIN).mo; \ + done + +%.mo: %.po + msgfmt -o "$@" "$<" + +clean: + -$(DEL_FILE) $(MO_FILES) + +distclean: clean + +check: all + diff --git a/community/signon-ui/PKGBUILD b/community/signon-ui/PKGBUILD new file mode 100644 index 000000000..5a21188df --- /dev/null +++ b/community/signon-ui/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 80673 2012-11-29 00:36:04Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=signon-ui +pkgver=0.12 +pkgrel=1 +pkgdesc="UI component that responsible for handling the user interactions which can happen during the login process of an online account" +arch=('i686' 'x86_64' 'mips64el') +url="https://launchpad.net/online-accounts-signon-ui" +license=('GPL') +depends=('libaccounts-qt' 'qtwebkit' 'libproxy') +makedepends=('signon' 'libnotify') +source=(https://launchpad.net/online-accounts-signon-ui/13.04/$pkgver/+download/$pkgname-$pkgver.tar.bz2 + Makefile) +md5sums=('dca78c25d2d5303a1479403fec334e27' + 'c73ecd27c76a9060862512b7678ae4f1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Do not install tests + echo 'INSTALLS =' >>tests/unit/unit.pro + + # Fix build + cp "$srcdir/Makefile" po/Makefile + + qmake PREFIX=/usr LIBDIR=/usr/lib + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make INSTALL_ROOT="$pkgdir" install +} diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD new file mode 100644 index 000000000..0e50ba8ad --- /dev/null +++ b/community/signon/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 80667 2012-11-28 23:53:12Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgbase=signon +pkgname=('signon' 'signon-doc') +pkgver=8.44 +pkgrel=1 +pkgdesc="Framework to provide credential storage and authentication service" +arch=('i686' 'x86_64' 'mips64el') +url="http://code.google.com/p/accounts-sso/" +license=('LGPL') +depends=('qt' 'libproxy') +makedepends=('doxygen' 'graphviz' 'ttf-dejavu') +backup=(etc/signond.conf) +install=$pkgname.install +source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2 + use_keyring.patch) +sha1sums=('c0fa356d36295c97879e3dce97d32a97428b007b' + 'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1') + +build() { + cd "$srcdir/$pkgbase-$pkgver" + + # Use gnome-keyring secrets storage if signon-keyring-extension is available + patch -Np1 -i "$srcdir/use_keyring.patch" + + qmake PREFIX=/usr LIBDIR=/usr/lib + make +} + +package_signon() { + cd "$srcdir/$pkgbase-$pkgver" + + make INSTALL_ROOT="$pkgdir" install + + # Split out documentation + mv "$pkgdir/usr/share/doc" "$srcdir" +} + +package_signon-doc() { + pkgdesc="Developer documention of signon" + depends=() + options=('!emptydirs') + backup=() + install= + + mkdir -p "$pkgdir/usr/share" + mv "$srcdir/doc" "$pkgdir/usr/share" +} diff --git a/community/signon/cryptsetup-optional.patch b/community/signon/cryptsetup-optional.patch new file mode 100644 index 000000000..d6293e598 --- /dev/null +++ b/community/signon/cryptsetup-optional.patch @@ -0,0 +1,12 @@ +diff -Naur signon-8.43.orig/src/extensions/extensions.pro signon-8.43/src/extensions/extensions.pro +--- signon-8.43.orig/src/extensions/extensions.pro 2012-09-18 14:59:58.000000000 +0200 ++++ signon-8.43/src/extensions/extensions.pro 2012-10-17 20:02:52.846790974 +0200 +@@ -1,7 +1,7 @@ + TEMPLATE = subdirs + SUBDIRS = + +-system(pkg-config --exists libcryptsetup) { ++CONFIG(cryptsetup) { + SUBDIRS += cryptsetup + } + diff --git a/community/signon/signon.install b/community/signon/signon.install new file mode 100644 index 000000000..4ccb62fcb --- /dev/null +++ b/community/signon/signon.install @@ -0,0 +1,6 @@ +post_upgrade() { + if [ "$(vercmp 8.44 "$2")" -eq 1 ]; then + printf '==> Default config location changed\n' + printf ' Move the file signon.db from ~/.signon/ to ~/.config/signond/\n' + fi +} diff --git a/community/signon/use_keyring.patch b/community/signon/use_keyring.patch new file mode 100644 index 000000000..55b593a26 --- /dev/null +++ b/community/signon/use_keyring.patch @@ -0,0 +1,12 @@ +=== modified file 'src/signond/signond.conf' +--- old/src/signond/signond.conf 2012-07-25 14:57:50 +0000 ++++ new/src/signond/signond.conf 2012-07-25 19:27:16 +0000 +@@ -17,6 +17,7 @@ + FileSystemName=signonfs + Size=8 + FileSystemType=ext2 ++SecretsStorage=gnome-keyring + + [ObjectTimeouts] + IdentityTimeout=300 + diff --git a/community/simavr/PKGBUILD b/community/simavr/PKGBUILD new file mode 100644 index 000000000..fd6d4357b --- /dev/null +++ b/community/simavr/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: schuay <jakob.gruber@gmail.com> + +pkgname=simavr +pkgver=1.0 +pkgrel=1 +pkgdesc='A lean, mean and hackable AVR simulator' +arch=('i686' 'x86_64') +url="https://github.com/buserror-uk/simavr" +license=('GPL3') +depends=('elfutils') +makedepends=('avr-libc') +source=("https://github.com/downloads/buserror-uk/simavr/$pkgname-$pkgver.tar.bz2") +options=(!strip) + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # The original Makefile depends on git, hardcode the version until it's fixed upstream. + sed -i "s/^\(SIMAVR_VERSION\).*/\1 = ${pkgver}/" simavr/Makefile + + make AVR_ROOT=/usr/avr SIMAVR_VERSION=1.0 \ + CFLAGS="-Wall -Wextra -fPIC -std=gnu99 -Wno-sign-compare -Wno-unused-parameter" \ + build-simavr +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/usr" install +} + +md5sums=('82c9704a4e8569548f01931e32ebfe0c') diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD index afde6eb8a..01e7a7557 100644 --- a/community/simple-scan/PKGBUILD +++ b/community/simple-scan/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=simple-scan -pkgver=3.4.1 +pkgver=3.6.0 pkgrel=1 pkgdesc='Simple scanning utility' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('sane' 'dconf' 'gtk3' 'colord' 'hicolor-icon-theme') makedepends=('yelp-tools' 'intltool') install=simple-scan.install source=(https://launchpad.net/$pkgname/${pkgver:0:3}/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha256sums=('e1ed8f90f95300c7b75249d0e6abbc06185db2afd4d44be4b8d98822d25d4ece') +sha256sums=('d00684d4697de6753b6633d7c87b9c067fdbf99b732da9007ea2bb6cbdad1cde') build() { cd $pkgname-$pkgver diff --git a/community/simutrans/PKGBUILD b/community/simutrans/PKGBUILD deleted file mode 100644 index cabad01c4..000000000 --- a/community/simutrans/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 75106 2012-08-13 23:27:28Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Anton Bazhenov <anton.bazhenov at gmail> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Gilles Gagniard <gilles@gagniard.org> -# Contributor: JD Steffen <jd at steffennet dot org> - -pkgname=simutrans -pkgver=111.3.1 -_pkgver=111-3-1 -pkgrel=1 -pkgdesc="An open source transportation simulation game" -arch=('i686' 'x86_64') -url="http://simutrans.com/" -license=('PerlArtistic') -depends=('gcc-libs' 'zlib' 'sdl_mixer' 'bzip2' 'simutrans-pak64') -makedepends=('imagemagick') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-src-$_pkgver.zip - http://downloads.sourceforge.net/$pkgname/simulinux-$_pkgver.zip - settings-folder.patch - path-for-game-data.patch - config.patch - fix-build.patch - simutrans.desktop) -md5sums=('efd18a25d30009d5421001c0d9fd7803' - '95b96826ff07b7da2cce33f38def6f4e' - 'c87d9a9910bc371df5d50f7f1ec298bb' - '4648680290b44775b9c47d3758d3bd6c' - 'd11bc8ee33a34e33341f6ccd90a44dba' - '7d6329f7db821e3cc22fde5c5c138e2d' - 'f41f7a08ad517ef2b60412859eb49963') - -build() { - cd "$srcdir" - - cp config.template config.default - patch -Np0 -i "$srcdir/settings-folder.patch" - patch -Np1 -i "$srcdir/path-for-game-data.patch" - patch -Np0 -i "$srcdir/config.patch" - patch -Np0 -i "$srcdir/fix-build.patch" - convert simutrans.ico -alpha on simutrans.png - chmod 644 simsys_opengl.cc - - make -} - -package() { - cd "$srcdir" - - #binary - install -Dm755 build/default/sim "$pkgdir/usr/bin/simutrans" - - #data - mkdir -p "$pkgdir/usr/share/games/$pkgname" - cp -r "$pkgname"/{config,font,music,skin,text} "$pkgdir/usr/share/games/$pkgname" - - #desktop file and icon - install -Dm644 simutrans.png "$pkgdir/usr/share/pixmaps/simutrans.png" - install -Dm644 simutrans.desktop "$pkgdir/usr/share/applications/simutrans.desktop" -} diff --git a/community/simutrans/config.patch b/community/simutrans/config.patch deleted file mode 100644 index ea4657a7a..000000000 --- a/community/simutrans/config.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- config.default.orig 2011-11-10 21:48:01.000000000 +0100 -+++ config.default 2011-11-10 21:51:58.383221979 +0100 -@@ -6,23 +6,23 @@ - #BACKEND = allegro - #BACKEND = gdi - #BACKEND = sdl --#BACKEND = mixer_sdl -+BACKEND = mixer_sdl - #BACKEND = posix - - #COLOUR_DEPTH = 0 --#COLOUR_DEPTH = 16 -+COLOUR_DEPTH = 16 - - #OSTYPE = amiga - #OSTYPE = beos - #OSTYPE = cygwin - #OSTYPE = freebsd - #OSTYPE = haiku --#OSTYPE = linux -+OSTYPE = linux - #OSTYPE = mingw - #OSTYPE = mac - - #DEBUG = 3 # Level 1-3, higher number means more debug-friendly, see Makefile --#OPTIMISE = 1 # Add umpteen optimisation flags -+OPTIMISE = 1 # Add umpteen optimisation flags - #PROFILE = 1 # Enable profiling - #PROFILE = 2 # Enable profiling with optimisation flags, can be used with `OPTIMISE = 1' - -@@ -34,9 +34,9 @@ - # Define these as empty strings, if you don't have the respective config program - #ALLEGRO_CONFIG = allegro-config - #PNG_CONFIG = pkg-config libpng --#SDL_CONFIG = sdl-config -+SDL_CONFIG = sdl-config - --#VERBOSE = 1 -+VERBOSE = 1 - - # The following useful conditional compilation flags exist - # -@@ -65,6 +65,9 @@ - # - # In order to use the flags, add a line like this: (-Dxxx) - # FLAGS = -DUSE_C -+ifeq ($(shell uname -m),x86_64) -+ FLAGS += -DUSE_C -+endif - - # Output directories: - # diff --git a/community/simutrans/fix-build.patch b/community/simutrans/fix-build.patch deleted file mode 100644 index a575cbef6..000000000 --- a/community/simutrans/fix-build.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur utils/csv.cc utils/csv.cc ---- utils/csv.cc 2012-03-18 21:10:39.000000000 +0000 -+++ utils/csv.cc 2012-05-04 11:06:50.228842822 +0000 -@@ -8,6 +8,7 @@ - #include <cstring> - #include <stdio.h> - #include <assert.h> -+#include <stdlib.h> - - #include "csv.h" - #include "simstring.h" diff --git a/community/simutrans/path-for-game-data.patch b/community/simutrans/path-for-game-data.patch deleted file mode 100644 index ac2b41407..000000000 --- a/community/simutrans/path-for-game-data.patch +++ /dev/null @@ -1,18 +0,0 @@ -look in /usr/share/games/simutrans for game data - -@DPATCH@ - ---- simutrans.orig/simmain.cc -+++ simutrans/simmain.cc -@@ -437,8 +437,9 @@ - strcat( umgebung_t::program_dir, path_sep ); - } - else { -- strcpy( umgebung_t::program_dir, argv[0] ); -- *(strrchr( umgebung_t::program_dir, path_sep[0] )+1) = 0; -+ // strcpy( umgebung_t::program_dir, argv[0] ); -+ // *(strrchr( umgebung_t::program_dir, path_sep[0] )+1) = 0; -+ strcpy(umgebung_t::program_dir, "/usr/share/games/simutrans/"); - - chdir( umgebung_t::program_dir ); - } diff --git a/community/simutrans/settings-folder.patch b/community/simutrans/settings-folder.patch deleted file mode 100644 index 166795803..000000000 --- a/community/simutrans/settings-folder.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- simsys.cc.orig 2011-10-28 20:32:25.000000000 +0200 -+++ simsys.cc 2011-11-10 23:09:10.380031846 +0100 -@@ -47,7 +47,7 @@ - #elif defined __APPLE__ - sprintf(buffer, "%s/Library/Simutrans", getenv("HOME")); - #else -- sprintf(buffer, "%s/simutrans", getenv("HOME")); -+ sprintf(buffer, "%s/.simutrans", getenv("HOME")); - #endif - - dr_mkdir(buffer); - diff --git a/community/simutrans/simutrans.desktop b/community/simutrans/simutrans.desktop deleted file mode 100644 index e8d8660c8..000000000 --- a/community/simutrans/simutrans.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Simutrans -Comment=Transportation simulator -Exec=simutrans -Icon=simutrans -Terminal=false -Type=Application -Categories=Game;Simulation; - diff --git a/community/slock/PKGBUILD b/community/slock/PKGBUILD index 47d00b409..a28fa9961 100644 --- a/community/slock/PKGBUILD +++ b/community/slock/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64276 2012-02-11 10:23:57Z bluewind $ +# $Id: PKGBUILD 78848 2012-10-25 20:30:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian A. Liem <sebastian at liem dot se> pkgname=slock -pkgver=1.0 +pkgver=1.1 pkgrel=1 pkgdesc="A simple screen locker for X" arch=('mips64el' 'i686' 'x86_64') @@ -12,7 +12,7 @@ license=('MIT') depends=('libxext') source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") #source=("slock-$pkgver.tar.bz2::http://hg.suckless.org/slock/archive/$_pkgver.tar.gz") -md5sums=('98503f0dae5acc15c90b81ffd423f987') +md5sums=('e3b25abdfd54c81562de4d63d3565be7') build() { cd "$srcdir/slock-$pkgver" diff --git a/community/smem/PKGBUILD b/community/smem/PKGBUILD index 4bb48b41b..1a08853d5 100644 --- a/community/smem/PKGBUILD +++ b/community/smem/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 59733 2011-11-30 03:48:48Z dreisner $ +# $Id: PKGBUILD 79614 2012-11-08 22:44:40Z stephane $ # Maintainer: Dave Reisner <d@falconindy.com> # Contributor: Isaac Dupree <id@isaac.cedarswampstudios.org> # Contributor: Sebastien Duquette <ekse.0x@gmail.com> pkgname=smem pkgver=1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Generate reports on memory usage." url="http://www.selenic.com/smem/" license=("GPL") depends=('python2') -optdepends=('python-matplotlib: for chart generation') +optdepends=('python2-matplotlib: for chart generation') arch=('i686' 'x86_64' 'mips64el') source=("http://www.selenic.com/smem/download/${pkgname}-${pkgver}.tar.gz") md5sums=('5620f20cae4d4f0e8eb33bdc2736b0f3') diff --git a/community/soil/PKGBUILD b/community/soil/PKGBUILD deleted file mode 100644 index 978af85cf..000000000 --- a/community/soil/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 64769 2012-02-18 04:26:01Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -pkgname=soil -pkgver=0708 -pkgrel=2 -pkgdesc="tiny C lib primarily for loading textures into OpenGL" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.lonesock.net/soil.html" -license=('custom:public') -makedepends=('unzip') -depends=('freeglut') -#options=('!libtool') -source=("http://www.lonesock.net/files/soil.zip") -md5sums=('4736ac4f34fd9a41fa0197eac23bbc24') - -build() { - cd "${srcdir}/Simple OpenGL Image Library/projects/makefile" - [[ -d obj ]] && rm -r obj/ - mkdir obj/ - - sed "s|LOCAL = /usr/local|LOCAL = ${pkgdir}/usr|g" -i makefile || return 1 - sed "s|CXXFLAGS = |CXXFLAGS = -fPIC |g" -i makefile || return 1 - mkdir -p ${pkgdir}/usr/{lib,include} - make || return 1 - make install || return 1 - chmod 644 ${pkgdir}/usr/lib/libSOIL.a -} diff --git a/community/sord/PKGBUILD b/community/sord/PKGBUILD deleted file mode 100644 index 779212094..000000000 --- a/community/sord/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 72425 2012-06-14 07:59:09Z speps $ -# Maintainer: speps <speps at aur dot archlinux dot org> - -pkgname=sord -pkgver=0.8.0 -pkgrel=1 -pkgdesc="A lightweight C library for storing RDF data in memory." -arch=(i686 x86_64 mips64el) -url="http://drobilla.net/software/$pkgname/" -license=('custom:ISC') -depends=('serd' 'pcre') -makedepends=('python2') -source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('62be6a2cd6e9bc2933d1297afeacda30') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # remove ldconfig - sed -i "/ldconfig/d" wscript - - python2 ./waf configure --prefix=/usr \ - --mandir=/usr/share/man - python2 ./waf -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - DESTDIR="$pkgdir" python2 ./waf install - - # license - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/soundkonverter/PKGBUILD b/community/soundkonverter/PKGBUILD index a62026c8b..d815835f8 100644 --- a/community/soundkonverter/PKGBUILD +++ b/community/soundkonverter/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 74832 2012-08-06 23:08:41Z andrea $ +# $Id: PKGBUILD 80754 2012-12-03 09:48:01Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=soundkonverter -pkgver=1.6.3 -pkgrel=2 +pkgver=1.6.4 +pkgrel=1 pkgdesc="Front-end to various audio converters" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde-apps.org/content/show.php?content=29024" @@ -31,7 +31,7 @@ optdepends=('cdrkit: cdda2wav backend' 'wavpack: wavpack backend') install=$pkgname.install source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz") -md5sums=('f617d9b73937d4576bc21fd359f4964b') +md5sums=('be01689be4c7e1811c57436ec45d7326') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD index 38bb767a8..8210de87c 100644 --- a/community/spacefm/PKGBUILD +++ b/community/spacefm/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 76236 2012-09-14 19:21:38Z bpiotrowski $ +# $Id: PKGBUILD 80587 2012-11-26 14:57:25Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com> pkgname=spacefm -pkgver=0.8.0 +pkgver=0.8.3 pkgrel=1 -pkgdesc='A multi-panel tabbed file manager' +pkgdesc='Multi-panel tabbed file manager' arch=('i686' 'x86_64' 'mips64el') url='http://ignorantguru.github.com/spacefm/' -license=('GPL2') +license=('GPL3') install=$pkgname.install depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' 'udev') makedepends=('intltool' 'gettext') @@ -22,7 +22,7 @@ optdepends=('lsof: device processes' 'udisks: mount as non-root user' 'udisks2: mount as non-root user') source=(https://raw.github.com/IgnorantGuru/spacefm/master/packages/${pkgver}/spacefm-${pkgver}.tar.xz) -md5sums=('e9fe71ecd1f2ac07f4cbda2036279a99') +md5sums=('247165245bb3d6f5afbff07649fe8f57') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/spectrwm/LICENSE b/community/spectrwm/LICENSE deleted file mode 100644 index 24c04f3a0..000000000 --- a/community/spectrwm/LICENSE +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us> - * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -/* - * Much code and ideas taken from dwm under the following license: - * MIT/X Consortium License - * - * 2006-2008 Anselm R Garbe <garbeam at gmail dot com> - * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com> - * 2006-2007 Jukka Salmi <jukka at salmi dot ch> - * 2007 Premysl Hruby <dfenze at gmail dot com> - * 2007 Szabolcs Nagy <nszabolcs at gmail dot com> - * 2007 Christof Musik <christof at sendfax dot de> - * 2007-2008 Enno Gottox Boland <gottox at s01 dot de> - * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com> - * 2008 Martin Hurton <martin dot hurton at gmail dot com> - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ diff --git a/community/spectrwm/PKGBUILD b/community/spectrwm/PKGBUILD deleted file mode 100644 index 92da2b182..000000000 --- a/community/spectrwm/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 75631 2012-08-27 17:30:40Z kkeen $ -# Maintainer: Kyle Keen <keenerd@gmail.com> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=spectrwm -pkgver=2.0.2 -pkgrel=1 -pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way." -arch=('i686' 'x86_64' 'mips64el') -url="http://www.spectrwm.org" -_watch="https://opensource.conformal.com/snapshots/spectrwm/" -license=('custom:ISC') -depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor') -replaces=('scrotwm') -makedepends=('libxt') -optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font') -backup=(etc/spectrwm.conf) -source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ - LICENSE \ - baraction.sh) -md5sums=('b7c52886492690eb1b71aa673743d044' - 'a67cfe51079481e5b0eab1ad371379e3' - '950d663692e1da56e0ac864c6c3ed80e') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # it is like a patch, only less fragile - sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c - sed -i 's/verbose_layout = 0;/verbose_layout = 1;/' spectrwm.c - sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf - sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf - - cd linux - make PREFIX="/usr" -} - -package() { - cd "$srcdir/$pkgname-$pkgver/linux" - make PREFIX="/usr" DESTDIR="$pkgdir" install - install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop" - cd .. - install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf" - install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh" - mkdir -p "$pkgdir/etc/spectrwm" - cp spectrwm_*.conf "$pkgdir/etc/spectrwm/" - cd "$srcdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh" - - ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0" - ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so" - - # fix this for real in the makefile - rm "$pkgdir/usr/bin/scrotwm" - ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm" - mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/ - mv "$pkgdir/usr/share/man/man1/spectrwm_es.1" "$pkgdir/usr/share/man/es/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_it.1" "$pkgdir/usr/share/man/it/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_pt.1" "$pkgdir/usr/share/man/pt/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_ru.1" "$pkgdir/usr/share/man/ru/man1/" -} diff --git a/community/spectrwm/baraction.sh b/community/spectrwm/baraction.sh deleted file mode 100644 index 96a8a7b1a..000000000 --- a/community/spectrwm/baraction.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash -# baraction.sh for spectrwm status bar -# From http://wiki.archlinux.org/index.php/Scrotwm - -SLEEP_SEC=5 -#loops forever outputting a line every SLEEP_SEC secs -while :; do - - eval $(cat /proc/acpi/battery/BAT0/state | awk '/charging state/ {printf "BAT_CHGSTATE=%s;", $3}; /remaining capacity/ {printf "BAT_REMNG=%s;",$3}; /present rate/ {printf "BAT_RATE=%s;",$3};' -) - eval $(cat /proc/acpi/battery/BAT0/info | awk '/present/ {printf "BAT_PRESENT=%s;", $2}; /last full capacity/ {printf "BAT_LASTFULL=%s;",$4};' -) - - BAT_REMNG_WH=`echo "scale=1; a=($BAT_REMNG+50)/1000; print a" | bc -l` - BAT_RATE_W=`echo "scale=1; a=($BAT_RATE+50)/1000; print a" | bc -l` - BCSCRIPT="scale=0; a=(100*$BAT_REMNG / $BAT_LASTFULL); print a" - BAT_PCT=`echo $BCSCRIPT | bc -l`% - - case $BAT_PRESENT in - no) - POWER_STR="AC, NO BATTERY" - ;; - yes) - - case $BAT_CHGSTATE in - charged) - #on ac - AC_STATUS="ON AC" - TIME_REMNG="N/A" - POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT" - ;; - charging) - #on ac - AC_STATUS="ON AC" - BCSCRIPT="scale=1; a=(60*($BAT_LASTFULL - $BAT_REMNG) / $BAT_RATE); print a" - TIMETOFULL_MIN=`echo $BCSCRIPT | bc -l` - POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT C="$BAT_REMNG_WH"Wh Rate="$BAT_RATE_W"W TTF="$TIMETOFULL_MIN"min" - ;; - discharging) - AC_STATUS="ON BATT" - TIME_REMNG_MIN=`echo "scale=0; a=(60*$BAT_REMNG / $BAT_RATE); print a" | bc -l` - TIME_REMNG_HH=`echo "scale=0; a=($BAT_REMNG / $BAT_RATE); if (a<10) {print "0"; print a} else {print a}" | bc -l` - - TIME_REMNG_MM=`echo "scale=0; a=($TIME_REMNG_MIN-60*$TIME_REMNG_HH); if (a<10) {print "0"; print a} else {print a}" | bc -l` - POWER_STR="$AC_STATUS $BAT_PCT C="$BAT_REMNG_WH"Wh P="$BAT_RATE_W"W R="$TIME_REMNG_HH":"$TIME_REMNG_MM - ;; - *) - POWER_STR=$BAT_CHGSTATE - ;; - esac - - ;; - *) - POWER_STR="error" - ;; - esac - - #spectrwm bar_print can't handle UTF-8 characters, such as degree symbol - #Core 0: +67.0°C (crit = +100.0°C) - eval $(sensors 2>/dev/null | sed s/[°+]//g | awk '/^Core 0/ {printf "CORE0TEMP=%s;", $3}; /^Core 1/ {printf "CORE1TEMP=%s;",$3}; /^fan1/ {printf "FANSPD=%s;",$2};' -) - TEMP_STR="Tcpu=$CORE0TEMP,$CORE1TEMP F=$FANSPD" - - WLAN_ESSID=$(iwconfig wlan0 | awk -F "\"" '/wlan0/ { print $2 }') - eval $(cat /proc/net/wireless | sed s/[.]//g | awk '/wlan0/ {printf "WLAN_QULTY=%s; WLAN_SIGNL=%s; WLAN_NOISE=%s", $3,$4,$5};' -) - BCSCRIPT="scale=0;a=100*$WLAN_QULTY/70;print a" - WLAN_QPCT=`echo $BCSCRIPT | bc -l` - WLAN_POWER=`iwconfig 2>/dev/null| grep "Tx-Power"| awk {'print $4'}|sed s/Tx-Power=//` - WLAN_STR="$WLAN_ESSID: Q=$WLAN_QPCT% S/N="$WLAN_SIGNL"/"$WLAN_NOISE"dBm T="$WLAN_POWER"dBm" - - CPUFREQ_STR=`echo "Freq:"$(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')` - CPULOAD_STR="Load:$(uptime | sed 's/.*://; s/,//g')" - - eval $(awk '/^MemTotal/ {printf "MTOT=%s;", $2}; /^MemFree/ {printf "MFREE=%s;",$2}' /proc/meminfo) - MUSED=$(( $MTOT - $MFREE )) - MUSEDPT=$(( ($MUSED * 100) / $MTOT )) - MEM_STR="Mem:${MUSEDPT}%" - - echo -e "$POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" - #alternatively if you prefer a different date format - #DATE_STR=`date +"%H:%M %a %d %b` - #echo -e "$DATE_STR $POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" - - sleep $SLEEP_SEC -done diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 26806e3cd..a3d622234 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77576 2012-10-12 19:50:28Z svenstaro $ +# $Id: PKGBUILD 78942 2012-10-27 23:45:40Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> @@ -6,14 +6,14 @@ pkgname=spring pkgver=0.91.0 _pkgver=91.0 -pkgrel=2 +pkgrel=3 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" license=('GPL') depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl' 'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils') -makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment') +makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'mesa') optdepends=('python2: python-based bots' 'java-runtime: java-based bots') install=spring.install diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD new file mode 100644 index 000000000..f2dfc58ed --- /dev/null +++ b/community/squid/PKGBUILD @@ -0,0 +1,97 @@ +# $Id: PKGBUILD 80766 2012-12-03 10:12:25Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Mark Coolen <mark.coolen@gmail.com> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Kevin Piche <kevin@archlinux.org> + +pkgname=squid +pkgver=3.2.4 +pkgrel=1 +pkgdesc='Full-featured Web proxy cache server' +arch=('x86_64' 'i686') +url='http://www.squid-cache.org' +depends=('openssl' 'pam' 'cron' 'perl' 'libltdl') +makedepends=('libcap') +license=('GPL') +options=('emptydirs') +backup=('etc/squid/squid.conf' + 'etc/squid/mime.conf' + 'etc/conf.d/squid') +install=$pkgname.install +source=("http://www.squid-cache.org/Versions/v3/3.2/$pkgname-$pkgver.tar.bz2" + 'squid' + 'squid.conf.d' + 'squid.pam' + 'squid.cron' + 'squid.service') +md5sums=('5fd7d120c429aaeacdf008938a36cb94' + '02f7b5bd793f778e40834fd6457d2199' + '2383772ef94efddc7b920628bc7ac5b0' + '270977cdd9b47ef44c0c427ab9034777' + 'b499c2b725aefd7bd60bec2f1a9de392' + '20e00e1aa1198786795f3da32db3c1d8') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # gcc 4.6 doesn't support -fhuge-objects. + sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure + + # 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 + + sed -i '1,1i#include <errno.h>' helpers/external_acl/file_userip/ext_file_userip_acl.cc + + ./configure \ + --prefix=/usr \ + --datadir=/usr/share/squid \ + --sysconfdir=/etc/squid \ + --libexecdir=/usr/lib/squid \ + --localstatedir=/var \ + --with-logdir=/var/log/squid \ + --with-pidfile=/run/squid.pid \ + --enable-auth \ + --enable-auth-basic \ + --enable-auth-ntlm \ + --enable-auth-digest \ + --enable-auth-negotiate \ + --enable-removal-policies="lru,heap" \ + --enable-storeio="aufs,ufs,diskd" \ + --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-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 + make +} + +package() { + cd "$srcdir" + + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + install -Dm755 "$srcdir/squid" "$pkgdir/etc/rc.d/squid" + install -Dm755 "$srcdir/squid.cron" "$pkgdir/etc/cron.weekly/squid" + install -Dm755 "$srcdir/squid.conf.d" "$pkgdir/etc/conf.d/squid" + install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid" + install -Dm644 "$srcdir/squid.service" \ + "$pkgdir/usr/lib/systemd/system/squid.service" + rm -rf $pkgdir/run $pkgdir/var/run +} + +# vim: ts=2 sw=2 et ft=sh diff --git a/community/squid/squid b/community/squid/squid new file mode 100644 index 000000000..da5534427 --- /dev/null +++ b/community/squid/squid @@ -0,0 +1,48 @@ +#!/bin/bash + +# source application-specific settings +[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid + +. /etc/rc.conf +. /etc/rc.d/functions + +pidfile=/run/squid.pid +{ read -r PID </run/squid.pid; } 2>/dev/null +if [[ $pid && ! /proc/$pid/exe -ef /usr/sbin/squid ]]; then + rm /run/squid.pid +fi + +case $1 in + start) + stat_busy "Starting squid" + if [[ $PID ]] || ! squid $SQUID_ARGS; then + stat_fail + else + add_daemon squid + stat_done + fi + ;; + + stop) + stat_busy "Stopping squid" + if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then + stat_fail + else + # squid takes forever to shutdown all its listening FDs + while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do + stat_append "." + sleep 3 + done + rm_daemon squid + stat_done + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/squid/squid.conf.d b/community/squid/squid.conf.d new file mode 100644 index 000000000..ea248b76c --- /dev/null +++ b/community/squid/squid.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to squid +# +SQUID_ARGS="-sYC" diff --git a/community/squid/squid.cron b/community/squid/squid.cron new file mode 100644 index 000000000..c78e51105 --- /dev/null +++ b/community/squid/squid.cron @@ -0,0 +1,9 @@ +#!/bin/sh + +# exit without error if no pidfile exists +{ read pid </run/squid.pid; } 2>/dev/null || exit 0 + +# make sure found PID really is a squid process +if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then + /usr/sbin/squid -k rotate +fi diff --git a/community/squid/squid.install b/community/squid/squid.install new file mode 100644 index 000000000..e7aa5ff68 --- /dev/null +++ b/community/squid/squid.install @@ -0,0 +1,26 @@ +post_install() { + if [ -z "$(grep ^proxy: /etc/group)" ]; then + usr/sbin/groupadd -g 15 proxy &>/dev/null + fi + + id proxy &>/dev/null || \ + usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy + + chown proxy.proxy var/{cache,log}/squid + +# cat << EOF +#Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html +#EOF +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/userdel proxy &> /dev/null + if [ ! -z "$(grep ^proxy: /etc/group)" ]; then + usr/sbin/groupdel proxy &>/dev/null + fi +} + diff --git a/community/squid/squid.pam b/community/squid/squid.pam new file mode 100644 index 000000000..df8a8104f --- /dev/null +++ b/community/squid/squid.pam @@ -0,0 +1,4 @@ +#/etc/pam.d/squid +# +auth required pam_unix.so +account required pam_unix.so diff --git a/community/squid/squid.service b/community/squid/squid.service new file mode 100644 index 000000000..9d41cc243 --- /dev/null +++ b/community/squid/squid.service @@ -0,0 +1,13 @@ +[Unit] +Description=Web Proxy Cache Server +After=network.target + +[Service] +Type=forking +PIDFile=/run/squid.pid +ExecStart=/usr/sbin/squid -sYC +ExecStop=/usr/sbin/squid -k shutdown +ExecReload=/usr/sbin/squid -k reconfigure + +[Install] +WantedBy=multi-user.target diff --git a/community/sratom/PKGBUILD b/community/sratom/PKGBUILD deleted file mode 100644 index 8064fbdd7..000000000 --- a/community/sratom/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 72426 2012-06-14 07:59:39Z speps $ -# Maintainer: speps <speps at aur dot archlinux dot org> - -pkgname=sratom -pkgver=0.2.0 -pkgrel=1 -pkgdesc="An LV2 Atom RDF serialisation library" -arch=(i686 x86_64 mips64el) -url="http://drobilla.net/software/$pkgname/" -license=('custom:ISC') -depends=('lv2' 'sord') -makedepends=('python2') -source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('c03cf2849186818610ffe889be4f5b55') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # remove ldconfig - sed -i '/ldconfig/d' wscript - - python2 waf configure --prefix=/usr - python2 waf -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - DESTDIR="$pkgdir/" python2 waf install - - # license - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD index 41ec998c9..83cc5ca65 100644 --- a/community/sshguard/PKGBUILD +++ b/community/sshguard/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 76846 2012-10-01 07:36:10Z mtorromeo $ +# $Id: PKGBUILD 80462 2012-11-22 08:40:25Z mtorromeo $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=sshguard pkgver=1.5 -pkgrel=6 -pkgdesc="brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables" +pkgrel=9 +pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables" arch=('i686' 'x86_64' 'mips64el') #url="http://sourceforge.net/projects/sshguard/" url="http://www.sshguard.net/" @@ -22,8 +21,8 @@ source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver. sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19' 'a810da878e40be8616a93c9984e7dbd3700367d665b78b8aa2498228bb33cb6e' '66f28e2cc81e5686f8fd5c0d5a5015d7feecbe018a259f4032cfbacf6fe8d1c3' - '53bcf72340495bea19e15a0d80771028e933fceb08789243fef47884b7507075' - 'b1ebc5dd10374a790c7d06419694143bffa019a7c65c8a7b2541487aecec574d') + '2b2a3c1140349296c3629e77f74c3b29f4ef2ce5f77cb3a811cbed5b46d23028' + '9491c4cd23d789dd04af551e16dc123f1517ca02ad3539f25715bbeec70ee21e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/sshguard/sshguard-journalctl b/community/sshguard/sshguard-journalctl index c919b4434..13afd6f33 100644 --- a/community/sshguard/sshguard-journalctl +++ b/community/sshguard/sshguard-journalctl @@ -1,2 +1,2 @@ #!/bin/sh -/usr/bin/journalctl -afbp info -n0 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 | /usr/sbin/sshguard -l- "$@" +/usr/bin/journalctl -afbp info -n1 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 | /usr/sbin/sshguard -l- "$@" diff --git a/community/sshguard/sshguard.service b/community/sshguard/sshguard.service index c317d0932..9340d8e9f 100644 --- a/community/sshguard/sshguard.service +++ b/community/sshguard/sshguard.service @@ -1,10 +1,10 @@ [Unit] Description=Block hacking attempts -After=iptables.service +After=iptables.service network.target +Wants=iptables.service [Service] -EnvironmentFile=/etc/conf.d/sshguard -ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl -b /var/db/sshguard/blacklist.db ${SSHGUARD_ARGS} +ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl -b /var/db/sshguard/blacklist.db [Install] WantedBy=multi-user.target diff --git a/community/suil/PKGBUILD b/community/suil/PKGBUILD deleted file mode 100644 index 9bc83e88a..000000000 --- a/community/suil/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 73981 2012-07-18 00:34:51Z speps $ -# Maintainer: speps <speps at aur dot archlinux dot org> - -pkgname=suil -pkgver=0.6.4 -pkgrel=1 -pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs" -arch=(i686 x86_64 mips64el) -url="http://drobilla.net/software/$pkgname/" -license=('custom:ISC') -depends=('lv2') -makedepends=('python2' 'qt' 'gtk2') -optdepends=('qt: Qt UIs wrapping support' - 'gtk2: Gtk2 UIs wrapping support') -source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('9f34d3f15b4266e7cce59e3ac8f1fb3a') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # remove ldconfig - sed -i "/ldconfig/d" wscript - - python2 ./waf configure --prefix=/usr \ - --mandir=/usr/share/man - python2 ./waf -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - DESTDIR="$pkgdir" python2 ./waf install - - # license - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/sunpinyin/PKGBUILD b/community/sunpinyin/PKGBUILD index bbcfd708c..ca1ba26bc 100644 --- a/community/sunpinyin/PKGBUILD +++ b/community/sunpinyin/PKGBUILD @@ -1,30 +1,70 @@ -# $Id: PKGBUILD 67784 2012-03-14 12:19:33Z giovanni $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# $Id: PKGBUILD 79715 2012-11-11 14:12:03Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > pkgname=sunpinyin -pkgver=2.0.3 -pkgrel=2 -pkgdesc="Statistical Language Model based pinyin IME by Sun" +pkgver=2.0.3.20121107 +_commit=cf3fe3d7aa5bb7aa6aa5b870a759af468b6d5b2b +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') +pkgdesc="Statistical Language Model based pinyin IME by Sun" +license=('LGPL' 'APACHE') url="http://sunpinyin.googlecode.com" -license=('LGPL') -depends=('sqlite3' 'gcc-libs') -makedepends=('scons') -source=("http://sunpinyin.googlecode.com/files/sunpinyin-${pkgver}.tar.gz") -md5sums=('bc1cd4d7d48a73276dfe4c9f5a434cc7') +depends=('sqlite' 'make' 'gcc-libs') +makedepends=('git' 'scons' 'intltool') +source=('http://open-gram.googlecode.com/files/lm_sc.t3g.arpa-20121025.tar.bz2' + 'http://open-gram.googlecode.com/files/dict.utf8-20120830.tar.bz2') + +__gitroot=git://github.com/sunpinyin/sunpinyin.git +__gitname=$pkgname build() { - cd sunpinyin-${pkgver} + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $__gitname ] ; then + cd $__gitname && git pull origin + msg "The local files are updated." + else + git clone $__gitroot + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$__gitname-build" + git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build" + cd "$srcdir/$__gitname-build" + git checkout "$_commit" + + # Build sunpinyin + sed -i -e "1s|python|python2|" python/*.py python/importer/*.py scons \ --prefix=/usr + + # Build sunpinyin-data + mkdir -p "$srcdir/$__gitname-build/raw" + ln -sf "$srcdir/lm_sc.t3g.arpa" "$srcdir/$__gitname-build/raw/lm_sc.t3g.arpa" + ln -sf "$srcdir/dict.utf8" "$srcdir/$__gitname-build/raw/dict.utf8" + + ln -sf "$srcdir/$__gitname-build/doc/SLM-inst.mk" "$srcdir/$__gitname-build/raw/Makefile" + cd "$srcdir/$__gitname-build/raw" + PATH="$srcdir/$__gitname-build/src:$PATH" + make } package() { - cd sunpinyin-${pkgver} + cd "$srcdir/$__gitname-build" scons \ --prefix=/usr \ - --install-sandbox=${pkgdir} \ + --install-sandbox="$pkgdir" \ install + + cd "$srcdir/$__gitname-build/raw" + make DESTDIR="$pkgdir" install } + +md5sums=('0586241ca33359ad176c842c90bf563e' + '52b9a47861bef707f65b682d52e8117f') diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD index 5d9a0c65a..64062b8a4 100644 --- a/community/supercollider/PKGBUILD +++ b/community/supercollider/PKGBUILD @@ -1,32 +1,28 @@ -# $Id: PKGBUILD 75940 2012-09-05 23:11:46Z speps $ +# $Id: PKGBUILD 80709 2012-11-30 03:35:13Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: <farid at archlinux-br.org> _name=SuperCollider pkgname=supercollider -pkgver=3.5.5 +pkgver=3.6.1 pkgrel=1 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition" arch=('i686' 'x86_64') url="http://supercollider.sourceforge.net/" license=('GPL3') -depends=('jack' 'fftw' 'icu' 'cwiid' 'curl' 'qtwebkit') +depends=('jack' 'fftw' 'cwiid' 'qtwebkit') makedepends=('cmake' 'ruby' 'vim' 'emacs') optdepends=('emacs: emacs interface' 'gedit: gedit interface' 'vim: vim interface' 'ruby: vim support') install="$pkgname.install" -source=("http://download.sourceforge.net/project/$pkgname/Source/$pkgver/$_name-$pkgver-Source-linux.tar.bz2") -md5sums=('55c08e1d3665346b85dbff4c27c1accc') +source=("http://download.sourceforge.net/project/$pkgname/Source/${pkgver%.*}/$_name-$pkgver-Source-linux.tar.bz2") +md5sums=('9ac8f563d885cef66b2365949eb666d1') build() { cd "$srcdir/$_name-Source" - ## glibc 2.16 + boost 1.49 fix - # https://svn.boost.org/trac/boost/ticket/6940 - sed -i "s/TIME_UTC/&_/" `grep -rl TIME_UTC .` - [ -d bld ] || mkdir bld && cd bld cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release diff --git a/community/supercollider/supercollider.install b/community/supercollider/supercollider.install index 78ec45794..32bd4537c 100644 --- a/community/supercollider/supercollider.install +++ b/community/supercollider/supercollider.install @@ -1,4 +1,5 @@ post_install() { + update-desktop-database -q update-mime-database usr/share/mime } diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD index b8d394894..578ad1447 100644 --- a/community/supertux/PKGBUILD +++ b/community/supertux/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74627 2012-07-31 19:57:01Z ebelanger $ +# $Id: PKGBUILD 78943 2012-10-27 23:45:45Z ebelanger $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: vande198 @@ -6,13 +6,13 @@ pkgname=supertux pkgver=0.3.3 -pkgrel=6 +pkgrel=7 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" arch=('i686' 'x86_64' 'mips64el') url="http://super-tux.sourceforge.net/" license=('GPL') -depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew') -makedepends=('cmake' 'boost') +depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew') +makedepends=('cmake' 'boost' 'mesa') source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 supertux2-0.3.3-squirrel-gcc47.patch) md5sums=('f3f803e629ee51a9de0b366a036e393d' diff --git a/community/sylpheed/PKGBUILD b/community/sylpheed/PKGBUILD index 34233381c..c834ce3df 100644 --- a/community/sylpheed/PKGBUILD +++ b/community/sylpheed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73041 2012-06-29 12:56:08Z speps $ +# $Id: PKGBUILD 79631 2012-11-09 11:59:26Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: dorphell <dorphell@archlinux.org> pkgname=sylpheed -pkgver=3.2.0 +pkgver=3.3.0 pkgrel=1 pkgdesc="Lightweight and user-friendly e-mail client" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ depends=('gpgme' 'gtkspell' 'desktop-file-utils') makedepends=('compface' 'openssl') options=('!libtool') install="$pkgname.install" -source=("http://sylpheed.sraoss.jp/$pkgname/v3.2/$pkgname-$pkgver.tar.bz2") -md5sums=('bbb691cf2bb11f84b329e68b58a62918') +source=("http://sylpheed.sraoss.jp/$pkgname/v3.3/$pkgname-$pkgver.tar.bz2") +md5sums=('20442f81dbb4e7c59462360ad0bb1afb') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/sysprof/PKGBUILD b/community/sysprof/PKGBUILD index 03bc87442..22e9ab701 100644 --- a/community/sysprof/PKGBUILD +++ b/community/sysprof/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76036 2012-09-09 18:03:25Z spupykin $ +# $Id: PKGBUILD 79392 2012-11-04 01:05:10Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Previous Contributor: Eric Belanger <belanger@astro.umontreal.ca> @@ -13,7 +13,7 @@ url="http://www.daimi.au.dk/~sandmann/sysprof/" license=("GPL") source=(http://www.daimi.au.dk/~sandmann/$pkgname/$pkgname-$pkgver.tar.gz) depends=('libglade' 'binutils') -makedepends=('libglade' 'binutils' 'kernel26-headers') +makedepends=('libglade' 'binutils' 'linux-headers') md5sums=('a81808d847732f8dafb59d26ec2eebbf') build() { diff --git a/community/tasks/PKGBUILD b/community/tasks/PKGBUILD deleted file mode 100644 index d75d7d3bc..000000000 --- a/community/tasks/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 69748 2012-04-23 09:08:34Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> -# Contributor: lp76 <l.peduto@gmail.com> - -pkgname=tasks -pkgver=0.20 -pkgrel=2 -pkgdesc="A simple to do list application that uses libecal" -arch=(i686 x86_64 mips64el) -url="http://pimlico-project.org/tasks.html" -license=('GPL') -depends=('evolution-data-server>=3.4.0' 'xdg-utils' 'gtk2') -makedepends=('intltool') -install=tasks.install -#source=(http://pimlico-project.org/sources/tasks/$pkgname-$pkgver.tar.gz) -#source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.gz) -source=(http://ftp.gnome.org/pub/GNOME/sources/tasks/$pkgver/tasks-$pkgver.tar.xz) -md5sums=('f4602cd39af10f5b327d9a59a22ea034') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -d "$pkgdir/usr/share/pixmaps" - ln -sf "/usr/share/icons/hicolor/48x48/apps/tasks.png" \ - "$pkgdir/usr/share/pixmaps/tasks.png" -} diff --git a/community/tasks/tasks.install b/community/tasks/tasks.install deleted file mode 100644 index c5571196e..000000000 --- a/community/tasks/tasks.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} diff --git a/community/tesseract/PKGBUILD b/community/tesseract/PKGBUILD index 1ef985d0b..3aa49afc9 100644 --- a/community/tesseract/PKGBUILD +++ b/community/tesseract/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74642 2012-08-01 04:56:09Z spupykin $ +# $Id: PKGBUILD 79036 2012-10-29 09:23:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Hauser <andy-aur@splashground.de> @@ -8,8 +8,8 @@ kor ell rus por bul lav lit pol dan-frak deu dan ces cat eng chi_tra chi_sim) pkgbase=tesseract pkgname=(tesseract $(for l in ${_langs[@]}; do echo tesseract-data-${l}; done)) -pkgver=3.01 -pkgrel=3 +pkgver=3.02.02 +pkgrel=1 pkgdesc="An OCR programm" arch=(x86_64 i686 'mips64el') url="http://code.google.com/p/tesseract-ocr" @@ -19,7 +19,7 @@ source=(http://tesseract-ocr.googlecode.com/files/$pkgname-$pkgver.tar.gz $(for l in ${_langs[@]}; do echo http://tesseract-ocr.googlecode.com/files/${l}.traineddata.gz done)) -md5sums=('1ba496e51a42358fb9d3ffe781b2d20a' +md5sums=('3d57ee5777fa998632ad0693c13a0e9e' 'f4ae2e5668f693cc51c6e3c3f57a8f1d' '3787ff0fc1a07517203466830f6f868e' '7b50075692e7a07ac8f59e0cde51cfb9' @@ -63,10 +63,11 @@ build() { } package_tesseract() { - cd $srcdir/$pkgname-$pkgver + install=tesseract.install + optdepends=($(for l in ${_langs[@]}; do echo tesseract-data-${l}; done)) + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - mkdir -p $pkgdir/usr/share/tessdata } diff --git a/community/tesseract/tesseract.install b/community/tesseract/tesseract.install new file mode 100644 index 000000000..114b82821 --- /dev/null +++ b/community/tesseract/tesseract.install @@ -0,0 +1,7 @@ +post_install() { + echo "You must install one of tesseract-data-* packages or whole tesseract-data group" +} + +post_upgrade() { + post_install +} diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD index 2e0e43573..7e050085e 100644 --- a/community/tigervnc/PKGBUILD +++ b/community/tigervnc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73952 2012-07-17 11:36:12Z spupykin $ +# $Id: PKGBUILD 79431 2012-11-04 20:22:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com> pkgname=tigervnc pkgver=1.2.0 -pkgrel=7 +pkgrel=9 _xorgver=1.12.3 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC." arch=('i686' 'x86_64') @@ -16,11 +16,12 @@ depends=('pam' 'gnutls' 'libjpeg-turbo' 'libxft' 'libxinerama' 'libxcursor' makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto' 'compositeproto' 'damageproto' 'randrproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto' - 'xtrans' 'mesa') + 'xtrans' 'mesa' 'glproto' 'dri2proto') options=(!libtool) conflicts=('tightvnc') source=(http://downloads.sourceforge.net/tigervnc/${pkgname}-${pkgver}.tar.gz ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2 + vncserver.service xorg111.patch xorg112.patch gnutls.patch @@ -28,6 +29,7 @@ source=(http://downloads.sourceforge.net/tigervnc/${pkgname}-${pkgver}.tar.gz cmakelists.patch) md5sums=('3a5755b4ed600a81c3a17976c6f8420d' '65a53b11bc01dcc97ee9b201dc620c32' + '0903d5a0dfa38e0b04964505b644585c' 'b680b55f7f9f569cd26ac0b330012a8b' 'f73e055153889ae7b5aac8e697f7a841' '1a5fe8867ab3e49e20aafc70c415494f' @@ -66,4 +68,5 @@ package() { cd unix/xserver/hw/vnc make DESTDIR=${pkgdir} install sed -i 's/iconic/nowin/' ${pkgdir}/usr/bin/vncserver + install -Dm0644 $srcdir/vncserver.service $pkgdir/usr/lib/systemd/system/vncserver.service } diff --git a/community/tigervnc/vncserver.service b/community/tigervnc/vncserver.service new file mode 100644 index 000000000..a5bb02ade --- /dev/null +++ b/community/tigervnc/vncserver.service @@ -0,0 +1,28 @@ +# The vncserver service unit file +# +# 1. Copy this file to /etc/systemd/system/vncserver@:<display>.service +# 2. Edit User= +# ("User=foo") +# 3. Edit and vncserver parameters appropriately +# ("/usr/bin/vncserver %i -arg1 -arg2 -argn") +# 4. Run `systemctl --system daemon-reload` +# 5. Run `systemctl enable vncserver@:<display>.service` +# +# DO NOT RUN THIS SERVICE if your local area network is untrusted! +# +# See the wiki page for more on security +# https://wiki.archlinux.org/index.php/Vncserver + +[Unit] +Description=Remote desktop service (VNC) +After=syslog.target network.target + +[Service] +Type=forking +User= + +ExecStart=/usr/bin/vncserver %i +ExecStop=/usr/bin/vncserver -kill %i + +[Install] +WantedBy=multi-user.target diff --git a/community/tightvnc/PKGBUILD b/community/tightvnc/PKGBUILD index 9d680a1ae..f911b2e26 100644 --- a/community/tightvnc/PKGBUILD +++ b/community/tightvnc/PKGBUILD @@ -1,30 +1,43 @@ -# $Id: PKGBUILD 72020 2012-06-05 20:37:51Z arodseth $ +# $Id: PKGBUILD 79388 2012-11-04 00:54:52Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Andrew Hills <hills.as@gmail.com> +# Contributor: John <graysky@archlinux.us> pkgname=tightvnc pkgver=1.3.10 -pkgrel=8 -pkgdesc="VNC Unix server && viewer" -arch=('i686' 'x86_64') +pkgrel=9 +pkgdesc='VNC server and viewer' +arch=('x86_64' 'i686') license=('GPL') -url="http://www.tightvnc.com" +url='http://www.tightvnc.com' depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth' 'perl') -makedepends=('imake' 'setconf') +makedepends=('imake' 'setconf' 'gendesk') options=('!makeflags') source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2" - 'http://people.csail.mit.edu/jaffer/Color/rgb.txt') + 'http://people.csail.mit.edu/jaffer/Color/rgb.txt' + 'vncserver.service' + 'tightvnc.png::http://virtual.itca.edu.sv/dokeos/sinapsis/cd/redes/vnc/tightvnc/documentos/TightVNC%20Frequently%20Asked%20Questions_archivos/tightvnc-logo.jpg') sha256sums=('f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d' - 'af6c056a95ae725f98534db22b9a4916d17f2356fdca84a4a038211a82fa8a73') + 'af6c056a95ae725f98534db22b9a4916d17f2356fdca84a4a038211a82fa8a73' + 'ccadf1fc708fad601e6113464d6c533a629f6dc9116f6071347cd0b465c1f48b' + '2592196a56444143c2f0c3738dce98f89ea0d46b125a3ea54ac1dbb50914b945') +_exec=('vncviewer') +_name=('TightVNC Viewer') build() { - cd $srcdir/vnc_unixsrc + cd $srcdir + gendesk -n + setconf $pkgname.desktop Categories 'Application;Network;' + cd vnc_unixsrc setconf vncserver '$vncClasses' \"/usr/share/tightvnc\"\; - setconf vncserver '$fontPath' \"/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/\"\; + setconf vncserver '$fontPath' \ + \"/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/\"\; + sed -i 's:/lib/cpp:/usr/bin/cpp:' Xvnc/config/cf/linux.cf xmkmf make World + cd Xvnc ./configure setconf programs/Xserver/dix/Makefile DEFAULTRGBDATABASE '/usr/share/tightvnc/rgb' @@ -34,14 +47,21 @@ build() { } package() { - cd "$srcdir/vnc_unixsrc" + cd $srcdir/vnc_unixsrc + mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1 + ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man + mkdir -p $pkgdir/usr/share/$pkgname - mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1" - ./vncinstall "$pkgdir/usr/bin" "$pkgdir/usr/share/man" - mkdir -p "$pkgdir/usr/share/$pkgname" - install -Dm644 "$srcdir/vnc_unixsrc/classes/"* \ - "$pkgdir/usr/share/$pkgname" - install -Dm644 "$srcdir/rgb.txt" "$pkgdir/usr/share/$pkgname/rgb.txt" + cd $srcdir + install -Dm644 vnc_unixsrc/classes/* \ + $pkgdir/usr/share/$pkgname + install -Dm644 rgb.txt $pkgdir/usr/share/$pkgname/rgb.txt + install -Dm644 $pkgname.desktop \ + $pkgdir/usr/share/applications/$pkgname.desktop + install -Dm644 $pkgname.png \ + $pkgdir/usr/share/pixmaps/$pkgname.png + install -Dm644 vncserver.service \ + $pkgdir/usr/lib/systemd/system/vncserver.service } # vim:set ts=2 sw=2 et: diff --git a/community/tightvnc/vncserver.service b/community/tightvnc/vncserver.service new file mode 100644 index 000000000..b64e729a6 --- /dev/null +++ b/community/tightvnc/vncserver.service @@ -0,0 +1,29 @@ +# The vncserver service unit file +# +# 1. Copy this file to /etc/systemd/system/vncserver@:<display>.service +# 2. Edit User= +# ("User=foo") +# 3. Edit and vncserver parameters appropriately +# ("/usr/bin/vncserver %i -arg1 -arg2 -argn") +# 4. Run `systemctl --system daemon-reload` +# 5. Run `systemctl enable vncserver@:<display>.service` +# +# DO NOT RUN THIS SERVICE if your local area network is untrusted! +# +# See the wiki page for more on security +# https://wiki.archlinux.org/index.php/Vncserver + +[Unit] +Description=Remote desktop service (VNC) +After=syslog.target network.target + +[Service] +Type=forking +User= +# Clean any existing files in /tmp/.X11-unix environment, especially useful for VMs +ExecStartPre=-/usr/bin/vncserver -kill %i +ExecStart=/usr/bin/vncserver %i +ExecStop=/usr/bin/vncserver -kill %i + +[Install] +WantedBy=multi-user.target diff --git a/community/tinycdb/PKGBUILD b/community/tinycdb/PKGBUILD deleted file mode 100644 index 9f30644e5..000000000 --- a/community/tinycdb/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 65399 2012-02-21 03:25:20Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=tinycdb -pkgver=0.77 -pkgrel=4 -pkgdesc="very fast and simple package for creating and reading constant data bases" -arch=(i686 x86_64 'mips64el') -url="http://www.corpit.ru/mjt/tinycdb.html" -license=("GPL") -depends=(glibc) -source=(http://www.corpit.ru/mjt/tinycdb/${pkgname}_$pkgver.tar.gz) -md5sums=('c00e5fb96c30356ac3b67b2ab5d5641b') - -build() { - cd $srcdir/$pkgname-$pkgver - make sharedlib staticlib cdb - - install -D -m 0644 cdb.h $pkgdir/usr/include/cdb.h - install -D -m 0644 cdb.3 $pkgdir/usr/share/man/man3/cdb.3 - install -D -m 0644 cdb.1 $pkgdir/usr/share/man/man1/cdb.1 - install -D -m 0644 cdb.5 $pkgdir/usr/share/man/man5/cdb.5 - install -D -m 0755 cdb $pkgdir/usr/bin/cdb - install -D -m 0644 libcdb.a $pkgdir/usr/lib/libcdb.a - install -D -m 0644 libcdb.so $pkgdir/usr/lib/libcdb.so - install -D -m 0644 libcdb.so.1 $pkgdir/usr/lib/libcdb.so.1 -} diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD index a6d782dca..7206f5728 100644 --- a/community/tinyproxy/PKGBUILD +++ b/community/tinyproxy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74395 2012-07-26 13:54:21Z lfleischer $ +# $Id: PKGBUILD 80139 2012-11-16 17:14:04Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=tinyproxy pkgver=1.8.3 -pkgrel=5 +pkgrel=6 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.' arch=('i686' 'x86_64' 'mips64el') url='https://banu.com/tinyproxy/' @@ -19,7 +19,7 @@ source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2" md5sums=('292ac51da8ad6ae883d4ebf56908400d' '90eb2b3371e56d5a784fd826d4a6e5f8' '3c2764578f26581346fe312da0519a3e' - '8e97b05cc8c87f7efefbf957e77c7f18') + '299ca484c08d9873c74e1eb96f6a5cc0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/tinyproxy/tinyproxy.service b/community/tinyproxy/tinyproxy.service index aea1d32fe..8776a0ee1 100644 --- a/community/tinyproxy/tinyproxy.service +++ b/community/tinyproxy/tinyproxy.service @@ -5,6 +5,7 @@ After=network.target [Service] Type=forking ExecStart=/usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf +PIDFile=/run/tinyproxy/tinyproxy.pid [Install] WantedBy=multi-user.target diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index 1d2be2c85..6792915b6 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76252 2012-09-15 09:03:52Z lfleischer $ +# $Id: PKGBUILD 80483 2012-11-22 17:38:18Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor -pkgver=0.2.2.39 +pkgver=0.2.3.25 pkgrel=1 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64' 'mips64el') @@ -21,12 +21,12 @@ source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} 'tor' 'tor.conf.d' 'tor.service') -md5sums=('9157a1f02fcda9d7d2c5744176373abd' - '7944de0693fccf65fe0e3ea6712887b6' +md5sums=('a1c364189a9a66ed9daa8e6436489daf' + 'a4c12795ffb8f68550a5dab4a9eb0654' '56c75d4e8a66f34167d31e38c43793dd' 'f8e6868a389877346e7eebaacd1078bb' '5c7c6834064b3530c442def6079ac3aa' - 'cf23b97a1da09670214da6229a3ecb09') + 'b8989a7b3ab39d697624b243f7fc255d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/tor/tor.service b/community/tor/tor.service index eb9b556b5..33bbc0776 100644 --- a/community/tor/tor.service +++ b/community/tor/tor.service @@ -1,13 +1,14 @@ [Unit] Description=Anonymizing Overlay Network +After=network.target [Service] Type=forking GuessMainPID=yes -EnvironmentFile=/etc/conf.d/tor -ExecStart=/usr/bin/tor -f $TOR_CONF $TOR_ARGS +ExecStart=/usr/bin/tor -f /etc/tor/torrc --quiet ExecReload=/bin/kill -HUP $MAINPID KillSignal=SIGINT +LimitNOFILE=8192 [Install] WantedBy=multi-user.target diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD index 5e418bb35..0d644cad8 100644 --- a/community/torcs/PKGBUILD +++ b/community/torcs/PKGBUILD @@ -1,23 +1,21 @@ -# $Id: PKGBUILD 77665 2012-10-13 11:45:51Z allan $ +# $Id: PKGBUILD 78671 2012-10-22 16:39:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Shahar Weiss <sweiss4@gmx.net> pkgname=torcs -pkgver=1.3.3 -pkgrel=2 +pkgver=1.3.4 +pkgrel=1 pkgdesc="A 3D racing cars simulator using OpenGL" url="http://torcs.sourceforge.net" license=("GPL") arch=('i686' 'x86_64' 'mips64el') depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis' 'glu') -makedepends=('plib') +makedepends=('plib' 'mesa') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 - torcs.desktop - torcs-gcc.patch) -md5sums=('0319c996dac4480f1182c03d2331b14a' - '328e419e9f985c3e7b69924fe299330d' - '5ae7e903df37300d3b8744328c756bff') + torcs.desktop) +md5sums=('07dbc9c53e2b177be1f53fe97d53d039' + '328e419e9f985c3e7b69924fe299330d') build() { cd $srcdir/$pkgname-${pkgver/_/-} diff --git a/community/tp_smapi/PKGBUILD b/community/tp_smapi/PKGBUILD deleted file mode 100644 index e80492955..000000000 --- a/community/tp_smapi/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: xduugu -# Contributor: nh2 -# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com> -# Contributor: Nick B <Shirakawasuna ð gmail đ com> -# Contributor: Christof Musik <christof ð senfdax đ de> -# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de> -# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com> - -pkgname=tp_smapi -pkgver=0.41 -pkgrel=5 -pkgdesc="Modules for ThinkPad's SMAPI functionality" -arch=('i686' 'x86_64') -url='https://github.com/evgeni/tp_smapi' -license=('GPL') -depends=('linux>=3.5' 'linux<3.6') -makedepends=('linux-headers>=3.5' 'linux-headers<3.6') -install="${pkgname}.install" -source=("https://github.com/downloads/evgeni/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('63c683415c764568f6bf17c7eabe4752') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - _kernver=${_kernver:-$(uname -r)} - _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) - _kernver=$(< "${_extramodules}/version") - - sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \ - -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile - - make HDAPS=1 -} - -package() { - _kernver=${_kernver:-$(uname -r)} - _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) - _kernver=$(< "${_extramodules}/version") - - make -C "${_extramodules%/*}/${_kernver}/build" \ - INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \ - M="${srcdir}/${pkgname}-${pkgver}" modules_install - - cd "${pkgdir}/${_extramodules%/*}" - mv "${_kernver}/extra" "${_extramodules##*/}" - rmdir "${_kernver}" - - # compress kernel modules - find "${pkgdir}" -name "*.ko" -exec gzip -9 {} + - - # load module on startup - echo tp_smapi > "${srcdir}/${pkgname}.conf" - install -Dm644 "${srcdir}/${pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" - - # update kernel version in install file - sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${pkgname}.install" -} diff --git a/community/tp_smapi/tp_smapi.install b/community/tp_smapi/tp_smapi.install deleted file mode 100644 index 5fe1bab90..000000000 --- a/community/tp_smapi/tp_smapi.install +++ /dev/null @@ -1,13 +0,0 @@ -extramodules=/usr/lib/modules/extramodules-3.5-ARCH - -post_install() { - depmod -v $(< "$extramodules/version") &>/dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/trickle/PKGBUILD b/community/trickle/PKGBUILD index 5bafbb940..536780e7d 100644 --- a/community/trickle/PKGBUILD +++ b/community/trickle/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68040 2012-03-17 11:08:43Z giovanni $ +# $Id: PKGBUILD 80164 2012-11-17 02:17:02Z kkeen $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor Romain Bouchaud-Leduc <r0m1.bl@camaris.org> pkgname=trickle pkgver=1.07 -pkgrel=6 +pkgrel=7 pkgdesc="Lightweight userspace bandwidth shaper" arch=('i686' 'x86_64' 'mips64el') url="http://monkey.org/~marius/trickle" @@ -15,6 +15,9 @@ md5sums=('860ebc4abbbd82957c20a28bd9390d7d') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # FS#23194 + sed -i 's|^_select(int|select(int|' trickle-overload.c ./configure --prefix=/usr \ --mandir=/usr/share/man diff --git a/community/tuxpaint-config/PKGBUILD b/community/tuxpaint-config/PKGBUILD new file mode 100644 index 000000000..26c9ae9c8 --- /dev/null +++ b/community/tuxpaint-config/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 79472 2012-11-06 00:37:14Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: royrocks <royrocks13@gmail.com> + +pkgname=tuxpaint-config +pkgver=0.0.12 +pkgrel=2 +pkgdesc='Tux Paint configuration tool' +arch=('x86_64' 'i686') +url='http://www.tuxpaint.org' +license='GPL' +depends=('tuxpaint' 'fltk' 'libxft' 'libxext') +source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz") +sha256sums=('9395a1c92e52c3420cabaa0c781b607e6832b5d9b6180902615f102216e1c8fd') + +build() { + cd $srcdir/$pkgname-$pkgver + + make PREFIX=/usr +} + +package() { + cd $srcdir/$pkgname-$pkgver + + install -d -m755 $pkgdir/usr/bin/ + install -d -m644 $pkgdir/opt/kde/share/icons/hicolor/48x48/apps/ + install -d -m644 $pkgdir/opt/kde/share/icons/hicolor/32x32/apps/ + install -d -m644 $pkgdir/opt/kde/share/icons/hicolor/16x16/apps/ + + make PREFIX=$pkgdir/usr DESTDIR=$pkgdir KDE_PREFIX=$pkgdir/opt/kde \ + KDE_ICON_PREFIX=$pkgdir/opt/kde/share/icons install + + install -D -m644 src/tuxpaint-config.desktop \ + $pkgdir/usr/share/applications/tuxpaint-config.desktop +} + +# vim:set ts=2 sw=2 et: diff --git a/community/tuxpaint/PKGBUILD b/community/tuxpaint/PKGBUILD index 6922a5706..3b51c3188 100644 --- a/community/tuxpaint/PKGBUILD +++ b/community/tuxpaint/PKGBUILD @@ -1,39 +1,53 @@ -# $Id: PKGBUILD 63759 2012-02-05 12:12:25Z ibiru $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 79380 2012-11-03 21:29:07Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Sergio Jovani Guzman <moret.sjg@gmail.com> -# Adopted: royrocks <royrocks13@gmail.com> +# Contributor: royrocks <royrocks13@gmail.com> + pkgname=tuxpaint pkgver=0.9.21 -pkgrel=5 -pkgdesc="Tux Paint is a free drawing program designed for young children." -arch=('i686' 'x86_64' 'mips64el') -url="http://www.tuxpaint.org" +pkgrel=7 +pkgdesc='Drawing program designed for young children' +arch=('x86_64' 'i686' 'mips64el') +url='http://www.tuxpaint.org/' license=('GPL') backup=('etc/tuxpaint/tuxpaint.conf') -depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango' 'libpaper' 'librsvg') -source=(http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz tuxpaint-0.9.21-libpng1.5.patch) -md5sums=('a88401d1860648098eeed819cff038fa' - '11d11119b3316c13f7b7a77048317bce') -sha1sums=('082a179a3cb44ee17af47421bc92125a890846e4' - '5595a65ebabc46bebd2d0670589effc8dbdd4e0c') +depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango' + 'libpaper' 'librsvg') +makedepends=('setconf') +optdepends=('tuxpaint-stamps: more stamps' + 'tuxpaint-conf: configuration manager') +source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz" + 'tuxpaint-0.9.21-libpng1.5.patch') +sha256sums=('6d4f2b981643b5c937708e5e6cdaf318ae7b5562375327b4b1cb84611e65ede9' + '6d572467fce710c9323ba53bb3309eb7ed1401b4fee2c1f56533e871558a7f20') build() { - cd "$srcdir/$pkgname-$pkgver" - - # python2 fix - for file in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file - done - - patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch - sed -i 's/$(ARCH_LINKS)/$(ARCH_LINKS) -lpng/' Makefile - echo "Categories=Game;KidsGame;Graphics;RasterGraphics;" >> src/tuxpaint.desktop - make PREFIX=/usr + cd "$srcdir/$pkgname-$pkgver" + + # python2 fix + for f in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do + sed -i '0,/on/s//on2/' $f + done + + patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch + sed -i 's:$(ARCH_LINKS):$(ARCH_LINKS) -lpng:' Makefile + setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;' + sed -i 's:# fu:fu:' src/tuxpaint.conf + make PREFIX=/usr } package() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX=/usr DESTDIR="$pkgdir" GNOME_PREFIX=/usr X11_ICON_PREFIX="$pkgdir/usr/share/pixmaps" install - chmod -R 644 "$pkgdir"/usr/share/doc/tuxpaint-dev/* - chmod 755 "$pkgdir/usr/share/doc/tuxpaint-dev/html" + cd "$srcdir/$pkgname-$pkgver" + + make \ + PREFIX=/usr \ + DESTDIR="$pkgdir" \ + GNOME_PREFIX=/usr \ + X11_ICON_PREFIX="$pkgdir/usr/share/pixmaps" \ + install + chmod -R 644 "$pkgdir/usr/share/doc/tuxpaint-dev/"* + chmod 755 "$pkgdir/usr/share/doc/tuxpaint-dev/html" } + +# vim:set ts=2 sw=2 et: diff --git a/community/tvtime/PKGBUILD b/community/tvtime/PKGBUILD index 6f7b8a552..01b21ed4b 100644 --- a/community/tvtime/PKGBUILD +++ b/community/tvtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63761 2012-02-05 12:12:36Z ibiru $ +# $Id: PKGBUILD 80477 2012-11-22 15:02:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:thefatprecious <marty@loomar.com> pkgname=tvtime pkgver=1.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="A high quality television application for use with video capture cards" arch=('i686' 'x86_64' 'mips64el') url='http://tvtime.sourceforge.net/' @@ -23,12 +23,19 @@ md5sums=('4b3d03afe61be239b08b5e522cd8afed' build() { cd $srcdir/$pkgname-$pkgver + patch -p1 < ../tvtime-1.0.2+linux-headers-2.6.18.patch patch -p1 < ../tvtime-1.0.2-gcc41.patch patch -p1 < ../tvtime-1.0.2-locale_t.patch sed -i '1,1i#include <zlib.h>' src/pngoutput.c + echo "StartupWMClass=tvtime" >>docs/net-tvtime.desktop + [ -f Makefile ] || ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var --sysconfdir=/etc make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install install -D -m644 docs/html/default.tvtime.xml $pkgdir/usr/share/tvtime/default.tvtime.xml } diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD index 52f6262af..6d95a2a4a 100644 --- a/community/ubuntuone-client/PKGBUILD +++ b/community/ubuntuone-client/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 78266 2012-10-17 10:27:54Z allan $ +# $Id: PKGBUILD 79225 2012-11-01 10:28:41Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=ubuntuone-client pkgver=4.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Ubuntu One helps you store, sync and share files between your computers" arch=('i686' 'x86_64') url="https://launchpad.net/ubuntuone-client" license=('GPL') -depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('intltool' 'imake' 'gobject-introspection') +depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'python2-gobject' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('intltool' 'imake') options=('!libtool') install=$pkgname.install source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD index ed2a02ca2..b4ad72276 100644 --- a/community/udevil/PKGBUILD +++ b/community/udevil/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76234 2012-09-14 18:50:59Z bpiotrowski $ +# $Id: PKGBUILD 80589 2012-11-26 14:58:37Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ pkgname=udevil -pkgver=0.3.3 +pkgver=0.3.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Mount and unmount without password' @@ -24,7 +24,7 @@ provides=('devmon') backup=('etc/udevil/udevil.conf') install=$pkgname.install source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz) -md5sums=('81abe64e0c6d3555f0b66b7d7fa9a340') +md5sums=('0acb03c85f06fc8b59c6997830613529') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index f4a92c8e3..965b82256 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74727 2012-08-02 13:31:20Z bisson $ +# $Id: PKGBUILD 80605 2012-11-27 00:42:31Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound pkgver=1.4.18 -pkgrel=1 +pkgrel=3 pkgdesc='Validating, recursive, and caching DNS resolver' url='http://unbound.net/' license=('custom:BSD') diff --git a/community/unbound/install b/community/unbound/install index 34e7026d1..964792592 100644 --- a/community/unbound/install +++ b/community/unbound/install @@ -1,14 +1,6 @@ post_install() { getent group unbound &>/dev/null || groupadd -r unbound >/dev/null getent passwd unbound &>/dev/null || useradd -r -g unbound -d /etc/unbound -s /bin/false -c unbound unbound >/dev/null - cat <<EOF -==> Start with: /etc/rc.d/unbound start -==> Then, add "nameserver 127.0.0.1" to /etc/resolv.conf.head -EOF -} - -pre_remove() { - /etc/rc.d/unbound stop } post_remove() { diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 1a9539897..4b19e62fd 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78360 2012-10-17 15:21:03Z spupykin $ +# $Id: PKGBUILD 78622 2012-10-22 09:20:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd pkgver=3.2.9 -pkgrel=3 +pkgrel=4 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64' 'mips64el') url="http://unrealircd.com" @@ -12,7 +12,8 @@ license=('GPL2') depends=('openssl' 'curl' 'c-ares') conflicts=('ircd') provides=('ircd') -backup=(etc/unrealircd/unrealircd.conf) +backup=('etc/unrealircd/unrealircd.conf' + 'etc/conf.d/unrealircd') source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.rc unrealircd.service diff --git a/community/uqm/PKGBUILD b/community/uqm/PKGBUILD index 79d3c0c74..4e1f2f037 100644 --- a/community/uqm/PKGBUILD +++ b/community/uqm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65007 2012-02-19 17:51:46Z lcarlier $ +# $Id: PKGBUILD 79596 2012-11-08 15:28:33Z heftig $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Maintainer : Daenyth <Daenyth+Arch _AT_ gmail _DOT_ com> # Contributor : wizzomafizzo <wizzomafizzo@gmail.com> @@ -7,12 +7,12 @@ pkgname=uqm pkgver=0.7.0 -pkgrel=2 -pkgdesc="The Ur-Quan Masters is a port of Star Control 2" +pkgrel=3 +pkgdesc="The Ur-Quan Masters, a port of Star Control 2" arch=('i686' 'x86_64' 'mips64el') url="http://sc2.sf.net/" license=('GPL') -depends=('libmikmod' 'libvorbis' 'sdl_image' 'libgl') +depends=('libmikmod' 'libvorbis' 'sdl_image' 'libgl' 'glu') makedepends=('imagemagick' 'mesa' 'namcap') optdepends=('uqm-sound: For extra music and conversation audio') source=(http://downloads.sourceforge.net/sourceforge/sc2/uqm-${pkgver}-source.tgz @@ -24,26 +24,20 @@ source=(http://downloads.sourceforge.net/sourceforge/sc2/uqm-${pkgver}-source.tg noextract=(uqm-${pkgver}-content.uqm) md5sums=('f9018ea0493d7dac6a9e1006b00af7df' '2f36dcb15274dbbcb5e266f2ed84d5b2' - '07f0a0e74a0b1c706940cc43d5a4160c' + 'ca497b754edf56aab8a5791f1d2c974a' '07e64632fce6323a14ab558d0214b885' '44c83b9b9d102b99210af0036749a318' '06d0a72aa18e7edce6cd3c7a3a747c44') -build() { +package() { cd $srcdir/$pkgname-$pkgver cp $srcdir/config.state . sed -e "/INPUT_install_prefix/ s|replaceme|$pkgdir/usr|" \ -i config.state - - echo | ./build.sh uqm config + ./build.sh uqm reprocess_config ./build.sh uqm -} - -package() { - cd $srcdir/$pkgname-$pkgver - ./build.sh uqm install install -Dm644 $srcdir/$pkgname-$pkgver-content.uqm \ diff --git a/community/uqm/config.state b/community/uqm/config.state index 1568f4a24..bfbeedffb 100644 --- a/community/uqm/config.state +++ b/community/uqm/config.state @@ -7,6 +7,7 @@ CHOICE_netplay_VALUE='full' CHOICE_joystick_VALUE='enabled' CHOICE_ioformat_VALUE='stdio_zip' CHOICE_accel_VALUE='asm' +CHOICE_threadlib_VALUE='sdl' INPUT_install_prefix_VALUE='replaceme' INPUT_install_bindir_VALUE='$prefix/bin' INPUT_install_libdir_VALUE='$prefix/lib' diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD index dfa2f6aee..456616062 100644 --- a/community/usb_modeswitch/PKGBUILD +++ b/community/usb_modeswitch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75530 2012-08-26 20:12:19Z spupykin $ +# $Id: PKGBUILD 80001 2012-11-15 11:55:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=usb_modeswitch -pkgver=1.2.4 +pkgver=1.2.5 pkgrel=1 -_pkgdata=20120815 +_pkgdata=20121109 pkgdesc="Activating switchable USB devices on Linux." arch=('i686' 'x86_64' 'mips64el') url="http://www.draisberghof.de/usb_modeswitch/" @@ -15,9 +15,9 @@ backup=("etc/$pkgname.conf") source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2" "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2" "usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt") -md5sums=('dbd4ce7966d7b4a5a0604a8280f7164d' - '12d7de3210e45ad6f48791d12bbdbf61' - '3588e76bf08f6c9ed51a1de4d086795e') +md5sums=('c393603908eceab95444c5bde790f6f0' + 'a7d23a03157871013a0d708ab2b1b6df' + '9918bbdc0f68873410688604c80d25c4') build() { cd $srcdir/usb-modeswitch-$pkgver/ diff --git a/community/uzbl/PKGBUILD b/community/uzbl/PKGBUILD index f12f1d623..ff6b9fd39 100644 --- a/community/uzbl/PKGBUILD +++ b/community/uzbl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71552 2012-05-28 19:39:02Z lcarlier $ +# $Id: PKGBUILD 80256 2012-11-18 14:26:45Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Dieter Plaetinck <dieter@plaetinck.be> @@ -6,7 +6,7 @@ pkgbase=uzbl pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed') pkgver=2012.05.14 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.uzbl.org" license=('GPL3') @@ -25,6 +25,9 @@ build() { -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find ./ -name '*.py') bin/* + # NEW_BG_TAB event fix (merged upstream) + sed -i -e "s/tab_bg/bg_tab/" bin/uzbl-tabbed + make } diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD index 039c2061e..5dc4cd3b6 100644 --- a/community/v8/PKGBUILD +++ b/community/v8/PKGBUILD @@ -1,41 +1,51 @@ -# $Id: PKGBUILD 75499 2012-08-26 09:56:04Z jelle $ +# $Id: PKGBUILD 78786 2012-10-24 19:28:22Z bpiotrowski $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: tocer <tocer.deng@gmail.com> pkgname=v8 -pkgver=3.13.0 +pkgver=3.14.0 pkgrel=1 -pkgdesc='A fast and modern javascript engine' +pkgdesc='Fast and modern javascript engine' arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/v8' license=('BSD') -depends=('gcc-libs') -makedepends=('scons') -source=("v8.tar.gz::https://github.com/v8/v8/tarball/$pkgver") -md5sums=('55878a54d5dc5674a5ade223d55965f6') +depends=('gcc-libs' 'readline') +makedepends=('subversion' 'python2') +source=($pkgname-$pkgver.tar.gz::https://github.com/v8/v8/tarball/$pkgver) +md5sums=('bcfec8d90a1d72d9962f3effa15e56c0') -build() { +[[ "$CARCH" = 'i686' ]] && ARCH=ia32 +[[ "$CARCH" = 'x86_64' ]] && ARCH=x64 +build() { cd $srcdir/$pkgname-$pkgname-* - [ "$CARCH" = 'i686' ] && SCONS_ARCH=ia32 - [ "$CARCH" = 'x86_64' ] && SCONS_ARCH=x64 + # Fetch gyp + make dependencies - scons mode=release library=shared arch=$SCONS_ARCH - scons d8 arch=$SCONS_ARCH + # The world isn't ready for python2 + export PYTHON=python2 + find build/ test/ tools/ src/ -type f \ + -exec sed -e 's_^#!/usr/bin/env python$_&2_' \ + -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' \ + -e 's_^#!/usr/bin/python$_&2_' \ + -e "s_'python'_'python2'_" -i {} \; + sed -i 's/python /python2 /' Makefile + make $ARCH.release library=shared console=readline } package() { - cd ${srcdir}/${pkgname}-$pkgname-* + cd $srcdir/$pkgname-$pkgname-* - install -Dm755 d8 "${pkgdir}/usr/bin/d8" - install -Dm755 libv8.so "${pkgdir}/usr/lib/libv8.so" + install -Dm755 out/$ARCH.release/d8 $pkgdir/usr/bin/d8 + install -Dm755 out/$ARCH.release/lib.target/libv8.so $pkgdir/usr/lib/libv8.so - # Include headers install -d $pkgdir/usr/include - install -Dm755 include/*.h $pkgdir/usr/include + install -Dm644 include/*.h $pkgdir/usr/include - install -d ${pkgdir}/usr/share/licenses/v8 + install -d $pkgdir/usr/share/licenses/v8 install -m644 LICENSE* ${pkgdir}/usr/share/licenses/v8 } + +# vim:set ts=2 sw=2 et: diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index a5369d307..e721b176c 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 75820 2012-09-01 20:39:43Z heftig $ +# $Id: PKGBUILD 78946 2012-10-27 23:46:16Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift pkgver=2012.07.22 -pkgrel=1 +pkgrel=3 pkgdesc="Open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64') url="http://vdrift.net/" license=('GPL') -depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data' +depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' "vdrift-data=2:$pkgver" 'gtk-update-icon-cache' 'hicolor-icon-theme' 'libarchive') -makedepends=('scons' 'boost' 'asio') +makedepends=('scons' 'boost' 'asio' 'mesa') +install=vdrift.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2 - http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}c_patch.diff) + vdrift-2012-07-22c_bullet281_patch.diff) md5sums=('fcfd6b65724d32dfe383df216d7afb74' - '981cd26709f97cdf85100b720290177f') + '67ff3037575c3aa74393971d1475ef54') build() { cd VDrift @@ -28,7 +29,7 @@ build() { _sconsarch="686" fi - patch -Np0 < $srcdir/$pkgname-${pkgver//./-}c_patch.diff + patch -Np0 < "$srcdir"/vdrift-2012-07-22c_bullet281_patch.diff # build and install scons $MAKEFLAGS \ diff --git a/community/vdrift/vdrift-2012-07-22c_bullet281_patch.diff b/community/vdrift/vdrift-2012-07-22c_bullet281_patch.diff new file mode 100644 index 000000000..c8509ff1b --- /dev/null +++ b/community/vdrift/vdrift-2012-07-22c_bullet281_patch.diff @@ -0,0 +1,898 @@ +--- data/skins/simple/menus/AssignControl Mon Jan 19 23:26:36 1970
++++ data/skins/simple/menus/AssignControl Mon Jan 19 23:26:36 1970
+@@ -46,7 +46,7 @@
+ image = white.png
+ color = 0.172, 0.161, 0.169
+ alpha = 0.7
+-left = 0.2
+-right = 0.2
++left = 0.1
++right = 0.1
+ top = 0.48
+ height = 0.04
+--- data/skins/simple/menus/GuiControls Mon Jan 19 23:26:36 1970
++++ data/skins/simple/menus/GuiControls Mon Jan 19 23:26:36 1970
+@@ -82,7 +82,7 @@
+ onselect = controledit.string:gui_select:0
+ onmoveleft = widget-01d
+ onmoveright = widget-01c
+-onmoveup = widget-13b
++onmoveup = widget-08b
+ onmovedown = widget-02b
+ onfocus = widget-01b.sat:0.56
+ onblur = widget-01b.sat:0.0
+@@ -101,7 +101,7 @@
+ onselect = controledit.string:gui_select:1
+ onmoveleft = widget-01b
+ onmoveright = widget-01d
+-onmoveup = widget-13b
++onmoveup = widget-08b
+ onmovedown = widget-02c
+ onfocus = widget-01c.sat:0.56
+ onblur = widget-01c.sat:0.0
+@@ -120,7 +120,7 @@
+ onselect = controledit.string:gui_select:2
+ onmoveleft = widget-01c
+ onmoveright = widget-01b
+-onmoveup = widget-13b
++onmoveup = widget-08b
+ onmovedown = widget-02d
+ onfocus = widget-01d.sat:0.56
+ onblur = widget-01d.sat:0.0
+--- data/skins/simple/menus/InGameMain Mon Jan 19 23:26:36 1970
++++ data/skins/simple/menus/InGameMain Mon Jan 19 23:26:36 1970
+@@ -44,10 +44,10 @@
+
+
+ [ widget-01 ]
+-text = Return to Game
++text = Continue
+ fontsize = 0.035
+ align = left
+-tip = Leave the menu and unpause the game.
++tip = Leave the menu and continue the game.
+ onselect = ReturnToGame
+ onmoveup = widget-05
+ onmovedown = widget-02
+@@ -72,7 +72,7 @@
+
+
+ [ widget-02 ]
+-text = Restart Game
++text = Restart
+ fontsize = 0.035
+ align = left
+ tip = Restart this game using the same car and track settings.
+@@ -100,7 +100,7 @@
+
+
+ [ widget-03 ]
+-text = Leave Game
++text = Abort
+ fontsize = 0.035
+ align = left
+ tip = Leave game and return to the Main menu.
+--- data/skins/simple/menus/InputDevice Mon Jan 19 23:26:36 1970
++++ data/skins/simple/menus/InputDevice Mon Jan 19 23:26:36 1970
+@@ -82,7 +82,7 @@
+ onselect = joystick.type.prev
+ onmoveleft = joystick.type.prev
+ onmoveright = joystick.type.next
+-onmoveup = widget-13b
++onmoveup = widget-11b
+ onmovedown = widget-02b
+ onfocus = widget-01b.alpha:1 widget-01c.alpha:1 widget-01d.sat:0.56
+ onblur = widget-01b.alpha:0 widget-01c.alpha:0 widget-01d.sat:0.0
+@@ -102,7 +102,7 @@
+ onselect = joystick.type.next
+ onmoveleft = joystick.type.prev
+ onmoveright = joystick.type.next
+-onmoveup = widget-13b
++onmoveup = widget-11b
+ onmovedown = widget-02b
+ onfocus = widget-01b.alpha:1 widget-01c.alpha:1 widget-01d.sat:0.56
+ onblur = widget-01b.alpha:0 widget-01c.alpha:0 widget-01d.sat:0.0
+--- data/skins/simple/menus/SingleRace Mon Jan 19 23:26:36 1970
++++ data/skins/simple/menus/SingleRace Mon Jan 19 23:26:36 1970
+@@ -860,7 +860,7 @@
+ onmoveleft = game.vehicle_damage.prev
+ onmoveright = game.vehicle_damage.next
+ onmoveup = widget-14b
+-onmovedown = widget-16
++onmovedown = widget-16b
+ onfocus = widget-15b.alpha:1 widget-15c.alpha:1 widget-15d.sat:0.56
+ onblur = widget-15b.alpha:0 widget-15c.alpha:0 widget-15d.sat:0.0
+ focus = false
+--- src/camera.h Mon Jan 19 23:26:36 1970
++++ src/camera.h Mon Jan 19 23:26:36 1970
+@@ -16,7 +16,7 @@
+
+ const std::string & GetName() const { return name; }
+
+- void SetFOV(float value) { fov = std::max(40.0f, std::min(160.0f, value)); }
++ void SetFOV(float value) { fov = std::max(0.0f, std::min(120.0f, value)); }
+
+ float GetFOV() const { return fov; }
+
+--- src/carcontrolmap_local.cpp Mon Jan 19 23:26:36 1970
++++ src/carcontrolmap_local.cpp Mon Jan 19 23:26:36 1970
+@@ -830,16 +830,6 @@
+ keycodes["y"] = SDLK_y;
+ keycodes["z"] = SDLK_z;
+ keycodes["DELETE"] = SDLK_DELETE;
+- keycodes["KP0"] = SDLK_KP_0;
+- keycodes["KP1"] = SDLK_KP_1;
+- keycodes["KP2"] = SDLK_KP_2;
+- keycodes["KP3"] = SDLK_KP_3;
+- keycodes["KP4"] = SDLK_KP_4;
+- keycodes["KP5"] = SDLK_KP_5;
+- keycodes["KP6"] = SDLK_KP_6;
+- keycodes["KP7"] = SDLK_KP_7;
+- keycodes["KP8"] = SDLK_KP_8;
+- keycodes["KP9"] = SDLK_KP_9;
+ keycodes["KP_PERIOD"] = SDLK_KP_PERIOD;
+ keycodes["KP_DIVIDE"] = SDLK_KP_DIVIDE;
+ keycodes["KP_MULTIPLY"] = SDLK_KP_MULTIPLY;
+@@ -872,20 +862,50 @@
+ keycodes["F14"] = SDLK_F14;
+ keycodes["F15"] = SDLK_F15;
+ keycodes["MENU"] = SDLK_MENU;
+- keycodes["APPLICATION"] = SDLK_APPLICATION;
+- keycodes["NUMLOCK"] = SDLK_NUMLOCKCLEAR;
+ keycodes["CAPSLOCK"] = SDLK_CAPSLOCK;
+- keycodes["SCROLLLOCK"] = SDLK_SCROLLLOCK;
+ keycodes["RSHIFT"] = SDLK_RSHIFT;
+ keycodes["LSHIFT"] = SDLK_LSHIFT;
+ keycodes["RCTRL"] = SDLK_RCTRL;
+ keycodes["LCTRL"] = SDLK_LCTRL;
+ keycodes["RALT"] = SDLK_RALT;
+ keycodes["LALT"] = SDLK_LALT;
++#if SDL_VERSION_ATLEAST(2,0,0)
++ keycodes["KP0"] = SDLK_KP_0;
++ keycodes["KP1"] = SDLK_KP_1;
++ keycodes["KP2"] = SDLK_KP_2;
++ keycodes["KP3"] = SDLK_KP_3;
++ keycodes["KP4"] = SDLK_KP_4;
++ keycodes["KP5"] = SDLK_KP_5;
++ keycodes["KP6"] = SDLK_KP_6;
++ keycodes["KP7"] = SDLK_KP_7;
++ keycodes["KP8"] = SDLK_KP_8;
++ keycodes["KP9"] = SDLK_KP_9;
++ keycodes["COMPOSE"] = SDLK_APPLICATION;
++ keycodes["NUMLOCK"] = SDLK_NUMLOCKCLEAR;
++ keycodes["SCROLLLOCK"] = SDLK_SCROLLLOCK;
+ keycodes["RMETA"] = SDLK_RGUI;
+ keycodes["LMETA"] = SDLK_LGUI;
+ keycodes["LSUPER"] = SDLK_LGUI;
+ keycodes["RSUPER"] = SDLK_RGUI;
++#else
++ keycodes["KP0"] = SDLK_KP0;
++ keycodes["KP1"] = SDLK_KP1;
++ keycodes["KP2"] = SDLK_KP2;
++ keycodes["KP3"] = SDLK_KP3;
++ keycodes["KP4"] = SDLK_KP4;
++ keycodes["KP5"] = SDLK_KP5;
++ keycodes["KP6"] = SDLK_KP6;
++ keycodes["KP7"] = SDLK_KP7;
++ keycodes["KP8"] = SDLK_KP8;
++ keycodes["KP9"] = SDLK_KP9;
++ keycodes["COMPOSE"] = SDLK_COMPOSE;
++ keycodes["NUMLOCK"] = SDLK_NUMLOCK;
++ keycodes["SCROLLLOCK"] = SDLK_SCROLLOCK;
++ keycodes["LMETA"] = SDLK_LMETA;
++ keycodes["RMETA"] = SDLK_RMETA;
++ keycodes["LSUPER"] = SDLK_LSUPER;
++ keycodes["RSUPER"] = SDLK_RSUPER;
++#endif
+ return keycodes;
+ }
+
+--- src/game.cpp Mon Jan 19 23:26:36 1970
++++ src/game.cpp Mon Jan 19 23:26:36 1970
+@@ -324,10 +324,6 @@
+
+ info_output << "Shutting down..." << std::endl;
+
+- // Stop the sound thread.
+- if (sound.Enabled())
+- sound.Pause(true);
+-
+ LeaveGame();
+
+ // Save settings first incase later deinits cause crashes.
+@@ -499,16 +495,7 @@
+ }
+
+ // Connect game actions to gui options
+- set_car_name.connect(gui.GetOption("game.car").signal_val);
+- set_car_paint.connect(gui.GetOption("game.car_paint").signal_val);
+- set_car_color_hue.connect(gui.GetOption("game.car_color_hue").signal_val);
+- set_car_color_sat.connect(gui.GetOption("game.car_color_sat").signal_val);
+- set_car_color_val.connect(gui.GetOption("game.car_color_val").signal_val);
+- set_car_ai_type.connect(gui.GetOption("game.ai_type").signal_val);
+- set_car_ai_level.connect(gui.GetOption("game.ai_level").signal_val);
+- set_cars_num.connect(gui.GetOption("game.cars_num").signal_val);
+- set_track_image.connect(gui.GetOption("game.track").signal_val);
+- set_control.connect(gui.GetOption("controledit.string").signal_val);
++ BindActionsToGUI();
+
+ // Set options from game settings.
+ std::map<std::string, std::string> optionmap;
+@@ -531,7 +518,6 @@
+ if (sound.Init(2048, info_output, error_output))
+ {
+ sound.SetVolume(settings.GetSoundVolume());
+- //sound.Pause(false);
+ content.setSound(sound.GetDeviceInfo());
+ }
+ else
+@@ -932,22 +918,18 @@
+ if (sound.Enabled())
+ {
+ bool pause_sound = pause || gui.Active();
+- sound.Pause(pause_sound);
+- if (!pause_sound)
+- {
+- PROFILER.beginBlock("sound");
+- MATHVECTOR <float, 3> pos;
+- QUATERNION <float> rot;
+- if (active_camera)
+- {
+- pos = active_camera->GetPosition();
+- rot = active_camera->GetOrientation();
+- }
+- sound.SetListenerPosition(pos[0], pos[1], pos[2]);
+- sound.SetListenerRotation(rot[0], rot[1], rot[2], rot[3]);
+- sound.Update();
+- PROFILER.endBlock("sound");
+- }
++ PROFILER.beginBlock("sound");
++ MATHVECTOR <float, 3> pos;
++ QUATERNION <float> rot;
++ if (active_camera)
++ {
++ pos = active_camera->GetPosition();
++ rot = active_camera->GetOrientation();
++ }
++ sound.SetListenerPosition(pos[0], pos[1], pos[2]);
++ sound.SetListenerRotation(rot[0], rot[1], rot[2], rot[3]);
++ sound.Update(pause_sound);
++ PROFILER.endBlock("sound");
+ }
+
+ //PROFILER.beginBlock("force-feedback");
+@@ -1798,9 +1780,12 @@
+ // get car start position marker for camera setup
+ MATHVECTOR<float, 3> car_pos = track.GetStart(0).first;
+
+- // car setup
++ // clear previous car
+ cars.clear();
+
++ // remove previous car sounds
++ sound.Update(true);
++
+ if (LoadCar(
+ cars_name[car_edit_id],
+ cars_paint[car_edit_id],
+@@ -1808,14 +1793,13 @@
+ car_pos, track.GetStart(0).second,
+ true, false))
+ {
+- // update car
++ // set car
+ CAR & car = cars.back();
+ dynamics.update(timestep);
+ car.Update(timestep);
+
+- // process car sound sources
+- // should they be loaded for garage car in the first place?
+- sound.Update();
++ // add car sounds
++ sound.Update(true);
+
+ // use car shape center for camera setup
+ car_pos = car.GetPosition();
+@@ -1958,7 +1942,7 @@
+ }
+
+ if (numreplays == 0)
+- replaylist.push_back(std::make_pair("", "None"));
++ replaylist.push_back(std::make_pair("none", "None"));
+
+ settings.SetSelectedReplay(replaylist.begin()->first);
+ }
+@@ -2411,6 +2395,7 @@
+
+ track.Clear();
+ cars.clear();
++ sound.Update(true);
+ hud.SetVisible(false);
+ inputgraph.Hide();
+ trackmap.Unload();
+@@ -2419,7 +2404,6 @@
+ pause = false;
+ race_laps = 0;
+ tire_smoke.Clear();
+- sound.Update();
+ }
+
+ void GAME::StartPractice()
+@@ -2473,7 +2457,7 @@
+
+ void GAME::StartReplay()
+ {
+- if (!settings.GetSelectedReplay().empty() && !NewGame(true))
++ if (settings.GetSelectedReplay() != "none" && !NewGame(true))
+ {
+ gui.ActivatePage("ReplayStartError", 0.25, error_output);
+ }
+@@ -2855,6 +2839,19 @@
+ EditControl();
+ }
+
++void GAME::BindActionsToGUI()
++{
++ set_car_name.connect(gui.GetOption("game.car").signal_val);
++ set_car_paint.connect(gui.GetOption("game.car_paint").signal_val);
++ set_car_color_hue.connect(gui.GetOption("game.car_color_hue").signal_val);
++ set_car_color_sat.connect(gui.GetOption("game.car_color_sat").signal_val);
++ set_car_color_val.connect(gui.GetOption("game.car_color_val").signal_val);
++ set_car_ai_type.connect(gui.GetOption("game.ai_type").signal_val);
++ set_car_ai_level.connect(gui.GetOption("game.ai_level").signal_val);
++ set_cars_num.connect(gui.GetOption("game.cars_num").signal_val);
++ set_track_image.connect(gui.GetOption("game.track").signal_val);
++ set_control.connect(gui.GetOption("controledit.string").signal_val);
++}
+
+ void GAME::RegisterActions()
+ {
+--- src/game.h Mon Jan 19 23:26:36 1970
++++ src/game.h Mon Jan 19 23:26:36 1970
+@@ -201,6 +201,7 @@
+ void SetTrackImage(const std::string & value);
+ void SetControl(const std::string & value);
+
++ void BindActionsToGUI();
+ void RegisterActions();
+ void InitActionMap(std::map<std::string, Slot0*> & actionmap);
+
+--- src/sound.cpp Mon Jan 19 23:26:36 1970
++++ src/sound.cpp Mon Jan 19 23:26:36 1970
+@@ -30,17 +30,20 @@
+ }
+
+ SOUND::SOUND() :
++ log_error(0),
+ deviceinfo(0, 0, 0, 0),
++ sound_volume(0),
+ initdone(false),
+ disable(false),
+- paused(true),
+ sampler_lock(0),
+ source_lock(0),
++ set_pause(true),
+ max_active_sources(64),
+ sources_num(0),
+- samplers_num(0)
++ sources_pause(true),
++ samplers_num(0),
++ samplers_pause(true)
+ {
+- volume_filter.SetFilterOrder0(1.0);
+ sources.reserve(64);
+ samplers.reserve(64);
+ }
+@@ -115,11 +118,13 @@
+ }
+
+ deviceinfo = SOUNDINFO(samples, frequency, channels, bytespersample);
+-
++ log_error = &error_output;
+ initdone = true;
+-
+ SetVolume(1.0);
+
++ // enable sound, run callback
++ SDL_PauseAudio(false);
++
+ return true;
+ }
+
+@@ -138,46 +143,21 @@
+ disable = true;
+ }
+
+-void SOUND::Pause(bool value)
+-{
+- if (paused != value)
+- {
+- SDL_PauseAudio(value);
+- paused = value;
+- }
+-}
+-
+-void SOUND::Update()
++void SOUND::Update(bool pause)
+ {
+ if (disable) return;
+
++ set_pause = pause;
++
+ GetSourceChanges();
+
+ ProcessSourceStop();
+
+- ProcessSourceRemove();
+-
+ ProcessSources();
+
+- SetSamplerChanges();
+-
+- // short circuit if paused(sound thread blocked)
+- if (paused)
+- {
+- GetSamplerChanges();
+-
+- ProcessSamplerAdd();
+-
+- ProcessSamplerRemove();
+-
+- SetSourceChanges();
+-
+- GetSourceChanges();
+-
+- ProcessSourceStop();
++ ProcessSourceRemove();
+
+- ProcessSourceRemove();
+- }
++ SetSamplerChanges();
+ }
+
+ void SOUND::SetMaxActiveSources(size_t value)
+@@ -192,18 +172,24 @@
+ size_t id = item_num;
+ if (id < items.size())
+ {
++ // reuse free slot
+ size_t idn = items[id].id;
+ if (idn != id)
+ {
+- // swap back redirected item
++ // free slot is redirecting to other item
+ assert(idn < id);
++
++ // swap redirected item back
+ items[id] = items[idn];
++
++ // use now free slot
+ id = idn;
+ }
+ items[id] = item;
+ }
+ else
+ {
++ // add item to new slot
+ items.push_back(item);
+ }
+ items[id].id = id;
+@@ -217,9 +203,14 @@
+ inline void RemoveItem(size_t id, std::vector<T> & items, size_t & item_num)
+ {
+ assert(id < items.size());
++
++ // get item true id
+ size_t idn = items[id].id;
+ assert(idn < item_num);
++
++ // pop last item
+ --item_num;
++
+ // swap last item with current
+ size_t idl = items[item_num].id;
+ if (idl != item_num)
+@@ -270,14 +261,13 @@
+ ns.id = -1;
+ sampler_add.getFirst().push_back(ns);
+
+- //std::cout << "Add sound source: " << id << " " << buffer->GetName() << std::endl;
++ //*log_error << "Add sound source: " << id << " " << buffer->GetName() << std::endl;
+ return id;
+ }
+
+ void SOUND::RemoveSource(size_t id)
+ {
+- // notify sound thread, it will notify main thread to remove the source
+- //std::cout << "To be removed source: " << id << " " << sources[sources[id].id].buffer->GetName() << std::endl;
++ // notify sound and main thread to remove the source/sampler
+ sampler_remove.getFirst().push_back(id);
+ }
+
+@@ -343,14 +333,13 @@
+
+ void SOUND::SetVolume(float value)
+ {
+- volume_filter.SetFilterOrder0(clamp(value, 0.f, 1.f));
++ sound_volume = value;
+ }
+
+ void SOUND::GetSourceChanges()
+ {
+ Lock(source_lock);
+ source_stop.swapFirst();
+- source_remove.swapFirst();
+ Unlock(source_lock);
+ }
+
+@@ -368,17 +357,18 @@
+
+ void SOUND::ProcessSourceRemove()
+ {
+- std::vector<size_t> & sremove = source_remove.getFirst();
++ std::vector<size_t> & sremove = sampler_remove.getFirst();
+ for (size_t i = 0; i < sremove.size(); ++i)
+ {
+ size_t id = sremove[i];
+ assert(id < sources.size());
++
+ size_t idn = sources[id].id;
+ assert(idn < sources_num);
+- //std::cout << "Remove sound source: " << id << " " << sources[idn].buffer->GetName() << std::endl;
++ //*log_error << "Remove sound source: " << id << " " << sources[idn].buffer->GetName() << std::endl;
++
+ RemoveItem(id, sources, sources_num);
+ }
+- sremove.clear();
+ }
+
+ void SOUND::ProcessSources()
+@@ -436,8 +426,11 @@
+ }
+ }
+
+- supdate[i].gain1 = gain1 * Sampler::denom;
+- supdate[i].gain2 = gain2 * Sampler::denom;
++ // fade sound volume
++ float volume = set_pause ? 0 : sound_volume;
++
++ supdate[i].gain1 = volume * gain1 * Sampler::denom;
++ supdate[i].gain2 = volume * gain2 * Sampler::denom;
+ supdate[i].pitch = src.pitch * Sampler::denom;
+ }
+
+@@ -471,6 +464,7 @@
+ if (sampler_update.getFirst().size()) sampler_update.swapFirst();
+ if (sampler_add.getFirst().size()) sampler_add.swapFirst();
+ if (sampler_remove.getFirst().size()) sampler_remove.swapFirst();
++ sources_pause = set_pause;
+ Unlock(sampler_lock);
+ }
+
+@@ -478,33 +472,41 @@
+ {
+ Lock(sampler_lock);
+ sampler_update.swapLast();
+- sampler_remove.swapLast();
+ sampler_add.swapLast();
++ sampler_remove.swapLast();
++ samplers_fade = samplers_pause != sources_pause;
++ samplers_pause = sources_pause;
+ Unlock(sampler_lock);
+ }
+
+ void SOUND::ProcessSamplerUpdate()
+ {
+ std::vector<SamplerUpdate> & supdate = sampler_update.getLast();
+- if (samplers_num == supdate.size())
++ if (supdate.empty()) return;
++
++ assert(samplers_num == supdate.size());
++ for (size_t i = 0; i < samplers_num; ++i)
+ {
+- for (size_t i = 0; i < samplers_num; ++i)
+- {
+- samplers[i].gain1 = supdate[i].gain1;
+- samplers[i].gain2 = supdate[i].gain2;
+- samplers[i].pitch = supdate[i].pitch;
+- }
++ samplers[i].gain1 = supdate[i].gain1;
++ samplers[i].gain2 = supdate[i].gain2;
++ samplers[i].pitch = supdate[i].pitch;
+ }
+ supdate.clear();
+ }
+
+ void SOUND::ProcessSamplers(unsigned char *stream, int len)
+ {
+- // set buffers and clear stream
++ // clear stream
++ memset(stream, 0, len);
++
++ // pause sampling
++ if (samplers_pause && !samplers_fade)
++ return;
++
++ // init sampling buffers
+ int len4 = len / 4;
+ buffer1.resize(len4);
+ buffer2.resize(len4);
+- memset(stream, 0, len);
+
+ // run samplers
+ short * sstream = (short*)stream;
+@@ -519,13 +521,17 @@
+ {
+ SampleAndAdvanceWithPitch16bit(smp, &buffer1[0], &buffer2[0], len4);
+
+- volume_filter.Filter(&buffer1[0], &buffer2[0], len4);
+-
+ for (int n = 0; n < len4; ++n)
+ {
+ int pos = n * 2;
+- sstream[pos] = clamp(sstream[pos] + buffer1[n], -32768, 32767);
+- sstream[pos + 1] = clamp(sstream[pos + 1] + buffer2[n], -32768, 32767);
++ int val1 = sstream[pos] + buffer1[n];
++ int val2 = sstream[pos + 1] + buffer2[n];
++
++ val1 = clamp(val1, -32768, 32767);
++ val2 = clamp(val2, -32768, 32767);
++
++ sstream[pos] = val1;
++ sstream[pos + 1] = val2;
+ }
+ }
+ else
+@@ -541,17 +547,13 @@
+ void SOUND::ProcessSamplerRemove()
+ {
+ std::vector<size_t> & sremove = sampler_remove.getLast();
+- if (!sremove.empty())
++ for (size_t i = 0; i < sremove.size(); ++i)
+ {
+- for (size_t i = 0; i < sremove.size(); ++i)
+- {
+- size_t id = sremove[i];
+- assert(id < samplers.size());
+- RemoveItem(id, samplers, samplers_num);
+- }
+- source_remove.getLast() = sremove;
+- sremove.clear();
++ size_t id = sremove[i];
++ assert(id < samplers.size());
++ RemoveItem(id, samplers, samplers_num);
+ }
++ sremove.clear();
+ }
+
+ void SOUND::ProcessSamplerAdd()
+@@ -589,7 +591,6 @@
+ {
+ Lock(source_lock);
+ if (source_stop.getLast().size()) source_stop.swapLast();
+- if (source_remove.getLast().size()) source_remove.swapLast();
+ Unlock(source_lock);
+ }
+
+@@ -600,12 +601,12 @@
+
+ GetSamplerChanges();
+
++ ProcessSamplerAdd();
++
+ ProcessSamplerUpdate();
+
+ ProcessSamplers(stream, len);
+
+- ProcessSamplerAdd();
+-
+ ProcessSamplerRemove();
+
+ SetSourceChanges();
+@@ -622,9 +623,10 @@
+ assert(len > 0);
+ assert(sampler.buffer);
+
+- // if not playing, fill output buffers with silence, should not happen
++ // if not playing, fill output buffers with silence
+ if (!sampler.playing)
+ {
++ // should be dealt with before getting here
+ assert(0);
+ for (int i = 0; i < len; ++i)
+ {
+--- src/sound.h Mon Jan 19 23:26:36 1970
++++ src/sound.h Mon Jan 19 23:26:36 1970
+@@ -33,11 +33,8 @@
+ // disable sound
+ void Disable();
+
+- // pause sound
+- void Pause(bool value);
+-
+ // commit state changes
+- void Update();
++ void Update(bool pause);
+
+ // active sources limit can be adjusted at runtime
+ void SetMaxActiveSources(size_t value);
+@@ -69,14 +66,14 @@
+ void SetVolume(float value);
+
+ private:
++ std::ostream * log_error;
+ SOUNDINFO deviceinfo;
+- SOUNDFILTER volume_filter;
+ MATHVECTOR<float, 3> listener_pos;
+ MATHVECTOR<float, 3> listener_vel;
+ QUATERNION<float> listener_rot;
++ float sound_volume;
+ bool initdone;
+ bool disable;
+- bool paused;
+
+ // state structs
+ struct Source
+@@ -95,8 +92,8 @@
+
+ struct Sampler
+ {
+- static const int denom = 1 << 15;
+- static const int max_gain_delta = (denom * 100) / 44100;
++ static const int denom = 32768;
++ static const int max_gain_delta = (denom * 173) / 44100; // 256 samples from min to max gain
+ const SOUNDBUFFER * buffer;
+ int samples_per_channel;
+ int sample_pos;
+@@ -135,21 +132,24 @@
+ TrippleBuffer<SamplerUpdate> sampler_update;
+ TrippleBuffer<SamplerAdd> sampler_add;
+ TrippleBuffer<size_t> sampler_remove;
+- TrippleBuffer<size_t> source_remove;
+ TrippleBuffer<size_t> source_stop;
+ SDL_mutex * sampler_lock;
+ SDL_mutex * source_lock;
++ bool set_pause;
+
+ // sound sources state
+ std::vector<SourceActive> sources_active;
+ std::vector<Source> sources;
+ size_t max_active_sources;
+ size_t sources_num;
++ bool sources_pause;
+
+ // sound thread state
+ std::vector<int> buffer1, buffer2;
+ std::vector<Sampler> samplers;
+ size_t samplers_num;
++ bool samplers_pause;
++ bool samplers_fade;
+
+ // main thread methods
+ void GetSourceChanges();
+--- src/texture.cpp Mon Jan 19 23:26:36 1970
++++ src/texture.cpp Mon Jan 19 23:26:36 1970
+@@ -179,6 +179,7 @@
+ else
+ {
+ error << "Error loading texture file: " + path << std::endl;
++ error << IMG_GetError();
+ return false;
+ }
+
+@@ -303,6 +304,7 @@
+ else
+ {
+ error << "Error loading texture file: " + path + " (" + cubefiles[i] + ")" << std::endl;
++ error << IMG_GetError();
+ return false;
+ }
+
+@@ -477,6 +479,7 @@
+ if (!orig_surface)
+ {
+ error << "Error loading texture file: " << path << std::endl;
++ error << IMG_GetError();
+ return false;
+ }
+ }
+--- src/cardynamics.cpp Mon Jan 19 23:26:36 1970
++++ src/cardynamics.cpp Mon Jan 19 23:26:36 1970
+@@ -1791,23 +1791,29 @@
+
+ bool CARDYNAMICS::WheelContactCallback(
+ btManifoldPoint& cp,
+- const btCollisionObject* colObj0,
+- int partId0,
++ const btCollisionObjectWrapper* col0,
++ int part0,
+ int index0,
+- const btCollisionObject* colObj1,
+- int partId1,
++ const btCollisionObjectWrapper* col1,
++ int part1,
+ int index1)
+ {
+- // cars are fracture bodies, wheel is a cylinder shape
+- const btCollisionShape* shape = colObj0->getCollisionShape();
+- if ((colObj0->getInternalType() & CO_FRACTURE_TYPE) &&
++#if (BT_BULLET_VERSION < 281)
++ const btCollisionObject* obj = col0;
++ const btCollisionShape* shape = obj->getCollisionShape();
++ const btCollisionShape* rootshape = obj->getRootCollisionShape();
++#else
++ const btCollisionObject* obj = col0->getCollisionObject();
++ const btCollisionShape* shape = col0->getCollisionShape();
++ const btCollisionShape* rootshape = obj->getCollisionShape();
++#endif
++ if ((obj->getInternalType() & CO_FRACTURE_TYPE) &&
+ (shape->getShapeType() == CYLINDER_SHAPE_PROXYTYPE))
+ {
+- // is contact within contact patch?
+- const btCompoundShape* car = static_cast<const btCompoundShape*>(colObj0->getRootCollisionShape());
+- const btCylinderShapeX* wheel = static_cast<const btCylinderShapeX*>(shape);
+- btVector3 contactPoint = cp.m_localPointA - car->getChildTransform(cp.m_index0).getOrigin();
+- if (-direction::up.dot(contactPoint) > 0.5 * wheel->getRadius())
++ const btCompoundShape* carshape = static_cast<const btCompoundShape*>(rootshape);
++ const btCylinderShapeX* wheelshape = static_cast<const btCylinderShapeX*>(shape);
++ btVector3 contactPoint = cp.m_localPointA - carshape->getChildTransform(cp.m_index0).getOrigin();
++ if (-direction::up.dot(contactPoint) > 0.5 * wheelshape->getRadius())
+ {
+ // break contact (hack)
+ cp.m_normalWorldOnB = btVector3(0, 0, 0);
+--- src/cardynamics.h Mon Jan 19 23:26:36 1970
++++ src/cardynamics.h Mon Jan 19 23:26:36 1970
+@@ -25,6 +25,12 @@
+ class FractureBody;
+ class PTree;
+
++#if (BT_BULLET_VERSION < 281)
++#define btCollisionObjectWrapper btCollisionObject
++#else
++struct btCollisionObjectWrapper;
++#endif
++
+ class CARDYNAMICS : public btActionInterface
+ {
+ friend class PERFORMANCE_TESTING;
+@@ -151,11 +157,11 @@
+
+ static bool WheelContactCallback(
+ btManifoldPoint& cp,
+- const btCollisionObject* colObj0,
+- int partId0,
++ const btCollisionObjectWrapper* col0,
++ int part0,
+ int index0,
+- const btCollisionObject* colObj1,
+- int partId1,
++ const btCollisionObjectWrapper* col1,
++ int part1,
+ int index1);
+
+ protected:
+--- src/dynamicsworld.cpp Mon Jan 19 23:26:36 1970
++++ src/dynamicsworld.cpp Mon Jan 19 23:26:36 1970
+@@ -105,7 +105,7 @@
+ int patch_id = -1;
+ const BEZIER * b = 0;
+ const TRACKSURFACE * s = TRACKSURFACE::None();
+- btCollisionObject * c = 0;
++ const btCollisionObject * c = 0;
+
+ MyRayResultCallback ray(origin, p, caster);
+ rayTest(origin, p, ray);
+@@ -221,6 +221,7 @@
+
+ void DynamicsWorld::fractureCallback()
+ {
++#if (BT_BULLET_VERSION < 281)
+ m_activeConnections.resize(0);
+
+ int numManifolds = getDispatcher()->getNumManifolds();
+@@ -268,4 +269,5 @@
+ btRigidBody* child = body->updateConnection(con_id);
+ if (child) addRigidBody(child);
+ }
++#endif
+ }
diff --git a/community/vhba-module/60-vhba.rules b/community/vhba-module/60-vhba.rules deleted file mode 100644 index e4de1dca7..000000000 --- a/community/vhba-module/60-vhba.rules +++ /dev/null @@ -1,13 +0,0 @@ -ACTION=="remove", GOTO="vhba_end" -KERNEL!="vhba_ctl", GOTO="vhba_end" - -NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu" - -TEST=="/sys/fs/cgroup/systemd", GOTO="vhba_uaccess" -TAG+="udev-acl" -GOTO="vhba_end" - -LABEL="vhba_uaccess" -TAG+="uaccess" - -LABEL="vhba_end" diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD deleted file mode 100644 index 2ced9f72c..000000000 --- a/community/vhba-module/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 74112 2012-07-21 11:58:49Z schiv $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Mateusz Herych <heniekk@gmail.com> -# Contributor: Charles Lindsay <charles@chaoslizard.org> - -pkgname=vhba-module -pkgver=20120422 -_extramodules=extramodules-3.4-ARCH -pkgrel=4 -pkgdesc="Kernel module that emulates SCSI devices" -arch=('i686' 'x86_64' 'mips64el') -url="http://cdemu.sourceforge.net/" -license=('GPL') -depends=('linux>=3.4' 'linux<3.5') -makedepends=('linux-headers>=3.4') -options=(!makeflags) -install=$pkgname.install -source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" - '60-vhba.rules') -md5sums=('d97372da1d270d1605742b2995fb6678' - 'b5e82d0160e7a181219b67c1794d5c27') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - - make KDIR=/usr/lib/modules/$_kernver/build -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -Dm644 vhba.ko \ - "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" - - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \ - "$startdir/vhba-module.install" - - install -Dm644 "$srcdir/60-vhba.rules" \ - "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install deleted file mode 100644 index 8458b2ae7..000000000 --- a/community/vhba-module/vhba-module.install +++ /dev/null @@ -1,22 +0,0 @@ -post_upgrade() { - ! grep -q 'cdemu' /etc/group && groupadd cdemu - echo " > Updating module dependencies..." - EXTRAMODULES='extramodules-3.4-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - - -post_install() { - echo " > Adding 'cdemu' group" - ! grep -q 'cdemu' /etc/group && groupadd cdemu - echo " > Add 'vhba' to your modules array to autoload it" - post_upgrade -} - -post_remove() { - post_upgrade - echo "Removing 'cdemu' group" - groupdel cdemu -} - -# vim:set ts=2 sw=2 et: diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD index 72f698552..37ad57e17 100644 --- a/community/vifm/PKGBUILD +++ b/community/vifm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 73402 2012-07-07 08:01:19Z jlichtblau $ +# $Id: PKGBUILD 78687 2012-10-22 20:52:48Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=vifm -pkgver=0.7.3a +pkgver=0.7.4a pkgrel=1 pkgdesc="Ncurses based file manager with vi like keybindings" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('ncurses' 'gtk2') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('77dbf8bb8caaf1b8e805c98dc6c3345d08a855fe1c09e93e6eb5a1b2cf0fd383') +sha256sums=('fe9b8bcd992f4f34ad83dd3de46064e5d3d8d4a0c468dbd11869f9790f3dcd1f') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/vifm/vifm.changelog b/community/vifm/vifm.changelog index 767b7b70a..ef4ac0ea9 100644 --- a/community/vifm/vifm.changelog +++ b/community/vifm/vifm.changelog @@ -1,3 +1,6 @@ +2012-10-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * vifm 0.7.4a-1 + 2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * vifm 0.7.3a-1 diff --git a/community/virtkey/PKGBUILD b/community/virtkey/PKGBUILD index 7d350b553..4db74b450 100644 --- a/community/virtkey/PKGBUILD +++ b/community/virtkey/PKGBUILD @@ -4,14 +4,14 @@ pkgbase=virtkey pkgname=('python2-virtkey' 'python-virtkey') -pkgver=0.61.0 -pkgrel=2 -arch=('i686' 'x86_64') +pkgver=0.62.0 +pkgrel=1 +arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/virtkey" license=('LGPL') makedepends=('python2' 'python' 'libxtst' 'gtk2') source=(http://launchpad.net/$pkgbase/${pkgver%.*}/$pkgver/+download/$pkgbase-$pkgver.tar.gz) -md5sums=('536d30acb2c8ddadc6b4a26fc01e8390') +md5sums=('2c6f2e5941501f74d754554c545a2186') build() { cd "$srcdir" diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index aa1f3d890..e172e043a 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78541 2012-10-20 11:53:48Z seblu $ +# $Id: PKGBUILD 78917 2012-10-27 18:38:36Z seblu $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') -pkgver=4.2.2 +pkgver=4.2.4 pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' diff --git a/community/virtualbox-modules-lts/build.sh b/community/virtualbox-modules-lts/build.sh index 828448cab..bbf855c1a 100755 --- a/community/virtualbox-modules-lts/build.sh +++ b/community/virtualbox-modules-lts/build.sh @@ -6,13 +6,11 @@ if (( $# != 1 )); then exit 1 fi -$1-i686-build -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -$1-x86_64-build -makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 6850f7879..338b4763d 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78539 2012-10-20 11:51:18Z seblu $ +# $Id: PKGBUILD 79182 2012-10-31 07:25:55Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') -pkgver=4.2.2 -pkgrel=1 +pkgver=4.2.4 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/virtualbox-modules/build.sh b/community/virtualbox-modules/build.sh index 828448cab..371c9b982 100755 --- a/community/virtualbox-modules/build.sh +++ b/community/virtualbox-modules/build.sh @@ -6,13 +6,11 @@ if (( $# != 1 )); then exit 1 fi -$1-i686-build -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -$1-x86_64-build -makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 4563c8c34..6b53c1faf 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75604 2012-08-27 13:46:13Z aginiewicz $ +# $Id: PKGBUILD 79495 2012-11-06 06:33:11Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> @@ -9,8 +9,8 @@ # Contributor: djscholl pkgname=vtk -pkgver=5.10.0 -pkgrel=2 +pkgver=5.10.1 +pkgrel=1 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' @@ -25,13 +25,13 @@ optdepends=('python2: python bindings' source=("http://www.vtk.org/files/release/${pkgver:0:4}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:4}/vtkdata-${pkgver}.tar.gz" ffmpeg-0.8.diff ffmpeg-0.11.diff) -md5sums=('a0363f78910f466ba8f1bd5ab5437cb9' - '8c4105b221384154421e7a460adc9c0c' +md5sums=('264b0052e65bd6571a84727113508789' + 'b6355063264cd56bcd1396c92f6ca59a' 'e992321c9d1def6034d0fa6607b40c5a' '81922ea61989e5591135f233a0400694') build() { - cd "${srcdir}"/VTK + cd "${srcdir}"/VTK$pkgver # fix compilation error: patch -Np1 -i "${srcdir}/ffmpeg-0.8.diff" @@ -56,7 +56,7 @@ build() { -Wno-dev \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ - -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData \ + -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData$pkgver \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DDOCUMENTATION_HTML_HELP:BOOL=ON \ -DDOCUMENTATION_HTML_TARZ:BOOL=ON \ @@ -80,7 +80,7 @@ build() { -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ ${cmake_system_flags} \ ${cmake_system_python_flags} \ - "${srcdir}/VTK" + "${srcdir}/VTK$pkgver" make } @@ -98,7 +98,7 @@ package() { # Install license install -dv "${pkgdir}/usr/share/licenses/vtk" - install -m644 "${srcdir}/VTK/Copyright.txt" \ + install -m644 "${srcdir}/VTK$pkgver/Copyright.txt" \ "${pkgdir}/usr/share/licenses/vtk" # Put an entry in /etc/ld.so.conf.d diff --git a/community/webfs/PKGBUILD b/community/webfs/PKGBUILD index 289641381..e23bd81d8 100644 --- a/community/webfs/PKGBUILD +++ b/community/webfs/PKGBUILD @@ -1,34 +1,40 @@ -# $Id: PKGBUILD 73433 2012-07-07 15:26:00Z cbrannon $ +# $Id: PKGBUILD 79331 2012-11-03 03:32:04Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: Mark Rosenstand <mark@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Maintainer: Chris Brannon <chris@the-brannons.com> +# Contributor: Chris Brannon <chris@the-brannons.com> pkgname=webfs pkgver=1.21 -pkgrel=7 -pkgdesc="Simple http server for mostly static content." +pkgrel=9 +pkgdesc="Simple and instant http server for mostly static content." arch=(i686 x86_64 'mips64el') url="http://linux.bytesex.org/misc/webfs.html" license=("GPL") depends=('mime-types' 'openssl') backup=(etc/conf.d/webfsd) source=(http://dl.bytesex.org/releases/webfs/webfs-${pkgver}.tar.gz - webfsd.rc webfsd.conf webfs.patch) -md5sums=('6dc125fe160479404147e7bbfc781dbc' '3ae9fcdcf79b193aa88e386055e9ebd7' - 'b2c1ab041a82acd8391b06dc38d986be' '7294edcec2589df04bb775270d56536e') + webfsd.rc webfsd.conf webfs.patch + webfsd.service) +md5sums=('6dc125fe160479404147e7bbfc781dbc' + '3ae9fcdcf79b193aa88e386055e9ebd7' + 'b2c1ab041a82acd8391b06dc38d986be' + '7294edcec2589df04bb775270d56536e' + 'e1202dd915cba1a02e0016aa3a516b4a') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - patch -i ${srcdir}/webfs.patch + patch -i "$srcdir/webfs.patch" make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr DESTDIR=${pkgdir} install - install -Dm755 ${srcdir}/webfsd.rc ${pkgdir}/etc/rc.d/webfsd - install -Dm644 ${srcdir}/webfsd.conf ${pkgdir}/etc/conf.d/webfsd + make prefix=/usr DESTDIR="$pkgdir" install + install -Dm755 "$srcdir/webfsd.rc" "$pkgdir/etc/rc.d/webfsd" + install -Dm644 "$srcdir/webfsd.conf" "$pkgdir/etc/conf.d/webfsd" + install -Dm755 "$srcdir/webfsd.service" "$pkgdir/usr/lib/systemd/system/webfsd.service" } diff --git a/community/webfs/webfsd.launcher b/community/webfs/webfsd.launcher new file mode 100644 index 000000000..fe2170617 --- /dev/null +++ b/community/webfs/webfsd.launcher @@ -0,0 +1,9 @@ +#! /bin/bash + +# wrapper script for systemd service + +[ -f /etc/conf.d/webfsd ] && . /etc/conf.d/webfsd + +# -F for simple target +exec /usr/bin/webfsd -F ${WEBFSD_ARGS} + diff --git a/community/webfs/webfsd.service b/community/webfs/webfsd.service new file mode 100644 index 000000000..b4095fc6f --- /dev/null +++ b/community/webfs/webfsd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Simple and instant http server. +Documentation=man:webfsd(1) +After=network.target + +[Service] +EnvironmentFile=/etc/conf.d/webfsd +ExecStart=/usr/bin/webfsd $WEBFSD_ARGS -F + +[Install] +WantedBy=multi-user.target diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index 389e32ca4..46c336e42 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75822 2012-09-01 20:40:05Z heftig $ +# $Id: PKGBUILD 78944 2012-10-27 23:46:00Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> @@ -6,13 +6,13 @@ pkgname=widelands pkgver=17 _realver=build17 -pkgrel=4 +pkgrel=5 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64' 'mips64el') url="http://widelands.org/" license=('GPL') -depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua' 'glew' 'python2' 'widelands-data') -makedepends=('cmake' 'boost') +depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua' 'glew' 'python2') +makedepends=('cmake' 'boost' 'mesa') source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2" $pkgname.desktop $pkgname.png @@ -38,6 +38,7 @@ build() { } package() { + depends=(${depends[@]} 'widelands-data') cd $srcdir/$pkgname-$_realver-src/build/compile make DESTDIR="$pkgdir" install diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD index 3fa7ea7a3..a03916839 100644 --- a/community/wings3d/PKGBUILD +++ b/community/wings3d/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ +# $Id: PKGBUILD 80322 2012-11-19 22:41:50Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: kappa <kappacurve@gmail.com> pkgname=wings3d _pkgname=wings pkgver=1.4.1 -pkgrel=8 -pkgdesc="3D modeling program" +pkgrel=10 +pkgdesc='3D modeling program' arch=('x86_64' 'i686') -url="http://www.wings3d.com/" +url='http://www.wings3d.com/' license=('GPL') -depends=('esdl' 'bash' 'desktop-file-utils' 'cl') +depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils') makedepends=('setconf' 'gendesk') optdepends=('povray: rendering support via POV-Ray') -replaces=('wings' 'wings-devel') install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/wings/tarball/dgud/r15b-driver-compat" +source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/wings/tar.gz/dgud/r15b-driver-compat" "$pkgname.sh" "$pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png") -sha256sums=('cbe917601b31b7d469c2f9ed0de1b016be86f14f9e757860990d9489a84585dd' +sha256sums=('b89aca41937d4d07424ccc0447eb5a6c3755350428201d7d7644e467dcd20fdf' '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e' '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a') _genericname=('3D Modeler') -_dirname='dgud-wings-4f3a3ff' +_dirname="$_pkgname-dgud-r15b-driver-compat" build() { cd "$srcdir" diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index a7b4ab0a5..9ea56a999 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,39 +1,36 @@ -# $Id: PKGBUILD 77566 2012-10-12 14:44:41Z svenstaro $ +# $Id: PKGBUILD 80535 2012-11-24 02:25:08Z svenstaro $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> pkgname=wt -pkgver=3.2.3rc1 -_pkgver=3.2.3-rc1 -pkgrel=1 +pkgver=3.2.3 +_pkgver=3.2.3 +pkgrel=2 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.webtoolkit.eu/" license=('GPL') -depends=('boost-libs') -makedepends=('boost' 'cmake>=2.8' - 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt') +depends=('boost-libs' 'libharu') +makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt') optdepends=('openssl: for SSL support in built-in webserver' 'zlib: for compression in HTTP protocol' 'fcgi: for FastCGI support' 'postgresql-libs: for PostgreSQL Dbo support' 'sqlite: for Sqlite Dbo support' - 'libharu: for PDF generation (WPdfImage)' 'graphicsmagick: for raster image support (WRasterImage)' 'pango: for advanced font rendering (WRasterImage)' 'mysql++: for the hangman example' 'qt: for the Wt/Qt interopability example (wtwithqt)') backup=('etc/wt/wt_config.xml') source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz) -md5sums=('b58780f11d85b2da32a21f4c2be84cde') +md5sums=('58922ba5d68104880adbe2e022132fb5') build() { cd ${srcdir}/${pkgname}-${_pkgver} - mkdir -p build - cd build - #-DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \ + [[ -d build ]] && rm -r build + mkdir -p build && cd build cmake \ -DCONNECTOR_HTTP=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index ce775bbd8..eb99ea59c 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78434 2012-10-18 10:03:49Z spupykin $ +# $Id: PKGBUILD 79508 2012-11-06 11:41:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -9,7 +9,7 @@ _prefix=/usr pkgname=xbmc pkgver=11.0 -pkgrel=9 +pkgrel=13 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -33,16 +33,12 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' install="${pkgname}.install" source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" "xbmc.service") -sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19') -sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19') sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' - '395ca1afd3430ad66239bafbffde0eedf9c43409b77f65341ef387f09cd65588') + '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b') sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' - '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af') + '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b') sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' - '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af') -sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' - '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af') + '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b') build() { cd "${srcdir}/xbmc-$pkgver" diff --git a/community/xbmc/xbmc.install b/community/xbmc/xbmc.install index a3ae3d0d8..b104b33e8 100644 --- a/community/xbmc/xbmc.install +++ b/community/xbmc/xbmc.install @@ -1,13 +1,13 @@ post_install() { [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications - groupadd xbmc - useradd -G xbmc -d /var/empty xbmc + getent group xbmc > /dev/null || groupadd xbmc + getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc + usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc } post_upgrade() { post_install $1 - echo "You may want to add xbmc user and group to use xbmc standalone" } post_remove() { diff --git a/community/xbmc/xbmc.service b/community/xbmc/xbmc.service index b66e35c80..23756cf03 100644 --- a/community/xbmc/xbmc.service +++ b/community/xbmc/xbmc.service @@ -7,7 +7,7 @@ User = xbmc Group = xbmc Type = simple ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -Restart = on-failure +Restart = always [Install] WantedBy = multi-user.target diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD index 3568d8c85..ce1655f78 100644 --- a/community/xemacs/PKGBUILD +++ b/community/xemacs/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 63784 2012-02-05 12:14:51Z ibiru $ -# Maintainer: juergen <juergen@archlinux.org> -# Contributor : Stéphane Gaudreault <stephane@archlinux.org> +# $Id: PKGBUILD 78989 2012-10-28 17:25:41Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: juergen <juergen@archlinux.org> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=xemacs -pkgver=21.5.31 -pkgrel=5 +pkgver=21.5.32 +pkgrel=1 pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs" arch=('i686' 'x86_64' 'mips64el') url="http://www.xemacs.org/" @@ -13,23 +14,15 @@ depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'gif optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface' 'xorg-fonts-100dpi: X bitmap fonts needed for the interface') makedepends=('xbitmaps') -install=xemacs.install +install=$pkgname.install source=(http://ftp.xemacs.org/pub/xemacs/beta/${pkgname}-${pkgver}.tar.gz - xemacs.desktop - xemacs-21.5.29-optimization-bug.patch) -md5sums=('0185fe905d0b8d8d094d9b60cf262d4a' - 'a4d3d5c0aa2c7ce7bec491f809ca3694' - 'eb061b10ea3bbe1026df5326ae1618e3') + xemacs.desktop) +sha256sums=('5d7473fd4b9ca3278de44882ef004b0028e3ff130ed714831c885893a9cd5e7d' + 'd6dc802cf07519584aa28f3b5f4ae84d5e18b619ddd7e89a04da2f6783125f34') build() { cd "${srcdir}/${pkgname}-${pkgver}" -# Fix problem caused by improper optimization with GCC>=4.1.2 on i686 -# (and possibly other arches). See -# http://tracker.xemacs.org/XEmacs/its/issue354 -# for the upstream bug report. - patch -Np0 -i ../xemacs-21.5.29-optimization-bug.patch - ./configure --build="${CHOST}" --prefix=/usr --with-dynamic \ --without-postgresql --with-athena=xaw \ --enable-database=berkdb --without-ldap \ @@ -62,4 +55,3 @@ package() { rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info} } -# vim: ts=2 sw=2 et ft=sh diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD index 7c9722fba..9a11417c6 100644 --- a/community/xl2tpd/PKGBUILD +++ b/community/xl2tpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77112 2012-10-05 10:17:51Z spupykin $ +# $Id: PKGBUILD 79633 2012-11-09 12:06:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Hengfu <rhfcaesar@gmail.com> pkgname=xl2tpd -pkgver=1.3.0 -pkgrel=3 +pkgver=1.3.1 +pkgrel=1 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation" arch=('i686' 'x86_64' 'mips64el') url="http://www.xelerance.com/services/software/xl2tpd/" @@ -12,8 +12,7 @@ license=('GPL') depends=('ppp') options=(emptydirs zipman docs) backup=(etc/ppp/options.l2tpd) -#source=(ftp://ftp.xelerance.com/$pkgname/$pkgname-$pkgver.tar.gz -source=(http://arch.p5n.pp.ru/~sergej/dl/2012/xl2tpd-$pkgver.tar.gz +source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$pkgver.tar.gz xl2tpd.rc xl2tpd.conf.client-example xl2tpd.conf.server-example @@ -21,7 +20,7 @@ source=(http://arch.p5n.pp.ru/~sergej/dl/2012/xl2tpd-$pkgver.tar.gz xl2tpd.service xl2tpd.tmpfiles ipparam.patch) -md5sums=('28264284552c442b24cf421755a2bb48' +md5sums=('38c2461d3562f98b08454ca403706886' '1439d13084fc09c2a19c97b24a834345' '5f0ae07026e61a3dd15a76fd4144a6d5' '16ed0886115d4dcc21072cfb847250bb' diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index 7372a74c6..ba33064bd 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77869 2012-10-15 10:22:11Z spupykin $ +# $Id: PKGBUILD 80569 2012-11-25 17:22:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=xlockmore -pkgver=5.40 -pkgrel=3 +pkgver=5.41 +pkgrel=1 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64 'mips64el') license=('BSD') @@ -14,7 +14,7 @@ url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 LICENSE) -md5sums=('47a8e16c485da7b0ebfa3f3e43300189' +md5sums=('a9af1cc72f0fd096ba4bba9097f9291c' 'a64afab4283f53972a6702c2e59850d7') build() { diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD index 0ca9ff580..6982c0e3d 100644 --- a/community/xmlrpc-c/PKGBUILD +++ b/community/xmlrpc-c/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 75673 2012-08-28 21:19:22Z arodseth $ +# $Id: PKGBUILD 79057 2012-10-29 19:02:22Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Vitaliy Berdinskikh <skipper13@root.ua> pkgname=xmlrpc-c -pkgver=1.31.04 +pkgver=1.32.2 +pkgrel=1 epoch=1 -pkgrel=2 pkgdesc='XML-RPC for C and C++' arch=('i686' 'x86_64' 'mips64el') url='http://xmlrpc-c.sourceforge.net/' @@ -15,8 +15,8 @@ license=('custom') depends=('curl' 'libxml2') makedepends=('libtool' 'setconf') options=('!makeflags' '!libtool' '!emptydirs') -source=("$pkgname-advanced-$pkgver.tar.gz::http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced.tar.gz") -sha256sums=('16095f8ed4531079ce07ca2e2503cddbc1d4e3734e9ea81669d468f2787275d9') +source=("$pkgname-advanced-$pkgver.tar.gz::http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced/?view=tar") +sha256sums=('5ed7260e6d07b0fe1a1e8d117ddf6ef1e1d2b6a4c40f1ec7083e0da36b2eade5') build() { cd "$srcdir/advanced" @@ -28,6 +28,7 @@ build() { --disable-cgi-server \ --disable-libwww-client \ --disable-wininet-client \ + --enable-abyss \ --enable-cplusplus mkdir include/curl touch include/curl/types.h diff --git a/community/xmlstarlet/PKGBUILD b/community/xmlstarlet/PKGBUILD index 74067d1a6..f10c67071 100644 --- a/community/xmlstarlet/PKGBUILD +++ b/community/xmlstarlet/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69626 2012-04-20 16:57:50Z spupykin $ +# $Id: PKGBUILD 79551 2012-11-07 10:18:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: PyroPeter <abi1789@googlemail.com> # Contributor: BlackEagle <ike.devolder@scarlet.be> # Contributor: chochem <chochem@gmail.com> pkgname=xmlstarlet -pkgver=1.3.1 +pkgver=1.4.0 pkgrel=1 pkgdesc="A set of tools to transform, query, validate, and edit XML documents" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://xmlstar.sourceforge.net/" license=('MIT') depends=('libxslt>=1.1.9') source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download") -md5sums=('5173ad3f01ec0ba0d54bd1fbfc057abf') +md5sums=('9f1d8e23f6f3d4a688fe0c05610caff4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 3cc9f715b..cbf481a01 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78342 2012-10-17 14:41:57Z spupykin $ +# $Id: PKGBUILD 79342 2012-11-03 08:25:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=8 +pkgrel=9 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" @@ -55,7 +55,7 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz "ffmpeg-0.11.diff") md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' 'af13c937bf3c86b77ae6820107aab9b8' - '9d8e3e1a434f271423bdd228a1e9bd7c' + '31ab8c0980966dbe3e9f5e80b7b82612' '19167aa54e4745853689abad72443b3e' 'e176971ef96807f72fa8fc17d260c20a') diff --git a/community/xmms2/xmms2d.rc b/community/xmms2/xmms2d.rc index 9d4d2b7e9..5387448d9 100755 --- a/community/xmms2/xmms2d.rc +++ b/community/xmms2/xmms2d.rc @@ -8,7 +8,7 @@ PID=`pidof xmms2d xmms2-et` case "$1" in start) stat_busy "Starting xmms2d" - [ -z "$PID" ] && su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null' - $XMMS2_USER + [ -z "$PID" ] && su -c "/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null" - $XMMS2_USER if [ $? -gt 0 ]; then stat_fail else @@ -34,6 +34,6 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac exit 0 diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index 2b61e3ba3..0952d3da1 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77363 2012-10-09 04:19:10Z tdziedzic $ +# $Id: PKGBUILD 80796 2012-12-03 20:58:24Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=xmobar pkgver=0.16 -pkgrel=1 +pkgrel=3 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" license=('custom:BSD3') @@ -13,16 +13,15 @@ depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') makedepends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string' 'haskell-stm>=2.3' 'haskell-parsec>=3.1' 'haskell-mtl>=2') options=('strip') -#source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz xmobar-0.15-builddep.patch) -# Use Git snapshot for Ghc 7.6.1 rebuild -source=(ftp://ftp.archlinux.org/other/community/xmobar/xmobar-$pkgver.tar.gz +source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz 0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch) - +md5sums=('b470f8253f8d2b014f59e9d657cc7ddd' + '149583c19ac3d0ad829f3138342bb9db') build() { cd ${srcdir}/xmobar patch -Np1 -i $srcdir/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch - runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib" + runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_threaded with_utf8 with_xft with_iwlib" runhaskell Setup build } @@ -32,6 +31,3 @@ package() { install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } -md5sums=('b470f8253f8d2b014f59e9d657cc7ddd' - 'ffd6079c879f3b6ff7208a846d6ee241' - '149583c19ac3d0ad829f3138342bb9db') diff --git a/community/xvidcap/PKGBUILD b/community/xvidcap/PKGBUILD deleted file mode 100644 index 52f8f4622..000000000 --- a/community/xvidcap/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 63169 2010-01-15 14:58:38Z giovanni $ -# Maintainer: Thorsten Töpper <atsutane at freethoughts dot de> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: red_over_blue, Abaddon <kukububu@go2.pl> -# Contributor: damir <damir@archlinux.org> - -pkgname=xvidcap -pkgver=1.1.7 -pkgrel=4 -pkgdesc="A small tool to capture things going on on an X-Windows display to either individual frames or an MPEG video" -arch=("i686" "x86_64" 'mips64el') -license=('GPL') -url="http://xvidcap.sourceforge.net/" -depends=('dbus-glib' 'lame' 'libxmu' 'libglade' 'ffmpeg' 'dbus') -makedepends=('perlxml' 'rarian') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - 'xextproto-7.1.1.patch' - 'xvidcap-ffmpeg.patch' - 'ffmpeg-0.8.patch') -md5sums=('b39a682d3ef9fcbf424af771936780e2' - 'fbde2b076c5ea05723883b87f3ef2a65' - 'f18817da1c0dada05fa791ae53193b2c') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - patch -Np1 -i ${srcdir}/xextproto-7.1.1.patch - patch -Np0 -i ${srcdir}/xvidcap-ffmpeg.patch - patch -Np1 -i ${srcdir}/ffmpeg-0.8.patch - - ./configure --prefix=/usr \ - --with-x \ - --with-gtk2 \ - --enable-libmp3lame \ - --without-forced-embedded-ffmpeg - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make prefix=${pkgdir}/usr install -} -md5sums=('b39a682d3ef9fcbf424af771936780e2' - 'fbde2b076c5ea05723883b87f3ef2a65' - 'f18817da1c0dada05fa791ae53193b2c' - '36ead5f0345ae776601d49c1c90cb101') -md5sums=('b39a682d3ef9fcbf424af771936780e2' - 'fbde2b076c5ea05723883b87f3ef2a65' - 'f18817da1c0dada05fa791ae53193b2c' - '6e4dfab56b877362757092f55ad6b337') diff --git a/community/xvidcap/ffmpeg-0.8.patch b/community/xvidcap/ffmpeg-0.8.patch deleted file mode 100644 index 511333a0f..000000000 --- a/community/xvidcap/ffmpeg-0.8.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -aur xvidcap-1.1.7/src/xtoffmpeg.c xvidcap-1.1.7.new/src/xtoffmpeg.c ---- xvidcap-1.1.7/src/xtoffmpeg.c 2008-05-25 22:01:54.000000000 +0000 -+++ xvidcap-1.1.7.new/src/xtoffmpeg.c 2011-10-31 20:41:08.259171263 +0000 -@@ -361,7 +361,7 @@ - } - // put sample parameters - au_c->codec_id = xvc_audio_codecs[job->au_targetCodec].ffmpeg_id; -- au_c->codec_type = CODEC_TYPE_AUDIO; -+ au_c->codec_type = AVMEDIA_TYPE_AUDIO; - au_c->bit_rate = target->sndsize; - au_c->sample_rate = target->sndrate; - au_c->channels = target->sndchannels; -@@ -567,7 +567,7 @@ - av_rescale_q (enc->coded_frame->pts, enc->time_base, - ost->st->time_base); - } -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - pkt.stream_index = ost->st->index; - - pkt.data = audio_out; -@@ -627,7 +627,7 @@ - pkt.pts = - av_rescale_q (enc->coded_frame->pts, enc->time_base, - ost->st->time_base); -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - av_interleaved_write_frame (s, &pkt); - } - -@@ -681,7 +681,7 @@ - if (ret <= 0) { - ret = avcodec_encode_audio (enc, bit_buffer, bit_buffer_size, NULL); - } -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - - if (samples) { - av_free (samples); -@@ -905,7 +905,7 @@ - ost->time_base); - } - if (enc->coded_frame->key_frame) -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - } - - pkt.stream_index = ost->index; -@@ -1157,7 +1157,7 @@ - } - - st->codec->codec_id = codec_id; -- st->codec->codec_type = CODEC_TYPE_VIDEO; -+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - - // find the video encoder - codec = avcodec_find_encoder (st->codec->codec_id); -@@ -1439,13 +1439,13 @@ - // guess AVOutputFormat - if (job->target >= CAP_MF) - file_oformat = -- guess_format (xvc_formats[job->target].ffmpeg_name, NULL, NULL); -+ av_guess_format (xvc_formats[job->target].ffmpeg_name, NULL, NULL); - else { - char tmp_fn[30]; - - snprintf (tmp_fn, 29, "test-%%d.%s", - xvc_formats[job->target].extensions[0]); -- file_oformat = guess_format (NULL, tmp_fn, NULL); -+ file_oformat = av_guess_format (NULL, tmp_fn, NULL); - } - if (!file_oformat) { - fprintf (stderr, -@@ -1466,7 +1466,7 @@ - #endif // DEBUG - - // prepare AVFormatContext -- output_file = av_alloc_format_context (); -+ output_file = avformat_alloc_context(); - if (!output_file) { - fprintf (stderr, - _ diff --git a/community/xvidcap/xextproto-7.1.1.patch b/community/xvidcap/xextproto-7.1.1.patch deleted file mode 100644 index b65da0ee7..000000000 --- a/community/xvidcap/xextproto-7.1.1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xvidcap-1.1.7/src/capture.c.orig 2008-05-26 02:01:53.000000000 +0400 -+++ xvidcap-1.1.7/src/capture.c 2009-12-12 00:12:31.368260518 +0300 -@@ -65,7 +65,7 @@ - #include <sys/ipc.h> - #include <sys/shm.h> - #include <X11/extensions/XShm.h> --#include <X11/extensions/shmstr.h> -+#include <X11/extensions/shmproto.h> - #ifndef SOLARIS - #include <X11/extensions/extutil.h> - #endif // SOLARIS diff --git a/community/xvidcap/xvidcap-ffmpeg.patch b/community/xvidcap/xvidcap-ffmpeg.patch deleted file mode 100644 index 3a74bf508..000000000 --- a/community/xvidcap/xvidcap-ffmpeg.patch +++ /dev/null @@ -1,105 +0,0 @@ -Index: src/codecs.c -=================================================================== ---- src/codecs.c (revision 319) -+++ src/codecs.c (working copy) -@@ -43,8 +43,8 @@ - #include <locale.h> - - #ifdef USE_FFMPEG --#include <ffmpeg/avcodec.h> --#include <ffmpeg/avformat.h> -+#include <libavcodec/avcodec.h> -+#include <libavformat/avformat.h> - #endif // USE_FFMPEG - - #include "app_data.h" -Index: src/xtoffmpeg.c -=================================================================== ---- src/xtoffmpeg.c (revision 319) -+++ src/xtoffmpeg.c (working copy) -@@ -56,13 +56,13 @@ - #include "xvidcap-intl.h" - - // ffmpeg stuff --#include <ffmpeg/avcodec.h> --#include <ffmpeg/avformat.h> --#include <ffmpeg/avdevice.h> -+#include <libavcodec/avcodec.h> -+#include <libavformat/avformat.h> -+#include <libavdevice/avdevice.h> - //#include <ffmpeg/dsputil.h> --#include <ffmpeg/swscale.h> --#include <ffmpeg/rgb2rgb.h> --#include <ffmpeg/fifo.h> -+#include <libswscale/swscale.h> -+#include <libavutil/pixfmt.h> -+#include <libavutil/fifo.h> - #define swscale_isRGB(x) ((x)==PIX_FMT_BGR32 || (x)==PIX_FMT_RGB24 \ - || (x)==PIX_FMT_RGB565 || (x)==PIX_FMT_RGB555 \ - || (x)==PIX_FMT_RGB8 || (x)==PIX_FMT_RGB4 \ -@@ -96,9 +96,10 @@ - || (x)==PIX_FMT_YUVJ420P || (x)==PIX_FMT_YUVJ422P \ - || (x)==PIX_FMT_YUVJ444P) - --#define PIX_FMT_ARGB32 PIX_FMT_RGBA32 /* this is just my personal -- * convenience */ -+#define PIX_FMT_ARGB32 PIX_FMT_RGB32 /* this is just my personal -+ * convenience */ - -+ - /* - * file globals - */ -@@ -1248,7 +1249,11 @@ - st->codec->flags |= CODEC_FLAG2_FAST; - // there is no trellis quantiser in libav* for mjpeg - if (st->codec->codec_id != CODEC_ID_MJPEG) -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - st->codec->flags |= CODEC_FLAG_TRELLIS_QUANT; -+#else -+ st->codec->trellis = 1; -+#endif - st->codec->flags &= ~CODEC_FLAG_OBMC; - // some formats want stream headers to be seperate - if (oc->oformat->flags & AVFMT_GLOBALHEADER) -@@ -1498,11 +1503,10 @@ - // add the video stream and initialize the codecs - // - // prepare stream -- out_st = -- add_video_stream (output_file, image, -- (input_pixfmt == -- PIX_FMT_PAL8 ? PIX_FMT_RGB24 : input_pixfmt), -- xvc_codecs[job->targetCodec].ffmpeg_id, job); -+ fprintf(stderr, "The current pixfmt is %d, but the choosen one is %d\n", input_pixfmt, (input_pixfmt == PIX_FMT_PAL8 ? PIX_FMT_RGB24 : input_pixfmt)); -+ out_st = add_video_stream (output_file, image, -+ (input_pixfmt == PIX_FMT_PAL8 ? PIX_FMT_RGB24 : input_pixfmt), -+ xvc_codecs[job->targetCodec].ffmpeg_id, job); - - // FIXME: set params - // memset (p_fParams, 0, sizeof(*p_fParams)); -Index: src/main.c -=================================================================== ---- src/main.c (revision 319) -+++ src/main.c (working copy) -@@ -45,7 +45,7 @@ - #include <locale.h> - - #ifdef USE_FFMPEG --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - #endif // USE_FFMPEG - - #include "control.h" -@@ -217,9 +217,6 @@ - - if (app) - xvc_appdata_free (app); --#ifdef USE_FFMPEG -- av_free_static (); --#endif - } - - /** - - diff --git a/community/yajl/PKGBUILD b/community/yajl/PKGBUILD deleted file mode 100644 index 19aedc0be..000000000 --- a/community/yajl/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: Dave Reisner <d@falconindy.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> - -pkgname=yajl -pkgver=2.0.4 -pkgrel=1 -pkgdesc='Yet Another JSON Library.' -arch=('i686' 'x86_64' 'mips64el') -url='http://lloyd.github.com/yajl/' -license=('ISC') -makedepends=('cmake') -source=("$pkgname-$pkgver.tar.gz::https://github.com/lloyd/$pkgname/tarball/$pkgver") -md5sums=('2356068635e8b93c09896a72c5b9cb8b') - -build() { - dirname=$(tar tf "$srcdir/$pkgname-$pkgver.tar.gz" | sed 1q); - cd "$dirname" - - cmake -DCMAKE_INSTALL_PREFIX=/usr . - - make -} - -package() { - dirname=$(tar tf "$srcdir/$pkgname-$pkgver.tar.gz" | sed 1q); - cd "$dirname" - - make DESTDIR="$pkgdir" install - - install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" -} -md5sums=('ee6208e697c43dcccf798ce80d370379') diff --git a/community/yamdi/PKGBUILD b/community/yamdi/PKGBUILD new file mode 100644 index 000000000..95f57b23f --- /dev/null +++ b/community/yamdi/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 80642 2012-11-28 08:29:57Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgname=yamdi +pkgver=1.8 +pkgrel=2 +pkgdesc="A metadata injector for FLV files" +arch=('i686' 'x86_64') +url="http://yamdi.sourceforge.net/" +license=('custom:BSD') +depends=('glibc') +source=("http://downloads.sourceforge.net/yamdi/$pkgname-$pkgver.tar.gz") +md5sums=('7562f6e28247013cd09e62c4c91272d5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -Dm 0755 -o root yamdi "$pkgdir/usr/bin/yamdi" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 man1/yamdi.1 "$pkgdir/usr/share/man/man1/yamdi.1" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD index 6a2ab49a2..f88fe5655 100644 --- a/community/yaws/PKGBUILD +++ b/community/yaws/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 69782 2012-04-23 09:18:43Z ibiru $ +# $Id: PKGBUILD 80743 2012-12-01 19:51:02Z arodseth $ # Maintainer: Vesa Kaihlavirta -# Contributor: Alexander Rødseth <rodseth@gmail.com> +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Patrick Smits <mail@patricksmits.net> pkgname=yaws -pkgver=1.92 -pkgrel=2 -pkgdesc='Yet Another Web Server -- The pure Erlang HTTP server/framework' +pkgver=1.95 +pkgrel=3 +pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework' arch=('x86_64' 'i686' 'mips64el') url='http://yaws.hyber.org/' license=('BSD') @@ -13,8 +14,10 @@ depends=('pam' 'erlang') backup=('etc/yaws/yaws.conf') options=('!emptydirs') install=$pkgname.install -source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz") -sha256sums=('cde83ca55d8e1b10a89094e1cfdc3e78d91ba9b1036cb5ea4e1994f5922c2357') +source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz" + "$pkgname.service") +sha256sums=('e4efae836561f5e8a1324a5c9ab63fb82468e9dc93dc95cb4cb6248ab6b95406' + 'cce672e0bc73f536186bdbb8ac139d8000db4bd67f5fdeff84fdc4b4f8bd84f9') build() { cd "$pkgname-$pkgver" @@ -34,6 +37,8 @@ package() { install -d "$pkgdir/usr/lib/erlang/lib" ln -s /usr/lib/yaws "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 "$srcdir/$pkgname.service" \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" } # vim:set ts=2 sw=2 et: diff --git a/community/yaws/yaws.service b/community/yaws/yaws.service new file mode 100644 index 000000000..48f9bb8ef --- /dev/null +++ b/community/yaws/yaws.service @@ -0,0 +1,12 @@ +[Unit] +Description=A fast lightweight webserver. +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/bin/yaws --daemon --heart +ExecReload=/usr/bin/yaws --hup +ExecStop=/usr/bin/yaws --stop + +[Install] +WantedBy=multi-user.target diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD index d2aea71eb..2ad381a66 100644 --- a/community/yaz/PKGBUILD +++ b/community/yaz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70645 2012-05-13 19:04:54Z jlichtblau $ +# $Id: PKGBUILD 80246 2012-11-18 10:31:25Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,16 +7,16 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=yaz -pkgver=4.2.33 -pkgrel=1 +pkgver=4.2.43 +pkgrel=2 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers" arch=('i686' 'x86_64' 'mips64el') url="http://www.indexdata.dk/yaz" license=('BSD') depends=('openssl' 'libxslt' 'icu') options=('!libtool') -source=("http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz") -sha256sums=('77baecaa0b032c0155676e704d39b49415d4793ab65ad6c26e04f6dfb0be1276') +source=(http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('849419a3e647568f2cc9a6097e009f0be8f379759d6d13274eb5d19314b1bfc2') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/zeitgeist-datahub/PKGBUILD b/community/zeitgeist-datahub/PKGBUILD new file mode 100644 index 000000000..535899a65 --- /dev/null +++ b/community/zeitgeist-datahub/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 79124 2012-10-30 23:06:48Z heftig $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Leontius Adhika Pradhana <leon@leapon.net> +# Contributor: Ner0 + +pkgname=zeitgeist-datahub +pkgver=0.9.5 +pkgrel=2 +pkgdesc="Provides passive plugins which insert events into Zeitgeist" +arch=('i686' 'x86_64') +url="https://launchpad.net/zeitgeist-datahub" +license=('GPL3') +depends=('libzeitgeist' 'json-glib' 'gtk2' 'telepathy-glib' 'zeitgeist') +makedepends=('intltool' 'vala') +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('b2b76b82b67363c45e5fe4f39a172775') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD index a3b216b74..ad882df72 100644 --- a/community/zeromq/PKGBUILD +++ b/community/zeromq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 70149 2012-04-30 19:48:46Z kkeen $ +# $Id: PKGBUILD 80560 2012-11-25 15:27:50Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=zeromq -pkgver=2.2.0 -pkgrel=2 +pkgver=3.2.2 +pkgrel=1 pkgdesc="Fast messaging system built on sockets, C and C++ bindings. aka 0MQ, ZMQ." arch=('i686' 'x86_64' 'mips64el') url="http://www.zeromq.org" @@ -10,7 +10,7 @@ license=('LGPL') depends=('gcc-libs' 'util-linux') makedepends=('python2') source=(http://download.zeromq.org/$pkgname-$pkgver.tar.gz) -md5sums=('1b11aae09b19d18276d0717b2ea288f6') +md5sums=('df68431d9300da84a1a5f9a2784e33de') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index 94811a9bd..eb4d2bada 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,36 +1,35 @@ -# $Id: PKGBUILD 78271 2012-10-17 10:28:08Z allan $ +# $Id: PKGBUILD 79573 2012-11-07 18:35:01Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc -pkgver=0.206 -pkgrel=3 +pkgver=1.0 +pkgrel=1 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('c-ares' 'libsasl') -#makedepends=('swig' 'tcl' 'python' 'perl') -makedepends=('tcl' 'python' 'perl') +makedepends=('swig' 'tcl' 'python' 'perl') +#makedepends=('tcl' 'python' 'perl') optdepends=('tcl: modtcl module' 'python: modpython module' 'perl: modperl module' 'cyrus-sasl: saslauth module') -source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz" - "http://people.znc.in/~darthgandalf/znc/modperl/modperl-znc-0.204.tar.bz2" - "http://people.znc.in/~darthgandalf/znc/modpython/modpython-znc-0.204.tar.bz2") -md5sums=('b7d3f21da81abaeb553066b0e10beb53' - 'a9c72d556d9a4ef100520433f17d71ae' - '19bf033c5cb9243171c215043c594f07') +source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz") +# "http://people.znc.in/~darthgandalf/znc/modperl/modperl-znc-0.207-472-g7a4aa74.tar.bz2" +# "http://people.znc.in/~darthgandalf/znc/modpython/modpython-znc-0.207-472-g7a4aa74.tar.bz2") +md5sums=('23807ca830c27392cccb6774f542df6e') build() { + # disable with znc 1.0 # swig 2.0.6 is bugged, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672035 # use an alternate ways of building znc explain here: # - http://wiki.znc.in/Modperl # - http://wiki.znc.in/Modpython - mv -v modperl/* $pkgname-$pkgver/modules/modperl - mv -v modpython/* $pkgname-$pkgver/modules/modpython + #mv -v modperl/* $pkgname-$pkgver/modules/modperl + #mv -v modpython/* $pkgname-$pkgver/modules/modpython cd $pkgname-$pkgver ./configure --prefix=/usr \ --enable-sasl \ |