summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-03-03 03:39:05 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-03-03 03:39:05 +0000
commitf0127fa225ad83116fabd5f7d9df4c92cd23f6f1 (patch)
treed99dfac9224fe3e070b5516f32d155d1b729c7cc /community
parent20baa30c3c0e442a770f2906d12784ab7ef719ec (diff)
Mon Mar 3 03:35:30 UTC 2014
Diffstat (limited to 'community')
-rw-r--r--community/cppcheck/PKGBUILD15
-rw-r--r--community/dart/PKGBUILD29
-rw-r--r--community/dmd/PKGBUILD47
-rw-r--r--community/dstep/PKGBUILD13
-rw-r--r--community/dtools/PKGBUILD52
-rw-r--r--community/dub/PKGBUILD17
-rw-r--r--community/homebank/PKGBUILD6
-rw-r--r--community/homebank/homebank.changelog3
-rw-r--r--community/kcm-touchpad/PKGBUILD8
-rw-r--r--community/kshutdown/PKGBUILD13
-rw-r--r--community/ldc/PKGBUILD7
-rw-r--r--community/metapixel/PKGBUILD29
-rw-r--r--community/metapixel/metapixel-1.0.2-giflib-5.0.patch11
-rw-r--r--community/metapixel/metapixel-1.0.2-libpng-1.5.patch174
-rw-r--r--community/python-sqlalchemy/PKGBUILD6
15 files changed, 140 insertions, 290 deletions
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 86f0b2110..40ef9c1f1 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 103687 2014-01-09 16:14:18Z jelle $
+# $Id: PKGBUILD 106398 2014-03-02 12:48:38Z jelle $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=cppcheck
-pkgver=1.63.1
-pkgrel=2
+pkgver=1.64
+pkgrel=1
pkgdesc="A tool for static C/C++ code analysis"
arch=('i686' 'x86_64')
url="http://cppcheck.wiki.sourceforge.net/"
license=('GPL')
depends=('qt5-base')
-makedepends=('docbook-xsl')
+makedepends=('docbook-xsl' 'qt5-tools')
source=(https://github.com/danmar/cppcheck/archive/${pkgver}.tar.gz)
-sha1sums=('19ad7251603356a82dc75a836dfad9629a3d12a0')
+sha1sums=('feaa8b3333c20f950a38026461ff407de4ef1ba0')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -19,9 +19,8 @@ build() {
make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl man
cd gui
- export HAVE_RULES=yes
- qmake
- make
+ qmake HAVE_RULES=yes CFGDIR=/usr/share/cppcheck/cfg
+ make CFGDIR=/usr/share/cppcheck/cfg
}
package() {
diff --git a/community/dart/PKGBUILD b/community/dart/PKGBUILD
index f353194ca..47b873400 100644
--- a/community/dart/PKGBUILD
+++ b/community/dart/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105737 2014-02-14 17:58:11Z arodseth $
+# $Id: PKGBUILD 106382 2014-03-01 23:40:44Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: T. Jameson Little <t.jameson.little at gmail dot com>
# Contributor: Usagi Ito <usagi@WonderRabbitProject.net>
@@ -6,7 +6,7 @@
# Contributor: Julien Nicoulaud <julien.nicoulaud@gmail.com>
pkgname=dart
-pkgver=1.1.3
+pkgver=1.2
pkgrel=1
pkgdesc='The dart programming language SDK'
arch=('x86_64' 'i686')
@@ -17,15 +17,11 @@ makedepends=('setconf')
options=('!strip')
if [[ $CARCH == x86_64 ]]; then
- source=("$pkgname-$pkgver-64.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip"
- 'license.html::https://code.google.com/intl/no/google_bsd_license.html')
- sha256sums=('5019225dd58ffba9ae726f100993345e2801f7b59f6b49edbb5020ec3621e67a'
- 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650')
+ source=("$pkgname-$pkgver-64.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip")
+ sha256sums=('d288122e9413710da1ec5b8966c8027073f5c64b83a9a90c61125aa90b30c4ec')
else
- source=("$pkgname-$pkgver-32.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip"
- 'license.html::https://code.google.com/intl/no/google_bsd_license.html')
- sha256sums=('de33b20167727d50903c1cf33d86320472d728f93641ec37a541a233e377acc4'
- 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650')
+source=("$pkgname-$pkgver-32.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip")
+ sha256sums=('beb0f817870f76308beb446c87b2918495bd7735fad8291cec127dcf641f6c52')
fi
prepare() {
@@ -39,12 +35,17 @@ prepare() {
setconf dart2js BIN_DIR "/opt/$pkgname-sdk/bin"
setconf dart2js PROG_NAME "/opt/$pkgname-sdk/bin/dart2js"
setconf dartanalyzer SCRIPT_DIR "/opt/$pkgname-sdk/bin"
- setconf dartdoc BIN_DIR "/opt/$pkgname-sdk/bin"
+ setconf docgen BIN_DIR "/opt/$pkgname-sdk/bin"
setconf pub BIN_DIR "/opt/$pkgname-sdk/bin"
setconf pub SDK_DIR "/opt/$pkgname-sdk/"
+ setconf dartfmt BIN_DIR "/opt/$pkgname-sdk/bin"
+ setconf dartfmt SDK_DIR "/opt/$pkgname-sdk/"
# Fix missing "fi" and missing newline
echo -e "fi\n" >> pub
+
+ # Extract license (AUTHORS and LICENSE files are missing
+ head -n5 "../include/dart_api.h" > ../../LICENSE
}
package() {
@@ -55,7 +56,7 @@ package() {
cp -a "$pkgname-sdk/"* "$pkgdir/opt/$pkgname-sdk/"
# Set up symbolic links for the executables
- for f in dart dart2js dartanalyzer dartdoc pub; do
+ for f in dart dart2js dartanalyzer docgen pub dartfmt; do
ln -s "/opt/$pkgname-sdk/bin/$f" "$pkgdir/usr/bin/$f"
done
@@ -65,8 +66,8 @@ package() {
done
# BSD License
- install -Dm644 license.html \
- "$pkgdir/usr/share/licenses/$pkgname/license.html"
+ install -Dm644 LICENSE \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
# vim:set ts=2 sw=2 et:
diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD
index 134e8cb69..819ecb157 100644
--- a/community/dmd/PKGBUILD
+++ b/community/dmd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 106170 2014-02-24 17:34:53Z dicebot $
+# $Id: PKGBUILD 106417 2014-03-02 21:15:14Z dicebot $
# Maintainer: Mihails Strasunse <public@dicebot.lv>
# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Chris Brannon <cmbrannon79@gmail.com>
@@ -6,21 +6,19 @@
# Contributor: Anders Bergh <anders1@gmail.com>
# Contributor: Alexander Fehr <pizzapunk gmail com>
-pkgname=('dmd' 'libphobos-devel' 'libphobos' 'dtools')
+pkgname=('dmd' 'libphobos-devel' 'libphobos')
groups=('dlang' 'dlang-dmd')
pkgbase=dmd
pkgver=2.065.0
-pkgrel=1
+pkgrel=3
arch=('i686' 'x86_64')
url="http://www.dlang.org"
makedepends=('git' 'gcc' 'make')
source=("git+http://github.com/D-Programming-Language/dmd.git#tag=v$pkgver"
"git+http://github.com/D-Programming-Language/druntime.git#tag=v$pkgver"
- "git+http://github.com/D-Programming-Language/phobos.git#tag=v$pkgver"
- "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver")
+ "git+http://github.com/D-Programming-Language/phobos.git#tag=v$pkgver")
sha1sums=('SKIP'
'SKIP'
- 'SKIP'
'SKIP')
[[ $CARCH == "x86_64" ]] && _archbits="64"
@@ -35,22 +33,16 @@ build() {
cd $srcdir/phobos
make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1
-
- cd $srcdir/tools
-
- # rdmd is used to build others
- $srcdir/dmd/src/dmd -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ -od. -ofdtools-rdmd rdmd.d
-
- for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do
- ./dtools-rdmd --compiler=$srcdir/dmd/src/dmd --build-only -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ -od. -ofdtools-`basename $tool` $tool.d
- done
}
package_dmd() {
pkgdesc="The D programming language reference compiler"
backup=('etc/dmd.conf')
- depends=('gcc')
- optdepends=('dtools: collection of useful utilities for development in D' 'libphobos-devel: standard library, development package')
+ depends=('gcc' 'libphobos-devel')
+ optdepends=(
+ 'dtools: collection of useful utilities for development in D' 'libphobos-devel: standard library, development package'
+ 'libphobos: standard D library, Phobos; shared library'
+ )
provides=("d-compiler=$pkgver")
license=('custom')
backup=('etc/dmd.conf')
@@ -79,7 +71,6 @@ package_dmd() {
package_libphobos-devel() {
pkgdesc="The Phobos standard library for D programming language. Modules and static library."
- depends=("dmd")
options=("staticlibs")
provides=("d-runtime=$pkgver" "d-stdlib=$pkgver")
license=("custom")
@@ -104,23 +95,3 @@ package_libphobos() {
install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.so $pkgdir/usr/lib/libphobos2.so
install -Dm644 $srcdir/phobos/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
}
-
-package_dtools() {
- pkgdesc="Ancilliary tools for the D programming language compiler"
- depends=("curl")
- license=("custom")
-
- cd $srcdir/tools
-
- mkdir -p $pkgdir/usr/bin
- for tool in rdmd ddemangle catdoc detab tolf dget dustmite; do
- install -m755 -t $pkgdir/usr/bin $pkgname-$tool
- done
-
- cd $pkgdir
- ln -s dtools-rdmd usr/bin/rdmd
- ln -s dtools-dustmite usr/bin/dustmite
-
- # same Boost license as Phobos
- install -Dm644 $srcdir/phobos/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community/dstep/PKGBUILD b/community/dstep/PKGBUILD
index cc1e93ea4..a3319f99e 100644
--- a/community/dstep/PKGBUILD
+++ b/community/dstep/PKGBUILD
@@ -1,33 +1,38 @@
# Maintainer: Dicebot <public@dicebot.lv>
pkgname=dstep
pkgver=0.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="Automatic C header to D module translator"
arch=('i686' 'x86_64')
groups=('dlang')
url="https://github.com/jacob-carlborg/dstep"
license=('custom')
depends=('clang')
-makedepends=('git' 'dmd' 'libphobos-devel' 'dtools')
+makedepends=('git' 'd-compiler' 'd-stdlib' 'dtools')
source=(
"git+https://github.com/jacob-carlborg/dstep.git#tag=v$pkgver"
"tango::git+https://github.com/SiegeLord/Tango-D2.git"
+ "git+https://github.com/Dicebot/Arch-PKGBUILDs.git"
"http://www.boost.org/LICENSE_1_0.txt"
)
sha1sums=(
'SKIP'
'SKIP'
+ 'SKIP'
'3cba29011be2b9d59f6204d6fa0a386b1b2dbd90'
)
build ()
{
+ DMD=`$srcdir/Arch-PKGBUILDs/d-compiler.sh`
+
cd $srcdir/tango
- ARCH=$CARCH make -f build/Makefile
+ make -f build/Makefile DC=$DMD ARCH=$CARCH COMPILER=$(basedir $DMD)
+ mv libtango-* libtango.a
cd $srcdir/dstep
git submodule update --init --recursive
- rdmd --build-only -debug -gc -ofbin/dstep -Idstack/mambo -Idstack -I$srcdir/tango -L-L$srcdir/tango -I/usr/include/dlang -L-lclang -L-ltango-dmd dstep/driver/DStep.d
+ rdmd --compiler=$DMD --build-only -debug -gc -ofbin/dstep -Idstack/mambo -Idstack -I$srcdir/tango -L-L$srcdir/tango -I/usr/include/dlang -L-lclang -L-ltango dstep/driver/DStep.d
}
package ()
diff --git a/community/dtools/PKGBUILD b/community/dtools/PKGBUILD
new file mode 100644
index 000000000..86e350d53
--- /dev/null
+++ b/community/dtools/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Mihails Strasunse <public@dicebot.lv>
+
+pkgname=('dtools')
+pkgver=2.065.0
+pkgrel=3
+pkgdesc="Ancilliary tools for the D programming language compiler"
+license=("custom")
+groups=('dlang' 'dlang-dmd')
+arch=('i686' 'x86_64')
+url="http://www.dlang.org"
+depends=("curl")
+makedepends=('git' 'gcc' 'make' 'd-compiler')
+source=(
+ "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver"
+ "git+https://github.com/Dicebot/Arch-PKGBUILDs.git"
+ "http://www.boost.org/LICENSE_1_0.txt"
+)
+sha1sums=(
+ 'SKIP'
+ 'SKIP'
+ '3cba29011be2b9d59f6204d6fa0a386b1b2dbd90'
+)
+
+build()
+{
+ DMD=`$srcdir/Arch-PKGBUILDs/d-compiler.sh`
+
+ cd $srcdir/tools
+
+ # rdmd is used to build others
+ $DMD -od. -ofdtools-rdmd rdmd.d
+
+ for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do
+ ./dtools-rdmd --compiler=$DMD --build-only -od. -ofdtools-`basename $tool` $tool.d
+ done
+}
+
+package()
+{
+ cd $srcdir/tools
+
+ mkdir -p $pkgdir/usr/bin
+ for tool in rdmd ddemangle catdoc detab tolf dget dustmite; do
+ install -m755 -t $pkgdir/usr/bin $pkgname-$tool
+ done
+
+ cd $pkgdir
+ ln -s dtools-rdmd usr/bin/rdmd
+ ln -s dtools-dustmite usr/bin/dustmite
+
+ install -Dm644 $srcdir/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/community/dub/PKGBUILD b/community/dub/PKGBUILD
index a3c876a20..8351e773b 100644
--- a/community/dub/PKGBUILD
+++ b/community/dub/PKGBUILD
@@ -2,26 +2,33 @@
# Contributor: Moritz Maxeiner <moritz@ucworks.org>
pkgname=dub
pkgver=0.9.21
-pkgrel=1
+pkgrel=2
pkgdesc="Developer package manager for D programming language"
arch=('i686' 'x86_64')
url="https://github.com/rejectedsoftware/dub"
license=('MIT')
-makedepends=('dmd' 'libphobos-devel' 'git')
+makedepends=('d-compiler' 'd-stdlib' 'git')
depends=('d-compiler' 'd-runtime' 'curl')
conflicts=('dub-git')
-source=("git+http://github.com/rejectedsoftware/dub.git#tag=v$pkgver")
-sha256sums=('SKIP')
+source=(
+ "git+http://github.com/rejectedsoftware/dub.git#tag=v$pkgver"
+ "git+https://github.com/Dicebot/Arch-PKGBUILDs.git"
+)
+sha256sums=(
+ 'SKIP'
+ 'SKIP'
+)
build()
{
+ DMD=`$srcdir/Arch-PKGBUILDs/d-compiler.sh`
cd "${srcdir}/${pkgname}"
echo Generating version file...
GITVER=$(git describe) || GITVER=unknown
echo "module dub.version_; enum dubVersion = \"$GITVER\";" > source/dub/version_.d
- dmd -ofbin/dub -g -debug -w -version=DubUseCurl -Isource -L-lcurl @build-files.txt
+ $DMD -ofbin/dub -g -debug -w -version=DubUseCurl -Isource -L-lcurl @build-files.txt
}
package()
diff --git a/community/homebank/PKGBUILD b/community/homebank/PKGBUILD
index aa61d89c7..55163296f 100644
--- a/community/homebank/PKGBUILD
+++ b/community/homebank/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 105296 2014-02-04 18:24:40Z jlichtblau $
+# $Id: PKGBUILD 106400 2014-03-02 14:11:46Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=homebank
-pkgver=4.5.5
+pkgver=4.5.6
pkgrel=1
pkgdesc="Free, easy, personal accounting for everyone"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('intltool')
install=$pkgname.install
changelog=$pkgname.changelog
source=(http://homebank.free.fr/public/$pkgname-$pkgver.tar.gz)
-sha256sums=('6f3a26075c4da67cf3521a407e90685be9aac2ef3e41614cfece2c8d4f226416')
+sha256sums=('dbff6282a8a81d9dd6ff47dff950f164d69da81147e7d94a516230c23de8a5e8')
build() {
cd "${srcdir}"/$pkgname-$pkgver
diff --git a/community/homebank/homebank.changelog b/community/homebank/homebank.changelog
index 8eddc34ad..7a2c25a32 100644
--- a/community/homebank/homebank.changelog
+++ b/community/homebank/homebank.changelog
@@ -1,3 +1,6 @@
+2014-03-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * homebank 4.5.6-1
+
2014-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* homebank 4.5.5-1
diff --git a/community/kcm-touchpad/PKGBUILD b/community/kcm-touchpad/PKGBUILD
index bb2592777..e26b3d2d1 100644
--- a/community/kcm-touchpad/PKGBUILD
+++ b/community/kcm-touchpad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 106129 2014-02-23 16:02:33Z andrea $
+# $Id: PKGBUILD 106384 2014-03-01 23:58:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: A Rojas < nqn1976 @ gmail.com >
# Contributor: Alexander Mezin <mezin.alexander@gmail.com>
pkgname=kcm-touchpad
-pkgver=0.9
-pkgrel=2
+pkgver=0.99
+pkgrel=1
pkgdesc='KCM, daemon and applet for touchpad'
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/playground/utils/kcm-touchpad'
@@ -14,7 +14,7 @@ depends=('kdebase-workspace' 'xf86-input-synaptics')
makedepends=('cmake' 'automoc4' 'xorg-server-devel')
install="${pkgname}.install"
source=("https://github.com/sanya-m/kde-touchpad-config/archive/v${pkgver}.tar.gz")
-md5sums=('2d60b154b60a745a931ded129a6297d6')
+md5sums=('3a7ab88eef4cd7c93e9d0783179cf852')
prepare() {
mkdir build
diff --git a/community/kshutdown/PKGBUILD b/community/kshutdown/PKGBUILD
index 01108ab54..5bde9df87 100644
--- a/community/kshutdown/PKGBUILD
+++ b/community/kshutdown/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 93787 2013-07-10 09:09:23Z arodseth $
+# $Id: PKGBUILD 106386 2014-03-02 00:23:09Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=kshutdown
-pkgver=3.0
+pkgver=3.2
pkgrel=1
pkgdesc='Shutdown Utility for KDE'
arch=('x86_64' 'i686')
@@ -13,11 +13,11 @@ depends=('kdebase-workspace')
makedepends=('cmake' 'automoc4')
install="$pkgname.install"
source=("http://downloads.sourceforge.net/$pkgname/$pkgname-source-$pkgver.zip")
-sha256sums=('71295e88e30538e6bc9aceb0ba2d60c2bb6c47739a97ee76f7f1f767044493ee')
+sha256sums=('8be6c2a15bb539919f94ec0caf20f00b144185f996b7663c464fbf7ce8f4a39f')
build() {
- mkdir "$srcdir/build"
- cd "$srcdir/build"
+ mkdir build
+ cd build
cmake "../$pkgname-$pkgver" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
@@ -25,8 +25,7 @@ build() {
}
package() {
- cd "$srcdir/build"
- make DESTDIR="$pkgdir" install
+ make -C build DESTDIR="$pkgdir" install
}
# vim:set ts=2 sw=2 et:
diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD
index 5fcea7099..f7431fd08 100644
--- a/community/ldc/PKGBUILD
+++ b/community/ldc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 101888 2013-12-02 15:58:18Z dicebot $
+# $Id: PKGBUILD 106423 2014-03-02 22:29:17Z dicebot $
# Maintainer: Mihails Strasuns <public@dicebot.lv>
# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=('ldc' 'liblphobos-devel')
groups=('dlang' 'dlang-ldc')
pkgver=0.12.1
epoch=1
-pkgrel=1
+pkgrel=2
pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2"
arch=('i686' 'x86_64')
url="https://github.com/ldc-developers/ldc"
@@ -35,7 +35,7 @@ build() {
}
package_ldc() {
- optdepends=("liblphobos-devel: standard library, static one + imports, LDC version")
+ depends=('liblphobos-devel')
backup=("etc/ldc2.conf"
"etc/ldc2.rebuild.conf"
)
@@ -57,7 +57,6 @@ package_ldc() {
}
package_liblphobos-devel() {
- depends=("ldc")
provides=("d-runtime" "d-stdlib")
options=("staticlibs")
diff --git a/community/metapixel/PKGBUILD b/community/metapixel/PKGBUILD
index 64d451ab4..6a9d0880b 100644
--- a/community/metapixel/PKGBUILD
+++ b/community/metapixel/PKGBUILD
@@ -1,35 +1,34 @@
-# $Id: PKGBUILD 94928 2013-08-01 07:01:23Z bpiotrowski $
+# $Id: PKGBUILD 106408 2014-03-02 18:09:48Z schuay $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de>
pkgname=metapixel
pkgver=1.0.2
-pkgrel=5
+pkgrel=6
pkgdesc='A program for generating photomosaics.'
arch=('i686' 'x86_64')
url='http://www.complang.tuwien.ac.at/schani/metapixel/'
license=('GPL')
-depends=('giflib' 'libjpeg' 'libpng' 'perl')
-source=("http://www.complang.tuwien.ac.at/schani/metapixel/files/${pkgname}-${pkgver}.tar.gz"
- 'metapixel-1.0.2-libpng-1.5.patch'
- 'metapixel-1.0.2-giflib-5.0.patch')
-md5sums=('af5d77d38826756af213a08e3ada9941'
- '1832a79790b07402735bfeb9f71f36e9'
- 'f16abb33c545734eea36ec16c92a05e8')
+depends=('giflib' 'libjpeg' 'libpng' 'perl' 'glib2')
+makedepends=('git' 'docbook-xsl')
+source=("git://github.com/schani/metapixel.git#commit=4ad7be9e82")
+md5sums=('SKIP')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}"
- patch -p1 -i ../metapixel-1.0.2-libpng-1.5.patch
- patch -p0 -i ../metapixel-1.0.2-giflib-5.0.patch
+ git submodule init
+ git submodule update
- make
+ # Build librwimg first, make dependencies seem to be bugged.
+ make librwimg
+ make MANPAGE_XSL="/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl"
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}"
install -dm0755 "${pkgdir}/usr/share/man/man1"
- make PREFIX="${pkgdir}/usr" install
+ make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man/man1" install
}
diff --git a/community/metapixel/metapixel-1.0.2-giflib-5.0.patch b/community/metapixel/metapixel-1.0.2-giflib-5.0.patch
deleted file mode 100644
index d9d4b9065..000000000
--- a/community/metapixel/metapixel-1.0.2-giflib-5.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rwimg/rwgif.c.orig 2013-07-30 13:21:57.733602922 +0200
-+++ rwimg/rwgif.c 2013-07-30 13:21:01.827421262 +0200
-@@ -54,7 +54,7 @@ open_gif_file (const char *filename, int
-
- assert(data != 0);
-
-- data->file = DGifOpenFileName(filename);
-+ data->file = DGifOpenFileName(filename, NULL);
-
- assert(data->file !=0);
-
diff --git a/community/metapixel/metapixel-1.0.2-libpng-1.5.patch b/community/metapixel/metapixel-1.0.2-libpng-1.5.patch
deleted file mode 100644
index ed787452f..000000000
--- a/community/metapixel/metapixel-1.0.2-libpng-1.5.patch
+++ /dev/null
@@ -1,174 +0,0 @@
---- metapixel-1.0.2.orig/rwimg/rwpng.c
-+++ metapixel-1.0.2/rwimg/rwpng.c
-@@ -57,19 +57,39 @@
- data->end_info = png_create_info_struct(data->png_ptr);
- assert(data->end_info != 0);
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
- if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- assert(0);
-
-- png_init_io(data->png_ptr, data->file);
--
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ png_init_io(data->png_ptr, data->file);
-+ png_read_info(data->png_ptr, data->info_ptr);
-+#else
-+ png_init_io(data->png_ptr, data->file);
- png_read_info(data->png_ptr, data->info_ptr);
-+#endif
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ *width = png_get_image_width(data->png_ptr, data->info_ptr);
-+ *height = png_get_image_height(data->png_ptr, data->info_ptr);
-+ {
-+ png_byte value = png_get_bit_depth(data->png_ptr, data->info_ptr);
-+ assert(value == 8 || value == 16);
-+ value = png_get_color_type(data->png_ptr, data->info_ptr);
-+ assert(value == PNG_COLOR_TYPE_RGB || value == PNG_COLOR_TYPE_RGB_ALPHA);
-+ value = png_get_interlace_type(data->png_ptr, data->info_ptr);
-+ assert(value == PNG_INTERLACE_NONE);
-+ }
-+#else
- *width = data->info_ptr->width;
- *height = data->info_ptr->height;
--
- assert(data->info_ptr->bit_depth == 8 || data->info_ptr->bit_depth == 16);
- assert(data->info_ptr->color_type == PNG_COLOR_TYPE_RGB || data->info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA);
- assert(data->info_ptr->interlace_type == PNG_INTERLACE_NONE);
-+#endif
-
- data->have_read = 0;
-
-@@ -81,32 +101,51 @@
- {
- png_data_t *data = (png_data_t*)_data;
- int i;
-- int bps, spp;
-+ int bps, spp, width;
- unsigned char *row;
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+
-+ if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
- if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- assert(0);
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if(png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB)
-+#else
- if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB)
-+#endif
- spp = 3;
- else
- spp = 4;
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if(png_get_bit_depth(data->png_ptr, data->info_ptr) == 16)
-+#else
- if (data->info_ptr->bit_depth == 16)
-+#endif
- bps = 2;
- else
- bps = 1;
-
-- row = (unsigned char*)malloc(data->info_ptr->width * spp * bps);
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ width = png_get_image_width(data->png_ptr, data->info_ptr);
-+#else
-+ width = data->info_ptr->width:
-+#endif
-+
-+ row = (unsigned char*)malloc(width * spp * bps);
-
- for (i = 0; i < num_lines; ++i)
- {
- int j, channel;
-
- png_read_row(data->png_ptr, (png_bytep)row, 0);
-- for (j = 0; j < data->info_ptr->width; ++j)
-+ for (j = 0; j < width; ++j)
- for (channel = 0; channel < 3; ++channel)
-- lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps];
-+ lines[i * width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps];
- }
-
- free(row);
-@@ -119,7 +158,11 @@
- {
- png_data_t *data = (png_data_t*)_data;
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
- if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- assert(0);
-
- if (data->have_read)
-@@ -148,7 +191,11 @@
- data->info_ptr = png_create_info_struct(data->png_ptr);
- assert(data->info_ptr != 0);
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
- if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- assert(0);
-
- if (pixel_stride == 4)
-@@ -156,6 +203,16 @@
-
- png_init_io(data->png_ptr, data->file);
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ png_set_IHDR(data->png_ptr, data->info_ptr,
-+ width, height, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
-+ PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
-+
-+ /* Maybe does not need following. */
-+ png_set_tRNS(data->png_ptr, data->info_ptr, NULL, 0, NULL);
-+ png_set_PLTE(data->png_ptr, data->info_ptr, NULL, 0);
-+ png_set_invalid(data->png_ptr, data->info_ptr, 0);
-+#else
- data->info_ptr->width = width;
- data->info_ptr->height = height;
- data->info_ptr->valid = 0;
-@@ -168,6 +225,7 @@
- data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
- data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT;
- data->info_ptr->interlace_type = PNG_INTERLACE_NONE;
-+#endif
-
- png_write_info(data->png_ptr, data->info_ptr);
-
-@@ -182,7 +240,11 @@
- png_data_t *data = (png_data_t*)_data;
- int i;
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
- if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- assert(0);
-
- for (i = 0; i < num_lines; ++i)
-@@ -194,7 +256,11 @@
- {
- png_data_t *data = (png_data_t*)_data;
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
- if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- assert(0);
-
- png_write_end(data->png_ptr, data->info_ptr);
diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD
index c94e0936f..2f4d2877b 100644
--- a/community/python-sqlalchemy/PKGBUILD
+++ b/community/python-sqlalchemy/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 105348 2014-02-05 18:51:35Z angvp $
+# $Id: PKGBUILD 106390 2014-03-02 04:42:29Z angvp $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
pkgbase=python-sqlalchemy
pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
-pkgver=0.9.2
+pkgver=0.9.3
pkgrel=1
arch=('i686' 'x86_64') # python2 package contain .so
url="http://www.sqlalchemy.org/"
license=('custom: MIT')
makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools' 'python-nose' 'python2-nose')
source=("https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz")
-md5sums=('c36a958e46a8514583be82523785269d')
+md5sums=('a27989b9d4b3f14ea0b1600aa45559c4')
build() {
cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver