diff options
Diffstat (limited to 'community')
59 files changed, 2908 insertions, 57 deletions
diff --git a/community/acpi/PKGBUILD b/community/acpi/PKGBUILD new file mode 100644 index 000000000..634c26b0f --- /dev/null +++ b/community/acpi/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 148027 2012-01-30 03:41:28Z dan $ +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=acpi +pkgver=1.6 +pkgrel=1 +pkgdesc="Linux ACPI client providing battery, AC power, and thermal readings" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/acpiclient" +depends=('glibc') +source=(http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz) +license=('GPL2') +sha256sums=('ed61d20400c4fd3965dde9b49ab3ac74da02f8eca1a55454f7a1ac3fa1fd5c31') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD new file mode 100644 index 000000000..fa62a9ebb --- /dev/null +++ b/community/acpid/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 67166 2012-03-05 00:42:11Z pschmitz $ +# Maintainer: +# Contributor: xduugu +# Contributor: Manolis Tzanidakis +# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us + +pkgname=acpid +pkgver=2.0.14 +pkgrel=1 +pkgdesc="A daemon for delivering ACPI power management events with netlink support" +arch=('i686' 'x86_64') +url="http://tedfelix.com/linux/acpid-netlink.html" +license=('GPL') +depends=('bash') +replaces=('acpid2') +backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid') +source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz" + 'acpid' + 'anything' + 'handler.sh' + 'acpid.conf.d') +md5sums=('14fc1eabc3489f3ded9347fcd55f158a' + 'd69203a032c4583f9abaafcf21a7ed84' + '2d37b98d6e74bab815604b8b48c6cfd4' + 'd411b758e8531adee191b66bcbc2892d' + '929c6d2e91295c22ed9ec6212d7eabef') + +build() { + cd "${srcdir}"/$pkgname-$pkgver + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install + + install -Dm755 "$srcdir/acpid" "$pkgdir/etc/rc.d/acpid" + install -Dm644 "$srcdir/anything" "$pkgdir/etc/acpi/events/anything" + install -Dm755 "$srcdir/handler.sh" "$pkgdir/etc/acpi/handler.sh" + install -Dm644 "$srcdir/acpid.conf.d" "$pkgdir/etc/conf.d/acpid" + + chmod 755 "${pkgdir}"/usr/sbin/acpid +} diff --git a/community/acpid/acpid b/community/acpid/acpid new file mode 100644 index 000000000..288ac078d --- /dev/null +++ b/community/acpid/acpid @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -f /etc/conf.d/acpid ] && . /etc/conf.d/acpid + +PID=`pidof -o %PPID /usr/sbin/acpid` +case "$1" in + start) + stat_busy "Starting acpid" + [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon acpid + stat_done + fi + ;; + stop) + stat_busy "Stopping acpid" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon acpid + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/acpid/acpid.conf.d b/community/acpid/acpid.conf.d new file mode 100644 index 000000000..b60103a2d --- /dev/null +++ b/community/acpid/acpid.conf.d @@ -0,0 +1,5 @@ +# +# Arguments to be passed to the acpid daemon +# + +ACPID_ARGS="" diff --git a/community/acpid/anything b/community/acpid/anything new file mode 100644 index 000000000..d1828989b --- /dev/null +++ b/community/acpid/anything @@ -0,0 +1,3 @@ +# Pass all events to our one handler script +event=.* +action=/etc/acpi/handler.sh %e diff --git a/community/acpid/handler.sh b/community/acpid/handler.sh new file mode 100644 index 000000000..505ed7c11 --- /dev/null +++ b/community/acpid/handler.sh @@ -0,0 +1,70 @@ +#!/bin/sh +# Default acpi script that takes an entry for all actions + +minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq` +maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq` +setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed" + +set $* + +case "$1" in + button/power) + #echo "PowerButton pressed!">/dev/tty5 + case "$2" in + PBTN|PWRF) logger "PowerButton pressed: $2" ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + button/sleep) + case "$2" in + SLPB) echo -n mem >/sys/power/state ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + ac_adapter) + case "$2" in + AC|ACAD|ADP0) + case "$4" in + 00000000) + echo -n $minspeed >$setspeed + #/etc/laptop-mode/laptop-mode start + ;; + 00000001) + echo -n $maxspeed >$setspeed + #/etc/laptop-mode/laptop-mode stop + ;; + esac + ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + battery) + case "$2" in + BAT0) + case "$4" in + 00000000) #echo "offline" >/dev/tty5 + ;; + 00000001) #echo "online" >/dev/tty5 + ;; + esac + ;; + CPU0) + ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + button/lid) + case "$3" in + close) + #echo "LID closed!">/dev/tty5 + ;; + open) + #echo "LID opened!">/dev/tty5 + ;; + esac + ;; + + *) + logger "ACPI group/action undefined: $1 / $2" + ;; +esac diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD new file mode 100644 index 000000000..4f078a8ca --- /dev/null +++ b/community/alex/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 67160 2012-03-05 00:29:42Z pschmitz $ +# 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.1 +pkgrel=1 +pkgdesc='a lexical analyser generator for Haskell' +arch=('i686' 'x86_64') +url='http://www.haskell.org/alex/' +license=('custom:BSD3') +depends=('gmp') +makedepends=('ghc=7.4.1-2' 'haskell-quickcheck=2.4.2-1') +source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") +md5sums=('5dec239c89165d159faa2154bc0724cd') + +build() { + cd $srcdir/$pkgname-$pkgver + runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname + runghc Setup.lhs build +} + +package() { + cd $srcdir/$pkgname-$pkgver + runghc Setup.lhs copy --destdir=$pkgdir + install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3 + + # doc/ contains only license which already installed into proper place + rm -rf $pkgdir/usr/share/doc +} diff --git a/community/allegro/PKGBUILD b/community/allegro/PKGBUILD new file mode 100644 index 000000000..d7e8e550b --- /dev/null +++ b/community/allegro/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 146876 2012-01-19 02:37:24Z eric $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: arjan <arjan@archlinux.org> + +pkgname=allegro +pkgver=5.0.5 +pkgrel=2 +pkgdesc="Portable library mainly aimed at video game and multimedia programming" +arch=('i686' 'x86_64') +url="http://alleg.sourceforge.net/" +license=('custom') +depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg') +makedepends=('cmake' 'mesa' 'freetype2') +source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz) +md5sums=('4d879afe7062f7dc9b8913cba2e44bdf') + +build() { + cd "${srcdir}" + mkdir build && cd build + + cmake "../${pkgname}-${pkgver}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWANT_DOCS=OFF + + make +} + +package() { + cd "${srcdir}"/build + + make DESTDIR="${pkgdir}" install + + install -D -m644 ../${pkgname}-${pkgver}/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/aspell-cs/PKGBUILD b/community/aspell-cs/PKGBUILD index fa8a54422..1e409e7bc 100644 --- a/community/aspell-cs/PKGBUILD +++ b/community/aspell-cs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 43275 2011-03-24 13:21:51Z andrea $ +# $Id: PKGBUILD 67108 2012-03-04 12:33:51Z stativ $ # Maintainer: Jaroslav Lichtblau <tu@dragonlord.cz> # Contributor: Michal Karas <largon@largon.net> pkgname=aspell-cs pkgver=20040614 -pkgrel=5 +pkgrel=6 pkgdesc="Czech dictionary for aspell" arch=('i686' 'x86_64') url="http://aspell.net/" @@ -14,14 +14,14 @@ source=(ftp://ftp.gnu.org/gnu/aspell/dict/cs/aspell6-cs-$pkgver-1.tar.bz2) md5sums=('50f0c2b7b6fcfe47bb647ad8993d2fe8') build() { - cd aspell6-cs-$pkgver-1 + cd "$srcdir"/aspell6-cs-$pkgver-1 ./configure make } package() { - cd aspell6-cs-$pkgver-1 + cd "$srcdir"/aspell6-cs-$pkgver-1 - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install } diff --git a/community/atanks/PKGBUILD b/community/atanks/PKGBUILD index 3cc5b8da4..5c7dca88c 100644 --- a/community/atanks/PKGBUILD +++ b/community/atanks/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56999 2011-10-18 03:48:36Z ebelanger $ +# $Id: PKGBUILD 67099 2012-03-04 08:25:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jacek Poplawski <jacekpoplawski@gmail.com> # Contributor: Charlie Cox <ccoxiv@yahoo.com> pkgname=atanks -pkgver=5.2 +pkgver=5.3 pkgrel=1 pkgdesc="Atomic Tanks" url="http://atanks.sourceforge.net" @@ -13,7 +13,7 @@ arch=('i686' 'x86_64') makedepends=('sed') depends=('allegro4>=4.4.0.1' 'gcc-libs') source=("http://downloads.sourceforge.net/project/atanks/atanks/atanks-${pkgver}/atanks-${pkgver}.tar.gz") -md5sums=('05bedbb7b3f50831a30b47f7776c8c1a') +md5sums=('33e344eb18b1421df120a59696958d5c') build() { cd atanks-${pkgver} diff --git a/community/camlp5/PKGBUILD b/community/camlp5/PKGBUILD index 690c3c483..cfbfdadbc 100644 --- a/community/camlp5/PKGBUILD +++ b/community/camlp5/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Massimiliano Brocchini <brocchini@netseven.it> pkgname=('camlp5' 'camlp5-transitional') -_baseversion=6.04 +_baseversion=6.05 _patchlevel=0 #pkgver=${_baseversion}.${_patchlevel} pkgver=${_baseversion} @@ -18,7 +18,7 @@ source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${_baseversion} for i in $(seq ${_patchlevel}); do source+=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${_baseversion}-${i}") done -md5sums=('0fcd56e4512ef9da41808331d8e1d197') +md5sums=('51e333f027ead70aa1b0cd7993320e24') build() { cd camlp5-${_baseversion} diff --git a/community/choqok/PKGBUILD b/community/choqok/PKGBUILD index 9109daf32..00151541c 100644 --- a/community/choqok/PKGBUILD +++ b/community/choqok/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 61252 2011-12-26 11:59:59Z andrea $ +# $Id: PKGBUILD 67102 2012-03-04 10:12:03Z andrea $ # Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Emanuele Rossi <newdna1510@yahoo.it> # Contributor: Bram Schoenmakers <me@bramschoenmakers.nl> pkgname=choqok -pkgver=1.2 -pkgrel=3 +pkgver=1.3 +pkgrel=1 pkgdesc="A Twitter/identi.ca/laconica client for KDE" -url="http://choqok.gnufolks.org/" +url='http://choqok.gnufolks.org/' license=('GPL') arch=('i686' 'x86_64') depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl') @@ -16,20 +16,19 @@ makedepends=('cmake' 'automoc4') optdepends=('kdebase-konqueror: proxy support') install="${pkgname}.install" source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('05d01f4c93c081f3a84ea013cfba7229') +md5sums=('87eea4f2c23467fb021e3e6b794eb37d') build() { - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DKWEBKITPART_LIBRARIES=/usr/lib/kde4/ + -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/community/espeak/PKGBUILD b/community/espeak/PKGBUILD index 5611a89e1..a5517d62d 100644 --- a/community/espeak/PKGBUILD +++ b/community/espeak/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 61395 2011-12-30 08:21:47Z bpiotrowski $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> -# Contributor: niQo +# $Id: PKGBUILD 67106 2012-03-04 10:23:58Z andrea $ +# Maintainer: +# Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Christoph Siegenthaler <csi@gmx.ch> pkgname=espeak -pkgver=1.46.01 +pkgver=1.46.02 pkgrel=1 pkgdesc="Text to Speech engine for good quality English, with support for other languages" arch=('i686' 'x86_64') -url="http://espeak.sourceforge.net/" +url='http://espeak.sourceforge.net/' license=('GPL') depends=('gcc-libs' 'portaudio') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-source.zip) -md5sums=('a3e9de4b2a56ec19c059115dca587494') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-source.zip") +md5sums=('84e8e44562f05a3afc5427218afc8af1') build() { cd $srcdir/$pkgname-$pkgver-source/src cp portaudio19.h portaudio.h make } + package() { cd $srcdir/$pkgname-$pkgver-source/src make DESTDIR=$pkgdir install - find "$pkgdir/usr/share/espeak-data" -type f -print0 |xargs -0 chmod 644 + + # Fix permissions + chmod 644 ${pkgdir}/usr/lib/libespeak.a } diff --git a/community/gftp/PKGBUILD b/community/gftp/PKGBUILD new file mode 100644 index 000000000..ecf7042e2 --- /dev/null +++ b/community/gftp/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 67144 2012-03-05 00:04:12Z pschmitz $ +# Maintainer: +# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> + +pkgname=gftp +pkgver=2.0.19 +pkgrel=4 +pkgdesc="A multithreaded ftp client for X Windows" +arch=('i686' 'x86_64') +url="http://www.gftp.org/" +license=('GPL2') +depends=('gtk2' 'openssl' 'readline') +source=(http://www.gftp.org/$pkgname-$pkgver.tar.bz2) +md5sums=('5183cb4955d94be0e03c892585547c64') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/community/gimp-refocus/PKGBUILD b/community/gimp-refocus/PKGBUILD new file mode 100644 index 000000000..5cc3b5703 --- /dev/null +++ b/community/gimp-refocus/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 128457 2011-06-24 02:06:37Z eric $ +# Maintainer: Tobias Kieslich <tobias@justdreams.de> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=gimp-refocus +pkgver=0.9.0 +pkgrel=3 +pkgdesc="A sharpen plugin for gimp using FIR Wiener filtering" +arch=('i686' 'x86_64') +url="http://refocus.sourceforge.net/" +license=('GPL2') +depends=('gimp') +source=(http://downloads.sourceforge.net/sourceforge/refocus/refocus-${pkgver}.tar.gz \ + refocus-gimp-2.0.patch refocus-mirror-fix.patch refocus-gimp-preview.patch) +md5sums=('8d4eac4ef45c904fb5e73021696bec94' + '8ef9dfe697cd20be2be14c1ee53a240a' + '532593cba030feab8ffa7800fc9cd782' + '6b55dbdc656646c765064cf21e1a3c57') + +build() { + cd "${srcdir}/refocus-${pkgver}" + patch -Np0 -i ../refocus-gimp-2.0.patch + patch -Np0 -i ../refocus-mirror-fix.patch + patch -Np0 -i ../refocus-gimp-preview.patch + aclocal + autoconf + automake --add-missing + ./configure --prefix=/usr --bindir=/usr/lib/gimp/2.0/plug-ins + make +} + +package() { + cd "${srcdir}/refocus-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/gimp-refocus/refocus-gimp-2.0.patch b/community/gimp-refocus/refocus-gimp-2.0.patch new file mode 100644 index 000000000..259ee9f87 --- /dev/null +++ b/community/gimp-refocus/refocus-gimp-2.0.patch @@ -0,0 +1,209 @@ +Index: configure.in +=================================================================== +RCS file: /cvsroot/refocus/refocus/configure.in,v +retrieving revision 1.1.1.1 +diff -u -u -r1.1.1.1 configure.in +--- configure.in 30 Jan 2003 21:29:29 -0000 1.1.1.1 ++++ configure.in 6 Apr 2004 20:26:54 -0000 +@@ -1,8 +1,8 @@ + dnl Process this file with autoconf to produce a configure script. + +-AC_INIT(README) +- +-AM_INIT_AUTOMAKE(refocus, 0.9.0) ++AC_INIT([refocus],[0.9.0]) ++AC_CONFIG_SRCDIR(README) ++AM_INIT_AUTOMAKE + + AC_PROG_CC + AC_CHECK_PROG(GCC3, gcc3, gcc3) +@@ -12,7 +12,7 @@ + AC_MSG_RESULT([using $CC as compiler]) + fi + +-AC_STDC_HEADERS ++AC_HEADER_STDC([]) + AC_PROG_RANLIB + + # Check if the user has ATLAS installed in ./lib-atlas +@@ -36,7 +36,7 @@ + AC_SUBST(LAPACK_INCLUDE_DIR) + AM_CONDITIONAL(HAVE_ATLAS, test x${have_atlas} = xyes) + +-AM_PATH_GIMP(1.2.0) ++AM_PATH_GIMP_2_0(2.0.0) + AM_PATH_GTK_2_0(2.0.0) + AM_PATH_GLIB_2_0(2.0.0) + +@@ -106,5 +106,6 @@ + #Check if erf is defined in the mathlibrary + AC_CHECK_LIB(m, erf, AC_DEFINE(HAVE_ERF)) + +-AC_OUTPUT([Makefile src/Makefile lib/Makefile doc/Makefile gtk-doc/Makefile ]) ++AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile doc/Makefile gtk-doc/Makefile ]) ++AC_OUTPUT + +Index: lib/Makefile.am +=================================================================== +RCS file: /cvsroot/refocus/refocus/lib/Makefile.am,v +retrieving revision 1.1.1.1 +diff -u -u -r1.1.1.1 Makefile.am +--- lib/Makefile.am 30 Jan 2003 21:29:52 -0000 1.1.1.1 ++++ lib/Makefile.am 6 Apr 2004 20:26:55 -0000 +@@ -1,4 +1,4 @@ +-CFLAGS=-fomit-frame-pointer -O3 -funroll-all-loops ++AM_CFLAGS=-fomit-frame-pointer -O3 -funroll-all-loops + + + noinst_LIBRARIES = liblapack.a libatlas.a libcblas.a +Index: src/Makefile.am +=================================================================== +RCS file: /cvsroot/refocus/refocus/src/Makefile.am,v +retrieving revision 1.1.1.1 +diff -u -u -r1.1.1.1 Makefile.am +--- src/Makefile.am 30 Jan 2003 21:30:18 -0000 1.1.1.1 ++++ src/Makefile.am 6 Apr 2004 20:26:55 -0000 +@@ -11,7 +11,7 @@ + EXTRA_DIST = dummy-plugin.c + + refocus_SOURCES = refocus.c conv.c gimppreview.c prevman.c util.c matrix.c tilebuf.c bdclosure.c fwlapack.c +-refocus_LDADD = @GTK_LIBS@ -lgimp ${ldadd_atlas} ++refocus_LDADD = @GIMP_LIBS@ ${ldadd_atlas} + refocus_DEPENDENCIES=@LAPACK_LIB_DIR@/liblapack.a + + test_matrix_SOURCES = matrix.c test-matrix.c fwlapack.c +Index: src/gimppreview.c +=================================================================== +RCS file: /cvsroot/refocus/refocus/src/gimppreview.c,v +retrieving revision 1.1.1.1 +diff -u -u -r1.1.1.1 gimppreview.c +--- src/gimppreview.c 30 Jan 2003 21:30:18 -0000 1.1.1.1 ++++ src/gimppreview.c 6 Apr 2004 20:26:55 -0000 +@@ -344,7 +344,7 @@ + + /* Save the drawable info. */ + preview->drawable = drawable; +- preview->drawable_has_alpha = gimp_drawable_has_alpha (drawable->id); ++ preview->drawable_has_alpha = gimp_drawable_has_alpha (drawable->drawable_id); + + /* Calculate our preview size. */ + if (preview_size == PREVIEW_FIXED_SIZE) +Index: src/prevman.c +=================================================================== +RCS file: /cvsroot/refocus/refocus/src/prevman.c,v +retrieving revision 1.1.1.1 +diff -u -u -r1.1.1.1 prevman.c +--- src/prevman.c 30 Jan 2003 21:30:18 -0000 1.1.1.1 ++++ src/prevman.c 6 Apr 2004 20:26:56 -0000 +@@ -52,7 +52,7 @@ + tile_source->width = drawable->width; + tile_source->height = drawable->height; + tile_source->bpp = drawable->bpp; +- tile_source->has_alpha = gimp_drawable_has_alpha (drawable->id); ++ tile_source->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id); + tile_source->un.drw.drawable = drawable; + gimp_pixel_rgn_init (&tile_source->un.drw.pixel_rgn, drawable, x, y, width, + height, FALSE, FALSE); +@@ -144,7 +144,7 @@ + tile_sink->width = drawable->width; + tile_sink->height = drawable->height; + tile_sink->bpp = drawable->bpp; +- tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->id); ++ tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id); + gimp_pixel_rgn_init (&tile_sink->un.drw.pixel_rgn, drawable, x, y, width, + height, TRUE, TRUE); + } +@@ -159,7 +159,7 @@ + tile_sink->width = width; + tile_sink->height = height; + tile_sink->bpp = drawable->bpp; +- tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->id); ++ tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id); + tile_sink->un.prv.data = g_new (guchar, + tile_sink->width * tile_sink->height * + tile_sink->bpp); +Index: src/refocus.c +=================================================================== +RCS file: /cvsroot/refocus/refocus/src/refocus.c,v +retrieving revision 1.1.1.1 +diff -u -u -r1.1.1.1 refocus.c +--- src/refocus.c 30 Jan 2003 21:30:19 -0000 1.1.1.1 ++++ src/refocus.c 6 Apr 2004 20:26:56 -0000 +@@ -45,9 +45,9 @@ + + /* Declare local functions. */ + static void query (void); +-static void run (char *name, ++static void run (const gchar *name, + gint nparams, +- GimpParam * param, ++ const GimpParam * param, + gint * nreturn_vals, GimpParam ** return_vals); + static gint dialog (); + static void doit (void); +@@ -111,7 +111,6 @@ + {GIMP_PDB_FLOAT, "noise", "Noise to Signal ratio"}, + }; + static GimpParamDef *return_vals = NULL; +- static gint nargs = (gint) (sizeof (args) / sizeof (args[0])); + static gint nreturn_vals = 0; + + gimp_install_procedure ("plug_in_refocus", +@@ -123,15 +122,15 @@ + "<Image>/Filters/Enhance/Refocus ...", + "RGB*, GRAY*", + GIMP_PLUGIN, +- nargs, nreturn_vals, args, return_vals); ++ G_N_ELEMENTS(args), nreturn_vals, args, return_vals); + } + + static void +-run (char *name, gint n_params, GimpParam * param, ++run (const gchar *name, gint n_params, const GimpParam * param, + gint * nreturn_vals, GimpParam ** return_vals) + { + static GimpParam values[1]; +- GimpRunModeType run_mode; ++ GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; + + (void) name; /* Shut up warnings about unused parameters. */ +@@ -186,8 +185,8 @@ + { + + /* Make sure that the drawable is gray or RGB color */ +- if (gimp_drawable_is_rgb (drawable->id) || +- gimp_drawable_is_gray (drawable->id)) ++ if (gimp_drawable_is_rgb (drawable->drawable_id) || ++ gimp_drawable_is_gray (drawable->drawable_id)) + { + doit (); + +@@ -411,7 +410,7 @@ + event_is_current = + gimp_preview_draw_unscaled_row (GIMP_PREVIEW (my_widgets.preview), + event->event_id, +- gimp_drawable_type (drawable->id), ++ gimp_drawable_type (drawable->drawable_id), + row, buf); + }; + g_free (buf); +@@ -608,7 +607,7 @@ + gimp_progress_init ("Computing matrix"); + update_matrix (); + gimp_progress_init ("Applying convolution"); +- gimp_drawable_mask_bounds (drawable->id, &sx1, &sy1, &sx2, &sy2); ++ gimp_drawable_mask_bounds (drawable->drawable_id, &sx1, &sy1, &sx2, &sy2); + width = sx2 - sx1; + height = sy2 - sy1; + tile_source_init_from_drawable (&source, drawable, sx1, sy1, width, height); +@@ -618,7 +617,7 @@ + matrix, 2 * my_config.mat_width + 1, + &update_progress_closure); + gimp_drawable_flush (drawable); +- gimp_drawable_merge_shadow (drawable->id, TRUE); +- gimp_drawable_update (drawable->id, sx1, sy1, width, height); ++ gimp_drawable_merge_shadow (drawable->drawable_id, TRUE); ++ gimp_drawable_update (drawable->drawable_id, sx1, sy1, width, height); + g_free (matrix); + } diff --git a/community/gimp-refocus/refocus-gimp-preview.patch b/community/gimp-refocus/refocus-gimp-preview.patch new file mode 100644 index 000000000..089365dcb --- /dev/null +++ b/community/gimp-refocus/refocus-gimp-preview.patch @@ -0,0 +1,440 @@ +diff -ur src/gimppreview.c src/gimppreview.c +--- src/gimppreview.c 2008-03-17 17:20:49.000000000 -0700 ++++ src/gimppreview.c 2008-03-17 17:15:51.000000000 -0700 +@@ -36,18 +36,18 @@ + #include "gimppreview.h" + + +-static void gimp_preview_init (GimpPreview * preview); +-static void gimp_preview_class_init (GimpPreviewClass * klass); ++static void gimp_preview_init (RefocusPreview * preview); ++static void gimp_preview_class_init (RefocusPreviewClass * klass); + + static void gimp_preview_plus_callback (GtkWidget * widget, gpointer data); + static void gimp_preview_minus_callback (GtkWidget * widget, gpointer data); + static gint gimp_preview_event (GtkWidget * widget, GdkEvent * event, + gpointer data); +-static void gimp_preview_recompute_sizes (GimpPreview * preview, ++static void gimp_preview_recompute_sizes (RefocusPreview * preview, + gdouble newscale); +-static void gimp_preview_update_preview (GimpPreview * preview); ++static void gimp_preview_update_preview (RefocusPreview * preview); + +-static void gimp_preview_image_set_size (GimpPreview * preview, gint width, ++static void gimp_preview_image_set_size (RefocusPreview * preview, gint width, + gint height); + static void gimp_preview_size_request (GtkWidget * widget, + GtkRequisition * requisition); +@@ -58,7 +58,7 @@ + GtkCallback callback, + gpointer callback_data); + gboolean gimp_preview_update_preview_idle_fun (gpointer data); +-void gimp_preview_schedule_update (GimpPreview * preview); ++void gimp_preview_schedule_update (RefocusPreview * preview); + + #define PROGRESS_BAR_HEIGHT (10) + #define PREVIEW_SIZE (100) +@@ -94,11 +94,11 @@ + + + /* +- * Apps which use a GimpPreview widget should not be accessing the private ++ * Apps which use a RefocusPreview widget should not be accessing the private + * data! + */ + #define PREVIEW_DATA(preview) \ +- ((GimpPreviewData*)(GIMP_PREVIEW (preview)->private_data)) ++ ((RefocusPreviewData*)(GIMP_PREVIEW (preview)->private_data)) + + typedef struct + { +@@ -126,7 +126,7 @@ + GtkWidget *image; + GtkWidget *progress_bar; + } +-GimpPreviewData; ++RefocusPreviewData; + + + /* Convert coordinate in preview space to image coordinates */ +@@ -155,20 +155,20 @@ + if (!preview_type) + { + GTypeInfo preview_info = { +- sizeof (GimpPreviewClass), ++ sizeof (RefocusPreviewClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) gimp_preview_class_init, + (GClassFinalizeFunc) NULL, + (gconstpointer) NULL, /* class_data */ +- sizeof (GimpPreview), ++ sizeof (RefocusPreview), + 0, /* n_preallocs */ + (GInstanceInitFunc) gimp_preview_init, + (GTypeValueTable *) NULL /* value_table */ + }; + + preview_type = +- g_type_register_static (GTK_TYPE_CONTAINER, "GimpPreview", ++ g_type_register_static (GTK_TYPE_CONTAINER, "RefocusPreview", + &preview_info, 0); + } + +@@ -181,7 +181,7 @@ + * by GTK's internal mechanisms. + */ + static void +-gimp_preview_class_init (GimpPreviewClass * klass) ++gimp_preview_class_init (RefocusPreviewClass * klass) + { + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass); +@@ -190,7 +190,7 @@ + g_signal_new ("update_preview", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_FIRST, +- G_STRUCT_OFFSET (GimpPreviewClass, update_preview), ++ G_STRUCT_OFFSET (RefocusPreviewClass, update_preview), + NULL, + NULL, + g_cclosure_marshal_VOID__POINTER, +@@ -200,7 +200,7 @@ + g_signal_new ("preview_changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_FIRST, +- G_STRUCT_OFFSET (GimpPreviewClass, preview_changed), ++ G_STRUCT_OFFSET (RefocusPreviewClass, preview_changed), + NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + + klass->update_preview = NULL; +@@ -212,7 +212,7 @@ + + + void +-gimp_preview_set_scale_amount(GimpPreview *preview, gdouble scale_amount) ++gimp_preview_set_scale_amount(RefocusPreview *preview, gdouble scale_amount) + { + /* + * If the caller wants to set the scale amount, let them do so. +@@ -269,7 +269,7 @@ + * by GTK's internal mechanisms. + */ + static void +-gimp_preview_init (GimpPreview * preview) ++gimp_preview_init (RefocusPreview * preview) + { + gchar buffer[10]; + +@@ -277,7 +277,7 @@ + GTK_WIDGET_SET_FLAGS (preview, GTK_NO_WINDOW); + GTK_CONTAINER (preview)->resize_mode = GTK_RESIZE_IMMEDIATE; + +- preview->private_data = g_malloc0 (sizeof (GimpPreviewData)); ++ preview->private_data = g_malloc0 (sizeof (RefocusPreviewData)); + + + PREVIEW_DATA (preview)->label = gtk_label_new (""); +@@ -307,7 +307,7 @@ + gimp_preview_new_with_args (GimpDrawable * drawable, gint cb_preview_size, + gdouble cb_scale_amount, gint cb_allow_scale) + { +- GimpPreview *preview; ++ RefocusPreview *preview; + GtkWidget *frame; + GtkWidget *hbox; + GtkWidget *event_box; +@@ -454,7 +454,7 @@ + static void + gimp_preview_size_request (GtkWidget * widget, GtkRequisition * requisition) + { +- GimpPreview *preview = GIMP_PREVIEW (widget); ++ RefocusPreview *preview = GIMP_PREVIEW (widget); + GtkRequisition resize_box_requisition; + + #ifdef PREVIEW_DEBUG +@@ -478,7 +478,7 @@ + static void + gimp_preview_size_allocate (GtkWidget * widget, GtkAllocation * allocation) + { +- GimpPreview *preview = GIMP_PREVIEW (widget); ++ RefocusPreview *preview = GIMP_PREVIEW (widget); + GtkAllocation resize_box_allocation, progress_bar_allocation, + event_box_allocation; + GtkRequisition resize_box_requisition; +@@ -543,7 +543,7 @@ + gboolean include_internals, + GtkCallback callback, gpointer callback_data) + { +- GimpPreview *preview = GIMP_PREVIEW (container); ++ RefocusPreview *preview = GIMP_PREVIEW (container); + + if (PREVIEW_DATA (preview)->resize_box) + { +@@ -564,7 +564,7 @@ + * Plug-ins call this to do an update of the preview area. + */ + void +-gimp_preview_update (GimpPreview * preview) ++gimp_preview_update (RefocusPreview * preview) + { + gimp_preview_recompute_sizes (preview, preview->scale); + gimp_preview_update_preview (preview); +@@ -579,7 +579,7 @@ + static void + gimp_preview_plus_callback (GtkWidget * widget, gpointer data) + { +- GimpPreview *preview; ++ RefocusPreview *preview; + gchar buffer[10]; + gdouble new_scale; + +@@ -616,7 +616,7 @@ + static void + gimp_preview_minus_callback (GtkWidget * widget, gpointer data) + { +- GimpPreview *preview; ++ RefocusPreview *preview; + gchar buffer[10]; + gdouble new_scale; + +@@ -651,7 +651,7 @@ + static gint + gimp_preview_event (GtkWidget * widget, GdkEvent * event, gpointer data) + { +- GimpPreview *preview; ++ RefocusPreview *preview; + GdkEventButton *button_event; + gint x, y; + gint dx, dy; +@@ -733,7 +733,7 @@ + * This function is also used for initializing the preview. + */ + static void +-gimp_preview_recompute_sizes (GimpPreview * preview, gdouble new_scale) ++gimp_preview_recompute_sizes (RefocusPreview * preview, gdouble new_scale) + { + + /* The center of the preview in image coordinates. +@@ -765,7 +765,7 @@ + } + + void +-gimp_preview_generate_update_event (GimpPreview * preview) ++gimp_preview_generate_update_event (RefocusPreview * preview) + /* Signal the user that the preview must be updated */ + { + const gdouble scale = preview->scale; +@@ -783,7 +783,7 @@ + 0, + preview->drawable->height - image_y); + +- GimpPreviewEvent preview_event; ++ RefocusPreviewEvent preview_event; + + preview_event.event_id = PREVIEW_DATA (preview)->current_event_id; + preview_event.scale = preview->scale; +@@ -814,7 +814,7 @@ + * to step through source and destination! + */ + static void +-gimp_preview_update_preview (GimpPreview * preview) ++gimp_preview_update_preview (RefocusPreview * preview) + { + GimpPixelRgn region; + guchar *image_data = NULL; +@@ -1012,7 +1012,7 @@ + + + void +-gimp_preview_force_redraw (GimpPreview * preview) ++gimp_preview_force_redraw (RefocusPreview * preview) + { + gtk_widget_queue_draw (GTK_WIDGET (PREVIEW_DATA (preview)->image)); + } +@@ -1022,7 +1022,7 @@ + gboolean + gimp_preview_update_preview_idle_fun (gpointer data) + { +- GimpPreview *preview = GIMP_PREVIEW (data); ++ RefocusPreview *preview = GIMP_PREVIEW (data); + gint event_id = PREVIEW_DATA (preview)->current_event_id; + + #ifdef PREVIEW_DEBUG +@@ -1041,7 +1041,7 @@ + } + + void +-gimp_preview_schedule_update (GimpPreview * preview) ++gimp_preview_schedule_update (RefocusPreview * preview) + { + PREVIEW_DATA (preview)->current_event_id++; + +@@ -1082,7 +1082,7 @@ + } + + void +-gimp_preview_image_set_size (GimpPreview * preview, gint width, gint height) ++gimp_preview_image_set_size (RefocusPreview * preview, gint width, gint height) + { + const gint real_width = MIN (preview->max_width, width); + const gint real_height = MIN (preview->max_height, height); +@@ -1120,8 +1120,8 @@ + + /** + * gimp_preview_draw_row: +- * @preview: the #GimpPreview +- * @event_id: event_id that was sent with the #GimpPreviewEvent. ++ * @preview: the #RefocusPreview ++ * @event_id: event_id that was sent with the #RefocusPreviewEvent. + * @type: the format of the data (e.g. %GIMP_RGBA_IMAGE). + * @row:the relative number of the row within the preview. + * The top row of the preview is number 0. +@@ -1137,7 +1137,7 @@ + * with the same event-id will be ignored by the preview. + **/ + gboolean +-gimp_preview_draw_row (GimpPreview * preview, const gint event_id, ++gimp_preview_draw_row (RefocusPreview * preview, const gint event_id, + GimpImageType type, gint row, + const guchar * const data) + { +@@ -1247,8 +1247,8 @@ + + /** + * gimp_preview_draw_unscaled_row: +- * @preview: the #GimpPreview +- * @event_id: event_id that was sent with the #GimpPreviewEvent. ++ * @preview: the #RefocusPreview ++ * @event_id: event_id that was sent with the #RefocusPreviewEvent. + * @type: the format of the data (e.g. %GIMP_RGBA_IMAGE). + * @row:row is the relative position of the row w.r.t. preview_event->image_y. + * The top row has number 0. +@@ -1267,7 +1267,7 @@ + * with the same event-id will be ignored by the preview. + **/ + gboolean +-gimp_preview_draw_unscaled_row (GimpPreview * preview, const gint event_id, ++gimp_preview_draw_unscaled_row (RefocusPreview * preview, const gint event_id, + GimpImageType type, const gint row, + const guchar * const data) + { +@@ -1445,8 +1445,8 @@ + + /** + * gimp_preview_progress_set_fraction: +- * @preview: the #GimpPreview. +- * @event_id: event_id that was sent with the #GimpPreviewEvent. ++ * @preview: the #RefocusPreview. ++ * @event_id: event_id that was sent with the #RefocusPreviewEvent. + * @fraction: the fraction completed. + * + * Set the progress bar of the preview to @fraction completed. +@@ -1456,7 +1456,7 @@ + * with the same event-id will be ignored by the preview. + **/ + gboolean +-gimp_preview_progress_set_fraction (GimpPreview * preview, ++gimp_preview_progress_set_fraction (RefocusPreview * preview, + const gint event_id, double fraction) + { + const gboolean return_status = +diff -ur src/gimppreview.h src/gimppreview.h +--- src/gimppreview.h 2003-01-30 13:30:18.000000000 -0800 ++++ src/gimppreview.h 2008-03-17 17:16:29.000000000 -0700 +@@ -33,24 +33,24 @@ + #define PREVIEW_FIXED_SIZE 0 + #define PREVIEW_DEFAULT_SIZE -1 + #define GIMP_TYPE_PREVIEW (gimp_preview_get_type ()) +-#define GIMP_PREVIEW(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_PREVIEW, GimpPreview)) +-#define GIMP_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW, GimpPreviewClass)) ++#define GIMP_PREVIEW(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_PREVIEW, RefocusPreview)) ++#define GIMP_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW, RefocusPreviewClass)) + #define GIMP_IS_PREVIEW(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_PREVIEW)) + #define GIMP_IS_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PREVIEW)) +-typedef struct _GimpPreview GimpPreview; +-typedef struct _GimpPreviewClass GimpPreviewClass; +-typedef struct _GimpPreviewEvent GimpPreviewEvent; ++typedef struct _RefocusPreview RefocusPreview; ++typedef struct _RefocusPreviewClass RefocusPreviewClass; ++typedef struct _RefocusPreviewEvent RefocusPreviewEvent; + +-struct _GimpPreviewClass ++struct _RefocusPreviewClass + { + GtkContainerClass parent_class; + +- void (*update_preview) (GimpPreview * preview, GimpPreviewEvent * event); +- void (*preview_changed) (GimpPreview * preview); ++ void (*update_preview) (RefocusPreview * preview, RefocusPreviewEvent * event); ++ void (*preview_changed) (RefocusPreview * preview); + }; + + +-struct _GimpPreview ++struct _RefocusPreview + { + GtkContainer parent; + +@@ -75,13 +75,13 @@ + }; + + /** +- * GimpPreviewEvent: ++ * RefocusPreviewEvent: + * @event_id: Id of this event. This is needed for gimp_preview_draw_row, + * gimp_preview_draw_unscaled_row and gimp_preview_progress_set_fraction. + * @scale: Current scale of the preview. + * + **/ +-struct _GimpPreviewEvent ++struct _RefocusPreviewEvent + { + gint event_id; /* Id of this event */ + gdouble scale; /* Scale of preview */ +@@ -113,20 +113,20 @@ + gint preview_size, + gdouble scale_amount, + gint allow_scale); +-void gimp_preview_update (GimpPreview * preview); ++void gimp_preview_update (RefocusPreview * preview); + +-gboolean gimp_preview_draw_row (GimpPreview * preview, const gint event_id, ++gboolean gimp_preview_draw_row (RefocusPreview * preview, const gint event_id, + GimpImageType type, const gint row, + const guchar * const data); + +-gboolean gimp_preview_draw_unscaled_row (GimpPreview * preview, ++gboolean gimp_preview_draw_unscaled_row (RefocusPreview * preview, + const gint event_id, + GimpImageType type, const gint row, + const guchar * const data); + +-void gimp_preview_force_redraw (GimpPreview * preview); ++void gimp_preview_force_redraw (RefocusPreview * preview); + +-gboolean gimp_preview_progress_set_fraction (GimpPreview * preview, ++gboolean gimp_preview_progress_set_fraction (RefocusPreview * preview, + const gint event_id, + double fraction); + +diff -ur src/refocus.c src/refocus.c +--- src/refocus.c 2008-03-17 17:20:49.000000000 -0700 ++++ src/refocus.c 2008-03-17 17:18:48.000000000 -0700 +@@ -25,6 +25,7 @@ + #include <time.h> + #include <string.h> + #include <libgimp/gimp.h> ++#include <libgimp/gimpcompat.h> + #include <gtk/gtk.h> + #include <sys/types.h> + #include <signal.h> +@@ -372,7 +373,7 @@ + } + + static void +-preview_callback (GtkWidget * widget, GimpPreviewEvent * event, gpointer data) ++preview_callback (GtkWidget * widget, RefocusPreviewEvent * event, gpointer data) + { + TileSource source; + TileSink sink; diff --git a/community/gimp-refocus/refocus-mirror-fix.patch b/community/gimp-refocus/refocus-mirror-fix.patch new file mode 100644 index 000000000..af79dd893 --- /dev/null +++ b/community/gimp-refocus/refocus-mirror-fix.patch @@ -0,0 +1,54 @@ +Index: src/tilebuf.c +=================================================================== +RCS file: /cvsroot/refocus/refocus/src/tilebuf.c,v +retrieving revision 1.1.1.1 +diff -u -u -r1.1.1.1 tilebuf.c +--- src/tilebuf.c 30 Jan 2003 21:30:19 -0000 1.1.1.1 ++++ src/tilebuf.c 6 Apr 2004 20:26:56 -0000 +@@ -140,7 +140,10 @@ + + for (x = x_lo - 1; x >= buf->real_x; x--) + { +- copy_col (buf, 2 * x_lo - x, y_start, y_end - y_start, x); ++ gint sx = 2 * x_lo - x; ++ copy_col (buf, ++ sx<=buf->real_x+buf->real_width-1?sx:buf->real_x+buf->real_width-1, ++ y_start, y_end - y_start, x); + }; + } + break; +@@ -171,7 +174,9 @@ + + for (x = x_hi; x < buf->real_x + buf->real_width; x++) + { +- copy_col (buf, 2 * (x_hi - 1) - x, y_start, y_end - y_start, x); ++ gint sx = 2 * (x_hi - 1) - x; ++ copy_col (buf, sx>=buf->real_x?sx:buf->real_x, ++ y_start, y_end - y_start, x); + }; + } + break; +@@ -200,7 +205,10 @@ + + for (y = y_lo - 1; y >= buf->real_y; y--) + { +- copy_row (buf, buf->real_x, 2 * y_lo - y, buf->real_width, y); ++ gint sy = 2 * y_lo - y; ++ copy_row (buf, buf->real_x, ++ sy<=buf->real_y+buf->real_height-1?sy:buf->real_y+buf->real_height-1, ++ buf->real_width, y); + }; + } + break; +@@ -230,8 +238,9 @@ + + for (y = y_hi; y < buf->real_y + buf->real_height; y++) + { +- copy_row (buf, buf->real_x, 2 * (y_hi - 1) - y, buf->real_width, +- y); ++ gint sy = 2 * (y_hi - 1) - y; ++ copy_row (buf, buf->real_x, sy>=buf->real_y?sy:buf->real_y, ++ buf->real_width, y); + }; + } + break; diff --git a/community/haskell-html/PKGBUILD b/community/haskell-html/PKGBUILD new file mode 100644 index 000000000..44a3ea50b --- /dev/null +++ b/community/haskell-html/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> +# Package generated by cabal2arch 0.7.6 + +_hkgname=html +pkgname=haskell-html +pkgver=1.0.1.2 +pkgrel=10 +pkgdesc="HTML combinator library" +url="http://hackage.haskell.org/package/html" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=('ghc=7.4.1-2' sh) +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('2a7de5a2af9a2f80d39825d6a95ee445') + +build() { + cd ${srcdir}/${_hkgname}-${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}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-html/haskell-html.install b/community/haskell-html/haskell-html.install new file mode 100644 index 000000000..768297e0a --- /dev/null +++ b/community/haskell-html/haskell-html.install @@ -0,0 +1,19 @@ +HS_DIR=usr/share/haskell/haskell-html +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh &> /dev/null + exit 0 +} +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-quickcheck/PKGBUILD b/community/haskell-quickcheck/PKGBUILD new file mode 100644 index 000000000..7b27cfb0c --- /dev/null +++ b/community/haskell-quickcheck/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> +# Package generated by cabal2arch 0.7.5 + +_hkgname=QuickCheck +pkgname=haskell-quickcheck +pkgver=2.4.2 +pkgrel=1 +pkgdesc="Automatic testing of Haskell programs" +url="http://hackage.haskell.org/package/QuickCheck" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) +install=${pkgname}.install +md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67') + +build() { + cd ${srcdir}/${_hkgname}-${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}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-quickcheck/haskell-quickcheck.install b/community/haskell-quickcheck/haskell-quickcheck.install new file mode 100644 index 000000000..c9e12fadc --- /dev/null +++ b/community/haskell-quickcheck/haskell-quickcheck.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-quickcheck +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-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD new file mode 100644 index 000000000..3b8ecb4bb --- /dev/null +++ b/community/haskell-regex-base/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> + +_hkgname=regex-base +pkgname=haskell-regex-base +pkgver=0.93.2 +pkgrel=5 +pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa" +url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=('ghc=7.4.1-2' sh 'haskell-mtl=2.0.1.0-4') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) +install=${pkgname}.install +md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3') + +build() { + cd ${srcdir}/${_hkgname}-${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}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-regex-base/haskell-regex-base.install b/community/haskell-regex-base/haskell-regex-base.install new file mode 100644 index 000000000..3ad2fea28 --- /dev/null +++ b/community/haskell-regex-base/haskell-regex-base.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-regex-base +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-regex-compat/PKGBUILD b/community/haskell-regex-compat/PKGBUILD new file mode 100644 index 000000000..c880ff4f2 --- /dev/null +++ b/community/haskell-regex-compat/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> + +_hkgname=regex-compat +pkgname=haskell-regex-compat +pkgver=0.95.1 +pkgrel=1 +pkgdesc="Replaces and enhances Text.Regex" +url="http://hackage.haskell.org/package/${_hkgname}" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5' 'haskell-regex-posix=0.95.1-1') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('d0573ab4e2f3de5faa61380b67333320') + +build() { + cd ${srcdir}/${_hkgname}-${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}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-regex-compat/haskell-regex-compat.install b/community/haskell-regex-compat/haskell-regex-compat.install new file mode 100644 index 000000000..898c0bba1 --- /dev/null +++ b/community/haskell-regex-compat/haskell-regex-compat.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-regex-compat +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-regex-posix/PKGBUILD b/community/haskell-regex-posix/PKGBUILD new file mode 100644 index 000000000..1bed15490 --- /dev/null +++ b/community/haskell-regex-posix/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> + +_hkgname=regex-posix +pkgname=haskell-regex-posix +pkgver=0.95.1 +pkgrel=1 +pkgdesc="The posix regex backend for regex-base" +url="http://hackage.haskell.org/package/${_hkgname}" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('41cbc6d2b99837b64e0cc457c2737cc8') + +build() { + cd ${srcdir}/${_hkgname}-${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}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-regex-posix/haskell-regex-posix.install b/community/haskell-regex-posix/haskell-regex-posix.install new file mode 100644 index 000000000..2b89fae7b --- /dev/null +++ b/community/haskell-regex-posix/haskell-regex-posix.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-regex-posix +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/kmess/PKGBUILD b/community/kmess/PKGBUILD index d00422fce..a75362d7f 100644 --- a/community/kmess/PKGBUILD +++ b/community/kmess/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 66627 2012-02-26 15:31:41Z lfleischer $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 67104 2012-03-04 10:22:10Z andrea $ +# Maintainer: +# Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com> pkgname=kmess -pkgver=2.0.6.1 -pkgrel=3 -pkgdesc="A MSN Messenger client for Linux." +pkgver=2.0.6.2 +pkgrel=1 +pkgdesc="A MSN Messenger client for Linux" arch=('i686' 'x86_64') -url="http://kmess.sourceforge.net/" +url='http://kmess.sourceforge.net/' license=('GPL') depends=('kdebase-lib') -makedepends=('automoc4' 'cmake' 'docbook-xsl') +makedepends=('automoc4' 'cmake') optdepends=('cabextract: provides winks support') -install=kmess.install -source=("http://downloads.sourceforge.net/sourceforge/kmess/kmess-$pkgver.tar.bz2") -md5sums=('bc960c0bacb38be6dc118a2d2a6e69a6') +install=${pkgname}.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") +md5sums=('a2e57911713308bef81b9347135cc5dd') build() { - cd "$srcdir/$pkgname-$pkgver" - - cmake -DCMAKE_INSTALL_PREFIX=/usr . + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } - diff --git a/community/kmess/kmess.install b/community/kmess/kmess.install index c5571196e..c0797237a 100644 --- a/community/kmess/kmess.install +++ b/community/kmess/kmess.install @@ -1,11 +1,11 @@ post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_upgrade() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + post_install } post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + post_install } diff --git a/community/luajit/Makefile.patch b/community/luajit/Makefile.patch new file mode 100644 index 000000000..69e172145 --- /dev/null +++ b/community/luajit/Makefile.patch @@ -0,0 +1,11 @@ +--- Makefile.orig 2011-12-14 15:15:00.000000000 +0100 ++++ Makefile 2012-03-04 14:53:43.137778596 +0100 +@@ -41,7 +41,7 @@ + INSTALL_MAN= $(INSTALL_SHARE)/man/man1 + INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig + +-INSTALL_TNAME= luajit-$(VERSION) ++INSTALL_TNAME= $(INSTALL_TSYMNAME) + INSTALL_TSYMNAME= luajit + INSTALL_ANAME= libluajit-$(ABIVER).a + INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD new file mode 100644 index 000000000..8e1f0b122 --- /dev/null +++ b/community/luajit/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 67115 2012-03-04 14:30:22Z 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.0b9 +pkgrel=1 +pkgdesc="A Just-In-Time Compiler for Lua" +arch=('i686' 'x86_64') +url="http://luajit.org/" +license=('MIT') +depends=('gcc-libs') +source=("http://luajit.org/download/LuaJIT-${pkgver/b/-beta}.tar.gz" + "http://luajit.org/download/beta${pkgver: -1}_hotfix1.patch" + 'luaconf.patch' + 'Makefile.patch') +md5sums=('e7e03e67e2550817358bc28b44270c6d' + '4920f04fcef1ce486891509faf26b4f1' + 'c8da9c6790e20a12a0e2496f438d9dc3' + '8997c5e5fa4f6e8e0b86cc6b888de631') + +build() { + cd "$srcdir/LuaJIT-${pkgver/b/-beta}" + + patch -Np1 -i "$srcdir/beta${pkgver: -1}_hotfix1.patch" + patch -Np0 -i "$srcdir/luaconf.patch" + patch -Np0 -i "$srcdir/Makefile.patch" + + make +} + +package() { + cd "$srcdir/LuaJIT-${pkgver/b/-beta}" + make install DESTDIR="$pkgdir" PREFIX=/usr + + install -Dm644 "$srcdir/LuaJIT-${pkgver/b/-beta}/COPYRIGHT" \ + "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT" +} diff --git a/community/luajit/luaconf.patch b/community/luajit/luaconf.patch new file mode 100644 index 000000000..ba9373b52 --- /dev/null +++ b/community/luajit/luaconf.patch @@ -0,0 +1,11 @@ +--- src/luaconf.h.orig 2010-08-24 15:00:00.000000000 +0200 ++++ src/luaconf.h 2010-09-06 15:52:22.043333530 +0200 +@@ -33,7 +33,7 @@ + #define LUA_CPATH_DEFAULT \ + ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" + #else +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/5.1/" + #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" + #ifdef LUA_XROOT diff --git a/community/luajit/luajit-arch.patch b/community/luajit/luajit-arch.patch new file mode 100644 index 000000000..689a87d4e --- /dev/null +++ b/community/luajit/luajit-arch.patch @@ -0,0 +1,12 @@ +diff -ruN LuaJIT-1.1.4.orig/src/luaconf.h LuaJIT-1.1.3/src/luaconf.h +--- LuaJIT-1.1.4.orig/src/luaconf.h 2007-05-24 13:30:00.000000000 +0200 ++++ LuaJIT-1.1.4/src/luaconf.h 2007-11-02 06:28:59.000000000 +0100 +@@ -94,7 +94,7 @@ + ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" + + #else +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/5.1/" + #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" + #define LUA_PATH_DEFAULT \ diff --git a/community/mailman/PKGBUILD b/community/mailman/PKGBUILD new file mode 100644 index 000000000..975b3cb96 --- /dev/null +++ b/community/mailman/PKGBUILD @@ -0,0 +1,71 @@ +# $Id: PKGBUILD 67164 2012-03-05 00:39:58Z pschmitz $ +# Maintainer: Paul Mattal <paul@archlinux.org> + +pkgname=mailman +pkgver=2.1.14 +pkgrel=4 +pkgdesc="Mailing list manager with built in web access" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.list.org/" +depends=('python2' 'smtp-server') +# we need to have the mailman user to build mailman +makedepends=('mailman') +# 'Defaults.py' should not be changed by users; 'mm_cfg.py' should instead. +backup=('usr/lib/mailman/Mailman/mm_cfg.py') +install=$pkgname.install +source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz" + 'mailman-2.1-build.patch' + 'rc.mailman') +md5sums=('9ea163871ceccbd33fee4c9e335fcf7b' + 'ed04d062379eb21e39ce1e70e6b1ade2' + '3d83d06d0ec3319bf3c7d9df5d18e89f') + +build() { + cd $srcdir/$pkgname-$pkgver + + # fix calls to /usr/bin/python + find . -name '*.py' -exec sed -i 's@^#!.*python$@#!/usr/bin/python2@' {} + + # fix directory permissions to satisfy check_perms + patch -p1 -i ${srcdir}/mailman-2.1-build.patch + # set some sane defaults before the configure script has a chance to screw them up + sed -e 's/@MAILHOST@/localhost/g' \ + -e 's/@URLHOST@/localhost/g' \ + -i Mailman/Defaults.py.in + + ./configure --without-permcheck \ + --prefix=/usr/lib/mailman \ + --with-var-prefix=/var/lib/mailman \ + --with-mail-gid=mailman \ + --with-username=mailman --with-groupname=mailman \ + --with-cgi-gid=http --with-python=/usr/bin/python2 + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + # let's follow Fedora FHS way; Gentoo does it the other way round + + # Create a link so that the config file mm_cfg.py appears in config + # directory /etc/mailman. We don't put mm_cfg.py in the config directory + # because its executable code (python file) and the security policy wants + # to keep executable code out of /etc and inside of a lib directory instead, + # and because traditionally mm_cfg.py was in the Mailman subdirectory and + # experienced mailman admins will expect to find it there. But having it + # "appear" in the config directory is good practice and heading in the + # right direction for FHS compliance. + install -d -m755 ${pkgdir}/etc/${pkgname} + ln -sv /usr/lib/mailman/Mailman/mm_cfg.py ${pkgdir}/etc/${pkgname}/mm_cfg.py + + # fix some permissions to satisfy check_perms + chown -R mailman:mailman $pkgdir/{usr/lib/mailman,var/lib/mailman,etc/mailman/*} + chown http:mailman ${pkgdir}/var/lib/mailman/archives/private + chmod 2770 ${pkgdir}/var/lib/mailman/archives/private + chmod 2755 ${pkgdir}/usr/lib/mailman/cgi-bin/* + chmod 2755 ${pkgdir}/usr/lib/mailman/mail/mailman + + # install the launch script + install -D -m755 $srcdir/rc.mailman $pkgdir/etc/rc.d/mailman +} diff --git a/community/mailman/mailman-2.1-build.patch b/community/mailman/mailman-2.1-build.patch new file mode 100644 index 000000000..d00613ad7 --- /dev/null +++ b/community/mailman/mailman-2.1-build.patch @@ -0,0 +1,694 @@ +diff -ruN mailman-2.1.12-a/bin/Makefile.in mailman-2.1.12-b/bin/Makefile.in +--- mailman-2.1.12-a/bin/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/bin/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -56,7 +55,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -72,8 +71,6 @@ + $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/cron/Makefile.in mailman-2.1.12-b/cron/Makefile.in +--- mailman-2.1.12-a/cron/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/cron/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -68,8 +67,6 @@ + $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman/Archiver/Makefile.in +--- mailman-2.1.12-a/Mailman/Archiver/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/Mailman/Archiver/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -47,7 +46,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -63,8 +62,6 @@ + $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/Mailman/Bouncers/Makefile.in mailman-2.1.12-b/Mailman/Bouncers/Makefile.in +--- mailman-2.1.12-a/Mailman/Bouncers/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/Mailman/Bouncers/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -45,7 +44,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -61,8 +60,6 @@ + $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/Mailman/Cgi/Makefile.in mailman-2.1.12-b/Mailman/Cgi/Makefile.in +--- mailman-2.1.12-a/Mailman/Cgi/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/Mailman/Cgi/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -47,7 +46,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -63,8 +62,6 @@ + $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman/Commands/Makefile.in +--- mailman-2.1.12-a/Mailman/Commands/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/Mailman/Commands/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -45,7 +44,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -61,8 +60,6 @@ + $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/Makefile.in +--- mailman-2.1.12-a/Mailman/Gui/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/Mailman/Gui/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -45,7 +44,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -61,8 +60,6 @@ + $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman/Handlers/Makefile.in +--- mailman-2.1.12-a/Mailman/Handlers/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/Mailman/Handlers/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -45,7 +44,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -61,8 +60,6 @@ + $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/Logging/Makefile.in +--- mailman-2.1.12-a/Mailman/Logging/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/Mailman/Logging/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -45,7 +44,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -61,8 +60,6 @@ + $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile.in +--- mailman-2.1.12-a/Mailman/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/Mailman/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -20,8 +20,6 @@ + + # Variables set by configure + +-VERSION= @VERSION@ +- + VPATH= @srcdir@ + srcdir= @srcdir@ + bindir= @bindir@ +@@ -30,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -48,7 +45,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -79,12 +76,6 @@ + (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \ + done + +-finish: +- @for d in $(SUBDIRS); \ +- do \ +- (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) finish); \ +- done +- + clean: + for d in $(SUBDIRS); \ + do \ +diff -ruN mailman-2.1.12-a/Mailman/MTA/Makefile.in mailman-2.1.12-b/Mailman/MTA/Makefile.in +--- mailman-2.1.12-a/Mailman/MTA/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/Mailman/MTA/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -45,7 +44,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -61,8 +60,6 @@ + $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Queue/Makefile.in +--- mailman-2.1.12-a/Mailman/Queue/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/Mailman/Queue/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -45,7 +44,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -61,8 +60,6 @@ + $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in +--- mailman-2.1.12-a/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -61,11 +61,10 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +-DIRSETGID= chmod g+s + + DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),') + LANGPACK = README-I18N.en templates messages +@@ -85,14 +84,24 @@ + + doinstall: $(SUBDIRS) + @echo "Creating architecture independent directories..." ++ dir=$(DESTDIR)$(prefix); \ ++ if test ! -d $$dir; then \ ++ echo "Creating directory hierarchy $$dir"; \ ++ $(INSTALL) -d -m $(DIRMODE) $$dir; \ ++ else true; \ ++ fi; ++ dir=$(DESTDIR)$(var_prefix); \ ++ if test ! -d $$dir; then \ ++ echo "Creating directory hierarchy $$dir"; \ ++ $(INSTALL) -d -m $(DIRMODE) $$dir; \ ++ else true; \ ++ fi; + @for d in $(VAR_DIRS); \ + do \ + dir=$(DESTDIR)$(var_prefix)/$$d; \ + if test ! -d $$dir; then \ + echo "Creating directory hierarchy $$dir"; \ +- $(srcdir)/mkinstalldirs $$dir; \ +- chmod $(DIRMODE) $$dir; \ +- $(DIRSETGID) $$dir; \ ++ $(INSTALL) -d -m $(DIRMODE) $$dir; \ + else true; \ + fi; \ + done +@@ -102,9 +111,7 @@ + dir=$(DESTDIR)$(prefix)/$$d; \ + if test ! -d $$dir; then \ + echo "Creating directory hierarchy $$dir"; \ +- $(srcdir)/mkinstalldirs $$dir; \ +- chmod $(DIRMODE) $$dir; \ +- $(DIRSETGID) $$dir; \ ++ $(INSTALL) -d -m $(DIRMODE) $$dir; \ + else true; \ + fi; \ + done +@@ -114,9 +121,7 @@ + dir=$(DESTDIR)$(exec_prefix)/$$d; \ + if test ! -d $$dir; then \ + echo "Creating directory hierarchy $$dir"; \ +- $(srcdir)/mkinstalldirs $$dir; \ +- chmod $(DIRMODE) $$dir; \ +- $(DIRSETGID) $$dir; \ ++ $(INSTALL) -d -m $(DIRMODE) $$dir; \ + else true; \ + fi; \ + done +diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefile.in +--- mailman-2.1.12-a/messages/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/messages/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -32,7 +32,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -43,7 +42,6 @@ + CFLAGS= $(OPT) $(DEFS) + PACKAGEDIR= $(prefix)/messages + SHELL= /bin/sh +-DIRSETGID= chmod g+s + MSGFMT= @PYTHON@ ../build/bin/msgfmt.py + MSGMERGE= msgmerge + +@@ -60,7 +58,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -90,9 +88,8 @@ + do \ + dir=$(DESTDIR)$(prefix)/$$d; \ + echo "Creating language directory $$dir"; \ +- $(srcdir)/../mkinstalldirs $$dir; \ +- chmod $(DIRMODE) $$dir; \ +- $(DIRSETGID) $$dir; \ ++ $(INSTALL) -d -m $(DIRMODE) `dirname $$dir`; \ ++ $(INSTALL) -d -m $(DIRMODE) $$dir; \ + done + @for d in $(LANGUAGES); \ + do \ +@@ -113,8 +110,6 @@ + + mofiles: $(MOFILES) + +-finish: +- + clean: + -rm -f */LC_MESSAGES/mailman.mo + +diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in +--- mailman-2.1.12-a/misc/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/misc/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -30,7 +30,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + PYTHON= @PYTHON@ + +@@ -62,7 +61,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + DATAMODE= 664 +@@ -101,8 +100,6 @@ + (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile.in +--- mailman-2.1.12-a/scripts/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/scripts/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -49,7 +48,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -68,8 +67,6 @@ + $(INSTALL) -m $(FILEMODE) $(srcdir)/join $(DESTDIR)$(SCRIPTSDIR)/subscribe + $(INSTALL) -m $(FILEMODE) $(srcdir)/leave $(DESTDIR)$(SCRIPTSDIR)/unsubscribe + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in +--- mailman-2.1.12-a/src/Makefile.in 2009-07-28 12:19:47.000000000 +0200 ++++ mailman-2.1.12-b/src/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + PYTHON= @PYTHON@ + +@@ -63,10 +62,9 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 +-EXEMODE= 755 ++DIRMODE= 2775 ++EXEMODE= 2755 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +-DIRSETGID= chmod g+s + + # Fixed definitions + +@@ -110,20 +108,10 @@ + do \ + exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \ + $(INSTALL_PROGRAM) $$f $$exe; \ +- $(DIRSETGID) $$exe; \ + done + for f in $(MAIL_PROGS); \ + do \ + $(INSTALL_PROGRAM) $$f $(DESTDIR)$(MAILDIR); \ +- $(DIRSETGID) $(DESTDIR)$(MAILDIR)/$$f; \ +- done +- +-finish: +- -for f in $(SUID_CGI_PROGS); \ +- do \ +- exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \ +- chown $(MAILMAN_USER) $$exe; \ +- chmod u+s $$exe; \ + done + + clean: +diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Makefile.in +--- mailman-2.1.12-a/templates/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/templates/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + TRUE= @TRUE@ + +@@ -48,7 +47,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -61,15 +60,13 @@ + install: + for d in $(LANGUAGES); \ + do \ +- $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \ ++ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(TEMPLATEDIR)/$$d; \ + for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \ + do \ + $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \ + done; \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/bounces/Makefile.in +--- mailman-2.1.12-a/tests/bounces/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/tests/bounces/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -46,7 +45,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -60,8 +59,6 @@ + $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in +--- mailman-2.1.12-a/tests/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/tests/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -46,7 +45,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -71,8 +70,6 @@ + (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \ + done + +-finish: +- + clean: + + distclean: +diff -ruN mailman-2.1.12-a/tests/msgs/Makefile.in mailman-2.1.12-b/tests/msgs/Makefile.in +--- mailman-2.1.12-a/tests/msgs/Makefile.in 2009-02-23 22:23:35.000000000 +0100 ++++ mailman-2.1.12-b/tests/msgs/Makefile.in 2009-07-28 12:19:48.000000000 +0200 +@@ -28,7 +28,6 @@ + DESTDIR= + + CC= @CC@ +-CHMOD= @CHMOD@ + INSTALL= @INSTALL@ + + DEFS= @DEFS@ +@@ -46,7 +45,7 @@ + # Modes for directories and executables created by the install + # process. Default to group-writable directories but + # user-only-writable for executables. +-DIRMODE= 775 ++DIRMODE= 2775 + EXEMODE= 755 + FILEMODE= 644 + INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) +@@ -60,8 +59,6 @@ + $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \ + done + +-finish: +- + clean: + + distclean: diff --git a/community/mailman/mailman.install b/community/mailman/mailman.install new file mode 100644 index 000000000..ec85260a5 --- /dev/null +++ b/community/mailman/mailman.install @@ -0,0 +1,31 @@ +## arg 1: the new package version +post_install() { + # Make sure the group and user "mailman" exists on this system and has the correct values + if grep -q "^mailman:" /etc/group &> /dev/null ; then + groupmod -g 80 -n mailman mailman &> /dev/null + else + groupadd -g 80 mailman &> /dev/null + fi + + if grep -q "^mailman:" /etc/passwd 2> /dev/null ; then + usermod -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman mailman &> /dev/null + else + useradd -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman -M -r mailman &> /dev/null + fi + + # check file permissions +# cd /usr/lib/mailman && bin/check_perms -f > /dev/null 2>&1 # -f applies fixes we should solve in the PKGBUILD + cd /usr/lib/mailman && bin/check_perms > /dev/null +} + +## 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 mailman &>/dev/null + groupdel mailman &>/dev/null || /bin/true +} diff --git a/community/mailman/rc.mailman b/community/mailman/rc.mailman new file mode 100644 index 000000000..07660e530 --- /dev/null +++ b/community/mailman/rc.mailman @@ -0,0 +1,35 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting mailman Daemon" + /usr/lib/mailman/bin/mailmanctl start &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon mailman + stat_done + fi + ;; + stop) + stat_busy "Stopping mailman Daemon" + /usr/lib/mailman/bin/mailmanctl stop &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon mailman + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD new file mode 100644 index 000000000..815e16643 --- /dev/null +++ b/community/midori/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 67138 2012-03-04 23:52:43Z pschmitz $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: rabyte <rabyte.at.gmail.dot.com> +# Contributor: Johannes Krampf <wuischke.at.amule.dot.org> + +pkgname=midori +pkgver=0.4.3 +pkgrel=1 +pkgdesc="A lightweight web browser based on Gtk WebKit" +arch=('i686' 'x86_64') +url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" +license=('LGPL2.1') +install=midori.install +depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss') +makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' +optdepends=('vala: for use in extensions') +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +md5sums=('900037557b82818d79d2dd1c5a7d7fd2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # python2 + export PYTHON=/usr/bin/python2 + sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf + + ./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \ + --enable-addons \ + --disable-hildon \ + --enable-unique \ + --enable-nls \ + --enable-docs \ + --enable-apidocs + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/midori/midori.install b/community/midori/midori.install new file mode 100644 index 000000000..4da5511fd --- /dev/null +++ b/community/midori/midori.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -f -q -t usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/midori/webkit_search.diff b/community/midori/webkit_search.diff new file mode 100644 index 000000000..620cdc96f --- /dev/null +++ b/community/midori/webkit_search.diff @@ -0,0 +1,59 @@ +From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001 +From: Christian Dywan <christian@twotoasts.de> +Date: Wed, 21 Sep 2011 21:50:51 +0000 +Subject: Use DOM API to get selected text in WebKitGTK+ 1.5.1 + +Fixes: https://bugs.launchpad.net/midori/+bug/799603 +--- +diff --git a/midori/midori-view.c b/midori/midori-view.c +index 0d7a96e..e426e7f 100644 +--- a/midori/midori-view.c ++++ b/midori/midori-view.c +@@ -39,9 +39,11 @@ + #include <sys/utsname.h> + #endif + ++#if !WEBKIT_CHECK_VERSION (1, 5, 1) + /* This is unstable API, so we need to declare it */ + gchar* + webkit_web_view_get_selected_text (WebKitWebView* web_view); ++#endif + + static void + midori_view_construct_web_view (MidoriView* view); +@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view) + gboolean + midori_view_has_selection (MidoriView* view) + { ++#if WEBKIT_CHECK_VERSION (1, 5, 1) ++ WebKitDOMDocument* doc; ++ WebKitDOMDOMWindow* window; ++ WebKitDOMDOMSelection* selection; ++ WebKitDOMRange* range; ++#endif ++ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + ++ ++#if WEBKIT_CHECK_VERSION (1, 5, 1) ++ doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view)); ++ window = webkit_dom_document_get_default_view (doc); ++ selection = webkit_dom_dom_window_get_selection (window); ++ if (selection == NULL) ++ return FALSE; ++ ++ range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL); ++ if (range == NULL) ++ return FALSE; ++ ++ katze_assign (view->selected_text, webkit_dom_range_get_text (range)); ++#else + katze_assign (view->selected_text, webkit_web_view_get_selected_text ( + WEBKIT_WEB_VIEW (view->web_view))); ++#endif ++ + if (view->selected_text && *view->selected_text) + return TRUE; + else +-- +cgit diff --git a/community/milkytracker/PKGBUILD b/community/milkytracker/PKGBUILD index 430a67ffa..ecee22ddf 100644 --- a/community/milkytracker/PKGBUILD +++ b/community/milkytracker/PKGBUILD @@ -4,14 +4,16 @@ pkgname=milkytracker pkgver=0.90.85 -pkgrel=3 +pkgrel=4 pkgdesc="Fast Tracker II inspired music tracker" arch=('x86_64' 'i686') url="http://www.milkytracker.org/" license=('GPL3') depends=('sdl>=1.2.0' 'alsa-lib' 'zlib' 'gcc-libs') +makedepends=('jack-audio-connection-kit') optdepends=('jack-audio-connection-kit: JACK audio support') options=('docs') +install=$pkgname.install source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2" 'arch.patch' "$pkgname.desktop") @@ -23,7 +25,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" patch -p1 -i ../arch.patch - ./configure --prefix=/usr --with-alsa + ./configure --prefix=/usr --with-alsa --with-jack make } @@ -35,7 +37,8 @@ package() { "$pkgdir/usr/share/doc/milkytracker" install -Dm644 resources/pictures/carton.png \ "$pkgdir/usr/share/pixmaps/milkytracker.png" - install -m644 "$srcdir/milkytracker.desktop" "$pkgdir/usr/share/applications" + install -m644 "$srcdir/milkytracker.desktop" \ + "$pkgdir/usr/share/applications" install -m644 docs/ChangeLog.html "$pkgdir/usr/share/doc/milkytracker" install -m644 docs/MilkyTracker.html "$pkgdir/usr/share/doc/milkytracker" install -m644 docs/readme_unix "$pkgdir/usr/share/doc/milkytracker" diff --git a/community/milkytracker/milkytracker.install b/community/milkytracker/milkytracker.install new file mode 100644 index 000000000..aeef78890 --- /dev/null +++ b/community/milkytracker/milkytracker.install @@ -0,0 +1,18 @@ +post_upgrade() { + gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor + update-desktop-database -q + echo 'If you wish to use jack (or jack2), use this command the first time' + echo 'you start milkytracker: SDL_AUDIODRIVER=jack milkytracker' + echo 'Then select the jack driver in milkytracker and connect the audio' + echo 'with a program like qjackctl.' +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD index 1b6180ff0..80f11c713 100644 --- a/community/php-memcached/PKGBUILD +++ b/community/php-memcached/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 67035 2012-03-03 11:31:56Z foutrelis $ +# $Id: PKGBUILD 67120 2012-03-04 18:04:34Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=php-memcached -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="PHP extension for interfacing with memcached via libmemcached library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('PHP') depends=('php' 'libmemcached') backup=('etc/php/conf.d/memcached.ini') source=(http://pecl.php.net/get/memcached-$pkgver.tgz) -sha256sums=('3d06dfc9ef3ec11c48427965dd8310b6a7af2cf6187319a55013f0829b86a16f') +sha256sums=('250779594e846b7b31390c384697eb24a5096123b0d3e2f4a1a0b79d14fb1bff') build() { cd "$srcdir/memcached-$pkgver" diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD index 83f906f85..2f981488c 100644 --- a/community/powertop/PKGBUILD +++ b/community/powertop/PKGBUILD @@ -1,21 +1,27 @@ -# $Id: PKGBUILD 24103 2010-08-19 22:45:29Z heftig $ +# $Id: PKGBUILD 67110 2012-03-04 12:47:55Z stativ $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Xilon <xilonmu@gmail.com> pkgname=powertop pkgver=1.13 -pkgrel=2 +pkgrel=3 pkgdesc="Tool that finds the software that makes your laptop use more power than necessary" arch=('i686' 'x86_64') url="http://www.lesswatts.org/projects/powertop/" license=('GPL2') depends=('ncurses') -source=(http://www.lesswatts.org/projects/powertop/download/$pkgname-$pkgver.tar.gz) -md5sums=('78aa17c8f55178004223bf236654298e') +source=(http://www.lesswatts.org/projects/powertop/download/$pkgname-$pkgver.tar.gz \ + powertop-1.13-with-3.0.6.patch) +md5sums=('78aa17c8f55178004223bf236654298e' + '2b4c9d75fb0f5c96bcd549bcbbeb9c9d') build() { cd "$srcdir/powertop-$pkgver" + + # fix the reported batery usage on recent kernels + patch -Np1 < "$srcdir/powertop-1.13-with-3.0.6.patch" || true + make } diff --git a/community/powertop/powertop-1.13-with-3.0.6.patch b/community/powertop/powertop-1.13-with-3.0.6.patch new file mode 100644 index 000000000..fc61913a8 --- /dev/null +++ b/community/powertop/powertop-1.13-with-3.0.6.patch @@ -0,0 +1,142 @@ +Common subdirectories: powertop-1.13/kernel-patches and powertop-patched/kernel-patches +Common subdirectories: powertop-1.13/po and powertop-patched/po +diff -u powertop-1.13/powertop.c powertop-patched/powertop.c +--- powertop-1.13/powertop.c 2010-07-20 01:08:21.000000000 +0200 ++++ powertop-patched/powertop.c 2011-10-20 14:34:41.163951192 +0200 +@@ -547,95 +547,6 @@ + qsort (lines, linehead, sizeof (struct line), line_compare); + } + +- +- +-int print_battery_proc_acpi(void) +-{ +- DIR *dir; +- struct dirent *dirent; +- FILE *file; +- double rate = 0; +- double cap = 0; +- +- char filename[256]; +- +- dir = opendir("/proc/acpi/battery"); +- if (!dir) +- return 0; +- +- while ((dirent = readdir(dir))) { +- int dontcount = 0; +- double voltage = 0.0; +- double amperes_drawn = 0.0; +- double watts_drawn = 0.0; +- double amperes_left = 0.0; +- double watts_left = 0.0; +- char line[1024]; +- +- if (strlen(dirent->d_name) < 3) +- continue; +- +- sprintf(filename, "/proc/acpi/battery/%s/state", dirent->d_name); +- file = fopen(filename, "r"); +- if (!file) +- continue; +- memset(line, 0, 1024); +- while (fgets(line, 1024, file) != NULL) { +- char *c; +- if (strstr(line, "present:") && strstr(line, "no")) +- break; +- +- if (strstr(line, "charging state:") +- && !strstr(line, "discharging")) +- dontcount = 1; +- c = strchr(line, ':'); +- if (!c) +- continue; +- c++; +- +- if (strstr(line, "present voltage")) +- voltage = strtoull(c, NULL, 10) / 1000.0; +- +- if (strstr(line, "remaining capacity") && strstr(c, "mW")) +- watts_left = strtoull(c, NULL, 10) / 1000.0; +- +- if (strstr(line, "remaining capacity") && strstr(c, "mAh")) +- amperes_left = strtoull(c, NULL, 10) / 1000.0; +- +- if (strstr(line, "present rate") && strstr(c, "mW")) +- watts_drawn = strtoull(c, NULL, 10) / 1000.0 ; +- +- if (strstr(line, "present rate") && strstr(c, "mA")) +- amperes_drawn = strtoull(c, NULL, 10) / 1000.0; +- +- } +- fclose(file); +- +- if (!dontcount) { +- rate += watts_drawn + voltage * amperes_drawn; +- } +- cap += watts_left + voltage * amperes_left; +- +- +- } +- closedir(dir); +- if (prev_bat_cap - cap < 0.001 && rate < 0.001) +- last_bat_time = 0; +- if (!last_bat_time) { +- last_bat_time = prev_bat_time = time(NULL); +- last_bat_cap = prev_bat_cap = cap; +- } +- if (time(NULL) - last_bat_time >= 400) { +- prev_bat_cap = last_bat_cap; +- prev_bat_time = last_bat_time; +- last_bat_time = time(NULL); +- last_bat_cap = cap; +- } +- +- show_acpi_power_line(rate, cap, prev_bat_cap - cap, time(NULL) - prev_bat_time); +- return 1; +-} +- + int print_battery_proc_pmu(void) + { + char line[80]; +@@ -719,9 +630,6 @@ + + char filename[256]; + +- if (print_battery_proc_acpi()) +- return; +- + if (print_battery_proc_pmu()) + return; + +@@ -733,7 +641,6 @@ + while ((dirent = readdir(dir))) { + int dontcount = 0; + double voltage = 0.0; +- double amperes_drawn = 0.0; + double watts_drawn = 0.0; + double watts_left = 0.0; + char line[1024]; +@@ -790,8 +697,12 @@ + watts_left *= strtoull(line, NULL, 10) / 1000000.0; + fclose(file); + +- sprintf(filename, "/sys/class/power_supply/%s/current_now", dirent->d_name); ++ sprintf(filename, "/sys/class/power_supply/%s/power_now", dirent->d_name); + file = fopen(filename, "r"); ++ if (!file) { ++ sprintf(filename, "/sys/class/power_supply/%s/current_now", dirent->d_name); ++ file = fopen(filename, "r"); ++ } + if (!file) + continue; + memset(line, 0, 1024); +@@ -801,7 +712,7 @@ + fclose(file); + + if (!dontcount) { +- rate += watts_drawn + voltage * amperes_drawn; ++ rate += watts_drawn; + } + cap += watts_left; + diff --git a/community/pwgen/PKGBUILD b/community/pwgen/PKGBUILD new file mode 100644 index 000000000..863c8c4b2 --- /dev/null +++ b/community/pwgen/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 67140 2012-03-04 23:54:53Z pschmitz $ +# Maintainer: damir <damir@archlinux.org> +# Contributor : Tobias Powalowski <t.powa@gmx.de> + +pkgname=pwgen +pkgver=2.06 +pkgrel=3 +pkgdesc="Pwgen is a small password generator which creates passwords which can be easily memorized by a human" +arch=("i686" "x86_64") +url="http://sourceforge.net/projects/pwgen/" +license=('GPL') +depends=('glibc') +source=("http://downloads.sourceforge.net/sourceforge/pwgen/${pkgname}-${pkgver}.tar.gz") +md5sums=('935aebcbe610fbc9de8125e7b7d71297') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/community/ristretto/PKGBUILD b/community/ristretto/PKGBUILD new file mode 100644 index 000000000..ce3d74f98 --- /dev/null +++ b/community/ristretto/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 67146 2012-03-05 00:06:06Z pschmitz $ +# Maintainer: +# Contributor: AndyRTR <andyrtr@archlinux.org> +# Contributor: Ronald van Haren <ronald.archlinux.org> + +pkgname=ristretto +pkgver=0.3.4 +pkgrel=1 +pkgdesc="A fast and lightweight picture-viewer for Xfce" +arch=('i686' 'x86_64') +url="http://goodies.xfce.org/projects/applications/ristretto" +license=('GPL') +depends=('libxfce4ui' 'libexif' 'exo' 'desktop-file-utils') +makedepends=('intltool') +groups=('xfce4-goodies') +install=ristretto.install +source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2") +sha1sums=('7da6c287c45949193fd6046e82a099fd0469278c') + +build() { + cd "${srcdir}/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-debug + make +} + +package() { + cd "${srcdir}/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} diff --git a/community/ristretto/ristretto.install b/community/ristretto/ristretto.install new file mode 100644 index 000000000..75e2b7b55 --- /dev/null +++ b/community/ristretto/ristretto.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community/rxvt-unicode/ChangeLog b/community/rxvt-unicode/ChangeLog new file mode 100644 index 000000000..ba267d49e --- /dev/null +++ b/community/rxvt-unicode/ChangeLog @@ -0,0 +1,14 @@ +2012-01-22 Angel Velasquez <angvp@archlinux.org> + * Version bump to 9.15 + +2011-12-02 Angel Velasquez <angvp@archlinux.org> + * Version bump to 9.14 + +2011-12-02 Angel Velasquez <angvp@archlinux.org> + * Moved perl from optdepend to depend (closes FS#25782) + +2011-05-22 Angel Velasquez <angvp@archlinux.org> + * Rebuilt against perl 5.14.0 + +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * Removed not accepted upstream patch (closes FS#23324) diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD new file mode 100644 index 000000000..ce0beeac1 --- /dev/null +++ b/community/rxvt-unicode/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 67162 2012-03-05 00:37:20Z pschmitz $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: tobias <tobias@archlinux.org> +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org + +pkgname=rxvt-unicode +pkgver=9.15 +pkgrel=1 +pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)" +arch=('i686' 'x86_64') +url="http://software.schmorp.de/pkg/rxvt-unicode.html" +license=('GPL') +depends=('gcc-libs' 'libxft' 'gdk-pixbuf2' 'perl') +optdepends=('gtk2-perl: to use the urxvt-tabbed') +changelog=ChangeLog +source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \ + ${pkgname}.desktop) +md5sums=('15595aa326167ac5eb68c28d95432faf' + '3de6c13126a45bc3bc9f6bba077a1311') +sha1sums=('e6fdf091860ecb458730dc68b0176f67f207a2f7' + '962aebc88982dbeb62a7c4a051ff567e015f61a0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --with-terminfo=/usr/share/terminfo \ + --enable-256-color \ + --enable-font-styles \ + --enable-xim \ + --enable-keepscrolling \ + --enable-selectionscrolling \ + --enable-smart-resize \ + --enable-pixbuf \ + --enable-transparency \ + --enable-utmp \ + --enable-wtmp \ + --enable-lastlog \ + --disable-frills + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}/usr/share/terminfo" + export TERMINFO="${pkgdir}/usr/share/terminfo" + make DESTDIR="${pkgdir}" install + # install the tabbing wrapper ( requires gtk2-perl! ) + sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed + install -Dm 755 doc/rxvt-tabbed "${pkgdir}/usr/bin/urxvt-tabbed" + # install freedesktop menu + install -Dm644 ../${pkgname}.desktop \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" +} diff --git a/community/rxvt-unicode/rxvt-unicode.desktop b/community/rxvt-unicode/rxvt-unicode.desktop new file mode 100644 index 000000000..68d613dbd --- /dev/null +++ b/community/rxvt-unicode/rxvt-unicode.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=rxvt-unicode +Comment=An Unicode capable rxvt clone +Exec=urxvt +Icon=terminal +Terminal=false +Type=Application +Categories=Application;System;TerminalEmulator; diff --git a/community/tightvnc/PKGBUILD b/community/tightvnc/PKGBUILD new file mode 100644 index 000000000..356e6006f --- /dev/null +++ b/community/tightvnc/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 67142 2012-03-04 23:56:49Z pschmitz $ +# Maintainer: Paul Mattal <paul@archlinux.org> +pkgname=tightvnc +pkgver=1.3.10 +pkgrel=6 +pkgdesc="VNC Unix server && viewer" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.tightvnc.com" +depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth') +makedepends=('imake') +conflicts=('vnc') +options=('!makeflags') +source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2" + 'tightvnc-fontpath-xcolors.patch') +md5sums=('397b35faad32d5246b6d44b142f8304f' + '21aa7f3376ec3c608ff22d199a19c601') + +build() { + cd $srcdir/vnc_unixsrc + patch -Np1 -i ../tightvnc-fontpath-xcolors.patch + sed -i 's|/usr/local/|/usr/share/|' vncserver + + xmkmf + make World + cd Xvnc + ./configure + sed 's|PROTO_DEFINES =|PROTO_DEFINES = -D_XOPEN_SOURCE=500L|' \ + -i programs/Xserver/os/Makefile lib/font/fc/Makefile + make +} + +package() { + cd $srcdir/vnc_unixsrc + mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1 + ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man + + # install java classes + mkdir -p $pkgdir/usr/share/vnc/classes + install -Dm644 $srcdir/vnc_unixsrc/classes/* \ + $pkgdir/usr/share/vnc/classes +} diff --git a/community/tightvnc/tightvnc-fontpath-xcolors.patch b/community/tightvnc/tightvnc-fontpath-xcolors.patch new file mode 100644 index 000000000..10bc4b596 --- /dev/null +++ b/community/tightvnc/tightvnc-fontpath-xcolors.patch @@ -0,0 +1,13 @@ +diff -urN vnc_unixsrc/vncserver vnc_unixsrc.fixed/vncserver +--- vnc_unixsrc/vncserver 2009-02-11 23:27:18.000000000 -0500 ++++ vnc_unixsrc.fixed/vncserver 2009-04-23 21:46:46.000000000 -0400 +@@ -34,7 +34,8 @@ + $desktopName = "X"; + $vncClasses = "/usr/local/vnc/classes"; + $vncUserDir = "$ENV{HOME}/.vnc"; +-$fontPath = "unix/:7100"; ++$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/"; ++$colorPath = "/usr/share/X11/rgb"; + $authType = "-rfbauth $vncUserDir/passwd"; + + # Read configuration from the system-wide and user files if present. diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD new file mode 100644 index 000000000..1215b4714 --- /dev/null +++ b/community/vsftpd/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 67148 2012-03-05 00:08:24Z pschmitz $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=vsftpd +pkgver=2.3.5 +pkgrel=1 +pkgdesc="Very Secure FTP daemon" +arch=('i686' 'x86_64') +url="https://security.appspot.com/vsftpd.html" +license=('GPL2') +depends=('openssl') +backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') +install=vsftpd.install +source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc} + 'vsftpd.xinetd' 'vsftpd.d') +sha1sums=('f15b39ba6d68c953ab3c3e613e6ddc2a26493755' + '2ddf92782f19dafc72439a2917acb1d7e124d149' + 'c87b4ce56dac15223694a6e86c01ea813b877596' + '24f268956c24e78be0c234c6d31f41487922eafe') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # build-time config + sed \ + -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ + -i builddefs.h + make CFLAGS="${CFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd" + install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf" + install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8" + install -D -m644 vsftpd.conf.5 "${pkgdir}/usr/share/man/man5/vsftpd.conf.5" + install -D -m644 "${srcdir}/vsftpd.xinetd" "${pkgdir}/etc/xinetd.d/vsftpd" + install -D -m755 "${srcdir}/vsftpd.d" "${pkgdir}/etc/rc.d/vsftpd" + + install -d -m755 "${pkgdir}/usr/share/empty" +} diff --git a/community/vsftpd/vsftpd.d b/community/vsftpd/vsftpd.d new file mode 100644 index 000000000..27310855c --- /dev/null +++ b/community/vsftpd/vsftpd.d @@ -0,0 +1,67 @@ +#!/bin/bash + +daemon_name=vsftpd + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + $daemon_name & + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 diff --git a/community/vsftpd/vsftpd.install b/community/vsftpd/vsftpd.install new file mode 100644 index 000000000..48f134e24 --- /dev/null +++ b/community/vsftpd/vsftpd.install @@ -0,0 +1,17 @@ +# arg 1: the new package version +post_install() { + if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then + echo ">>> It appears that your current kernel has linux security" + echo ">>> capabilities built as a module. vsftpd requires this" + echo ">>> functionality to operate." + echo ">>>" + echo ">>> To activate the module, please load it now (modprobe capability)." + echo ">>> Also, you should add it to your MODULES array in rc.conf, so" + echo ">>> it will be activated automatically at boot-up." + fi +} + +post_upgrade() { + post_install $1 +} + diff --git a/community/vsftpd/vsftpd.xinetd b/community/vsftpd/vsftpd.xinetd new file mode 100644 index 000000000..eff2eb3db --- /dev/null +++ b/community/vsftpd/vsftpd.xinetd @@ -0,0 +1,10 @@ +service ftp +{ + socket_type = stream + wait = no + user = root + server = /usr/sbin/vsftpd + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +} diff --git a/community/wxcam/PKGBUILD b/community/wxcam/PKGBUILD new file mode 100644 index 000000000..4364dd27a --- /dev/null +++ b/community/wxcam/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +pkgname=wxcam +pkgver=1.1 +pkgrel=1 +arch=('i686' 'x86_64') +license=(GPL) +pkgdesc="Webcam application for linux" +# version of CImg library needed to compile wxcam - +# http://cimg.sourceforge.net/ +_CImg_ver=1.4.9 +url="http://wxcam.sourceforge.net" +makedepends=('intltool>=0.35.0') +depends=('libglade' 'mjpegtools' 'perlxml' 'wxgtk' 'xvidcore' 'v4l-utils' 'alsa-lib') +source=(http://downloads.sourceforge.net/wxcam/${pkgname}-${pkgver}.tar.bz2 + http://downloads.sourceforge.net/cimg/CImg-${_CImg_ver}.zip) +md5sums=('c9ea8991b6375c1709a7ce4e61fcc263' + 'a07cba03f6d66a9970e0b3fcc230bddc') + +build() { + cp $srcdir/CImg-${_CImg_ver}/CImg.h $srcdir/$pkgname-$pkgver + + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + mv $pkgdir/usr/doc $pkgdir/usr/share/ +} |