diff options
| author | root <root@rshg054.dnsready.net> | 2012-01-25 23:14:53 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-01-25 23:14:53 +0000 |
| commit | a61c6fb05ec1cbc6845b2ed4077ce0c5950c36ed (patch) | |
| tree | 7f7f0f3918738e6a508485da2242eec835d6e2ea | |
| parent | 2aa2acfff38de7de825868995e49792ecfc03126 (diff) | |
Wed Jan 25 23:14:53 UTC 2012
68 files changed, 2357 insertions, 86 deletions
diff --git a/community-staging/freedroidrpg/PKGBUILD b/community-staging/freedroidrpg/PKGBUILD new file mode 100644 index 000000000..1b8ac1ed3 --- /dev/null +++ b/community-staging/freedroidrpg/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 62710 2012-01-24 22:18:23Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: nut543 <kfs1@online.no> + +#pkgbase=freedroidrpg +#pkgname=('freedroidrpg' 'freedroidrpg-data') +pkgname='freedroidrpg' +pkgver=0.15 +pkgrel=2 +arch=('i686' 'x86_64') +# depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data') +depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa') +optdepends=('python2' 'espeak') +pkgdesc="a mature science fiction role playing game set in the future" +url="http://freedroid.sourceforge.net" +license=("GPL") +source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidrpg-$pkgver.tar.gz + freedroidrpg.jpg + freedroidrpg.desktop) +md5sums=('003a3f34619cfaa87add2030fea5d120' + 'b73d9dac44c7e83a6c80fbe4eb96ba79' + '9a10c2a2064439cdcff5b945dfb1c3ac') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir/ install + install -D -m644 $srcdir/freedroidrpg.jpg $pkgdir/usr/share/icons/freedroidrpg.jpg + install -D -m644 $srcdir/freedroidrpg.desktop $pkgdir/usr/share/applications/freedroidrpg.desktop +} diff --git a/community-staging/freedroidrpg/freedroidrpg.desktop b/community-staging/freedroidrpg/freedroidrpg.desktop new file mode 100644 index 000000000..33ee2f5b8 --- /dev/null +++ b/community-staging/freedroidrpg/freedroidrpg.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=freedroidrpg +Comment=Extension/modification of the classical Freedroid game(based on paradroid) into an RPG +Exec=freedroidRPG +Encoding=UTF-8 +Icon=/usr/share/icons/freedroidrpg.jpg +Categories=Game;RolePlaying; +Terminal=false +StartupNotify=false diff --git a/community-staging/freedroidrpg/freedroidrpg.jpg b/community-staging/freedroidrpg/freedroidrpg.jpg Binary files differnew file mode 100644 index 000000000..4daa89313 --- /dev/null +++ b/community-staging/freedroidrpg/freedroidrpg.jpg diff --git a/community-staging/gnash/PKGBUILD b/community-staging/gnash/PKGBUILD new file mode 100644 index 000000000..348db3561 --- /dev/null +++ b/community-staging/gnash/PKGBUILD @@ -0,0 +1,89 @@ +# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgbase=gnash +pkgname=(gnash-common gnash-gtk) +pkgver=0.8.9 +pkgrel=9 +arch=(i686 x86_64) +url="http://www.gnu.org/software/gnash/" +license=(GPL3) +makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool + speex fontconfig libva ffmpeg libxinerama + gstreamer0.10-base gstreamer0.10-ffmpeg + gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils + pkgconfig boost) +options=(!libtool !emptydirs) +source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 + gentoo-ffmpeg-0.8.patch xul8.patch nodebug.patch) +sha256sums=('f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd' + '5e6b9c2ccb0f6dda70745712dddf302d2b42895feda850f2ed126bf53d8815ca' + 'd484f1c21ef71847a2d4b3dd254d1fa93a58719d45bc9df8b8deabee388ce4e9' + '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551') + +build() { + cd "$srcdir/gnash-$pkgver" + + # Consolidated gentoo patches for ffmpeg compatibility + # as of 2011-10-31 + patch -Np1 -i "$srcdir/gentoo-ffmpeg-0.8.patch" + + # Patch for compatibility with newer xulrunner headers + patch -Np1 -i "$srcdir/xul8.patch" + + # Disable very, very verbose debugging (gigabytes of logs) + patch -Np1 -i "$srcdir/nodebug.patch" + + ./autogen.sh + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-plugins-install=system \ + --with-npapi-plugindir=/usr/lib/mozilla/plugins \ + --enable-gui=sdl,gtk \ + --enable-renderer=agg \ + --enable-media=gst,ffmpeg \ + --enable-hwaccel=vaapi + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package_gnash-common() { + pkgdesc="A GNU Flash movie player" + depends=(curl giflib libldap sdl agg libjpeg libpng libtool + speex fontconfig libva ffmpeg libxinerama + gstreamer0.10-base gstreamer0.10-ffmpeg + boost-libs) + backup=(etc/gnashrc) + + cd "$srcdir/gnash-$pkgver" + + make DESTDIR="$pkgdir" install + + # Split gnash-gtk + mkdir -p "$srcdir"/gtk/{bin,man1,share} + mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} "$srcdir/gtk/bin/" + mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 "$srcdir/gtk/man1/" + mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/share/" + mv "$pkgdir/etc/gnashpluginrc" "$srcdir/gtk/" +} + +package_gnash-gtk() { + pkgdesc="A GNU Flash movie player" + depends=("gnash-common=$pkgver" + gtk2 libldap hicolor-icon-theme desktop-file-utils) + install=gnash-gtk.install + backup=(etc/gnashpluginrc) + + cd "$srcdir/gnash-$pkgver" + + make DESTDIR="$pkgdir" install-plugin + + install -d "$pkgdir"/{etc,usr/{bin,share/man/man1}} + mv "$srcdir"/gtk/bin/* "$pkgdir/usr/bin/" + mv "$srcdir"/gtk/man1/* "$pkgdir/usr/share/man/man1/" + mv "$srcdir"/gtk/share/* "$pkgdir/usr/share/" + mv "$srcdir/gtk/gnashpluginrc" "$pkgdir/etc/" +} diff --git a/community-staging/gnash/gentoo-ffmpeg-0.8.patch b/community-staging/gnash/gentoo-ffmpeg-0.8.patch new file mode 100644 index 000000000..d74bcc8e0 --- /dev/null +++ b/community-staging/gnash/gentoo-ffmpeg-0.8.patch @@ -0,0 +1,204 @@ +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-10-31 17:25:56.057379760 +0100 +@@ -29,7 +29,7 @@ + + //#define GNASH_DEBUG_AUDIO_DECODING + +-#define AVCODEC_DECODE_AUDIO avcodec_decode_audio2 ++#define AVCODEC_DECODE_AUDIO avcodec_decode_audio3 + + namespace gnash { + namespace media { +@@ -549,8 +549,12 @@ + #endif + + // older ffmpeg versions didn't accept a const input.. ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = (uint8_t*) input; ++ pkt.size = inputSize; + int tmp = AVCODEC_DECODE_AUDIO(_audioCodecCtx, outPtr, &outSize, +- input, inputSize); ++ &pkt); + + #ifdef GNASH_DEBUG_AUDIO_DECODING + log_debug(" avcodec_decode_audio[2](ctx, bufptr, %d, input, %d) " +@@ -658,13 +662,13 @@ + { + if ( _needsParsing ) + { +- return av_parser_parse(_parser, _audioCodecCtx, ++ return av_parser_parse2(_parser, _audioCodecCtx, + // as of 2008-10-28 SVN, ffmpeg doesn't + // accept a pointer to pointer to const.. + const_cast<boost::uint8_t**>(outFrame), + outFrameSize, + input, inputSize, +- 0, 0); // pts & dts ++ 0, 0, AV_NOPTS_VALUE); // pts & dts + } + else + { +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-10-31 17:25:51.210668136 +0100 +@@ -46,8 +46,10 @@ + { + if ( (ctx->sample_rate != 44100) || (ctx->channels != 2) ) { + if ( ! _context ) { +- _context = audio_resample_init( +- 2, ctx->channels, 44100, ctx->sample_rate ++ _context = av_audio_resample_init( ++ 2, ctx->channels, 44100, ctx->sample_rate, ++ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, ++ 16, 10, 0, 0.8 + ); + } + +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-10-31 17:25:57.720728522 +0100 +@@ -387,7 +387,7 @@ + + log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d", + _inputFmt->name, _formatCtx->nb_streams); +- ++ /* + if ( _formatCtx->title[0] ) + log_debug(_(" Title:'%s'"), _formatCtx->title); + if ( _formatCtx->author[0] ) +@@ -398,7 +398,7 @@ + log_debug(_(" Comment:'%s'"), _formatCtx->comment); + if ( _formatCtx->album[0] ) + log_debug(_(" Album:'%s'"), _formatCtx->album); +- ++ */ + // Find first audio and video stream + for (unsigned int i = 0; i < static_cast<unsigned int>(_formatCtx->nb_streams); i++) + { +@@ -415,7 +415,7 @@ + } + + switch (enc->codec_type) { +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + if (_audioStreamIndex < 0) { + _audioStreamIndex = i; + _audioStream = _formatCtx->streams[i]; +@@ -425,7 +425,7 @@ + } + break; + +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + if (_videoStreamIndex < 0) { + _videoStreamIndex = i; + _videoStream = _formatCtx->streams[i]; +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-10-31 17:25:54.590699488 +0100 +@@ -356,8 +356,12 @@ + + int bytes = 0; + // no idea why avcodec_decode_video wants a non-const input... +- avcodec_decode_video(_videoCodecCtx->getContext(), frame, &bytes, +- input, input_size); ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = (uint8_t*) input; ++ pkt.size = input_size; ++ avcodec_decode_video2(_videoCodecCtx->getContext(), frame, &bytes, ++ &pkt); + + if (!bytes) { + log_error("Decoding of a video frame failed"); +diff -u -Nr gnash-0.8.9/macros/ffmpeg.m4 gnash-0.8.9-ff/macros/ffmpeg.m4 +--- gnash-0.8.9/macros/ffmpeg.m4 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/macros/ffmpeg.m4 2011-10-31 17:25:49.700654130 +0100 +@@ -22,6 +22,7 @@ + backupLIBS="$LIBS" + backupCFLAGS="$CFLAGS" + avcodec_h="" ++ avcodec_version_h="" + ffmpeg_top_incl="" + + dnl If the user specify an path to include headers from, we assume it's the full +@@ -46,6 +47,9 @@ + else + AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the avcodec.h header]) + fi ++ if test -f ${with_ffmpeg_incl}/version.h; then ++ avcodec_version_h=${with_ffmpeg_incl}/version.h ++ fi + fi + ]) + +@@ -66,6 +70,9 @@ + if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then + ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`" + avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h" ++ if test -f ${ffmpeg_top_incl}/${i}/version.h; then ++ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h ++ fi + break + fi + done +@@ -83,6 +90,9 @@ + if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then + ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}/${i}; pwd)`" + avcodec_h=${ffmpeg_top_incl}/${i}/avcodec.h ++ if test -f ${ffmpeg_top_incl}/${i}/version.h; then ++ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h ++ fi + break + fi + done +@@ -182,14 +192,24 @@ + dnl a modified form of grepping may be better, making sure all old kinds of + dnl version numbering fail gracefully. + ++ versionfile="" ++ + dnl Check avcodec version number, if it was found +- if test x"${avcodec_h}" != x; then ++ if test x"${avcodec_version_h}" != x; then ++ versionfile=${avcodec_version_h} ++ else ++ if test x"${avcodec_h}" != x; then ++ versionfile=${avcodec_h} ++ fi ++ fi ++ ++ if test x"${versionfile}" != x; then + + AC_MSG_CHECKING([ffmpeg version]) + +- ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` +- ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` +- ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${versionfile} | sed -e "s%[[^0-9]]%%g"` + + if test x"${ffmpeg_major_version}" != x ; then + +@@ -198,15 +218,15 @@ + else + + dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1 +- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%,%.%g"` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"` + + if test x"${ffmpeg_version}" = x ; then + + dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix +- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` + + if test x"${ffmpeg_version}" = x ; then +- ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk '{print $'3'}'` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | awk '{print $'3'}'` + fi + fi + diff --git a/community-staging/gnash/gnash-gtk.install b/community-staging/gnash/gnash-gtk.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/community-staging/gnash/gnash-gtk.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/gnash/nodebug.patch b/community-staging/gnash/nodebug.patch new file mode 100644 index 000000000..ca160b898 --- /dev/null +++ b/community-staging/gnash/nodebug.patch @@ -0,0 +1,48 @@ +diff -u -r gnash-0.8.9/libbase/log.h gnash-0.8.9-nodebug/libbase/log.h +--- gnash-0.8.9/libbase/log.h 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-nodebug/libbase/log.h 2012-01-18 09:39:02.004103494 +0100 +@@ -331,27 +331,27 @@ + + // Define to 0 to completely remove parse debugging at compile-time + #ifndef VERBOSE_PARSE +-#define VERBOSE_PARSE 1 ++#define VERBOSE_PARSE 0 + #endif + + // Define to 0 to completely remove action debugging at compile-time + #ifndef VERBOSE_ACTION +-#define VERBOSE_ACTION 1 ++#define VERBOSE_ACTION 0 + #endif + + // Define to 0 to remove ActionScript errors verbosity at compile-time + #ifndef VERBOSE_ASCODING_ERRORS +-#define VERBOSE_ASCODING_ERRORS 1 ++#define VERBOSE_ASCODING_ERRORS 0 + #endif + + // Define to 0 this to remove invalid SWF verbosity at compile-time + #ifndef VERBOSE_MALFORMED_SWF +-#define VERBOSE_MALFORMED_SWF 1 ++#define VERBOSE_MALFORMED_SWF 0 + #endif + + // Define to 0 this to remove Networking verbosity at compile-time + #ifndef VERBOSE_NETWORKING +-#define VERBOSE_NETWORKING 1 ++#define VERBOSE_NETWORKING 0 + #endif + + #if VERBOSE_PARSE +diff -u -r gnash-0.8.9/libcore/vm/ActionExec.cpp gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp +--- gnash-0.8.9/libcore/vm/ActionExec.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp 2012-01-18 09:40:25.653458508 +0100 +@@ -46,7 +46,7 @@ + // too much information for my tastes. I really want just + // to see how stack changes while executing actions... + // --strk Fri Jun 30 02:28:46 CEST 2006 +-# define DEBUG_STACK 1 ++//# define DEBUG_STACK 1 + + // Max number of stack item to dump. 0 for unlimited. + # define STACK_DUMP_LIMIT 32 diff --git a/community-staging/gnash/xul8.patch b/community-staging/gnash/xul8.patch new file mode 100644 index 000000000..7bd708b2d --- /dev/null +++ b/community-staging/gnash/xul8.patch @@ -0,0 +1,44 @@ +diff -u -r gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp +--- gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-11-18 16:25:55.198007371 +0100 +@@ -238,7 +238,7 @@ + return NS_PluginInitialize(); + } + +-char * ++const char * + NP_GetMIMEDescription(void) + { + return NPP_GetMIMEDescription(); +diff -u -r gnash-0.8.9/plugin/npapi/plugin.cpp gnash-0.8.9-xul/plugin/npapi/plugin.cpp +--- gnash-0.8.9/plugin/npapi/plugin.cpp 2011-03-18 14:44:30.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/plugin.cpp 2011-11-18 16:35:42.496794816 +0100 +@@ -128,10 +128,10 @@ + } + + /// \brief Return the MIME Type description for this plugin. +-char* ++const char* + NPP_GetMIMEDescription(void) + { +- return const_cast<char *>(MIME_TYPES_DESCRIPTION); ++ return MIME_TYPES_DESCRIPTION; + } + + static bool waitforgdb = false; +diff -u -r gnash-0.8.9/plugin/npapi/test.cpp gnash-0.8.9-xul/plugin/npapi/test.cpp +--- gnash-0.8.9/plugin/npapi/test.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/test.cpp 2011-11-18 16:37:06.997539299 +0100 +@@ -408,10 +408,10 @@ + { + } + +-char* ++const char* + NPP_GetMIMEDescription(void) + { +- char *x = 0; ++ const char *x = 0; + return x; + } + diff --git a/community-staging/netsurf/PKGBUILD b/community-staging/netsurf/PKGBUILD new file mode 100644 index 000000000..b43fdcdfb --- /dev/null +++ b/community-staging/netsurf/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 62700 2012-01-24 21:17:57Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Paulo Matias <matiasΘarchlinux-br·org> +# Contributor: Georgij Kondratjev <smpuj@bk.ru> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +pkgname=netsurf +pkgver=2.8 +pkgrel=3 +pkgdesc="Lightweight and fast web browser" +arch=('x86_64' 'i686') +url="http://www.netsurf-browser.org/" +license=('GPL') +depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub') +makedepends=('re2c' 'lcms') +provides=('netsurf') +conflicts=('netsurf') +install=netsurf.install +source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" + "http://www.netsurf-browser.org/downloads/releases/$pkgname-$pkgver-src.tar.gz" + "$pkgname.desktop") +md5sums=('4f28912e5df4b826b819e175265bcc9c' + '49c41f281f3e9ca28a24da505fad2e3a' + '85e0af265e77607596fd90db9ac707ad') + +build() { + cd "$srcdir/$pkgname" + + sed 's:libpng:libpng15:' -i gtk/Makefile.target + sed 's:libpng:libpng15:' -i monkey/Makefile.target + make PREFIX=/usr TARGET=gtk +} + +package() { + cd "$srcdir/$pkgname" + + make install PREFIX=/usr DESTDIR="$pkgdir" + install -Dm644 "../$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "../$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/netsurf/PKGBUILD.wip b/community-staging/netsurf/PKGBUILD.wip new file mode 100644 index 000000000..592ca0268 --- /dev/null +++ b/community-staging/netsurf/PKGBUILD.wip @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 62434 2012-01-20 02:23:51Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Paulo Matias <matiasΘarchlinux-br·org> +# Contributor: Georgij Kondratjev <smpuj@bk.ru> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +pkgname=netsurf +pkgver=2.8 +pkgrel=3 +pkgdesc="Lightweight and fast web browser" +arch=('x86_64' 'i686') +url="http://www.netsurf-browser.org/" +license=('GPL') +depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub' 'libpng') +makedepends=('re2c' 'lcms' 'setconf') +provides=('netsurf') +conflicts=('netsurf') +install=netsurf.install +source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" + "http://www.netsurf-browser.org/downloads/releases/$pkgname-$pkgver-src.tar.gz" + "$pkgname.desktop") +md5sums=('4f28912e5df4b826b819e175265bcc9c' + '49c41f281f3e9ca28a24da505fad2e3a' + '85e0af265e77607596fd90db9ac707ad') + +build() { + cd "$srcdir/$pkgname" + + #sed 's:libpng:libpng15:' -i gtk/Makefile.target + #setconf Makefile.defaults NETSURF_USE_PNG NO + #setconf Makefile.defaults NETSURF_USE_RSVG NO + #setconf Makefile.defaults NETSURF_USE_MNG NO + #setconf Makefile.defaults NETSURF_USE_BMP NO + #setconf Makefile.defaults NETSURF_USE_GIF NO + #setconf Makefile.defaults NETSURF_USE_JPEG NO + + #setconf gtk/Makefile.target NETSURF_FEATURE_RSVG_CFLAGS "-DWITH_RSVG -pthread -lrsvg-2 -lgio-2.0 -lgdk_pixbuf-2.0 -lcairo -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -pthread -I/usr/include/librsvg-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/cairo -I/usr/include/libpng -I/usr/include/pixman-1 -I/usr/include/freetype2" + #sed 's:$(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG)):#:' -i gtk/Makefile.target + + setconf Makefile.defaults CFLAGS "-lm" + + #sed 's:$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS):echo $(LDFLAGS)\n\t$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS):' -i Makefile + + #LDFLAGS="-lm" make PREFIX=/usr TARGET=gtk + LDFLAGS="-lm" make PREFIX=/usr TARGET=gtk +} + +package() { + cd "$srcdir/$pkgname" + + make install PREFIX=/usr DESTDIR="$pkgdir" + install -Dm644 "../$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "../$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/netsurf/netsurf.desktop b/community-staging/netsurf/netsurf.desktop new file mode 100644 index 000000000..aca4deefc --- /dev/null +++ b/community-staging/netsurf/netsurf.desktop @@ -0,0 +1,127 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Netsurf +Name[ar]=صافي تصفح +Name[ast]=Netsurf +Name[ca]=Netsurf +Name[cs]=Netsurf +Name[da]=Netsurf +Name[de]=Netsurf +Name[el]=καθαρού σερφ +Name[en_GB]=Netsurf +Name[es]=Netsurf +Name[et]=Netsurf +Name[fi]=Netsurf +Name[fr]=Netsurf +Name[gl]=Netsurf +Name[he]=Netsurf +Name[hr]=Netsurf +Name[hu]=Netsurf +Name[id]=Netsurf +Name[it]=Netsurf +Name[ja]=Netsurf +Name[ko]=인터넷 서핑 +Name[lt]=Netsurf +Name[nl]=Netsurf +Name[no]=Netsurf +Name[pl]=Netsurf +Name[pt]=Netsurf +Name[pt_BR]=Netsurf +Name[ro]=Netsurf +Name[ru]=Netsurf +Name[sk]=Netsurf +Name[sr]=нетсурф +Name[sr@latin]=Netsurf +Name[sv]=Netsurf +Name[tr]=Netsurf +Name[ug]=Netsurf +Name[uk]=Інтернет серфінгу +Name[zh_CN]=Netsurf 网冲浪 +Name[zh_TW]=Netsurf 網衝浪 +GenericName=Web Browser +GenericName[ar]=متصفح الوب +GenericName[ast]=Restolador +GenericName[ca]=Navegador web +GenericName[cs]=Internetový prohlížeč +GenericName[da]=Webbrowser +GenericName[de]=Internetbetrachter +GenericName[el]=Περιηγητής Ιστού +GenericName[en_GB]=Web Browser +GenericName[es]=Navegador web +GenericName[et]=Veebibrauser +GenericName[fi]=Verkkoselain +GenericName[fr]=Navigateur Internet +GenericName[gl]=Navegador web +GenericName[he]=דפדפן +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[id]=Peramban Web +GenericName[it]=Browser web +GenericName[ja]=ウェブブラウザ +GenericName[ko]=웹 브라우저 +GenericName[lt]=Interneto naršyklė +GenericName[nl]=Webbrowser +GenericName[no]=Nettleser +GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ +GenericName[pl]=Przeglądarka internetowa +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador web +GenericName[ro]=Navigator web +GenericName[ru]=Интернет-обозреватель +GenericName[sk]=Internetový prehliadač +GenericName[sr]=Интернет прегледник +GenericName[sr@latin]=Internet preglednik +GenericName[sv]=Webbläsare +GenericName[tr]=Web Tarayıcı +GenericName[ug]=توركۆرگۈ +GenericName[uk]=Переглядач Веб +GenericName[zh_CN]=网页浏览器 +GenericName[zh_TW]=網頁瀏覽器 +Comment=Lightweight web browser +Comment[ar]=منصفح الوب الخفيف +Comment[ast]=Restolador llixeru +Comment[ca]=Navegador web lleuger +Comment[cs]=Odlehčený prohlížeč +Comment[da]=Letvægtig webbrowser +Comment[de]=Schlanker Internetbetrachter +Comment[el]=Ελαφρύς περιηγητής ιστού +Comment[en_GB]=Lightweight web browser +Comment[es]=Navegador web ligero +Comment[et]=Kergekaaluline veebibrauser +Comment[fi]=Kevyt verkkoselain +Comment[fr]=Navigateur Internet léger +Comment[gl]=Navegador web lixeiro +Comment[he]=דפדפן קל משקל +Comment[hr]=Lagani web preglednik +Comment[hu]=Könnyűsúlyú webböngésző +Comment[id]=Peramban web ringan +Comment[it]=Browser web leggero +Comment[ja]=軽量級ウェブブラウザ +Comment[ko]=가벼운 웹 브라우저 +Comment[lt]=Paprasta interneto naršyklė +Comment[nl]=Lichtgewicht webbrowser +Comment[no]=Lettvektig nettleser +Comment[pa]=ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ +Comment[pl]=Umożliwia przeglądanie zawartości sieci internetowej +Comment[pt]=Navegador Web rápido +Comment[pt_BR]=Navegador web leve +Comment[ro]=Mic navigator web +Comment[ru]=Легковесный Интернет-обозреватель +Comment[sk]=Ľahký internetový prehliadač +Comment[sr]=Једноставан Интернет прегледник +Comment[sr@latin]=Jednostavan Internet preglednik +Comment[sv]=Resurssnål webbläsare +Comment[tr]=Hafif web tarayıcı +Comment[ug]=يېنىك توركۆرگۈ +Comment[uk]=Легкий переглядач Веб +Comment[zh_CN]=轻量级网页浏览器 +Comment[zh_TW]=輕量級網頁瀏覽器 +Categories=GTK;Network;WebBrowser; +MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo; +Exec=netsurf %U +Icon=netsurf +Terminal=false +StartupNotify=true +X-Osso-Type=application/x-executable +X-Osso-Service=netsurf diff --git a/community-staging/netsurf/netsurf.install b/community-staging/netsurf/netsurf.install new file mode 100644 index 000000000..966f361ea --- /dev/null +++ b/community-staging/netsurf/netsurf.install @@ -0,0 +1,15 @@ +post_upgrade() { + echo "Updating icon cache" + gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor + echo "Updating mime entries" + update-desktop-database -q +} +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 704b9ea0c..770d47ef4 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 55877 2011-09-24 16:48:18Z stephane $ +# $Id: PKGBUILD 62687 2012-01-24 14:37:57Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> pkgname=cegui -pkgver=0.7.5 -pkgrel=5 +pkgver=0.7.6 +pkgrel=1 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64') url="http://crayzedsgui.sourceforge.net" @@ -15,7 +15,8 @@ license=("MIT") depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly') makedepends=('python2' 'doxygen') source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) -md5sums=('38c79d1fdfaaa10f481c99a2ac479516') +options=(!libtool) +md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3') build() { cd $srcdir/CEGUI-${pkgver} diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 11fe6c362..7c3836f47 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59260 2011-11-22 06:42:34Z spupykin $ +# $Id: PKGBUILD 62677 2012-01-24 12:51:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,7 +6,7 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.17 +pkgver=0.9.18 pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('d6802049c806e903ef1fa9c5b847e555') +md5sums=('af0f282b92413f414cb6daf2d2f618c7') build() { cd ${pkgname}-${pkgver} diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD index d85d74344..33cb3d7c6 100644 --- a/community/lightspark/PKGBUILD +++ b/community/lightspark/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=lightspark -pkgver=0.5.3 -pkgrel=2 +pkgver=0.5.4 +pkgrel=1 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64') url='http://lightspark.sourceforge.net' @@ -15,12 +15,12 @@ optdepends=('gnash-gtk: fallback support') install="lightspark.install" source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz" 'llvm29.diff') -md5sums=('2d4519c61aabc34cbba97120f5c01d18' +md5sums=('1101e1d1cb1b55b84b9214ef02217ec3' '5f717d1d9ead478184ca68f6ac068099') build() { - cd lightspark-${pkgver} - patch -Np0 -i ${srcdir}/llvm29.diff + #cd lightspark-${pkgver} + #patch -Np0 -i ${srcdir}/llvm29.diff cd ${srcdir} rm -rf build diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 3fbd4d977..6df58d747 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62066 2012-01-15 14:56:57Z svenstaro $ +# $Id: PKGBUILD 62705 2012-01-24 21:51:26Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest -pkgver=3.6.0.2 +pkgver=3.6.0.3 pkgrel=1 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' ' 'libircclient' 'miniupnpc' 'wxgtk') makedepends=('ftjam' 'cmake' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz") -md5sums=('9d840a04b41aef2cba503de7bf433b8d') +md5sums=('e939cbbb85c35e66c67ec2aa6f6b7f0b') build() { cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD index ae678386f..31dae918c 100644 --- a/community/miredo/PKGBUILD +++ b/community/miredo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 59154 2011-11-21 12:39:37Z spupykin $ +# $Id: PKGBUILD 62679 2012-01-24 12:52:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=miredo -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="Teredo client and server." arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.bz2 miredo.install miredo.rc.d miredo-server.rc.d) -md5sums=('6ba484ad5e331514a8a3452da2b144e7' +md5sums=('1281e7e75bddbde244cd778d99fa22d4' '51ab6d091192605ee9206944869cb2ab' 'd1b655d7a851cdb46c91c3418ed1962f' 'c5a9be5c3175fecec387f1710bfd2788' diff --git a/community/portmidi/PKGBUILD b/community/portmidi/PKGBUILD index 255c2e077..a513305dc 100644 --- a/community/portmidi/PKGBUILD +++ b/community/portmidi/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 31348 2010-10-30 15:46:33Z lfleischer $ +# $Id: PKGBUILD 62694 2012-01-24 20:35:44Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Denis Martinez <deuns.martinez AT gmail DOT com> pkgname=portmidi pkgver=217 -pkgrel=2 +pkgrel=3 pkgdesc="Platform independent library for real-time MIDI input/output." arch=('i686' 'x86_64') url='http://portmedia.sourceforge.net/' license=('GPL') depends=('alsa-lib') makedepends=('cmake' 'java-environment') -source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip") -md5sums=('03f46fd3947e2ef4c8c465baaf832241') +source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip" + 'portmidi-217-build-fix.patch') +md5sums=('03f46fd3947e2ef4c8c465baaf832241' + '59cb428b29a33bab3bb5811cda479a9b') build() { cd "${srcdir}/${pkgname}" @@ -21,6 +23,9 @@ build() { sed -i "s#/usr/local#/usr#" */CMakeLists.txt pm_python/setup.py mkdir -p pm_java/Release + # build fix for "pm_java/CMakeLists.txt" (fixes FS#27118) + patch -p1 -i ../portmidi-217-build-fix.patch + cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \ diff --git a/community/portmidi/portmidi-217-build-fix.patch b/community/portmidi/portmidi-217-build-fix.patch new file mode 100644 index 000000000..3e2dfef29 --- /dev/null +++ b/community/portmidi/portmidi-217-build-fix.patch @@ -0,0 +1,29 @@ +diff -rup portmidi.orig/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt +--- portmidi.orig/pm_java/CMakeLists.txt 2009-11-04 16:20:44.000000000 +0100 ++++ portmidi/pm_java/CMakeLists.txt 2012-01-24 21:13:08.513182169 +0100 +@@ -15,13 +15,11 @@ if(UNIX) + add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class + COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java + MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java +- DEPENDS pmdefaults/PmDefaults.java +- WORKING_DIRECTORY pm_java) ++ DEPENDS pmdefaults/PmDefaults.java) + add_custom_command(OUTPUT pmdefaults/PmDefaults.class + COMMAND javac -classpath . pmdefaults/PmDefaults.java + MAIN_DEPENDENCY pmdefaults/PmDefaults.java +- DEPENDS pmdefaults/PmDefaultsFrame.java +- WORKING_DIRECTORY pm_java) ++ DEPENDS pmdefaults/PmDefaultsFrame.java) + add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar + COMMAND cp pmdefaults/portmusic_logo.png . + COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar +@@ -31,8 +29,7 @@ if(UNIX) + COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} + COMMAND rm portmusic_logo.png + MAIN_DEPENDENCY pmdefaults/PmDefaults.class +- DEPENDS ${PMDEFAULTS_ALL_CLASSES} +- WORKING_DIRECTORY pm_java) ++ DEPENDS ${PMDEFAULTS_ALL_CLASSES}) + add_custom_target(pmdefaults_target ALL + DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) + # message(STATUS "add_custom_target: pmdefaults.jar") diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 272fa4291..c3d982595 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61097 2011-12-21 20:52:48Z andrea $ +# $Id: PKGBUILD 62685 2012-01-24 13:11:44Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil -pkgver=0.4.2 -pkgrel=3 +pkgver=0.5.0 +pkgrel=1 pkgdesc="A WYSIWYG ebook editor" arch=('i686' 'x86_64') url="http://code.google.com/p/sigil/" @@ -14,7 +14,7 @@ makedepends=('cmake') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip" "${pkgname}.desktop") -md5sums=('ce27976254236f8b11b787fd05be9acb' +md5sums=('8deb8ae451d485698ab9330dccfe46e5' 'fef6aa492af487ccccd6b133635cee5a') build() { @@ -28,7 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON .. - make + make } package() { diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD index c2c1efe37..560d82af7 100644 --- a/community/tmux/PKGBUILD +++ b/community/tmux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51497 2011-07-10 19:49:12Z spupykin $ +# $Id: PKGBUILD 62681 2012-01-24 12:53:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> pkgname=tmux -pkgver=1.5 +pkgver=1.6 pkgrel=1 pkgdesc="A terminal multiplexer" url="http://tmux.sourceforge.net/" @@ -13,7 +13,7 @@ license=('BSD') depends=('ncurses' 'libevent') source=(http://downloads.sourceforge.net/tmux/tmux-$pkgver.tar.gz LICENSE) -md5sums=('3d4b683572af34e83bc8b183a8285263' +md5sums=('3e37db24aa596bf108a0442a81c845b3' '71601bc37fa44e4395580b321963018e') build() { diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 97712e104..773c4e06e 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144041 2011-12-02 20:54:07Z ibiru $ +# $Id: PKGBUILD 147227 2012-01-24 20:32:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi -pkgver=1.6.2 -pkgrel=2 +pkgver=1.7.0 +pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64') url='http://pim.kde.org/akonadi' @@ -13,7 +13,7 @@ depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('07e2aa2e6953ac518f9306911747e264') +md5sums=('804309dca70ede35b4a654ab764e9079') build() { cd "${srcdir}" diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD index dcde4e180..bcd412b82 100644 --- a/extra/python-egenix-mx-base/PKGBUILD +++ b/extra/python-egenix-mx-base/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 140254 2011-10-11 00:44:55Z stephane $ +# $Id: PKGBUILD 147244 2012-01-25 02:07:03Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=python-egenix-mx-base _origname=egenix-mx-base -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="A collection of Python tools" arch=('i686' 'x86_64') license=('custom') url="http://www.egenix.com/products/python/mxBase/" depends=('python2') -makedepends=('python2-distribute') replaces=('egenix-mx-base') provides=('egenix-mx-base') source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz") -sha1sums=('a82f7f155ea92f26f40a6a3bf9160bfac7c52a00') +sha1sums=('9faaf608a29b80d9a8daf16b8b3578e896b6395b') build() { cd "${srcdir}/${_origname}-${pkgver}" diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD index 8bd7c546b..b72402f4a 100644 --- a/extra/qwtplot3d/PKGBUILD +++ b/extra/qwtplot3d/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 131790 2011-07-15 09:16:14Z ronald $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 147208 2012-01-24 18:38:05Z ronald $ +# Maintainer: Ronald van Haren <ronald@archlinux.org> +# Contributor: damir <damir@archlinux.org> pkgname=qwtplot3d pkgver=0.2.7 -pkgrel=3 +pkgrel=4 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets" arch=("i686" "x86_64") license=('custom:zlib') url="http://qwtplot3d.sourceforge.net/" depends=('qt' 'qwt' 'mesa') source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz" - qwtplot3d-gcc44.patch) -sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' '52fa169b651a98550f8a8391ddf52e0eaeb2c215') + qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch) +sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' + '52fa169b651a98550f8a8391ddf52e0eaeb2c215' + '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005') build() { cd ${srcdir}/${pkgname} patch -p1 < ../qwtplot3d-gcc44.patch + patch -p1 < ../qwtplot3d-qt-4.8.0.patch # build qwt: qmake qwtplot3d.pro diff --git a/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch b/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch new file mode 100644 index 000000000..ae10f48f0 --- /dev/null +++ b/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch @@ -0,0 +1,34 @@ +diff -urbN qwtplot3d/include/qwt3d_io_gl2ps.h qwtplot3d.patched/include/qwt3d_io_gl2ps.h +--- qwtplot3d/include/qwt3d_io_gl2ps.h 2005-07-10 16:54:52.000000000 +0300 ++++ qwtplot3d.patched/include/qwt3d_io_gl2ps.h 2012-01-21 22:15:20.000000000 +0200 +@@ -2,12 +2,7 @@ + #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
+
+ #include <time.h>
+-
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
+
+ #include "qwt3d_types.h"
+ #include "qwt3d_io.h"
+diff -urbN qwtplot3d/include/qwt3d_openglhelper.h qwtplot3d.patched/include/qwt3d_openglhelper.h +--- qwtplot3d/include/qwt3d_openglhelper.h 2005-07-19 17:40:28.000000000 +0300 ++++ qwtplot3d.patched/include/qwt3d_openglhelper.h 2012-01-21 22:29:56.000000000 +0200 +@@ -2,11 +2,8 @@ + #define __openglhelper_2003_06_06_15_49__
+
+ #include "qglobal.h"
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
++#include <GL/glu.h>
+
+ namespace Qwt3D
+ {
diff --git a/extra/time/PKGBUILD b/extra/time/PKGBUILD index 8b1a81e6e..3bd8b4197 100644 --- a/extra/time/PKGBUILD +++ b/extra/time/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 131069 2011-07-10 01:00:33Z stephane $ +# $Id: PKGBUILD 147242 2012-01-25 01:42:55Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.us> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: damir <damir@archlinux.org> pkgname=time pkgver=1.7 -pkgrel=5 +pkgrel=6 pkgdesc="Utility for monitoring a program's use of system resources" arch=('i686' 'x86_64') url="http://www.gnu.org/directory/time.html" diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 68fe8b673..fe0e79220 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -9,6 +9,7 @@ license=('GPL3') groups=('base') install=${pkgname}.install source=(https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt) +md5sums=('3f67515fda1c9b4e4d1a988d3c03bb9a') build() { cd ${srcdir} @@ -23,4 +24,3 @@ package() { sort -u )) } -md5sums=('980d8ab2f9886d648a700a7a909488d9') diff --git a/multilib-staging/lib32-libcanberra/PKGBUILD b/multilib-staging/lib32-libcanberra/PKGBUILD new file mode 100644 index 000000000..eecaeabfb --- /dev/null +++ b/multilib-staging/lib32-libcanberra/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 62699 2012-01-24 21:00:53Z heftig $ +# Maintainer: Florian Pritz <flo@xssn.at> +# Contributor: Jan de Groot <jgc@archlinux.org> + +_pkgbasename=libcanberra +pkgbase=lib32-$_pkgbasename +pkgname=(lib32-libcanberra lib32-libcanberra-pulse) +pkgver=0.28 +pkgrel=2 +pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification (32-bit)" +arch=(x86_64) +license=('LGPL') +depends=('lib32-libvorbis' 'lib32-libtool' 'lib32-gtk2' 'lib32-alsa-lib' 'lib32-tdb' + $_pkgbasename) +makedepends=('gtk-doc' lib32-libpulse gcc-multilib libtool-multilib) +options=(!emptydirs) +url=http://0pointer.de/lennart/projects/libcanberra +source=("$url/$_pkgbasename-$pkgver.tar.gz") +md5sums=('c198b4811598c4c161ff505e4531b02c') + +build() { + cd "$srcdir/$_pkgbasename-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ + --disable-static --with-builtin=dso --enable-null --disable-oss \ + --enable-alsa --disable-gstreamer --enable-pulse --disable-udev \ + --libdir=/usr/lib32 + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package_lib32-libcanberra() { + optdepends=("$pkgbase-pulse: PulseAudio driver") + + cd "$srcdir/$_pkgbasename-$pkgver" + + make -j1 DESTDIR="${pkgdir}" install + rm -f "${pkgdir}/usr/lib32/libcanberra-gtk.la" + rm -f "${pkgdir}/usr/lib32/gtk-2.0/modules/"*.la + + + # Split libcanberra-pulse + mkdir pulse-plugin + mv "${pkgdir}"/usr/lib32/${_pkgbasename}-${pkgver}/${_pkgbasename}-pulse.* pulse-plugin + + rm -rf "${pkgdir}"/{etc,usr/{include,share,bin,lib32/gnome-settings-daemon-3.0}} +} + +package_lib32-libcanberra-pulse() { + pkgdesc="PulseAudio plugin for libcanberra (32-bit)" + depends=("$pkgbase=$pkgver-$pkgrel" 'lib32-libpulse') + + cd "$srcdir/$_pkgbasename-$pkgver" + + mkdir -p "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}" + mv pulse-plugin/* "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}" +} diff --git a/multilib/lib32-sdl/PKGBUILD b/multilib/lib32-sdl/PKGBUILD index 51eda45e5..a4520d40f 100644 --- a/multilib/lib32-sdl/PKGBUILD +++ b/multilib/lib32-sdl/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 33692 2010-11-27 16:54:21Z heftig $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 62690 2012-01-24 18:20:52Z bluewind $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> _pkgbasename=sdl pkgname=lib32-$_pkgbasename -pkgver=1.2.14 -pkgrel=8 +pkgver=1.2.15 +pkgrel=1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit)" arch=('x86_64') url="http://www.libsdl.org" @@ -14,13 +15,9 @@ depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename) makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib) options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz - sdl-1.2.14-joystick-crash.diff - sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-fix-disappearing-cursor.patch) -md5sums=('e52086d1b508fa0b76c52ee30b55bec4' - '9d8890b3817736a5d365f7497f096634' - '04d8c179f125e04bcd4c9d60e013c2d7' - 'a6cf3e71b653aa97d0d8ae6c0a789807') + sdl-1.2.14-fix-mouse-clicking.patch) +md5sums=('9d96df8417572a2afb781a7c4c811a85' + '04d8c179f125e04bcd4c9d60e013c2d7') build() { export CC="gcc -m32" @@ -28,11 +25,9 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" cd ${srcdir}/SDL-${pkgver} - patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch ./configure --prefix=/usr --disable-nasm --enable-alsa \ - --with-x --disable-rpath --libdir=/usr/lib32 + --with-x --disable-rpath --libdir=/usr/lib32 --disable-static make } diff --git a/staging/evince/PKGBUILD b/staging/evince/PKGBUILD new file mode 100644 index 000000000..3920b1772 --- /dev/null +++ b/staging/evince/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 147248 2012-01-25 02:33:36Z eric $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=evince +pkgver=3.2.1 +pkgrel=3 +pkgdesc="Simply a document viewer" +url="http://projects.gnome.org/evince/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') +makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') +optdepends=('texlive-bin: DVI support') +groups=('gnome-extra') +install=evince.install +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/evince \ + --disable-static --enable-nautilus \ + --enable-pdf --enable-tiff \ + --enable-djvu --enable-dvi \ + --enable-t1lib --enable-comics \ + --disable-scrollkeeper --disable-schemas-compile \ + --enable-introspection + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/evince/evince.install b/staging/evince/evince.install new file mode 100644 index 000000000..9643a9ba0 --- /dev/null +++ b/staging/evince/evince.install @@ -0,0 +1,19 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall evince + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/glade-perl/PKGBUILD b/staging/glade-perl/PKGBUILD new file mode 100644 index 000000000..47a027b19 --- /dev/null +++ b/staging/glade-perl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 147196 2012-01-24 05:13:43Z eric $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=glade-perl +_realname=Gtk2-GladeXML +pkgver=1.007 +pkgrel=5 +pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x" +arch=(i686 x86_64) +license=('LGPL') +url="http://gtk2-perl.sourceforge.net/" +makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') +depends=('libglade' 'gtk2-perl' 'perl') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) +md5sums=('e6ca234e2a9f0221263acd2a593c583b') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/gnome-desktop2/PKGBUILD b/staging/gnome-desktop2/PKGBUILD new file mode 100644 index 000000000..130dbeaff --- /dev/null +++ b/staging/gnome-desktop2/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 147230 2012-01-24 20:46:21Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jan@archlinux.org> + +_pkgname=gnome-desktop +pkgname=${_pkgname}2 +pkgver=2.32.1 +pkgrel=2 +pkgdesc="Library with common API for various GNOME modules (legacy version)" +arch=(i686 x86_64) +license=(GPL LGPL) +depends=(gconf gtk2 startup-notification) +makedepends=(gnome-doc-utils intltool) +url="http://www.gnome.org" +options=(!libtool !emptydirs) +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2) +sha256sums=('55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --with-gnome-distributor="Archlinux" \ + --disable-scrollkeeper \ + --disable-gnome-about --disable-desktop-docs + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/staging/gnome-python/PKGBUILD b/staging/gnome-python/PKGBUILD new file mode 100644 index 000000000..7e6fce33b --- /dev/null +++ b/staging/gnome-python/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 147212 2012-01-24 19:17:06Z eric $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Sarah Hay <sarah@archlinux.org> + +pkgbase=gnome-python +pkgname=('gnome-python' 'python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs') +pkgver=2.28.1 +pkgrel=8 +arch=(i686 x86_64) +license=('LGPL') +makedepends=('pygtk' 'pyorbit' 'libgnomeui') +options=('!libtool') +url="http://www.pygtk.org/" +source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python/2.28/gnome-python-${pkgver}.tar.bz2) +sha256sums=('759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8') + +build() { + cd "${srcdir}/gnome-python-${pkgver}" + PYTHON=python2 ./configure --prefix=/usr + make +} + +package_gnome-python() { + pkgdesc="PyGNOME Python extension module" + depends=('python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs') + + cd "${srcdir}/gnome-python-${pkgver}" + make install-pkgconfigDATA DESTDIR="${pkgdir}" +} + +package_python2-bonobo(){ + pkgdesc="Python bindings for interacting with Bonobo" + depends=('pygtk' 'libbonoboui' 'pyorbit' 'python2-gnomecanvas') + + cd "${srcdir}/gnome-python-${pkgver}" + make -C bonobo install DESTDIR="${pkgdir}" +} + +package_python2-gconf(){ + pkgdesc="Python bindings for interacting with GConf" + depends=('pygtk' 'gconf') + + cd "${srcdir}/gnome-python-${pkgver}" + make -C gconf install DESTDIR="${pkgdir}" +} + +package_python2-libgnome() { + pkgdesc="Python bindings for libgnome" + depends=('pygtk' 'libgnomeui' 'python2-gnomevfs' 'python2-gnomecanvas' 'python2-bonobo') + + cd "${srcdir}/gnome-python-${pkgver}" + make -C gnome install DESTDIR="${pkgdir}" +} + +package_python2-gnomecanvas() { + pkgdesc="Python bindings for the GNOME Canvas" + depends=('pygtk' 'libgnomecanvas') + + cd "${srcdir}/gnome-python-${pkgver}" + make -C gnomecanvas install DESTDIR="${pkgdir}" +} + +package_python2-gnomevfs() { + pkgdesc="Python bindings for interacting with gnome-vfs" + depends=('python2' 'libbonobo' 'gnome-vfs') + + cd "${srcdir}/gnome-python-${pkgver}" + make -C gnomevfs install DESTDIR="${pkgdir}" +} diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD new file mode 100644 index 000000000..b2adc74f2 --- /dev/null +++ b/staging/inkscape/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 147200 2012-01-24 06:18:56Z bisson $ +# Contributor: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=inkscape +pkgver=0.48.2 +pkgrel=6 +pkgdesc='Vector graphics editor using the SVG file format' +url='http://inkscape.sourceforge.net/' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +makedepends=('boost' 'pkg-config' 'intltool') +depends=('gc' 'gtkmm' 'poppler-glib' 'libxslt' 'gsl' 'popt' 'python2' + 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme') +optdepends=('pstoedit: latex formulas' + 'texlive-core: latex formulas' + 'python2-numpy: some extensions' + 'python-lxml: some extensions and filters' + 'pyxml: some extensions' + 'uniconvertor: reading/writing to some proprietary formats') +options=('!libtool') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'libpng15.patch') +sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3' + 'd6512f3cb38ca8e2436dc485aa652490d17b3a52') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py + sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py + sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp + sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py + sed -i 's|"python"|"python2"|g' src/main.cpp + + patch -p1 -i ../libpng15.patch + + ./configure --prefix=/usr \ + --with-python \ + --with-perl \ + --without-gnome-vfs \ + --with-xft \ + --enable-lcms \ + --enable-poppler-cairo \ + --disable-dependency-tracking \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/staging/inkscape/install b/staging/inkscape/install new file mode 100644 index 000000000..6e803bf1d --- /dev/null +++ b/staging/inkscape/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 +} + + +post_remove() { + post_install +} diff --git a/staging/inkscape/libpng15.patch b/staging/inkscape/libpng15.patch new file mode 100644 index 000000000..e24913ed6 --- /dev/null +++ b/staging/inkscape/libpng15.patch @@ -0,0 +1,40 @@ +--- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp ++++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp +@@ -1443,7 +1443,7 @@ + return NULL; + } + // Set error handler +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return NULL; + } +--- inkscape-0.48.1/src/helper/png-write.cpp ++++ inkscape-0.48.1-mod//src/helper/png-write.cpp +@@ -165,7 +165,7 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file */ + fclose(fp); + png_destroy_write_struct(&png_ptr, &info_ptr); +--- inkscape-0.48.1/src/sp-image.cpp ++++ inkscape-0.48.1-mod//src/sp-image.cpp +@@ -386,9 +386,13 @@ + + #if defined(PNG_iCCP_SUPPORTED) + { +- char* name = 0; ++ png_charp name = 0; + int compression_type = 0; +- char* profile = 0; ++#if (PNG_LIBPNG_VER < 10500) ++ png_charp profile = 0; ++#else ++ png_bytep profile = 0; ++#endif + png_uint_32 proflen = 0; + if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { + // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); diff --git a/staging/lablgtk2/PKGBUILD b/staging/lablgtk2/PKGBUILD new file mode 100644 index 000000000..64af43ec5 --- /dev/null +++ b/staging/lablgtk2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 147254 2012-01-25 04:37:32Z eric $ +#Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=lablgtk2 +pkgver=2.14.2 +pkgrel=5 +pkgdesc=" An Objective Caml interface to gtk2" +arch=(i686 x86_64) +license=('LGPL') +url="http://lablgtk.forge.ocamlcore.org/" +depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview2') +makedepends=('ocaml') +optdepends=('ocaml: for using the tools') +DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o %o %u') +source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz) +options=(!makeflags) +md5sums=('bad77680a72dab8b915cae99d1ec9b1f') + +build() { + cd "${srcdir}/lablgtk-${pkgver}" + ./configure --prefix=/usr + make world + make opt +} + +package() { + cd "${srcdir}/lablgtk-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/" +} diff --git a/staging/libbonoboui/PKGBUILD b/staging/libbonoboui/PKGBUILD new file mode 100644 index 000000000..e6c53e0ec --- /dev/null +++ b/staging/libbonoboui/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 147198 2012-01-24 05:15:13Z eric $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libbonoboui +pkgver=2.24.5 +pkgrel=2 +pkgdesc="User Interface library for Bonobo" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +depends=('libgnomecanvas' 'libgnome') +makedepends=('intltool' 'pkg-config') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -f "${pkgdir}/usr/share/applications/bonobo-browser.desktop" +} diff --git a/staging/libgnomeui/PKGBUILD b/staging/libgnomeui/PKGBUILD new file mode 100644 index 000000000..1fd98234d --- /dev/null +++ b/staging/libgnomeui/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 147218 2012-01-24 19:35:41Z eric $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libgnomeui +pkgver=2.24.4 +pkgrel=2 +pkgdesc="User Interface library for GNOME" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('libbonoboui>=2.24.3' 'libgnome-keyring>=2.31.92' 'libsm') +makedepends=('intltool' 'pkg-config') +options=('!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('a64dcb5af190ec0bfe2ba647ab09a90e4187336fa417d301abfb736be41283b2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/libgnomeui + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/libgtkhtml/PKGBUILD b/staging/libgtkhtml/PKGBUILD new file mode 100644 index 000000000..15a82f102 --- /dev/null +++ b/staging/libgtkhtml/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 147216 2012-01-24 19:34:31Z eric $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libgtkhtml +pkgver=2.11.1 +pkgrel=4 +pkgdesc="An HTML library for GTK" +arch=(i686 x86_64) +license=('LGPL') +depends=('gtk2>=2.22.1' 'libxml2>=2.7.8') +makedepends=('perlxml') +options=('!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.11/${pkgname}-${pkgver}.tar.bz2) +md5sums=('a1d1a197dcff8c4571659deef5495e24') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/pygtksourceview2/PKGBUILD b/staging/pygtksourceview2/PKGBUILD new file mode 100644 index 000000000..794456360 --- /dev/null +++ b/staging/pygtksourceview2/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 147214 2012-01-24 19:17:55Z eric $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=pygtksourceview2 +pkgver=2.10.1 +pkgrel=4 +pkgdesc="Python bindings for gtksourceview2" +arch=(i686 x86_64) +license=('GPL') +depends=('gtksourceview2>=2.10.0' 'pygtk>=2.17.0') +makedepends=('intltool' 'pkg-config') +options=('!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${pkgver}.tar.bz2) +sha256sums=('b4b47c5aeb67a26141cb03663091dfdf5c15c8a8aae4d69c46a6a943ca4c5974') + +build() { + cd "${srcdir}/pygtksourceview-${pkgver}" + PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static --disable-docs + make +} + +package() { + cd "${srcdir}/pygtksourceview-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/sane/PKGBUILD b/staging/sane/PKGBUILD new file mode 100644 index 000000000..a5ea125be --- /dev/null +++ b/staging/sane/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 147246 2012-01-25 02:31:45Z eric $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: Simo L. <neotuli@yahoo.com> +# Contributor: eric <eric@archlinux.org> + +pkgname=sane +pkgver=1.0.22 +pkgrel=5 +pkgdesc="Scanner Access Now Easy" +url="http://www.sane-project.org/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash') +makedepends=('texlive-latexextra') +install=$pkgname.install +backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) +source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz + 'sane.xinetd' + 'libv4l-0.8.3.patch' + 'xerox_mfp_fix_usb_devices.patch') +md5sums=('fadf56a60f4776bfb24491f66b617cf5' + 'da946cc36fb83612162cf9505986d4b2' + 'e645a8921cff9f18ffbdabb2ed885060' + 'cfef73e7db7c28308914d3db6767d852') +options=(!libtool) + +build() { + cd "${srcdir}/${pkgname}-backends-${pkgver}" + + patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch + # fix https://bugs.archlinux.org/task/26114 + patch -Np1 -i "${srcdir}"/xerox_mfp_fix_usb_devices.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-docdir=/usr/share/doc/sane \ + --enable-avahi \ + --disable-locking + make +} + +package () { + cd "${srcdir}/${pkgname}-backends-${pkgver}" + make DESTDIR="${pkgdir}" install + # fix hp officejets + echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf" + # install udev files + install -D -m0644 tools/udev/libsane.rules \ + "${pkgdir}/lib/udev/rules.d/53-sane.rules" + # fix udev rules + sed -i 's|NAME="%k", ||g' "${pkgdir}/lib/udev/rules.d/53-sane.rules" + + # install xinetd file + install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane" +} diff --git a/staging/sane/libv4l-0.8.3.patch b/staging/sane/libv4l-0.8.3.patch new file mode 100644 index 000000000..4e240e0cf --- /dev/null +++ b/staging/sane/libv4l-0.8.3.patch @@ -0,0 +1,64 @@ +From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen <nils@redhat.com> +Date: Mon, 14 Mar 2011 13:35:05 +0100 +Subject: [PATCH] patch: v4l + +Squashed commit of the following: + +commit 23381932c76846191b42a48e505b37cd74711265 +Author: Julien BLACHE <jb@jblache.org> +Date: Wed Feb 16 19:37:43 2011 +0100 + + Fix v4l build with libv4l 0.8.3+ + + (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953) + + Conflicts: + + ChangeLog + + Signed-off-by: Nils Philippsen <nils@redhat.com> +--- + backend/v4l.c | 3 +-- + backend/v4l.h | 3 ++- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/backend/v4l.c b/backend/v4l.c +index 6510ef0..38595ed 100644 +--- a/backend/v4l.c ++++ b/backend/v4l.c +@@ -84,9 +84,8 @@ + #include "../include/sane/sanei_config.h" + #define V4L_CONFIG_FILE "v4l.conf" + +-#include "v4l.h" +- + #include <libv4l1.h> ++#include "v4l.h" + + static const SANE_Device **devlist = NULL; + static int num_devices; +diff --git a/backend/v4l.h b/backend/v4l.h +index 588b96e..6aee586 100644 +--- a/backend/v4l.h ++++ b/backend/v4l.h +@@ -29,6 +29,7 @@ + #ifndef v4l_h + #define v4l_h + ++#ifndef __LINUX_VIDEODEV_H + /* Kernel interface */ + /* Only the stuff we need. For more features, more defines are needed */ + +@@ -165,7 +166,7 @@ struct video_channel + + + /* end of kernel interface */ +- ++#endif /* !__LINUX_VIDEODEV_H */ + + #include <../include/sane/sane.h> + +-- +1.7.4 + diff --git a/staging/sane/sane.install b/staging/sane/sane.install new file mode 100644 index 000000000..5ec361eea --- /dev/null +++ b/staging/sane/sane.install @@ -0,0 +1,7 @@ +post_install() { + /bin/cat <<THEEND +NOTE +---- +Add your user to group 'scanner' to use scanner devices. +THEEND +} diff --git a/staging/sane/sane.xinetd b/staging/sane/sane.xinetd new file mode 100644 index 000000000..b035664b4 --- /dev/null +++ b/staging/sane/sane.xinetd @@ -0,0 +1,11 @@ +service sane-port +{ + port = 6566 + socket_type = stream + wait = no + user = root + group = scanner + server = /usr/sbin/saned + # disabled by default! + disable = yes + } diff --git a/staging/sane/xerox_mfp_fix_usb_devices.patch b/staging/sane/xerox_mfp_fix_usb_devices.patch new file mode 100644 index 000000000..5ed29b974 --- /dev/null +++ b/staging/sane/xerox_mfp_fix_usb_devices.patch @@ -0,0 +1,67 @@ +commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7 +Author: Alex Belkin <abc@telekom.ru> +Date: Tue Mar 8 17:57:19 2011 +0300 + + keep usb device by default (correct for bug introduced by tcp sub-backend + +diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c +index e08b50f..d4672a7 100644 +--- a/backend/xerox_mfp.c ++++ b/backend/xerox_mfp.c +@@ -37,10 +37,10 @@ + static const SANE_Device **devlist = NULL; /* sane_get_devices array */ + static struct device *devices_head = NULL; /* sane_get_devices list */ + +-transport available_transports[] = { ++enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX }; ++transport available_transports[TRANSPORTS_MAX] = { + { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device }, + { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device }, +- { 0 } + }; + + static int resolv_state(int state) +@@ -824,7 +824,13 @@ free_devices (void) + devices_head = NULL; + } + +-/* SANE API ignores return code of this callback */ ++static transport *tr_from_devname(SANE_String_Const devname) ++{ ++ if (strncmp("tcp", devname, 3) == 0) ++ return &available_transports[TRANSPORT_TCP]; ++ return &available_transports[TRANSPORT_USB]; ++} ++ + static SANE_Status + list_one_device (SANE_String_Const devname) + { +@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname) + return SANE_STATUS_GOOD; + } + +- for (tr = available_transports; tr->ttype; tr++) { +- if (!strncmp (devname, tr->ttype, strlen(tr->ttype))) +- break; +- } +- if (!tr->ttype) +- return SANE_STATUS_INVAL; ++ tr = tr_from_devname(devname); + + dev = calloc (1, sizeof (struct device)); + if (dev == NULL) +@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname) + static SANE_Status + list_conf_devices (UNUSED (SANEI_Config * config), const char *devname) + { +- transport *tr; +- +- for (tr = available_transports; tr->ttype; tr++) { +- if (!strncmp (devname, tr->ttype, strlen(tr->ttype))) +- return tr->configure_device(devname, list_one_device); +- } +- return SANE_STATUS_INVAL; ++ return tr_from_devname(devname)->configure_device(devname, list_one_device); + } + + SANE_Status diff --git a/staging/sdl_image/PKGBUILD b/staging/sdl_image/PKGBUILD new file mode 100644 index 000000000..b42e26880 --- /dev/null +++ b/staging/sdl_image/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 147224 2012-01-24 20:21:56Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=sdl_image +pkgver=1.2.12 +pkgrel=2 +pkgdesc="A simple library to load images of various formats as SDL surfaces" +arch=('i686' 'x86_64') +license=('custom') +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) +md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb') + +build() { + cd "$srcdir/SDL_image-$pkgver" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/SDL_image-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/staging/tracker/PKGBUILD b/staging/tracker/PKGBUILD new file mode 100644 index 000000000..6de2cd899 --- /dev/null +++ b/staging/tracker/PKGBUILD @@ -0,0 +1,84 @@ +# $Id: PKGBUILD 147228 2012-01-24 20:33:45Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Alexander Fehr <pizzapunk gmail com> + +pkgbase=tracker +pkgname=(tracker libtracker-sparql) +pkgver=0.12.9 +_tver=${pkgver%.*} +pkgrel=2 +pkgdesc="All-in-one indexer, search tool and metadata database" +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' + 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3' + 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection' + 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser' + 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala') +url="http://www.gnome.org" +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) +sha256sums=('ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c') + +build() { + cd "$srcdir/$pkgbase-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/tracker \ + --disable-unit-tests \ + --enable-libflac \ + --enable-libvorbis + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package_tracker() { + depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring' + 'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca' + 'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') + optdepends=('giflib: extractor for GIF data' + 'gstreamer0.10-base: video extractor' + 'totem-plparser: playlist support' + 'nautilus: nautilus-extension' + 'libvorbis: Vorbis metadata extractor' + 'flac: FLAC metadata extractor' + 'taglib: writeback for audio files' + 'gnome-panel: tracker-search-bar') + groups=('gnome-extra') + install=tracker.install + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + +### Split libtracker-sparql + + mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver + mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig} + mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi} + + mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib" + + mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \ + "$srcdir/sparql/usr/lib/tracker-$_tver" + + mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \ + "$srcdir/sparql/usr/share/vala/vapi" + + mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc + mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir +} + +package_libtracker-sparql() { + pkgdesc="$pkgdesc (SPARQL library)" + depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') + + mv "$srcdir"/sparql/* "$pkgdir" +} diff --git a/staging/tracker/tracker.install b/staging/tracker/tracker.install new file mode 100644 index 000000000..95114273e --- /dev/null +++ b/staging/tracker/tracker.install @@ -0,0 +1,13 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/wesnoth/PKGBUILD b/staging/wesnoth/PKGBUILD new file mode 100644 index 000000000..325ed58e7 --- /dev/null +++ b/staging/wesnoth/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 147232 2012-01-24 22:47:27Z eric $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Jacobo Arvelo <unix4all@ya.com> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=wesnoth +pkgver=1.8.6 +pkgrel=4 +pkgdesc="A turn-based strategy game on a fantasy world" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.wesnoth.org/" +depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core' 'python2') +makedepends=('boost') +install=wesnoth.install +options=(!emptydirs) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + wesnoth-libpng-1.4.0.patch + wesnoth-1.8.6-boost-foreach.patch + wesnoth.tmpfiles.conf) +md5sums=('f1c3179869b01b61e253e74aeb241034' + '3b0d2edcb45e8ecc8c790f92bdcb0087' + 'dc414ab7e1334941548e9db6db9c2460' + 'b8122f5054e3895c9c054e87460869dc') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/wesnoth-libpng-1.4.0.patch" + patch -Np1 -i "$srcdir/wesnoth-1.8.6-boost-foreach.patch" + ./autogen.sh + ./configure --prefix=/usr --localstatedir=/var --enable-tools \ + --enable-editor --enable-server --with-fifodir=/run/wesnothd + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install-exec + install -dm755 "$pkgdir/usr/lib/tmpfiles.d/" + install -m644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf" + + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wesnoth_addon_manager" + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlindent" + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlscope" + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmllint" +} diff --git a/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch new file mode 100644 index 000000000..5aee3118c --- /dev/null +++ b/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch @@ -0,0 +1,70 @@ +--- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~ 2011-07-21 23:05:56.594879049 +0200 ++++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp 2011-07-21 23:28:07.540358742 +0200 +@@ -238,6 +238,17 @@ void ttree_view_node::clear() + + struct ttree_view_node_implementation + { ++ template<class W, class It> ++ static W* find_at_aux(It begin, It end, ++ const tpoint& coordinate, const bool must_be_active) { ++ for (It it = begin; it != end; ++it) { ++ if(W* widget = it->find_at(coordinate, must_be_active)) { ++ return widget; ++ } ++ } ++ return NULL; ++ } ++ + template<class W> + static W* find_at( + typename tconst_duplicator<W, ttree_view_node>::type& +@@ -255,13 +266,9 @@ struct ttree_view_node_implementation + } + + typedef typename tconst_duplicator<W, ttree_view_node>::type thack; +- foreach(thack& node, tree_view_node.children_) { +- if(W* widget = node.find_at(coordinate, must_be_active)) { +- return widget; +- } +- } +- +- return NULL; ++ return find_at_aux<W>(tree_view_node.children_.begin(), ++ tree_view_node.children_.end(), ++ coordinate, must_be_active); + } + }; + +@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size + return size; + } + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; +@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz + size.x += (get_indention_level() - 1) * tree_view().indention_step_size_; + } + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; +@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s + + DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n"; + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; diff --git a/staging/wesnoth/wesnoth-libpng-1.4.0.patch b/staging/wesnoth/wesnoth-libpng-1.4.0.patch new file mode 100644 index 000000000..338f467af --- /dev/null +++ b/staging/wesnoth/wesnoth-libpng-1.4.0.patch @@ -0,0 +1,24 @@ +diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp +--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp 2010-01-01 15:16:49.000000000 +0200 ++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2010-04-08 17:38:03.066201123 +0300 +@@ -174,8 +174,8 @@ + //TODO: review whether providing NULL error handlers is something + //sensible + png_struct* png_ptr = png_create_write_struct +- (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL), +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL), ++ NULL, NULL); + if(!png_ptr) + throw exploder_failure("Unable to initialize the png write structure"); + +--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600 ++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600 +@@ -15,6 +15,7 @@ + #include "exploder_utils.hpp" + #include "game_config.hpp" + #include "serialization/string_utils.hpp" ++#include <zlib.h> + #include <png.h> + + exploder_point::exploder_point(const std::string &s) diff --git a/staging/wesnoth/wesnoth.install b/staging/wesnoth/wesnoth.install new file mode 100644 index 000000000..4f1e419ae --- /dev/null +++ b/staging/wesnoth/wesnoth.install @@ -0,0 +1,9 @@ +# arg 1: the new package version +post_install() { +cat << EOF +Note: +==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma" +==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth +==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output. +EOF +} diff --git a/staging/wesnoth/wesnoth.tmpfiles.conf b/staging/wesnoth/wesnoth.tmpfiles.conf new file mode 100644 index 000000000..3ec0f6013 --- /dev/null +++ b/staging/wesnoth/wesnoth.tmpfiles.conf @@ -0,0 +1 @@ +D /run/wesnothd 0700 root root - diff --git a/staging/xsane/PKGBUILD b/staging/xsane/PKGBUILD new file mode 100644 index 000000000..aa022720b --- /dev/null +++ b/staging/xsane/PKGBUILD @@ -0,0 +1,68 @@ +# $Id: PKGBUILD 147252 2012-01-25 03:22:07Z eric $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> + +pkgbase=xsane +pkgname=('xsane' 'xsane-gimp') +pkgver=0.998 +pkgrel=2 +arch=(i686 x86_64) +url="http://www.xsane.org" +license=('GPL2') +makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp') +source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz + xsane-0.995-xdg-open.patch) +md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa' + '15541ff0ddc10acfa2059cf99d5478eb') + +build() { + cd "$srcdir/$pkgbase-$pkgver" + # fix use "xdg-open" instead of "netscape" to launch help browser - taken from Fedora + patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch" + sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c + + ./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp + make + mv src/xsane src/xsane-gimp + + # build again with gimp enabled + make clean + ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp + make +} + +package_xsane() { + pkgdesc="A GTK-based X11 frontend for SANE and plugin for Gimp." + install=$pkgname.install + depends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg') + optdepends=('xsane-gimp: for gimp plugin support') + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install +} + +package_xsane-gimp() { + pkgdesc="XSane Gimp plugin" + depends=('xsane' 'gimp') + cd "$srcdir/$pkgbase-$pkgver" + install -D -m755 src/xsane-gimp "${pkgdir}/usr/bin/xsane-gimp" + + ## For making Gimp Plugin available + /bin/mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins" + cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/" + /bin/ln -s ../../../../bin/xsane-gimp xsane + +# http://cvs.fedoraproject.org/viewvc/rpms/xsane/devel/xsane.spec?revision=1.80&view=markup +# when makepkg will allow splitted pkg install file support we might change add a xsane-gimp.install file with the commands that are used by fedora, +# gentoo has something similar +#%post gimp +#107 if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then +#108 %{_sbindir}/gimp-plugin-mgr --install xsane +#109 fi +#110 +#111 %preun gimp +#112 if [ $1 = 0 ]; then +#113 if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then +#114 %{_sbindir}/gimp-plugin-mgr --uninstall xsane +#115 fi +#116 fi +} diff --git a/staging/xsane/xsane-0.995-xdg-open.patch b/staging/xsane/xsane-0.995-xdg-open.patch new file mode 100644 index 000000000..db1f9bd68 --- /dev/null +++ b/staging/xsane/xsane-0.995-xdg-open.patch @@ -0,0 +1,12 @@ +diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h +--- xsane-0.995/src/xsane.h.xdg-open 2007-08-13 09:20:32.000000000 +0200 ++++ xsane-0.995/src/xsane.h 2007-11-23 11:50:49.000000000 +0100 +@@ -251,7 +251,7 @@ + # elif defined(HAVE_OS2_H) + # define DEFAULT_BROWSER "netscape" + # else +-# define DEFAULT_BROWSER "netscape" ++# define DEFAULT_BROWSER "xdg-open" + # endif + #endif + diff --git a/staging/xsane/xsane.install b/staging/xsane/xsane.install new file mode 100644 index 000000000..aa3e3b8f8 --- /dev/null +++ b/staging/xsane/xsane.install @@ -0,0 +1,16 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_install() { + echo "NOTE:" + echo " If you experience any problems after installing xsane " + echo " it may help to remove the setup and preferences files" + echo " of xsane:" + echo "" + echo " \$ rm -rf ~/.sane/xsane" + echo "" +} + +post_upgrade() { + post_install $1 +} diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD new file mode 100644 index 000000000..4762c277c --- /dev/null +++ b/testing/curl/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 147206 2012-01-24 17:51:49Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=curl +pkgver=7.24.0 +pkgrel=1 +pkgdesc="An URL retrival utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') +options=('!libtool') +source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + fix-J-with-O-regression.patch + curlbuild.h) +md5sums=('b93420f80a2baaa61a0f45214eddc2ba' + '710242df6bc318d16eea611e7d1b1410' + 'aa4539ec4f4a2dad1663dc22dd3ab0a1' + '751bd433ede935c8fae727377625a8ae') + +ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') +case $ptrsize in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" + exit 1 + ;; +esac + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-dependency-tracking \ + --disable-ldap \ + --disable-ldaps \ + --enable-ipv6 \ + --enable-manual \ + --enable-versioned-symbols \ + --enable-threaded-resolver \ + --without-libidn \ + --with-random=/dev/urandom \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # license + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + # devel + install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" +} diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h new file mode 100644 index 000000000..b48862696 --- /dev/null +++ b/testing/curl/curlbuild.h @@ -0,0 +1,9 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "curlbuild-32.h" +#elif __WORDSIZE == 64 +#include "curlbuild-64.h" +#else +#error "Unknown word size" +#endif diff --git a/testing/curl/fix-J-with-O-regression.patch b/testing/curl/fix-J-with-O-regression.patch new file mode 100644 index 000000000..4b7de1a23 --- /dev/null +++ b/testing/curl/fix-J-with-O-regression.patch @@ -0,0 +1,142 @@ +From c532604b137cae2e2814280778f914e4cd0460d1 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Sun, 20 Nov 2011 23:33:46 +0100 +Subject: [PATCH] -J -O: use -O name if no Content-Disposition header comes! + +A regression between 7.22.0 and 7.23.0 -- downloading a file with the +flags -O and -J results in the content being written to stdout if and +only if there was no Content-Disposition header in the http response. If +there is a C-D header with a filename attribute, the output is correctly +written. + +Reported by: Dave Reisner +Bug: http://curl.haxx.se/mail/archive-2011-11/0030.html +--- + src/tool_cb_hdr.c | 3 +- + src/tool_operate.c | 59 ++++++++++++++++++++++---------------------- + src/tool_operhlp.c | 18 +++++++++++++ + tests/data/Makefile.am | 2 +- + tests/data/test1210 | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 112 insertions(+), 33 deletions(-) + create mode 100644 tests/data/test1210 + +diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c +index fb24b45..dea7338 100644 +--- a/src/tool_cb_hdr.c ++++ b/src/tool_cb_hdr.c +@@ -66,8 +66,7 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata) + } + #endif + +- if(!outs->filename && (cb > 20) && +- checkprefix("Content-disposition:", str)) { ++ if((cb > 20) && checkprefix("Content-disposition:", str)) { + const char *p = str + 20; + + /* look for the 'filename=' parameter +diff --git a/src/tool_operate.c b/src/tool_operate.c +index 7ab815f..1e88120 100644 +--- a/src/tool_operate.c ++++ b/src/tool_operate.c +@@ -576,41 +576,40 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) + + if((urlnode->flags & GETOUT_USEREMOTE) + && config->content_disposition) { +- /* Our header callback sets the filename */ ++ /* Our header callback MIGHT set the filename */ + DEBUGASSERT(!outs.filename); + } +- else { +- if(config->resume_from_current) { +- /* We're told to continue from where we are now. Get the size +- of the file as it is now and open it for append instead */ +- struct_stat fileinfo; +- /* VMS -- Danger, the filesize is only valid for stream files */ +- if(0 == stat(outfile, &fileinfo)) +- /* set offset to current file size: */ +- config->resume_from = fileinfo.st_size; +- else +- /* let offset be 0 */ +- config->resume_from = 0; +- } + +- if(config->resume_from) { +- /* open file for output: */ +- FILE *file = fopen(outfile, config->resume_from?"ab":"wb"); +- if(!file) { +- helpf(config->errors, "Can't open '%s'!\n", outfile); +- res = CURLE_WRITE_ERROR; +- goto quit_urls; +- } +- outs.fopened = TRUE; +- outs.stream = file; +- outs.init = config->resume_from; +- } +- else { +- outs.stream = NULL; /* open when needed */ ++ if(config->resume_from_current) { ++ /* We're told to continue from where we are now. Get the size ++ of the file as it is now and open it for append instead */ ++ struct_stat fileinfo; ++ /* VMS -- Danger, the filesize is only valid for stream files */ ++ if(0 == stat(outfile, &fileinfo)) ++ /* set offset to current file size: */ ++ config->resume_from = fileinfo.st_size; ++ else ++ /* let offset be 0 */ ++ config->resume_from = 0; ++ } ++ ++ if(config->resume_from) { ++ /* open file for output: */ ++ FILE *file = fopen(outfile, config->resume_from?"ab":"wb"); ++ if(!file) { ++ helpf(config->errors, "Can't open '%s'!\n", outfile); ++ res = CURLE_WRITE_ERROR; ++ goto quit_urls; + } +- outs.filename = outfile; +- outs.s_isreg = TRUE; ++ outs.fopened = TRUE; ++ outs.stream = file; ++ outs.init = config->resume_from; ++ } ++ else { ++ outs.stream = NULL; /* open when needed */ + } ++ outs.filename = outfile; ++ outs.s_isreg = TRUE; + } + + if(uploadfile && !stdin_upload(uploadfile)) { +diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c +index 808d2d5..4c1697b 100644 +--- a/src/tool_operhlp.c ++++ b/src/tool_operhlp.c +@@ -178,6 +178,24 @@ CURLcode get_url_file_name(char **filename, const char *url) + return CURLE_OUT_OF_MEMORY; + } + } ++ ++ /* in case we built debug enabled, we allow an environment variable ++ * named CURL_TESTDIR to prefix the given file name to put it into a ++ * specific directory ++ */ ++#ifdef DEBUGBUILD ++ { ++ char *tdir = curlx_getenv("CURL_TESTDIR"); ++ if(tdir) { ++ char buffer[512]; /* suitably large */ ++ snprintf(buffer, sizeof(buffer), "%s/%s", tdir, *filename); ++ Curl_safefree(*filename); ++ *filename = strdup(buffer); /* clone the buffer */ ++ curl_free(tdir); ++ } ++ } ++#endif ++ + return CURLE_OK; + } + +-- +1.7.7.3 diff --git a/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD index a40ad46f7..28229f186 100644 --- a/testing/libarchive/PKGBUILD +++ b/testing/libarchive/PKGBUILD @@ -1,16 +1,23 @@ -# $Id: PKGBUILD 146572 2012-01-13 16:55:27Z dreisner $ +# $Id: PKGBUILD 147250 2012-01-25 03:21:31Z dreisner $ # Maintainer: Dan McGee <dan@archlinux.org> + pkgname=libarchive pkgver=3.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64') url="http://libarchive.googlecode.com/" license=('BSD') depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') -source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz") -md5sums=('ca4090f0099432a9ac5a8b6618dc3892') -sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7') +source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz" + 'interpret-non-posix-zips.patch' + 'test-with-zip-mtime.patch') +md5sums=('ca4090f0099432a9ac5a8b6618dc3892' + 'f02b88eb10877c7a7d527ed89c662e44' + '8366def6d7d70d424fa28a986c78c015') +sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7' + '9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc' + 'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -18,6 +25,12 @@ PKGEXT='.pkg.tar.gz' build() { cd "$srcdir/$pkgname-$pkgver" + # http://code.google.com/p/libarchive/issues/detail?id=225 + patch -Np0 <"$srcdir/interpret-non-posix-zips.patch" + + # http://code.google.com/p/libarchive/issues/detail?id=231 + patch -Np0 <"$srcdir/test-with-zip-mtime.patch" + ./configure --prefix=/usr --without-xml2 make } @@ -25,8 +38,7 @@ build() { check() { cd "$srcdir/$pkgname-$pkgver" - # currently fails on i686 in a minor test involving atime updates (#60) - make check || : + make check } package() { diff --git a/testing/libarchive/interpret-non-posix-zips.patch b/testing/libarchive/interpret-non-posix-zips.patch new file mode 100644 index 000000000..63bc439d9 --- /dev/null +++ b/testing/libarchive/interpret-non-posix-zips.patch @@ -0,0 +1,165 @@ +Index: libarchive/archive_read_support_format_zip.c +=================================================================== +--- libarchive/archive_read_support_format_zip.c (revision 4189) ++++ libarchive/archive_read_support_format_zip.c (revision 4190) +@@ -217,14 +217,13 @@ + } + + /* +- * TODO: This is a performance sink because it forces +- * the read core to drop buffered data from the start +- * of file, which will then have to be re-read again +- * if this bidder loses. ++ * TODO: This is a performance sink because it forces the read core to ++ * drop buffered data from the start of file, which will then have to ++ * be re-read again if this bidder loses. + * +- * Consider passing in the winning bid value to subsequent +- * bidders so that this bidder in particular can avoid +- * seeking if it knows it's going to lose anyway. ++ * We workaround this a little by passing in the best bid so far so ++ * that later bidders can do nothing if they know they'll never ++ * outbid. But we can certainly do better... + */ + static int + archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid) +@@ -311,19 +310,29 @@ + external_attributes = archive_le32dec(p + 38); + zip_entry->local_header_offset = archive_le32dec(p + 42); + ++ /* If we can't guess the mode, leave it zero here; ++ when we read the local file header we might get ++ more information. */ ++ zip_entry->mode = 0; + if (zip_entry->system == 3) { + zip_entry->mode = external_attributes >> 16; +- } else { +- zip_entry->mode = AE_IFREG | 0777; + } + +- /* Do we need to parse filename here? */ +- /* Or can we wait until we read the local header? */ ++ /* We don't read the filename until we get to the ++ local file header. Reading it here would speed up ++ table-of-contents operations (removing the need to ++ find and read local file header to get the ++ filename) at the cost of requiring a lot of extra ++ space. */ ++ /* We don't read the extra block here. We assume it ++ will be duplicated at the local file header. */ + __archive_read_consume(a, + 46 + filename_length + extra_length + comment_length); + } + +- /* TODO: Sort zip entries. */ ++ /* TODO: Sort zip entries by file offset so that we ++ can optimize get_next_header() to use skip instead of ++ seek. */ + + return ARCHIVE_OK; + } +@@ -434,6 +443,11 @@ + return (30); + } + ++ /* TODO: It's worth looking ahead a little bit for a valid ++ * PK signature. In particular, that would make it possible ++ * to read some UUEncoded SFX files or SFX files coming from ++ * a network socket. */ ++ + return (0); + } + +Index: libarchive/test/test_compat_zip_6.zip.uu +=================================================================== +--- libarchive/test/test_compat_zip_6.zip.uu (revision 0) ++++ libarchive/test/test_compat_zip_6.zip.uu (revision 4190) +@@ -0,0 +1,10 @@ ++begin 755 test_compat_zip_6.zip ++M4$L#!`H``````'@3-T`````````````````6````3F5W($9O;&1E<B].97<@ ++M1F]L9&5R+U!+`P0*``````!\$S=`%4-8OPL````+````*P```$YE=R!&;VQD ++M97(O3F5W($9O;&1E<B].97<@5&5X="!$;V-U;65N="YT>'1S;VUE('1E>'0- ++M"E!+`0(4"PH``````'@3-T`````````````````6````````````$``````` ++M``!.97<@1F]L9&5R+TYE=R!&;VQD97(O4$L!`A0+"@``````?!,W0!5#6+\+ ++M````"P```"L``````````0`@````-````$YE=R!&;VQD97(O3F5W($9O;&1E ++M<B].97<@5&5X="!$;V-U;65N="YT>'102P4&``````(``@"=````B``````` ++` ++end +Index: libarchive/test/test_compat_zip.c +=================================================================== +--- libarchive/test/test_compat_zip.c (revision 4189) ++++ libarchive/test/test_compat_zip.c (revision 4190) +@@ -348,6 +348,53 @@ + free(p); + } + ++/* ++ * Issue 225: Errors extracting MSDOS Zip archives with directories. ++ */ ++static void ++compat_zip_6_verify(struct archive *a) ++{ ++ struct archive_entry *ae; ++ ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); ++ assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); ++ assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); ++ assertEqualInt(1327314468, archive_entry_mtime(ae)); ++ assertEqualInt(0, archive_entry_size(ae)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); ++ assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); ++ assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); ++ assertEqualInt(1327314476, archive_entry_mtime(ae)); ++ assertEqualInt(11, archive_entry_size(ae)); ++ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); ++} ++ ++static void ++test_compat_zip_6(void) ++{ ++ const char *refname = "test_compat_zip_6.zip"; ++ struct archive *a; ++ void *p; ++ size_t s; ++ ++ extract_reference_file(refname); ++ p = slurpfile(&s, refname); ++ ++ assert((a = archive_read_new()) != NULL); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7)); ++ compat_zip_6_verify(a); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); ++ ++ assert((a = archive_read_new()) != NULL); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 7)); ++ compat_zip_6_verify(a); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); ++} ++ + DEFINE_TEST(test_compat_zip) + { + test_compat_zip_1(); +@@ -355,6 +402,7 @@ + test_compat_zip_3(); + test_compat_zip_4(); + test_compat_zip_5(); ++ test_compat_zip_6(); + } + + +Index: Makefile.am +=================================================================== +--- Makefile.am (revision 4189) ++++ Makefile.am (revision 4190) +@@ -462,6 +462,7 @@ + libarchive/test/test_compat_zip_3.zip.uu \ + libarchive/test/test_compat_zip_4.zip.uu \ + libarchive/test/test_compat_zip_5.zip.uu \ ++ libarchive/test/test_compat_zip_6.zip.uu \ + libarchive/test/test_fuzz_1.iso.Z.uu \ + libarchive/test/test_fuzz.cab.uu \ + libarchive/test/test_fuzz.lzh.uu \ diff --git a/testing/libarchive/test-with-zip-mtime.patch b/testing/libarchive/test-with-zip-mtime.patch new file mode 100644 index 000000000..79e2f3c7e --- /dev/null +++ b/testing/libarchive/test-with-zip-mtime.patch @@ -0,0 +1,23 @@ +Index: libarchive/test/test_compat_zip.c +=================================================================== +--- libarchive/test/test_compat_zip.c (revision 4197) ++++ libarchive/test/test_compat_zip.c (revision 4198) +@@ -359,12 +359,16 @@ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); + assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); +- assertEqualInt(1327314468, archive_entry_mtime(ae)); ++ /* Zip timestamps are local time, so vary by time zone. */ ++ /* TODO: A more complex assert would work here; we could ++ verify that it's within +/- 24 hours of a particular value. */ ++ /* assertEqualInt(1327314468, archive_entry_mtime(ae)); */ + assertEqualInt(0, archive_entry_size(ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); + assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); +- assertEqualInt(1327314476, archive_entry_mtime(ae)); ++ /* Zip timestamps are local time, so vary by time zone. */ ++ /* assertEqualInt(1327314476, archive_entry_mtime(ae)); */ + assertEqualInt(11, archive_entry_size(ae)); + assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); + } diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index f1cfcbd5f..4e1d95a74 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146660 2012-01-15 17:04:30Z dreisner $ +# $Id: PKGBUILD 147240 2012-01-25 01:22:21Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=systemd -pkgver=38 -pkgrel=3 +pkgver=39 +pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -16,7 +16,6 @@ optdepends=('cryptsetup: required for encrypted block devices' 'initscripts-systemd: native boot and initialization scripts' 'python2-cairo: systemd-analyze' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') -groups=('systemd') options=('!libtool') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf @@ -28,13 +27,9 @@ backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/systemd/systemd-logind.conf) install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - "os-release" - '0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch' - '0001-units-make-sure-syslog-socket-goes-away-early-during.patch') -md5sums=('68c66dce5a28c0efd7c210af5d11efed' - '752636def0db3c03f121f8b4f44a63cd' - '07437e70be65ef14fd4f13c5ec5bd1fe' - 'c567ce597f68c07b9bc5b7e835f80f7d') + "os-release") +md5sums=('7179b34f6f6553d2a36551ac1dec5f0d' + '752636def0db3c03f121f8b4f44a63cd') build() { cd "$pkgname-$pkgver" @@ -44,9 +39,6 @@ build() { sed -i -e '/^Environ.*LANG/s/^/#/' \ -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4 - patch -Np1 < "$srcdir/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch" - patch -Np1 < "$srcdir/0001-units-make-sure-syslog-socket-goes-away-early-during.patch" - ./configure --sysconfdir=/etc \ --libexecdir=/usr/lib \ --libdir=/usr/lib \ diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install index 4850c879e..f31642e13 100644 --- a/testing/systemd/systemd.install +++ b/testing/systemd/systemd.install @@ -2,7 +2,7 @@ checkgroups() { if ! getent group lock >/dev/null; then - sbin/groupadd -g 54 lock + groupadd -g 54 lock fi } diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD index 2a3787ae9..2a30f0dce 100644 --- a/testing/udev/PKGBUILD +++ b/testing/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147057 2012-01-21 10:00:01Z tpowa $ +# $Id: PKGBUILD 147236 2012-01-24 23:31:40Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=178 +pkgver=179 pkgrel=1 arch=(i686 x86_64) url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" @@ -15,7 +15,6 @@ groups=('base') options=(!makeflags !libtool) makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz) -md5sums=('173cc6061e3a82dd6e9a1a5cf767a858') build() { cd $srcdir/$pkgbase-$pkgver @@ -100,4 +99,4 @@ package_udev-compat() { mknod cpu/microcode c 10 184 } -md5sums=('173cc6061e3a82dd6e9a1a5cf767a858') +md5sums=('7d2880f66ea39146aae928f19ff3ca09') diff --git a/testing/wireless_tools/PKGBUILD b/testing/wireless_tools/PKGBUILD new file mode 100644 index 000000000..16062dd2a --- /dev/null +++ b/testing/wireless_tools/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 147204 2012-01-24 11:13:02Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Jason Chu <jchu@xentac.net> + +pkgname=wireless_tools +pkgver=29 +pkgrel=6 +pkgdesc='Wireless Tools' +url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html' +arch=('i686' 'x86_64') +license=('GPL') +source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz") +sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710') + +build() { + cd "${srcdir}/${pkgname}.${pkgver}" + make CFLAGS="${CFLAGS} -Wall -Wextra -I." LDFLAGS="${LDFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}.${pkgver}" + make \ + INSTALL_DIR="${pkgdir}/usr/sbin" \ + INSTALL_LIB="${pkgdir}/usr/lib" \ + INSTALL_INC="${pkgdir}/usr/include" \ + INSTALL_MAN="${pkgdir}/usr/share/man" \ + install +} |
