diff options
Diffstat (limited to 'abs/extra')
25 files changed, 900 insertions, 358 deletions
diff --git a/abs/extra/apache-ant/PKGBUILD b/abs/extra/apache-ant/PKGBUILD index 663cc19..eaafed4 100644 --- a/abs/extra/apache-ant/PKGBUILD +++ b/abs/extra/apache-ant/PKGBUILD @@ -1,41 +1,53 @@ -# $Id: PKGBUILD 24082 2009-01-12 21:42:39Z paul $ +# $Id$ # Contributor: Andrew Wright <andreww@photism.org> # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=apache-ant -pkgver=1.7.1 -pkgrel=1 -pkgdesc="Ant is a java-based build tool." -arch=(i686 x86_64) +pkgver=1.8.2 +pkgrel=2 +pkgdesc="A java-based build tool" +arch=('any') license=('APACHE') url="http://ant.apache.org/" -depends=('java-runtime') -makedepends=('java-environment') -noextract=('junit3.8.1.zip') -source=(http://archive.apache.org/dist/ant/source/${pkgname}-${pkgver}-src.tar.bz2 - http://heanet.dl.sourceforge.net/sourceforge/junit/junit3.8.1.zip) -md5sums=('0d68db4a1ada5c91bcbf53cefd0c2fd7' '5110326e4b7f7497dfa60ede4b626751') - -build() { - cd ${startdir}/src || return 1 - unzip junit3.8.1.zip || return 1 - - cd ${startdir}/src/${pkgname}-${pkgver} - if [ -f /etc/profile.d/java-gcj-compat.sh ]; then - . /etc/profile.d/java-gcj-compat.sh - elif [ -f /etc/profile.d/jdk.sh ]; then - . /etc/profile.d/jre.sh - . /etc/profile.d/jdk.sh - fi - - # we need the junit jar in the classpath to build ant - export CLASSPATH="${startdir}/src/junit3.8.1/junit.jar" - - # build - mkdir dist || return 1 - ./build.sh -Ddist.dir=dist/ dist || return 1 - - # install - export ANT_HOME="${startdir}/pkg/usr" - ./build.sh install-lite || return 1 +depends=('java-environment') +optdepends=('junit: to jave junit on the classpath in javac tasks') +source=(http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2 + ${pkgname}.sh ${pkgname}.csh + ant_diagnostics.patch) +md5sums=('9e9ae9fc7352960191489a1286fb0928' + '593ee6ebd9b8ec321534a028e686880f' + '475b684eb8202c09cbb51496cd8ee1e0' + 'cbaab423be40a6e63f0fde901b91eb50') + +package() { + # install profile.d script + install -dm755 "${pkgdir}"/etc/profile.d + install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/ + + # Get the ANT_HOME env var + source "${srcdir}"/${pkgname}.sh + + cd "${srcdir}"/${pkgname}-${pkgver} + install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib} + + install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib + cp -Rp ./etc "${pkgdir}"/${ANT_HOME} + + # Do not copy Windows .bat/.cmd files + find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \ + -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \; + + # symlink to junit so it's on the javac build path for ant + # matches behavior on ubuntu 9 and makes sense for compatibility + # http://bugs.archlinux.org/task/15229 + ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/ + + # fix python2 path + sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py + + # The license says the NOTICE file should be redistributed for derivative + # works, so lets supply it. + cd "${srcdir}"/${pkgname}-${pkgver} + install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${pkgname} } diff --git a/abs/extra/apache-ant/ant_diagnostics.patch b/abs/extra/apache-ant/ant_diagnostics.patch new file mode 100644 index 0000000..38148b4 --- /dev/null +++ b/abs/extra/apache-ant/ant_diagnostics.patch @@ -0,0 +1,23 @@ +--- a/src/main/org/apache/tools/ant/Diagnostics.java ++++ b/src/main/org/apache/tools/ant/Diagnostics.java +@@ -179,7 +179,10 @@ + * @param clazz the class to get the information from.
+ * @since Ant 1.8.0
+ */
+- private static URL getClassLocation(Class clazz) {
++ private static URL getClassLocation(Class clazz) { ++ if (clazz.getProtectionDomain().getCodeSource() == null) { ++ return null; ++ }
+ return clazz.getProtectionDomain().getCodeSource().getLocation();
+ }
+
+@@ -241,7 +244,7 @@ + }
+ Transformer transformer = null;
+ try {
+- transformer = transformerFactory.newTransformer();
++ transformer = transformerFactory.newTransformer(); + } catch (Exception e) {
+ // ignore
+ ignoreThrowable(e);
diff --git a/abs/extra/apache-ant/apache-ant.csh b/abs/extra/apache-ant/apache-ant.csh new file mode 100644 index 0000000..b6a6d58 --- /dev/null +++ b/abs/extra/apache-ant/apache-ant.csh @@ -0,0 +1,2 @@ +setenv ANT_HOME /usr/share/java/apache-ant +setenv PATH ${PATH}:${ANT_HOME}/bin diff --git a/abs/extra/apache-ant/apache-ant.sh b/abs/extra/apache-ant/apache-ant.sh new file mode 100644 index 0000000..ab602fb --- /dev/null +++ b/abs/extra/apache-ant/apache-ant.sh @@ -0,0 +1,3 @@ +export ANT_HOME=/usr/share/java/apache-ant +export PATH=$PATH:$ANT_HOME/bin + diff --git a/abs/extra/community/mediatomb/PKGBUILD b/abs/extra/community/mediatomb/PKGBUILD index aaf4d58..606314a 100644 --- a/abs/extra/community/mediatomb/PKGBUILD +++ b/abs/extra/community/mediatomb/PKGBUILD @@ -1,57 +1,49 @@ -# Orginal Contributor: William Rea <sillywilly@gmail.com> +# $Id$ +# Contributor: William Rea <sillywilly@gmail.com> # Contributor: Nikhil Bysani <nikron@gmail.com> -# Contributor: Mika Hynnä <igheax@gmail.com> - -# 20090525: -# + makedepends=('gcc' 'patch' 'make') -# + mediatomb-0.11.0+glibc-2.10.patch +# Contributor: Mika Hynnä <igheax@gmail.com> +# Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgname=mediatomb -pkgver=0.11.0 -pkgrel=10 -pkgdesc="A UPnP mediaserver" +pkgver=0.12.1 +pkgrel=5 +pkgdesc="Free UPnP/DLNA media server" arch=('i686' 'x86_64') -url="http://mediatomb.sourceforge.net" +url="http://mediatomb.cc/" license=('GPL') -depends=('libexif' 'taglib' 'sqlite3' 'expat' 'spidermonkey' 'curl' 'ffmpeg') -makedepends=('gcc' 'patch' 'make') -backup=(etc/conf.d/mediatomb) -source=( - http://mesh.dl.sourceforge.net/sourceforge/mediatomb/mediatomb-$pkgver.tar.gz \ - mediatomb.rc \ - mediatomb.conf \ - http://kapsi.fi/~ighea/arch/mediatomb-gcc-4.3.patch - mediatomb-0.11.0+glibc-2.10.patch -) - -build() -{ - cd $startdir/src/mediatomb-$pkgver || return 1 - patch -Np1 < ../mediatomb-gcc-4.3.patch || return 1 - patch -Np0 < ../mediatomb-0.11.0+glibc-2.10.patch || return 1 - - sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i configure - sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i configure.ac - sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i src/metadata/ffmpeg_handler.cc - - - ./configure --prefix=/usr --enable-mysql=no --enable-libmagic=yes \ - --enable-libjs=yes --enable-ffmpeg --with-ffmpeg-h=/usr/include/ || return 1 - - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 +depends=('curl' 'ffmpegthumbnailer' 'js' 'libexif' 'libmp4v2' 'sqlite3' 'taglib') +backup=('etc/conf.d/mediatomb') +install=mediatomb.install +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + 'mediatomb.rc' + 'mediatomb.conf' + 'gcc46.patch' + 'tonewjs.patch') +md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2' + 'aa1191ec508d8bd4b3b9a5fe48efc079' + 'bec297e4178332a26b42bbde873b94cd' + '0ae34c0d73b76e3d215887834c3c08cf' + 'd9e02a9956eecf5ff645bddf6dac0331') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i $srcdir/gcc46.patch + patch -Np1 -i $srcdir/tonewjs.patch + + ./configure --prefix=/usr \ + --disable-mysql \ + --enable-libmagic \ + --enable-libjs \ + --enable-ffmpeg + make +} - # rc-script - mkdir -p $startdir/pkg/etc/rc.d/ || return 1 - install -m0755 ../mediatomb.rc $startdir/pkg/etc/rc.d/mediatomb || return 1 +package() { + cd "$srcdir/$pkgname-$pkgver" - # config-file - mkdir -p $startdir/pkg/etc/conf.d/ || return 1 - install -m0644 ../mediatomb.conf $startdir/pkg/etc/conf.d/mediatomb || return 1 + make DESTDIR="$pkgdir/" install + install -D -m0755 "$srcdir/mediatomb.rc" "$pkgdir/etc/rc.d/mediatomb" + install -D -m0755 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb" + install -d "$pkgdir/var/lib/mediatomb" } -md5sums=('661f08933830d920de21436fe122fb15' - 'a7ff197d5760b20b04675ba67bfd9e86' - 'a4cbd08c32c93f116363a29bef60e21d' - 'eda28d01e035b3237566da5b1aad7712' - '3b895eabee88a0697b4fd0c30af6cab2') diff --git a/abs/extra/community/mediatomb/gcc46.patch b/abs/extra/community/mediatomb/gcc46.patch new file mode 100644 index 0000000..0f4fe49 --- /dev/null +++ b/abs/extra/community/mediatomb/gcc46.patch @@ -0,0 +1,10 @@ +--- a/src/zmm/object.h ++++ b/src/zmm/object.h +@@ -33,6 +33,7 @@ + #define __ZMM_OBJECT_H__ + + #include <new> // for size_t ++#include <cstddef> + #include "atomic.h" + + namespace zmm diff --git a/abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch b/abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch deleted file mode 100644 index b1436c1..0000000 --- a/abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/tools.cc (revisione 2018) -+++ src/tools.cc (copia locale) -@@ -303,8 +303,8 @@ - Ref<StringBuffer> buf(new StringBuffer(len / 2)); - for (int i = 0; i < len; i += 2) - { -- char *chi = strchr(HEX_CHARS, ptr[i]); -- char *clo = strchr(HEX_CHARS, ptr[i + 1]); -+ const char *chi = strchr(HEX_CHARS, ptr[i]); -+ const char *clo = strchr(HEX_CHARS, ptr[i + 1]); - int hi, lo; - - if (chi) -@@ -397,7 +397,7 @@ - char clo = data[i++]; - int hi, lo; - -- char *pos; -+ const char *pos; - - pos = strchr(hex, chi); - if (!pos) - diff --git a/abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch b/abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch deleted file mode 100644 index 9440bec..0000000 --- a/abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch +++ /dev/null @@ -1,24 +0,0 @@ -# GCC-4.3 compatibility patch by Mika Hynnä (ighea) <igheaxATgmailDOTcom> -# ---- mediatomb-0.11.0/src/url.cc 2008-03-02 00:48:36.000000000 +0200 -+++ mediatomb-0.11.0.new/src/url.cc 2008-04-14 00:53:21.000000000 +0300 -@@ -75,7 +75,7 @@ - - if (only_header) - { -- curl_easy_setopt(curl_handle, CURLOPT_NOBODY); -+ curl_easy_setopt(curl_handle, CURLOPT_NOBODY,0); - curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl); - curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, - (void *)buffer.getPtr()); ---- mediatomb-0.11.0/src/metadata/id3_handler.cc 2008-03-02 00:48:36.000000000 +0200 -+++ mediatomb-0.11.0.new/src/metadata/id3_handler.cc 2008-04-14 01:22:36.000000000 +0300 -@@ -36,6 +36,8 @@ - - #ifdef HAVE_ID3 - -+#include <string.h> -+ - #ifdef HAVE_CONFIG_H - #undef HAVE_CONFIG_H // else utils.h from the id3 library tries to import "config.h" - diff --git a/abs/extra/community/mediatomb/mediatomb.conf b/abs/extra/community/mediatomb/mediatomb.conf index 339bd9e..798018d 100644 --- a/abs/extra/community/mediatomb/mediatomb.conf +++ b/abs/extra/community/mediatomb/mediatomb.conf @@ -1,5 +1,23 @@ -# User to run the mediatomb as: -USER="" -# Extra parameters to pass to the daemon: -PARAMS="" +# +# Parameters to be passed to mediatomb +# +# Port to listen on +MT_PORT='50500' + +# User and group to run as +MT_USER='nobody' +MT_GROUP='nobody' + +# Location of the PID file +MT_PIDFILE='/var/run/mediatomb.pid' + +# Location of the log file +MT_LOGFILE='/var/log/mediatomb.log' + +# Location of the config file/database +MT_HOME='/var/lib/mediatomb' +MT_CFGDIR='.mediatomb' + +# User defined command line options +MT_OPTIONS='' diff --git a/abs/extra/community/mediatomb/mediatomb.install b/abs/extra/community/mediatomb/mediatomb.install new file mode 100644 index 0000000..56f6ef9 --- /dev/null +++ b/abs/extra/community/mediatomb/mediatomb.install @@ -0,0 +1,9 @@ +post_install() { + echo 'Warning: the MediaTomb web interface exposes your filesystem to the network' + echo 'For maximum security, set <ui enabled="no"> in your MediaTomb config file' +} + +post_upgrade() { + # TODO: disable next update + post_install +} diff --git a/abs/extra/community/mediatomb/mediatomb.rc b/abs/extra/community/mediatomb/mediatomb.rc index b3333cc..7b93012 100755..100644 --- a/abs/extra/community/mediatomb/mediatomb.rc +++ b/abs/extra/community/mediatomb/mediatomb.rc @@ -1,58 +1,54 @@ #!/bin/bash -DESC="MediaTomb UPnP A/V Media Server" +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/mediatomb -USER="" +MT_OPTIONS="-p $MT_PORT -u $MT_USER -g $MT_GROUP -P $MT_PIDFILE \ + -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR $MT_OPTIONS" -if [ "$(whoami)" != "root" ];then - echo "You must be root to start/restart/stop services." - exit 1 -fi +case "$1" in + start) + stat_busy "Starting Mediatomb UPnP Media Server" -. /etc/rc.conf -. /etc/rc.d/functions + chown "$MT_USER:$MT_GROUP" "$MT_HOME" -[ -r "/etc/conf.d/mediatomb" ] && . /etc/conf.d/mediatomb + if ! pidof -o %PPID /usr/bin/mediatomb &> /dev/null; then + rm -f "$MT_PIDFILE" + fi -PID=`pidof -o %PPID /usr/bin/mediatomb` + PID="$(cat "$MT_PIDFILE" 2> /dev/null)" -case "$1" in - start) - stat_busy "Starting $DESC" - if [ -z "$PID" ]; then - if [ -n "$USER" ]; then - echo -n "Starting as user: $USER" - su - $USER -c "/usr/bin/mediatomb -d $PARAMS &> /dev/null" || stat_fail - else - /usr/bin/mediatomb -d $PARAMS &> /dev/null || stat_fail - fi - PID=`pidof -o %PPID /usr/bin/mediatomb` - if [ -z "$PID" ]; then exit 1;fi - echo $PID > /var/run/mediatomb.pid - add_daemon mediatomb - stat_done - else - echo -n "Already running!" - stat_fail - fi - ;; - stop) - stat_busy "Stopping $DESC" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - echo -n "Not started!" - stat_fail - else - rm /var/run/mediatomb.pid - rm_daemon mediatomb - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + if [ -z "$PID" ] && /usr/bin/mediatomb -d $MT_OPTIONS; then + add_daemon mediatomb + stat_done + else + stat_fail + fi + ;; + + stop) + stat_busy "Stopping Mediatomb UPnP Media Server" + + PID="$(cat "$MT_PIDFILE" 2> /dev/null)" + + if [ -n "$PID" ] && kill "$PID" &> /dev/null; then + rm -f "$MT_PIDFILE" + rm_daemon mediatomb + stat_done + else + stat_fail + fi + ;; + + restart) + "$0" stop + sleep 1 + "$0" start + ;; + + *) + echo "usage: $0 {start|stop|restart}" + ;; esac +exit 0 diff --git a/abs/extra/community/mediatomb/tonewjs.patch b/abs/extra/community/mediatomb/tonewjs.patch new file mode 100644 index 0000000..1159685 --- /dev/null +++ b/abs/extra/community/mediatomb/tonewjs.patch @@ -0,0 +1,564 @@ +diff -up mediatomb-0.12.1-back/build/Makefile.in.tonewjs mediatomb-0.12.1-back/build/Makefile.in +--- mediatomb-0.12.1-back/build/Makefile.in.tonewjs 2010-04-08 00:40:15.000000000 +0200 ++++ mediatomb-0.12.1-back/build/Makefile.in 2011-04-19 17:17:01.343509944 +0200 +@@ -257,7 +257,7 @@ CURL_LIBS = @CURL_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ ++CXXFLAGS = -fpermissive @CXXFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@ + DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@ +diff -up mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/import_script.cc +--- mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs 2011-04-18 13:10:48.000000000 +0200 ++++ mediatomb-0.12.1-back/src/scripting/import_script.cc 2011-04-18 13:29:36.000000000 +0200 +@@ -53,8 +53,8 @@ ImportScript::ImportScript(Ref<Runtime> + try + { + load(scriptPath); +- root = JS_NewScriptObject(cx, script); +- JS_AddNamedRoot(cx, &root, "ImportScript"); ++ root = JS_NewObject(cx, NULL, script, NULL); ++ JS_AddNamedObjectRoot(cx, &root, "ImportScript"); + } + catch (Exception ex) + { +@@ -117,7 +117,7 @@ ImportScript::~ImportScript() + #endif + + if (root) +- JS_RemoveRoot(cx, &root); ++ JS_RemoveObjectRoot(cx, &root); + + #ifdef JS_THREADSAFE + JS_EndRequest(cx); +diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.cc +--- mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs 2011-04-18 13:29:55.000000000 +0200 ++++ mediatomb-0.12.1-back/src/scripting/js_functions.cc 2011-04-19 16:48:04.009229611 +0200 +@@ -49,7 +49,7 @@ using namespace zmm; + extern "C" { + + JSBool +-js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++js_print(JSContext *cx, uintN argc, jsval *argv) + { + uintN i; + JSString *str; +@@ -60,19 +60,21 @@ js_print(JSContext *cx, JSObject *obj, u + if (!str) + return JS_TRUE; + argv[i] = STRING_TO_JSVAL(str); +- log_js("%s\n", JS_GetStringBytes(str)); ++ char * log_str = JS_EncodeString(cx, str); ++ log_js("%s\n", log_str); ++ JS_free(cx, log_str); + } + return JS_TRUE; + } + + JSBool +-js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++js_copyObject(JSContext *cx, uintN argc, jsval *argv) + { + jsval arg; + JSObject *js_cds_obj; + JSObject *js_cds_clone_obj; + +- Script *self = (Script *)JS_GetPrivate(cx, obj); ++ Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv)); + + try + { +@@ -91,7 +93,7 @@ js_copyObject(JSContext *cx, JSObject *o + + self->cdsObject2jsObject(cds_obj, js_cds_clone_obj); + +- *rval = OBJECT_TO_JSVAL(js_cds_clone_obj); ++ JS_SET_RVAL(cx, argv, OBJECT_TO_JSVAL(js_cds_clone_obj)); + + return JS_TRUE; + +@@ -110,7 +112,7 @@ js_copyObject(JSContext *cx, JSObject *o + } + + JSBool +-js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++js_addCdsObject(JSContext *cx, uintN argc, jsval *argv) + { + try + { +@@ -126,7 +128,7 @@ js_addCdsObject(JSContext *cx, JSObject + Ref<StringConverter> p2i; + Ref<StringConverter> i2i; + +- Script *self = (Script *)JS_GetPrivate(cx, obj); ++ Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv)); + + if (self == NULL) + { +@@ -156,20 +158,20 @@ js_addCdsObject(JSContext *cx, JSObject + if (!str) + path = _("/"); + else +- path = JS_GetStringBytes(str); ++ path = JS_EncodeString(cx, str); + + JSString *cont = JS_ValueToString(cx, argv[2]); + if (cont) + { +- containerclass = JS_GetStringBytes(cont); ++ containerclass = JS_EncodeString(cx, cont); + if (!string_ok(containerclass) || containerclass == "undefined") + containerclass = nil; + } + + if (self->whoami() == S_PLAYLIST) +- js_orig_obj = self->getObjectProperty(obj, _("playlist")); ++ js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("playlist")); + else if (self->whoami() == S_IMPORT) +- js_orig_obj = self->getObjectProperty(obj, _("orig")); ++ js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("orig")); + + if (js_orig_obj == NULL) + { +@@ -285,8 +287,7 @@ js_addCdsObject(JSContext *cx, JSObject + JSString *str2 = JS_NewStringCopyN(cx, tmp.c_str(), tmp.length()); + if (!str2) + return JS_TRUE; +- *rval = STRING_TO_JSVAL(str2); +- ++ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2)); + return JS_TRUE; + } + catch (ServerShutdownException se) +@@ -302,7 +303,7 @@ js_addCdsObject(JSContext *cx, JSObject + return JS_TRUE; + } + +-static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval, charset_convert_t chr) ++static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, charset_convert_t chr) + { + try + { +@@ -321,7 +322,7 @@ static JSBool convert_charset_generic(JS + { + str = JS_ValueToString(cx, argv[0]); + if (str) +- result = JS_GetStringBytes(str); ++ result = JS_EncodeString(cx, str); + } + + if (result != nil) +@@ -330,7 +331,7 @@ static JSBool convert_charset_generic(JS + JSString *str2 = JS_NewStringCopyN(cx, result.c_str(), result.length()); + if (!str2) + return JS_TRUE; +- *rval = STRING_TO_JSVAL(str2); ++ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2)); + } + } + catch (ServerShutdownException se) +@@ -347,24 +348,23 @@ static JSBool convert_charset_generic(JS + } + + +-JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv) + { +- return convert_charset_generic(cx, obj, argc, argv, rval, F2I); ++ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, F2I); + } + +-JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv) + { +- return convert_charset_generic(cx, obj, argc, argv, rval, M2I); +-} ++ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, M2I); } + +-JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv) + { +- return convert_charset_generic(cx, obj, argc, argv, rval, P2I); ++ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, P2I); + } + +-JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv) + { +- return convert_charset_generic(cx, obj, argc, argv, rval, J2I); ++ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, J2I); + } + + } // extern "C" +diff -up mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.h +--- mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs 2010-03-25 15:58:05.000000000 +0100 ++++ mediatomb-0.12.1-back/src/scripting/js_functions.h 2011-04-18 13:59:29.000000000 +0200 +@@ -40,18 +40,18 @@ + extern "C" { + + /// \brief Log output. +-JSBool js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); ++JSBool js_print(JSContext *cx, uintN argc, jsval *argv); + + /// \brief Adds an object to the database. +-JSBool js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); ++JSBool js_addCdsObject(JSContext *cx, uintN argc, jsval *argv); + + /// \brief Makes a copy of an CDS object. +-JSBool js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); ++JSBool js_copyObject(JSContext *cx, uintN argc, jsval *argv); + +-JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); +-JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); +-JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); +-JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); ++JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv); ++JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv); ++JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv); ++JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv); + + } // extern "C" + +diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc +--- mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs 2011-04-18 13:34:14.000000000 +0200 ++++ mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc 2011-04-18 13:51:59.000000000 +0200 +@@ -46,9 +46,9 @@ using namespace zmm; + extern "C" { + + static JSBool +-js_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ++js_readln(JSContext *cx, uintN argc, jsval *argv) + { +- PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, obj); ++ PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv)); + + String line; + +@@ -69,7 +69,7 @@ js_readln(JSContext *cx, JSObject *obj, + + JSString *jsline = JS_NewStringCopyZ(cx, line.c_str()); + +- *rval = STRING_TO_JSVAL(jsline); ++ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(jsline)); + + return JS_TRUE; + } +@@ -93,8 +93,8 @@ PlaylistParserScript::PlaylistParserScri + + String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT); + load(scriptPath); +- root = JS_NewScriptObject(cx, script); +- JS_AddNamedRoot(cx, &root, "PlaylistScript"); ++ root = JS_NewObject(cx, NULL, script, NULL); ++ JS_AddNamedObjectRoot(cx, &root, "PlaylistScript"); + } + catch (Exception ex) + { +@@ -245,7 +245,7 @@ PlaylistParserScript::~PlaylistParserScr + #endif + + if (root) +- JS_RemoveRoot(cx, &root); ++ JS_RemoveObjectRoot(cx, &root); + + #ifdef JS_THREADSAFE + JS_EndRequest(cx); +diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/script.cc +--- mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs 2011-04-18 13:53:07.000000000 +0200 ++++ mediatomb-0.12.1-back/src/scripting/script.cc 2011-04-19 18:26:34.460338804 +0200 +@@ -87,7 +87,7 @@ String Script::getProperty(JSObject *obj + str = JS_ValueToString(cx, val); + if (! str) + return nil; +- return JS_GetStringBytes(str); ++ return JS_EncodeString(cx, str); + } + + int Script::getBoolProperty(JSObject *obj, String name) +@@ -427,14 +427,14 @@ static JSFunctionSpec js_global_function + try + { + common_script = _load(common_scr_path); +- common_root = JS_NewScriptObject(cx, common_script); +- JS_AddNamedRoot(cx, &common_root, "common-script"); ++ common_root = JS_NewObject(cx, NULL, common_script, NULL); ++ JS_AddNamedObjectRoot(cx, &common_root, "common-script"); + _execute(common_script); + } + catch (Exception e) + { + if (common_root) +- JS_RemoveRoot(cx, &common_root); ++ JS_RemoveObjectRoot(cx, &common_root); + + log_js("Unable to load %s: %s\n", common_scr_path.c_str(), + e.getMessage().c_str()); +@@ -460,7 +460,7 @@ Script::~Script() + JS_BeginRequest(cx); + #endif + if (common_root) +- JS_RemoveRoot(cx, &common_root); ++ JS_RemoveObjectRoot(cx, &common_root); + + /* + * scripts are unrooted and will be cleaned up by GC +@@ -504,11 +504,11 @@ void Script::initGlobalObject() + static JSClass global_class = + { + "global", /* name */ +- JSCLASS_HAS_PRIVATE, /* flags */ ++ JSCLASS_HAS_PRIVATE | JSCLASS_GLOBAL_FLAGS,/* flags */ + JS_PropertyStub, /* add property */ + JS_PropertyStub, /* del property */ + JS_PropertyStub, /* get property */ +- JS_PropertyStub, /* set property */ ++ JS_StrictPropertyStub, /* set property */ + JS_EnumerateStandardClasses, /* enumerate */ + JS_ResolveStub, /* resolve */ + JS_ConvertStub, /* convert */ +@@ -517,7 +517,7 @@ void Script::initGlobalObject() + }; + + /* create the global object here */ +- glob = JS_NewObject(cx, &global_class, NULL, NULL); ++ glob = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL); + if (! glob) + throw _Exception(_("Scripting: could not initialize glboal class")); + +@@ -539,12 +539,12 @@ void Script::defineFunctions(JSFunctionS + throw _Exception(_("Scripting: JS_DefineFunctions failed")); + } + +-JSScript *Script::_load(zmm::String scriptPath) ++JSObject *Script::_load(zmm::String scriptPath) + { + if (glob == NULL) + initGlobalObject(); + +- JSScript *scr; ++ JSObject *scr; + + String scriptText = read_text_file(scriptPath); + +@@ -571,14 +571,11 @@ JSScript *Script::_load(zmm::String scri + + void Script::load(zmm::String scriptPath) + { +- if (script) +- JS_DestroyScript(cx, script); +- + script = _load((scriptPath)); + } + + +-void Script::_execute(JSScript *scr) ++void Script::_execute(JSObject *scr) + { + jsval ret_val; + +@@ -662,7 +659,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec + JSObject *js_meta = getObjectProperty(js, _("meta")); + if (js_meta) + { +- JS_AddNamedRoot(cx, &js_meta, "meta"); ++ JS_AddNamedObjectRoot(cx, &js_meta, "meta"); + /// \todo: only metadata enumerated in MT_KEYS is taken + for (int i = 0; i < M_MAX; i++) + { +@@ -687,7 +684,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec + } + } + } +- JS_RemoveRoot(cx, &js_meta); ++ JS_RemoveObjectRoot(cx, &js_meta); + } + + // stuff that has not been exported to js +diff -up mediatomb-0.12.1-back/src/scripting/script.h.tonewjs mediatomb-0.12.1-back/src/scripting/script.h +--- mediatomb-0.12.1-back/src/scripting/script.h.tonewjs 2011-04-18 12:56:14.000000000 +0200 ++++ mediatomb-0.12.1-back/src/scripting/script.h 2011-04-18 12:56:51.000000000 +0200 +@@ -66,8 +66,8 @@ public: + JSRuntime *rt; + JSContext *cx; + JSObject *glob; +- JSScript *script; +- JSScript *common_script; ++ JSObject *script; ++ JSObject *common_script; + + public: + Script(zmm::Ref<Runtime> runtime); +@@ -115,8 +115,8 @@ private: + JSObject *common_root; + + void initGlobalObject(); +- JSScript *_load(zmm::String scriptPath); +- void _execute(JSScript *scr); ++ JSObject *_load(zmm::String scriptPath); ++ void _execute(JSObject *scr); + zmm::Ref<StringConverter> _p2i; + zmm::Ref<StringConverter> _j2i; + zmm::Ref<StringConverter> _f2i; +--- mediatomb-0.12.1/configure.tonewjs 2011-07-04 20:20:00.290227110 +1200 ++++ mediatomb-0.12.1/configure 2011-07-04 20:20:28.186894644 +1200 +@@ -23784,14 +23784,14 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" + + else + +- LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS" +- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5 +-$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; } +-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then ++ LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs185 $ADD_PTHREAD_CFLAGS" ++ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5 ++$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; } ++if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmozjs $LIBS" ++LIBS="-lmozjs185 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23835,12 +23835,12 @@ $as_echo "$ac_try_echo") >&5 + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then +- ac_cv_lib_mozjs_JS_NewObject=yes ++ ac_cv_lib_mozjs185_JS_NewObject=yes + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_mozjs_JS_NewObject=no ++ ac_cv_lib_mozjs185_JS_NewObject=no + fi + + rm -rf conftest.dSYM +@@ -23848,12 +23848,12 @@ rm -f core conftest.err conftest.$ac_obj + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5 +-$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; } +-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5 ++$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; } ++if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then + +- JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs" +- MOZLIB=mozjs ++ JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs185" ++ MOZLIB=mozjs185 + + else + +@@ -24020,13 +24020,13 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" + else + + unset ac_cv_lib_smjs_JS_NewObject +- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5 +-$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; } +-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then ++ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5 ++$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; } ++if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmozjs $LIBS" ++LIBS="-lmozjs185 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -24070,12 +24070,12 @@ $as_echo "$ac_try_echo") >&5 + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then +- ac_cv_lib_mozjs_JS_NewObject=yes ++ ac_cv_lib_mozjs185_JS_NewObject=yes + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_mozjs_JS_NewObject=no ++ ac_cv_lib_mozjs185_JS_NewObject=no + fi + + rm -rf conftest.dSYM +@@ -24083,12 +24083,12 @@ rm -f core conftest.err conftest.$ac_obj + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5 +-$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; } +-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5 ++$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; } ++if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then + +- MOZLIB=mozjs +- JS_LIBS="-lmozjs" ++ MOZLIB=mozjs185 ++ JS_LIBS="-lmozjs185" + + else + +@@ -24239,15 +24239,15 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" + + else + +- LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs" +- unset ac_cv_lib_mozjs_JS_NewObject +- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5 +-$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; } +-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then ++ LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs185" ++ unset ac_cv_lib_mozjs185_JS_NewObject ++ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5 ++$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; } ++if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmozjs $LIBS" ++LIBS="-lmozjs185 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -24291,12 +24291,12 @@ $as_echo "$ac_try_echo") >&5 + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then +- ac_cv_lib_mozjs_JS_NewObject=yes ++ ac_cv_lib_mozjs185_JS_NewObject=yes + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_mozjs_JS_NewObject=no ++ ac_cv_lib_mozjs185_JS_NewObject=no + fi + + rm -rf conftest.dSYM +@@ -24304,12 +24304,12 @@ rm -f core conftest.err conftest.$ac_obj + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5 +-$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; } +-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5 ++$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; } ++if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then + +- JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs" +- MOZLIB=mozjs ++ JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185" ++ MOZLIB=mozjs185 + + else + diff --git a/abs/extra/community/ncdu/PKGBUILD b/abs/extra/community/ncdu/PKGBUILD index fb61b63..a9f83e6 100644 --- a/abs/extra/community/ncdu/PKGBUILD +++ b/abs/extra/community/ncdu/PKGBUILD @@ -1,6 +1,7 @@ # Contributor: lp76 <l.peduto@gmail.com> +# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> pkgname=ncdu -pkgver=1.4 +pkgver=1.7 pkgrel=1 pkgdesc="An NCurses version of the famous old 'du' unix command" arch=('i686' 'x86_64') @@ -8,12 +9,13 @@ url="http://dev.yorhel.nl/ncdu/" license=('MIT') depends=('ncurses') source=(http://dev.yorhel.nl/download/$pkgname-$pkgver.tar.gz) -md5sums=('07f01579f7c9852033139ae9fa2414c9') +md5sums=('172047c29d232724cc62e773e82e592a') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr + + ./configure --prefix=/usr || return 1 make || return 1 make DESTDIR=$pkgdir install || return 1 - install -D COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/abs/extra/conky/PKGBUILD b/abs/extra/conky/PKGBUILD index 0b27d0b..d542937 100644 --- a/abs/extra/conky/PKGBUILD +++ b/abs/extra/conky/PKGBUILD @@ -1,29 +1,47 @@ -# $Id: PKGBUILD 15346 2008-10-12 21:48:59Z giovanni $ -# Maintainer: James Rayner <james@archlinux.org> -# Contributor: MrGreen <mrgreen.linuxuser@gmail.com> +# $Id$ +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: James Rayner <james@archlinux.org> +# Contributor: Partha Chowdhury <kira.laucas@gmail.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=conky -pkgver=1.8.0 -pkgrel=1 -pkgdesc="Conky is an advanced, highly configurable system monitor for X based on torsmo" +pkgver=1.8.1 +pkgrel=3 +pkgdesc='An advanced, highly configurable system monitor for X based on torsmo' arch=('i686' 'x86_64') -url="http://conky.sourceforge.net/" +url='http://conky.sourceforge.net/' license=('custom') replaces=('torsmo') -depends=('libxext' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage') -makedepends=('pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/conky/$pkgname-$pkgver.tar.bz2) +makedepends=('pkg-config') +depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2') +backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'current-power.patch') + +sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f' + '2eeef0cc5a0b612826b2a7f0b43b7a3b7e10bf0b') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --enable-xft --enable-mpd --enable-double-buffer \ - --enable-proc-uptime --enable-seti --enable-wlan --enable-rss --enable-smapi - make || return 1 - make DESTDIR=$startdir/pkg install - mkdir -p $startdir/pkg/etc/xdg/ - mv $startdir/pkg/usr/etc/conky/ $startdir/pkg/etc/xdg/ - rmdir $startdir/pkg/usr/etc - install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 < ../current-power.patch # See FS#21984 + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-ibm \ + --enable-curl \ + --enable-rss \ + --enable-weather-xoap \ + --enable-imlib2 \ + --disable-lua \ + --enable-wlan \ + + make } -md5sums=('494cbaf1108cfdb977fc80454d9b13e2') +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/abs/extra/conky/current-power.patch b/abs/extra/conky/current-power.patch new file mode 100644 index 0000000..1e7cf5a --- /dev/null +++ b/abs/extra/conky/current-power.patch @@ -0,0 +1,12 @@ +diff -aur old/src/linux.c new/src/linux.c +--- old/src/linux.c 2010-10-05 23:29:36.000000000 +0200 ++++ new/src/linux.c 2010-12-06 22:18:59.346667183 +0100 +@@ -1671,6 +1671,8 @@ + the tradition! */ + else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0) + sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate); ++ else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0) ++ sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate); + else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0) + sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity); + else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0) diff --git a/abs/extra/ffmpegthumbnailer/PKGBUILD b/abs/extra/ffmpegthumbnailer/PKGBUILD new file mode 100644 index 0000000..8be79eb --- /dev/null +++ b/abs/extra/ffmpegthumbnailer/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: boromil@gmail.com + +pkgname=ffmpegthumbnailer +pkgver=2.0.6 +pkgrel=1 +pkgdesc="Lightweight video thumbnailer that can be used by file managers." +url="http://code.google.com/p/ffmpegthumbnailer/" +license=('GPL2') +arch=('i686' 'x86_64') +depends=('ffmpeg' 'libjpeg' 'libpng') +optdepends=('gvfs: support for gio uris') +source=(http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz) +options=(!libtool) +md5sums=('5003ceaadc1c5a1be1dbb34739a12bab') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --enable-gio + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + + diff --git a/abs/extra/help2man/PKGBUILD b/abs/extra/help2man/PKGBUILD index c9dc9fb..fff2829 100644 --- a/abs/extra/help2man/PKGBUILD +++ b/abs/extra/help2man/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 83522 2010-06-21 22:45:22Z giovanni $ +# $Id$ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> pkgname=help2man -pkgver=1.38.2 +pkgver=1.40.4 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/help2man/" license=('GPL') depends=('perl-locale-gettext') -source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('426671c6fe79e5ef2233303367eab5a6') +install=help2man.install +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('4d79dc7cb7c20019c2a3650d35259c45') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -20,6 +21,11 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --libdir=/lib - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install } diff --git a/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch b/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch deleted file mode 100644 index a314c27..0000000 --- a/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in 2009-11-14 07:21:34.000000000 +0100 -+++ b/Makefile.in 2010-02-10 12:23:35.000000000 +0100 -@@ -103,7 +103,7 @@ - - preload: $(preload).so - $(preload).so: $(srcdir)/$(preload).c -- $(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS) -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS) - - man: $(target).1 - $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m diff --git a/abs/extra/help2man/help2man-1.38.2-1-i686-build.log.1 b/abs/extra/help2man/help2man-1.38.2-1-i686-build.log.1 deleted file mode 100644 index 2f886ba..0000000 --- a/abs/extra/help2man/help2man-1.38.2-1-i686-build.log.1 +++ /dev/null @@ -1,56 +0,0 @@ -checking for perl... perl -checking for module Locale::gettext... yes -checking for msgfmt... /usr/bin/msgfmt -checking for gcc... gcc -checking whether the C compiler works... yes -checking for C compiler default output file name... a.out -checking for suffix of executables... -checking whether we are cross compiling... no -checking for suffix of object files... o -checking whether we are using the GNU C compiler... yes -checking whether gcc accepts -g... yes -checking for gcc option to accept ISO C89... none needed -checking for library containing dlsym... -ldl -checking for library containing bindtextdomain... none required -checking for a BSD-compatible install... /bin/install -c -checking for makeinfo... /usr/bin/makeinfo -checking for install-info... /usr/bin/install-info -configure: creating ./config.status -config.status: creating Makefile -perl help2man.PL --with-gettext -gcc -march=i686 -mtune=generic -O2 -pipe -o bindtextdomain.so -fPIC -shared bindtextdomain.c -ldl -Extracting help2man (with variable substitutions) -./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/bin -/bin/install -c bindtextdomain.so /data/linhes_pkgbuild/abs/extra/help2man/pkg/lib -for lang in de fi fr pl pt_BR ru sv vi; \ - do \ - ./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/$lang/LC_MESSAGES; \ - /bin/install -c -m 644 $(perl -e 'print +(grep -f, map "$_/$ARGV[0]", map +(length) ? $_ : ".", split ":", $ENV{VPATH} || ".")[0]' po/$lang.gmo) \ - /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/$lang/LC_MESSAGES/help2man.mo; \ - ./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/$lang/man1; \ - /bin/install -c -m 644 $(perl -e 'print +(grep -f, map "$_/$ARGV[0]", map +(length) ? $_ : ".", split ":", $ENV{VPATH} || ".")[0]' help2man.$lang.1) \ - /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/$lang/man1/help2man.1; \ - done -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/bin -./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/lib -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/de/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/lib -mkdir: cannot create directory `/data/linhes_pkgbuild/abs/extra/help2man/pkg/lib': File exists -make: *** [install_base] Error 1 -make: *** Waiting for unfinished jobs.... -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/de/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/fi/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/fi/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/fr/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/fr/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/pl/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/pl/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/pt_BR/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/pt_BR/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/ru/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/ru/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/sv/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/sv/man1 -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/vi/LC_MESSAGES -mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/vi/man1 -[1m Aborting...(B[m diff --git a/abs/extra/libgnomecanvas/PKGBUILD b/abs/extra/libgnomecanvas/PKGBUILD index 7e419ed..9a5fac2 100644 --- a/abs/extra/libgnomecanvas/PKGBUILD +++ b/abs/extra/libgnomecanvas/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 30223 2009-03-17 18:18:11Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgnomecanvas -pkgver=2.26.0 +pkgver=2.30.3 pkgrel=1 pkgdesc="The GNOME Canvas library" arch=(i686 x86_64) license=('LGPL') -depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.20') +depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.21') makedepends=('pkgconfig' 'intltool') options=('!libtool') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2) -md5sums=('9bbc635e5ae70e63af071af74ba7e72f') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --disable-static \ + --enable-glade + make + make DESTDIR="${pkgdir}" install } diff --git a/abs/extra/libidl2/PKGBUILD b/abs/extra/libidl2/PKGBUILD index 488909a..3e78a0b 100644 --- a/abs/extra/libidl2/PKGBUILD +++ b/abs/extra/libidl2/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 30208 2009-03-17 17:59:14Z jgc $ +# $Id$ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=libidl2 -pkgver=0.8.13 +pkgver=0.8.14 pkgrel=1 pkgdesc="A front-end for CORBA 2.2 IDL and Netscape's XPIDL" arch=(i686 x86_64) license=('LGPL') -depends=('glib2>=2.20.0' 'texinfo') +depends=('glib2>=2.24.0' 'texinfo') makedepends=('pkgconfig') install=libidl2.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-${pkgver}.tar.bz2) url="http://www.gnome.org" -md5sums=('b43b289a859eb38a710f70622c46e571') +sha256sums=('c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220') build() { cd "${srcdir}/libIDL-${pkgver}" ./configure --prefix=/usr || return 1 make || return 1 make DESTDIR="${pkgdir}" install || return 1 - + rm -f "${pkgdir}/usr/share/info/dir" gzip -9nf "${pkgdir}/usr/share/info/"* } diff --git a/abs/extra/libmms/PKGBUILD b/abs/extra/libmms/PKGBUILD index 230b082..d0101a6 100644 --- a/abs/extra/libmms/PKGBUILD +++ b/abs/extra/libmms/PKGBUILD @@ -2,20 +2,24 @@ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libmms -pkgver=0.5 +pkgver=0.6.2 pkgrel=1 pkgdesc="MMS stream protocol library" arch=(i686 x86_64) -url="https://launchpad.net/libmms" +url="http://sourceforge.net/projects/libmms/" license=(LGPL) -depends=('glib2>=2.16.4') +depends=('glib2') options=('!libtool') -source=(http://launchpad.net/libmms/trunk/${pkgver}/+download/libmms-${pkgver}.tar.gz) +source=(http://download.sourceforge.net/libmms/${pkgname}-${pkgver}.tar.gz) +md5sums=('9f63aa363deb4874e072a45850161bff') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } -md5sums=('cf83053ec891f14e73a04c84d9de08ee') diff --git a/abs/extra/sdl_image/PKGBUILD b/abs/extra/sdl_image/PKGBUILD index f3ab8cb..062490b 100644 --- a/abs/extra/sdl_image/PKGBUILD +++ b/abs/extra/sdl_image/PKGBUILD @@ -1,27 +1,22 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id$ +# Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> + pkgname=sdl_image -pkgver=1.2.6 -pkgrel=3 +pkgver=1.2.10 +pkgrel=2 pkgdesc="A simple library to load images of various formats as SDL surfaces" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('LGPL') -depends=('sdl>=1.2.13' 'libpng' 'libjpeg' 'libtiff' 'zlib') +depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib') options=('!libtool') url="http://www.libsdl.org/projects/SDL_image/" -source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz - SDL_image-IMG_lbm.patch - SDL_image-buffer-overflow.patch) -md5sums=('b866dc4f647517bdaf57f6ffdefd013e' - '81424f716513845f27e1b69459343327' - 'e774a12d1a07b788233f6c15aca05780') +source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz) +md5sums=('6c06584b31559e2b59f2b982d0d1f628') build() { - cd ${startdir}/src/SDL_image-${pkgver} - patch -Np2 -i ${startdir}/src/SDL_image-IMG_lbm.patch || return 1 - patch -Np2 -i ${startdir}/src/SDL_image-buffer-overflow.patch || return 1 + cd ${srcdir}/SDL_image-${pkgver} ./configure --prefix=/usr make || return 1 - make DESTDIR=${startdir}/pkg install + make DESTDIR=${pkgdir} install } diff --git a/abs/extra/sdl_image/SDL_image-IMG_lbm.patch b/abs/extra/sdl_image/SDL_image-IMG_lbm.patch deleted file mode 100644 index cc4a29b..0000000 --- a/abs/extra/sdl_image/SDL_image-IMG_lbm.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- trunk/SDL_image/IMG_lbm.c 2007/07/20 04:37:11 3341 -+++ trunk/SDL_image/IMG_lbm.c 2008/01/03 20:05:34 3521 -@@ -28,6 +28,7 @@ - EHB and HAM (specific Amiga graphic chip modes) support added by Marc Le Douarain - (http://www.multimania.com/mavati) in December 2003. - Stencil and colorkey fixes by David Raulo (david.raulo AT free DOT fr) in February 2004. -+ Buffer overflow fix in RLE decompression by David Raulo in January 2008. - */ - - #include <stdio.h> -@@ -328,7 +329,7 @@ - count ^= 0xFF; - count += 2; /* now it */ - -- if ( !SDL_RWread( src, &color, 1, 1 ) ) -+ if ( ( count > remainingbytes ) || !SDL_RWread( src, &color, 1, 1 ) ) - { - error="error reading BODY chunk"; - goto done; -@@ -339,7 +340,7 @@ - { - ++count; - -- if ( !SDL_RWread( src, ptr, count, 1 ) ) -+ if ( ( count > remainingbytes ) || !SDL_RWread( src, ptr, count, 1 ) ) - { - error="error reading BODY chunk"; - goto done; diff --git a/abs/extra/sdl_image/SDL_image-buffer-overflow.patch b/abs/extra/sdl_image/SDL_image-buffer-overflow.patch deleted file mode 100644 index 0be82dc..0000000 --- a/abs/extra/sdl_image/SDL_image-buffer-overflow.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- trunk/SDL_image/IMG_gif.c 2007/12/28 08:17:23 3461 -+++ trunk/SDL_image/IMG_gif.c 2007/12/28 16:43:56 3462 -@@ -418,6 +418,10 @@ - static int stack[(1 << (MAX_LWZ_BITS)) * 2], *sp; - register int i; - -+ /* Fixed buffer overflow found by Michael Skladnikiewicz */ -+ if (input_code_size > MAX_LWZ_BITS) -+ return -1; -+ - if (flag) { - set_code_size = input_code_size; - code_size = set_code_size + 1; |