diff options
Diffstat (limited to 'staging')
90 files changed, 3450 insertions, 51 deletions
diff --git a/staging/allegro/PKGBUILD b/staging/allegro/PKGBUILD new file mode 100644 index 000000000..3533ac18d --- /dev/null +++ b/staging/allegro/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 146877 2012-01-19 02:37:38Z eric $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: arjan <arjan@archlinux.org> + +pkgname=allegro +pkgver=5.0.5 +pkgrel=2 +pkgdesc="Portable library mainly aimed at video game and multimedia programming" +arch=('i686' 'x86_64') +url="http://alleg.sourceforge.net/" +license=('custom') +depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg') +makedepends=('cmake' 'mesa' 'freetype2') +source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz) +md5sums=('4d879afe7062f7dc9b8913cba2e44bdf') + +build() { + cd "${srcdir}" + mkdir build && cd build + + cmake "../${pkgname}-${pkgver}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWANT_DOCS=OFF + + make +} + +package() { + cd "${srcdir}"/build + + make DESTDIR="${pkgdir}" install + + install -D -m644 ../${pkgname}-${pkgver}/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/alsaplayer/PKGBUILD b/staging/alsaplayer/PKGBUILD new file mode 100644 index 000000000..d723ee447 --- /dev/null +++ b/staging/alsaplayer/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 146875 2012-01-19 02:21:54Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=alsaplayer +pkgver=0.99.81 +pkgrel=3 +pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit" +arch=('i686' 'x86_64') +url="http://www.alsaplayer.org/" +license=('GPL') +depends=('gcc-libs' 'desktop-file-utils') +makedepends=('gtk2' 'libid3tag' 'libvorbis' 'libmad' 'libmikmod' 'jack' 'mesa' 'audiofile' 'doxygen') +optdepends=('gtk2: for the gtk2 GUI interface' \ + 'libgl: for the OpenGL visual plugins' \ + 'jack: for JACK audio server output support' \ + 'audiofile: for support of various audio formats like AIFF, WAVE, .snd/.au' \ + 'libid3tag: for flac support' \ + 'flac: for flac support' \ + 'libmad: for MPEG support' \ + 'libsndfile: for sndfile support' \ + 'libvorbis: for ogg vorbis support' \ + 'libmikmod: for mod, s3m, it and xm formats supports') +options=('!libtool') +install=alsaplayer.install +source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('25817ebd1e5c36da31a88363315a1bf7a945ddfd') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-audiofile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/alsaplayer/alsaplayer.install b/staging/alsaplayer/alsaplayer.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/staging/alsaplayer/alsaplayer.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/cairo/PKGBUILD b/staging/cairo/PKGBUILD new file mode 100644 index 000000000..37aac6a2f --- /dev/null +++ b/staging/cairo/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 146832 2012-01-18 20:00:38Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Brice Carpentier <brice@daknet.org> + +pkgname=cairo +pkgver=1.10.2 +pkgrel=3 +pkgdesc="Cairo vector graphics library" +arch=(i686 x86_64) +license=('LGPL' 'MPL') +url="http://cairographics.org/" +depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh') +options=('!libtool') +source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.gz + cairo-1.10.0-buggy_gradients.patch) +sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e' + '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --enable-tee + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 Skipped +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/staging/cairo/cairo-1.10.0-buggy_gradients.patch b/staging/cairo/cairo-1.10.0-buggy_gradients.patch new file mode 100644 index 000000000..368e356d3 --- /dev/null +++ b/staging/cairo/cairo-1.10.0-buggy_gradients.patch @@ -0,0 +1,13 @@ +--- a/src/cairo-xlib-display.c.ubuntu 2010-08-04 11:57:49.000000000 +0200
++++ b/src/cairo-xlib-display.c 2010-08-04 11:58:28.000000000 +0200
+@@ -353,11 +353,7 @@
+ /* Prior to Render 0.10, there is no protocol support for gradients and
+ * we call function stubs instead, which would silently consume the drawing.
+ */
+-#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
+ display->buggy_gradients = TRUE;
+-#else
+- display->buggy_gradients = FALSE;
+-#endif
+ display->buggy_pad_reflect = FALSE;
+ display->buggy_repeat = FALSE;
diff --git a/staging/fbida/PKGBUILD b/staging/fbida/PKGBUILD new file mode 100644 index 000000000..c7fa1f6d6 --- /dev/null +++ b/staging/fbida/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 146887 2012-01-19 03:44:47Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=fbida +pkgver=2.08 +pkgrel=2 +pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran" +arch=('i686' 'x86_64') +url="http://www.kraxel.org/blog/linux/fbida/" +license=('GPL2') +depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl') +makedepends=('libxpm') +optdepends=('ghostscript: to use fbgs') +source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('9b3693ab26a58194e36b479bffb61ed0') +sha1sums=('597e0953c68112bf7c363b1ccaa94e72100b116a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's/ungif/gif/' GNUmakefile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" prefix=/usr install +} diff --git a/staging/feh/PKGBUILD b/staging/feh/PKGBUILD new file mode 100644 index 000000000..794de592d --- /dev/null +++ b/staging/feh/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 146881 2012-01-19 03:22:03Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=feh +pkgver=2.2 +pkgrel=2 +pkgdesc='Fast and light imlib2-based image viewer' +url='http://feh.finalrewind.org/' +license=('MIT') +arch=('i686' 'x86_64') +depends=('giblib' 'curl' 'libxinerama') +optdepends=('perl: feh-cam, webcam wrapper for feh') +makedepends=('libxt') +source=("${url}${pkgname}-${pkgver}.tar.bz2") +sha1sums=('655db5f558cdb268ff55cb088994d78331bd39aa') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/fontforge/PKGBUILD b/staging/fontforge/PKGBUILD new file mode 100644 index 000000000..f5dc25f1a --- /dev/null +++ b/staging/fontforge/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 146903 2012-01-19 04:55:00Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=fontforge +pkgver=20120119 +pkgrel=1 +pkgdesc='Outline and bitmap font editor' +arch=('i686' 'x86_64') +url='http://fontforge.sourceforge.net/' +license=('BSD') +depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro') +options=('!libtool' '!makeflags') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") +sha1sums=('2c363af075e77bf35d21ee1939e3d6ab39a9f80c') + +# git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's/python /python2 /g' Makefile.dynamic.in + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-type3 \ + --enable-devicetables \ + --enable-double \ + --with-regular-link \ + --with-python=python2 \ + --enable-pyextension \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/gd/PKGBUILD b/staging/gd/PKGBUILD new file mode 100644 index 000000000..d2c40835a --- /dev/null +++ b/staging/gd/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 146845 2012-01-18 20:23:55Z ibiru $ +# Maintainer: Eric Belanger <eric@archlinux.org> + +pkgname=gd +pkgver=2.0.36RC1 +pkgrel=5 +pkgdesc="Library for the dynamic creation of images by programmers" +arch=('i686' 'x86_64') +url="http://www.libgd.org/" +license=('custom') +depends=('libpng' 'fontconfig' 'libjpeg') +optdepends=('perl: bdftogd script') +options=('!libtool') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'libpng14.patch') +md5sums=('e876979ca3130623a4e7866d9579171a' + '7921556f4960e8d66cf4fb67ea7101b5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i ${srcdir}/libpng14.patch + ./configure --prefix=/usr --without-xpm + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/gd/libpng14.patch b/staging/gd/libpng14.patch new file mode 100644 index 000000000..19a3fda91 --- /dev/null +++ b/staging/gd/libpng14.patch @@ -0,0 +1,12 @@ +diff -Nur gd-2.0.36RC1.orig/gd_png.c gd-2.0.36RC1/gd_png.c +--- gd-2.0.36RC1.orig/gd_png.c 2007-11-27 10:30:34.000000000 +0200 ++++ gd-2.0.36RC1/gd_png.c 2010-01-17 17:14:11.000000000 +0200 +@@ -151,7 +151,7 @@ + return NULL; + } + +- if (!png_check_sig (sig, 8)) { /* bad signature */ ++ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */ + return NULL; /* bad signature */ + } + diff --git a/staging/gdk-pixbuf2/PKGBUILD b/staging/gdk-pixbuf2/PKGBUILD new file mode 100644 index 000000000..bf38ef13e --- /dev/null +++ b/staging/gdk-pixbuf2/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 146826 2012-01-18 19:45:40Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=gdk-pixbuf2 +pkgver=2.24.1 +pkgrel=2 +pkgdesc="An image loading library" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11') +makedepends=('gtk-doc' 'gobject-introspection') +options=('!libtool') +install=gdk-pixbuf2.install +source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-$pkgver.tar.xz) +sha256sums=('da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1') + +build() { + cd "$srcdir/gdk-pixbuf-$pkgver" + + ./configure --prefix=/usr \ + --without-libjasper \ + --with-x11 \ + --with-included-loaders=png + make +} + +package() { + cd "$srcdir/gdk-pixbuf-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/gdk-pixbuf2/gdk-pixbuf2.install b/staging/gdk-pixbuf2/gdk-pixbuf2.install new file mode 100644 index 000000000..1b35942cb --- /dev/null +++ b/staging/gdk-pixbuf2/gdk-pixbuf2.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/gdk-pixbuf-query-loaders --update-cache +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache +} diff --git a/staging/gegl/PKGBUILD b/staging/gegl/PKGBUILD new file mode 100644 index 000000000..9fecb8b2e --- /dev/null +++ b/staging/gegl/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 146879 2012-01-19 03:20:59Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=gegl +pkgver=0.1.8 +pkgrel=2 +pkgdesc="Graph based image processing framework" +arch=('i686' 'x86_64') +url="http://www.gegl.org/" +license=('GPL3' 'LGPL3') +depends=('babl' 'gtk2') +makedepends=('ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2') +optdepends=('openexr: for using the openexr plugin' \ + 'ffmpeg: for using the ffmpeg plugin' \ + 'librsvg: for using the svg plugin' \ + 'jasper: for using the jasper plugin') +options=('!libtool') +source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('3d4d902580f5c5122b01b5188b6b5da03089ecac') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ + --with-libavformat --with-jasper --disable-docs + make +} + +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# make check +#} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/imlib/CAN-2004-1026.patch b/staging/imlib/CAN-2004-1026.patch new file mode 100644 index 000000000..c820270d4 --- /dev/null +++ b/staging/imlib/CAN-2004-1026.patch @@ -0,0 +1,510 @@ +diff -urN imlib-1.9.13.orig/Imlib/load.c imlib-1.9.13/Imlib/load.c +--- imlib-1.9.13.orig/Imlib/load.c Wed Mar 13 19:06:29 2002 ++++ imlib-1.9.13/Imlib/load.c Thu Sep 16 17:21:01 2004 +@@ -4,6 +4,8 @@ + #include "Imlib_private.h" + #include <setjmp.h> + ++#define G_MAXINT ((int) 0x7fffffff) ++ + /* Split the ID - damages input */ + + static char * +@@ -41,13 +43,17 @@ + + /* + * Make sure we don't wrap on our memory allocations ++ * we check G_MAXINT/4 because rend.c malloc's w * h * bpp ++ * + 3 is safety margin + */ + + void * _imlib_malloc_image(unsigned int w, unsigned int h) + { +- if( w > 32767 || h > 32767) +- return NULL; +- return malloc(w * h * 3); ++ if (w <= 0 || w > 32767 || ++ h <= 0 || h > 32767 || ++ h >= (G_MAXINT/4 - 1) / w) ++ return NULL; ++ return malloc(w * h * 3 + 3); + } + + #ifdef HAVE_LIBJPEG +@@ -360,7 +366,9 @@ + npix = ww * hh; + *w = (int)ww; + *h = (int)hh; +- if(ww > 32767 || hh > 32767) ++ if (ww <= 0 || ww > 32767 || ++ hh <= 0 || hh > 32767 || ++ hh >= (G_MAXINT/sizeof(uint32)) / ww) + { + TIFFClose(tif); + return NULL; +@@ -463,7 +471,7 @@ + } + *w = gif->Image.Width; + *h = gif->Image.Height; +- if (*h > 32767 || *w > 32767) ++ if (*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767) + { + return NULL; + } +@@ -965,7 +973,12 @@ + comment = 0; + quote = 0; + context = 0; ++ memset(lookup, 0, sizeof(lookup)); ++ + line = malloc(lsz); ++ if (!line) ++ return NULL; ++ + while (!done) + { + pc = c; +@@ -994,25 +1007,25 @@ + { + /* Header */ + sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp); +- if (ncolors > 32766) ++ if (ncolors <= 0 || ncolors > 32766) + { + fprintf(stderr, "IMLIB ERROR: XPM files wth colors > 32766 not supported\n"); + free(line); + return NULL; + } +- if (cpp > 5) ++ if (cpp <= 0 || cpp > 5) + { + fprintf(stderr, "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n"); + free(line); + return NULL; + } +- if (*w > 32767) ++ if (*w <= 0 || *w > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n"); + free(line); + return NULL; + } +- if (*h > 32767) ++ if (*h <= 0 || *h > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n"); + free(line); +@@ -1045,11 +1058,13 @@ + { + int slen; + int hascolor, iscolor; ++ int space; + + iscolor = 0; + hascolor = 0; + tok[0] = 0; + col[0] = 0; ++ space = sizeof(col) - 1; + s[0] = 0; + len = strlen(line); + strncpy(cmap[j].str, line, cpp); +@@ -1072,10 +1087,10 @@ + { + if (k >= len) + { +- if (col[0]) +- strcat(col, " "); +- if (strlen(col) + strlen(s) < sizeof(col)) +- strcat(col, s); ++ if (col[0] && space > 0) ++ strcat(col, " "), space -= 1; ++ if (slen <= space) ++ strcat(col, s), space -= slen; + } + if (col[0]) + { +@@ -1105,14 +1120,17 @@ + } + } + } +- strcpy(tok, s); ++ if (slen < sizeof(tok)); ++ strcpy(tok, s); + col[0] = 0; ++ space = sizeof(col) - 1; + } + else + { +- if (col[0]) +- strcat(col, " "); +- strcat(col, s); ++ if (col[0] && space > 0) ++ strcat(col, " "), space -=1; ++ if (slen <= space) ++ strcat(col, s), space -= slen; + } + } + } +@@ -1341,12 +1359,12 @@ + sscanf(s, "%i %i", w, h); + a = *w; + b = *h; +- if (a > 32767) ++ if (a <= 0 || a > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n"); + return NULL; + } +- if (b > 32767) ++ if (b <= 0 || b > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n"); + return NULL; +diff -urN imlib-1.9.13.orig/Imlib/utils.c imlib-1.9.13/Imlib/utils.c +--- imlib-1.9.13.orig/Imlib/utils.c Mon Mar 4 17:45:28 2002 ++++ imlib-1.9.13/Imlib/utils.c Thu Sep 16 17:21:15 2004 +@@ -1496,36 +1496,56 @@ + context = 0; + ptr = NULL; + end = NULL; ++ memset(lookup, 0, sizeof(lookup)); + + while (!done) + { + line = data[count++]; ++ if (!line) ++ break; ++ line = strdup(line); ++ if (!line) ++ break; ++ len = strlen(line); ++ for (i = 0; i < len; ++i) ++ { ++ c = line[i]; ++ if (c < 32) ++ line[i] = 32; ++ else if (c > 127) ++ line[i] = 127; ++ } ++ + if (context == 0) + { + /* Header */ + sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp); +- if (ncolors > 32766) ++ if (ncolors <= 0 || ncolors > 32766) + { + fprintf(stderr, "IMLIB ERROR: XPM data wth colors > 32766 not supported\n"); + free(im); ++ free(line); + return NULL; + } +- if (cpp > 5) ++ if (cpp <= 0 || cpp > 5) + { + fprintf(stderr, "IMLIB ERROR: XPM data with characters per pixel > 5 not supported\n"); + free(im); ++ free(line); + return NULL; + } +- if (w > 32767) ++ if (w <= 0 || w > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for data\n"); + free(im); ++ free(line); + return NULL; + } +- if (h > 32767) ++ if (h <= 0 || h > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for data\n"); + free(im); ++ free(line); + return NULL; + } + cmap = malloc(sizeof(struct _cmap) * ncolors); +@@ -1533,6 +1553,7 @@ + if (!cmap) + { + free(im); ++ free(line); + return NULL; + } + im->rgb_width = w; +@@ -1542,6 +1563,7 @@ + { + free(cmap); + free(im); ++ free(line); + return NULL; + } + im->alpha_data = NULL; +@@ -1817,6 +1839,7 @@ + } + if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3)) + done = 1; ++ free(line); + } + if (!transp) + { +diff -urN imlib-1.9.13.orig/gdk_imlib/io-gif.c imlib-1.9.13/gdk_imlib/io-gif.c +--- imlib-1.9.13.orig/gdk_imlib/io-gif.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/io-gif.c Thu Sep 16 16:11:31 2004 +@@ -55,7 +55,7 @@ + } + *w = gif->Image.Width; + *h = gif->Image.Height; +- if(*h > 32767 || *w > 32767) ++ if(*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767) + { + return NULL; + } +diff -urN imlib-1.9.13.orig/gdk_imlib/io-ppm.c imlib-1.9.13/gdk_imlib/io-ppm.c +--- imlib-1.9.13.orig/gdk_imlib/io-ppm.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/io-ppm.c Thu Sep 16 16:13:13 2004 +@@ -53,12 +53,12 @@ + sscanf(s, "%i %i", w, h); + a = *w; + b = *h; +- if (a > 32767) ++ if (a <= 0 || a > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n"); + return NULL; + } +- if (b > 32767) ++ if (b <= 0 || b > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n"); + return NULL; +diff -urN imlib-1.9.13.orig/gdk_imlib/io-tiff.c imlib-1.9.13/gdk_imlib/io-tiff.c +--- imlib-1.9.13.orig/gdk_imlib/io-tiff.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/io-tiff.c Thu Sep 16 16:13:57 2004 +@@ -36,7 +36,9 @@ + npix = ww * hh; + *w = (int)ww; + *h = (int)hh; +- if(ww > 32767 || hh > 32767) ++ if (ww <= 0 || ww > 32767 || ++ hh <= 0 || hh > 32767 || ++ hh >= (G_MAXINT/sizeof(uint32)) / ww) + { + TIFFClose(tif); + return NULL; +diff -urN imlib-1.9.13.orig/gdk_imlib/io-xpm.c imlib-1.9.13/gdk_imlib/io-xpm.c +--- imlib-1.9.13.orig/gdk_imlib/io-xpm.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/io-xpm.c Thu Sep 16 17:08:24 2004 +@@ -40,8 +40,12 @@ + context = 0; + i = j = 0; + cmap = NULL; ++ memset(lookup, 0, sizeof(lookup)); + + line = malloc(lsz); ++ if (!line) ++ return NULL; ++ + while (!done) + { + pc = c; +@@ -70,25 +74,25 @@ + { + /* Header */ + sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp); +- if (ncolors > 32766) ++ if (ncolors <= 0 || ncolors > 32766) + { + fprintf(stderr, "gdk_imlib ERROR: XPM files wth colors > 32766 not supported\n"); + free(line); + return NULL; + } +- if (cpp > 5) ++ if (cpp <= 0 || cpp > 5) + { + fprintf(stderr, "gdk_imlib ERROR: XPM files with characters per pixel > 5 not supported\n"); + free(line); + return NULL; + } +- if (*w > 32767) ++ if (*w <= 0 || *w > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n"); + free(line); + return NULL; + } +- if (*h > 32767) ++ if (*h <= 0 || *h > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n"); + free(line); +@@ -120,11 +124,13 @@ + { + int slen; + int hascolor, iscolor; ++ int space; + + hascolor = 0; + iscolor = 0; + tok[0] = 0; + col[0] = 0; ++ space = sizeof(col) - 1; + s[0] = 0; + len = strlen(line); + strncpy(cmap[j].str, line, cpp); +@@ -147,10 +153,10 @@ + { + if (k >= len) + { +- if (col[0]) +- strcat(col, " "); +- if (strlen(col) + strlen(s) < sizeof(col)) +- strcat(col, s); ++ if (col[0] && space > 0) ++ strncat(col, " ", space), space -= 1; ++ if (slen <= space) ++ strcat(col, s), space -= slen; + } + if (col[0]) + { +@@ -180,14 +186,17 @@ + } + } + } +- strcpy(tok, s); ++ if (slen < sizeof(tok)) ++ strcpy(tok, s); + col[0] = 0; ++ space = sizeof(col) - 1; + } + else + { +- if (col[0]) +- strcat(col, " "); +- strcat(col, s); ++ if (col[0] && space > 0) ++ strcat(col, " "), space -= 1; ++ if (slen <= space) ++ strcat(col, s), space -= slen; + } + } + } +diff -urN imlib-1.9.13.orig/gdk_imlib/misc.c imlib-1.9.13/gdk_imlib/misc.c +--- imlib-1.9.13.orig/gdk_imlib/misc.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/misc.c Thu Sep 16 16:35:32 2004 +@@ -1355,11 +1355,16 @@ + + /* + * Make sure we don't wrap on our memory allocations ++ * we check G_MAX_INT/4 because rend.c malloc's w * h * bpp ++ * + 3 is safety margin + */ + + void *_gdk_malloc_image(unsigned int w, unsigned int h) + { +- if( w > 32767 || h > 32767) ++ if (w <= 0 || w > 32767 || ++ h <= 0 || h > 32767 || ++ h >= (G_MAXINT/4 - 1) / w) + return NULL; +- return malloc(w * h * 3); ++ return malloc(w * h * 3 + 3); + } ++ +diff -urN imlib-1.9.13.orig/gdk_imlib/utils.c imlib-1.9.13/gdk_imlib/utils.c +--- imlib-1.9.13.orig/gdk_imlib/utils.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/utils.c Thu Sep 16 17:28:35 2004 +@@ -1236,36 +1236,56 @@ + context = 0; + ptr = NULL; + end = NULL; ++ memset(lookup, 0, sizeof(lookup)); + + while (!done) + { + line = data[count++]; ++ if (!line) ++ break; ++ line = strdup(line); ++ if (!line) ++ break; ++ len = strlen(line); ++ for (i = 0; i < len; ++i) ++ { ++ c = line[i]; ++ if (c < 32) ++ line[i] = 32; ++ else if (c > 127) ++ line[i] = 127; ++ } ++ + if (context == 0) + { + /* Header */ + sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp); +- if (ncolors > 32766) ++ if (ncolors <= 0 || ncolors > 32766) + { + fprintf(stderr, "gdk_imlib ERROR: XPM data wth colors > 32766 not supported\n"); + free(im); ++ free(line); + return NULL; + } +- if (cpp > 5) ++ if (cpp <= 0 || cpp > 5) + { + fprintf(stderr, "gdk_imlib ERROR: XPM data with characters per pixel > 5 not supported\n"); + free(im); ++ free(line); + return NULL; + } +- if (w > 32767) ++ if (w <= 0 || w > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for data\n"); + free(im); ++ free(line); + return NULL; + } +- if (h > 32767) ++ if (h <= 0 || h > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for data\n"); + free(im); ++ free(line); + return NULL; + } + cmap = malloc(sizeof(struct _cmap) * ncolors); +@@ -1273,6 +1293,7 @@ + if (!cmap) + { + free(im); ++ free(line); + return NULL; + } + im->rgb_width = w; +@@ -1282,6 +1303,7 @@ + { + free(cmap); + free(im); ++ free(line); + return NULL; + } + im->alpha_data = NULL; +@@ -1355,7 +1377,7 @@ + strcpy(col + colptr, " "); + colptr++; + } +- if (colptr + ls <= sizeof(col)) ++ if (colptr + ls < sizeof(col)) + { + strcpy(col + colptr, s); + colptr += ls; +@@ -1558,6 +1580,7 @@ + } + if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3)) + done = 1; ++ free(line); + } + if (!transp) + { diff --git a/staging/imlib/PKGBUILD b/staging/imlib/PKGBUILD new file mode 100644 index 000000000..a24025502 --- /dev/null +++ b/staging/imlib/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 146849 2012-01-18 20:31:10Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=imlib +pkgver=1.9.15 +pkgrel=11 +pkgdesc="General image handling library for X11 and Gtk" +arch=('i686' 'x86_64') +url="http://freshmeat.net/projects/imlib/" +license=('GPL') +depends=('gtk' 'giflib' 'libpng' 'libtiff') +makedepends=('libxt') +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2 + debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch imlib-1.9.15-libpng15.patch) +sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' + 'fe2fd9ce4d7bc62271e724153de39012de8ec5ee' + 'ec1b47281c1a7fb21abe841f948ecc56ed13f310' + 'af54cb1ee0c8c6122b277284ebdd1022e31df3b5' + '33c3aaa43eb624f2a6ab0406285a8515903333e3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/debian-bug448360.patch" + patch -p1 -i "${srcdir}/CAN-2004-1026.patch" + patch -p0 -i "${srcdir}/aclocal-fixes.patch" + patch -p0 -i "${srcdir}/imlib-1.9.15-libpng15.patch" + sed '/AC_PATH_XTRA/d' -i configure.in + libtoolize --force + cp /usr/bin/libtool . + autoreconf --force --install + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm --disable-static + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/imlib/aclocal-fixes.patch b/staging/imlib/aclocal-fixes.patch new file mode 100644 index 000000000..04ef737e7 --- /dev/null +++ b/staging/imlib/aclocal-fixes.patch @@ -0,0 +1,20 @@ +--- imlib.m4.orig 2006-03-05 12:41:14.000000000 +0000 ++++ imlib.m4 2006-03-05 12:44:15.000000000 +0000 +@@ -6,7 +6,7 @@ + dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS + dnl +-AC_DEFUN(AM_PATH_IMLIB, ++AC_DEFUN([AM_PATH_IMLIB], + [dnl + dnl Get the cflags and libraries from the imlib-config script + dnl +@@ -164,7 +164,7 @@ + ]) + + # Check for gdk-imlib +-AC_DEFUN(AM_PATH_GDK_IMLIB, ++AC_DEFUN([AM_PATH_GDK_IMLIB], + [dnl + dnl Get the cflags and libraries from the imlib-config script + dnl diff --git a/staging/imlib/debian-bug448360.patch b/staging/imlib/debian-bug448360.patch new file mode 100644 index 000000000..f1c0ef111 --- /dev/null +++ b/staging/imlib/debian-bug448360.patch @@ -0,0 +1,92 @@ +diff -up -ru imlib-1.9.15.orig/gdk_imlib/misc.c imlib-1.9.15/gdk_imlib/misc.c +--- imlib-1.9.15.orig/gdk_imlib/misc.c 2002-03-04 18:06:32.000000000 +0100 ++++ imlib-1.9.15/gdk_imlib/misc.c 2007-10-28 14:00:04.000000000 +0100 +@@ -674,6 +674,10 @@ gdk_imlib_init_params(GdkImlibInitParams + visual = gdk_rgb_get_visual(); + id->x.visual = GDK_VISUAL_XVISUAL(visual); /* the visual type */ + id->x.depth = visual->depth; /* the depth of the screen in bpp */ ++ ++ id->x.shm = 0; ++ id->x.shmp = 0; ++ id->max_shm = 0; + #ifdef HAVE_SHM + if (XShmQueryExtension(id->x.disp)) + { +@@ -689,17 +693,14 @@ gdk_imlib_init_params(GdkImlibInitParams + id->x.last_xim = NULL; + id->x.last_sxim = NULL; + id->max_shm = 0x7fffffff; +- if (XShmPixmapFormat(id->x.disp) == ZPixmap) ++ if ((XShmPixmapFormat(id->x.disp) == ZPixmap) && ++ (pm == True)) + id->x.shmp = 1; + } + } + } +- else + #endif +- { +- id->x.shm = 0; +- id->x.shmp = 0; +- } ++ + id->cache.on_image = 0; + id->cache.size_image = 0; + id->cache.num_image = 0; +@@ -935,8 +936,8 @@ gdk_imlib_init_params(GdkImlibInitParams + } + if (p->flags & PARAMS_SHAREDPIXMAPS) + { +- if (id->x.shm) +- id->x.shmp = p->sharedpixmaps; ++ if (!p->sharedpixmaps) ++ id->x.shmp = 0; + } + if (p->flags & PARAMS_PALETTEOVERRIDE) + override = p->paletteoverride; +diff -up -ru imlib-1.9.15.orig/Imlib/misc.c imlib-1.9.15/Imlib/misc.c +--- imlib-1.9.15.orig/Imlib/misc.c 2004-09-21 02:22:59.000000000 +0200 ++++ imlib-1.9.15/Imlib/misc.c 2007-10-28 14:00:23.000000000 +0100 +@@ -675,6 +675,10 @@ Imlib_init_with_params(Display * disp, I + id->x.root = DefaultRootWindow(disp); /* the root window id */ + id->x.visual = DefaultVisual(disp, id->x.screen); /* the visual type */ + id->x.depth = DefaultDepth(disp, id->x.screen); /* the depth of the screen in bpp */ ++ ++ id->x.shm = 0; ++ id->x.shmp = 0; ++ id->max_shm = 0; + #ifdef HAVE_SHM + if (XShmQueryExtension(id->x.disp)) + { +@@ -690,17 +694,14 @@ Imlib_init_with_params(Display * disp, I + id->x.last_xim = NULL; + id->x.last_sxim = NULL; + id->max_shm = 0x7fffffff; +- if (XShmPixmapFormat(id->x.disp) == ZPixmap) ++ if ((XShmPixmapFormat(id->x.disp) == ZPixmap && ++ (pm == True))) + id->x.shmp = 1; + } + } + } +- else + #endif +- { +- id->x.shm = 0; +- id->x.shmp = 0; +- } ++ + id->cache.on_image = 0; + id->cache.size_image = 0; + id->cache.num_image = 0; +@@ -952,8 +953,8 @@ Imlib_init_with_params(Display * disp, I + } + if (p->flags & PARAMS_SHAREDPIXMAPS) + { +- if (id->x.shm) +- id->x.shmp = p->sharedpixmaps; ++ if (!p->sharedpixmaps) ++ id->x.shmp = 0; + } + if (p->flags & PARAMS_PALETTEOVERRIDE) + override = p->paletteoverride; diff --git a/staging/imlib/imlib-1.9.15-libpng15.patch b/staging/imlib/imlib-1.9.15-libpng15.patch new file mode 100644 index 000000000..7837cd488 --- /dev/null +++ b/staging/imlib/imlib-1.9.15-libpng15.patch @@ -0,0 +1,142 @@ +--- gdk_imlib/io-png.c ++++ gdk_imlib/io-png.c +@@ -40,13 +40,13 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -275,13 +275,13 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -301,6 +301,9 @@ + /* Setup Translators */ + if (color_type == PNG_COLOR_TYPE_PALETTE) + png_set_expand(png_ptr); ++ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) ++ png_set_expand(png_ptr); ++ + png_set_strip_16(png_ptr); + png_set_packing(png_ptr); + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) +@@ -440,13 +443,13 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -635,7 +638,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); + return 0; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fclose(f); + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); +--- Imlib/load.c ++++ Imlib/load.c +@@ -197,12 +197,12 @@ + png_destroy_read_struct(&png_ptr, NULL, NULL); + return NULL; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -260,7 +260,8 @@ + png_read_image(png_ptr, lines); + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + ptr = data; +- if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ++ if (color_type == PNG_COLOR_TYPE_GRAY ++ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) + { + for (y = 0; y < *h; y++) + { +@@ -285,6 +286,7 @@ + } + } + } ++#if 0 + else if (color_type == PNG_COLOR_TYPE_GRAY) + { + for (y = 0; y < *h; y++) +@@ -300,6 +302,7 @@ + } + } + } ++#endif + else + { + for (y = 0; y < *h; y++) +--- Imlib/save.c ++++ Imlib/save.c +@@ -342,7 +342,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); + return 0; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fclose(f); + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); +--- Imlib/utils.c ++++ Imlib/utils.c +@@ -1981,14 +1981,13 @@ + png_destroy_read_struct(&png_ptr, NULL, NULL); + return NULL; + } +- +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; diff --git a/staging/lcms2/PKGBUILD b/staging/lcms2/PKGBUILD new file mode 100644 index 000000000..e3d08a500 --- /dev/null +++ b/staging/lcms2/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 146836 2012-01-18 20:10:04Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> + +pkgname=lcms2 +pkgver=2.3 +pkgrel=2 +pkgdesc="Small-footprint color management engine, version 2" +arch=('i686' 'x86_64') +license=('MIT') +depends=('libtiff') +url="http://www.littlecms.com" +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz) +sha1sums=('67d5fabda2f5777ca8387766539b9c871d993133') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/libgdiplus/PKGBUILD b/staging/libgdiplus/PKGBUILD new file mode 100644 index 000000000..26c513066 --- /dev/null +++ b/staging/libgdiplus/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 146859 2012-01-18 21:23:30Z daniel $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> + +pkgname=libgdiplus +pkgver=2.10 +pkgrel=2 +pkgdesc="An Open Source Implementation of the GDI+ API" +arch=(i686 x86_64) +license=('MPL' 'LGPL') +url="http://www.mono-project.com" +depends=('libtiff>=3.9.2-2' 'cairo>=1.8.10' 'giflib' 'glib2>=2.24.0' 'libexif') +makedepends=('pkgconfig') +options=('!libtool') +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng15.patch) +md5sums=('451966e8f637e3a1f02d1d30f900255d' + 'a2d143676bbaceeb88b4c34069e93986') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 <../libpng15.patch + ./configure --prefix=/usr --with-cairo=system || return 1 + + make || return 1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/staging/libgdiplus/gdiplus-png14.patch b/staging/libgdiplus/gdiplus-png14.patch new file mode 100644 index 000000000..d13260812 --- /dev/null +++ b/staging/libgdiplus/gdiplus-png14.patch @@ -0,0 +1,20 @@ +--- src/pngcodec.c.orig 2010-01-16 23:47:17.000000000 +0100 ++++ src/pngcodec.c 2010-01-16 23:49:49.000000000 +0100 +@@ -352,7 +352,7 @@ + info_ptr->palette[i].blue, + info_ptr->palette[i].green, + info_ptr->palette[i].red, +- info_ptr->trans[i]); /* alpha */ ++ info_ptr->trans_alpha[i]); /* alpha */ + } + } + +@@ -418,7 +418,7 @@ + } + + if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { diff --git a/staging/libgdiplus/libpng15.patch b/staging/libgdiplus/libpng15.patch new file mode 100644 index 000000000..31a1c0162 --- /dev/null +++ b/staging/libgdiplus/libpng15.patch @@ -0,0 +1,164 @@ +$NetBSD: patch-aa,v 1.8 2011/01/21 10:21:51 wiz Exp $ + +Fix build with png-1.5. + +--- src/pngcodec.c.orig 2010-11-03 16:52:54.000000000 +0000 ++++ src/pngcodec.c +@@ -116,10 +116,15 @@ gdip_load_png_properties (png_structp pn + bitmap_data->dpi_horz = png_get_x_pixels_per_inch(png_ptr, info_ptr); + bitmap_data->dpi_vert = png_get_y_pixels_per_inch(png_ptr, info_ptr); + #elif defined(PNG_pHYs_SUPPORTED) +- if ((info_ptr->valid & PNG_INFO_pHYs) && (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)) { +- bitmap_data->image_flags |= ImageFlagsHasRealDPI; +- bitmap_data->dpi_horz = info_ptr->x_pixels_per_unit * 0.0254; +- bitmap_data->dpi_vert = info_ptr->y_pixels_per_unit * 0.0254; ++ if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) { ++ png_uint_32 res_x, res_y; ++ int unit_type; ++ png_get_pHYs (png_ptr, info_ptr, &res_x, &res_y, &unit_type); ++ if (unit_type == PNG_RESOLUTION_METER) { ++ bitmap_data->image_flags |= ImageFlagsHasRealDPI; ++ bitmap_data->dpi_horz = res_x * 0.0254; ++ bitmap_data->dpi_vert = res_y * 0.0254; ++ } + } + #endif + /* default to screen resolution (if nothing was provided or available) */ +@@ -130,7 +135,7 @@ gdip_load_png_properties (png_structp pn + #if defined(PNG_iCCP_SUPPORTED) + { + png_charp name; +- png_charp profile; ++ png_bytep profile; + png_uint_32 proflen; + int compression_type; + +@@ -292,6 +297,11 @@ gdip_load_png_image_from_file_or_stream + ImageFlags colourspace_flag; + int i; + int j; ++ png_colorp png_palette; ++ int png_num_palette; ++ png_bytep trans_alpha; ++ int num_trans; ++ png_color_16p trans_color; + + width = png_get_image_width (png_ptr, info_ptr); + height = png_get_image_height (png_ptr, info_ptr); +@@ -309,6 +319,8 @@ gdip_load_png_image_from_file_or_stream + } + + /* Copy palette. */ ++ png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette); ++ + num_colours = 1 << bit_depth; + + if (png_get_color_type (png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) { +@@ -321,8 +333,8 @@ gdip_load_png_image_from_file_or_stream + colourspace_flag = ImageFlagsColorSpaceRGB; + + palette_entries = num_colours; +- if (palette_entries > info_ptr->num_palette) { +- palette_entries = info_ptr->num_palette; ++ if (palette_entries > png_num_palette) { ++ palette_entries = png_num_palette; + } + + palette = GdipAlloc (sizeof(ColorPalette) + (num_colours - 1) * sizeof(ARGB)); +@@ -331,29 +343,30 @@ gdip_load_png_image_from_file_or_stream + + for (i=0; i < palette_entries; i++) { + set_pixel_bgra (&palette->Entries[i], 0, +- info_ptr->palette[i].blue, +- info_ptr->palette[i].green, +- info_ptr->palette[i].red, ++ png_palette[i].blue, ++ png_palette[i].green, ++ png_palette[i].red, + 0xFF); /* alpha */ + } + } + ++ png_get_tRNS (png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color); + /* Make sure transparency is respected. */ +- if (info_ptr->num_trans > 0) { ++ if (num_trans > 0) { + palette->Flags |= PaletteFlagsHasAlpha; + colourspace_flag |= ImageFlagsHasAlpha; + +- if (info_ptr->num_trans > info_ptr->num_palette) { +- info_ptr->num_trans = info_ptr->num_palette; ++ if (num_trans > png_num_palette) { ++ num_trans = png_num_palette; + } + +- for (i=0; i < info_ptr->num_trans; i++) { ++ for (i=0; i < num_trans; i++) { + set_pixel_bgra(&palette->Entries[i], 0, +- info_ptr->palette[i].blue, +- info_ptr->palette[i].green, +- info_ptr->palette[i].red, ++ png_palette[i].blue, ++ png_palette[i].green, ++ png_palette[i].red, + #if PNG_LIBPNG_VER > 10399 +- info_ptr->trans_alpha [i]); /* alpha */ ++ trans_alpha [i]); /* alpha */ + #else + info_ptr->trans[i]); /* alpha */ + #endif +@@ -398,6 +411,8 @@ gdip_load_png_image_from_file_or_stream + BYTE bit_depth; + int stride; + int interlace; ++ png_colorp png_palette; ++ int png_num_palette; + png_bytep *row_pointers; + BYTE *rawptr; + int i, j; +@@ -490,32 +505,33 @@ gdip_load_png_image_from_file_or_stream + png_byte palette = 0; + png_byte pix = *rowp++; + ++ png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette); + palette = (pix >> 6) & 0x03; + set_pixel_bgra (rawptr, 0, +- info_ptr->palette[palette].blue, +- info_ptr->palette[palette].green, +- info_ptr->palette[palette].red, ++ png_palette[palette].blue, ++ png_palette[palette].green, ++ png_palette[palette].red, + 0xFF); /* alpha */ + + palette = (pix >> 4) & 0x03; + set_pixel_bgra (rawptr, 4, +- info_ptr->palette[palette].blue, +- info_ptr->palette[palette].green, +- info_ptr->palette[palette].red, ++ png_palette[palette].blue, ++ png_palette[palette].green, ++ png_palette[palette].red, + 0xFF); /* alpha */ + + palette = (pix >> 2) & 0x03; + set_pixel_bgra (rawptr, 8, +- info_ptr->palette[palette].blue, +- info_ptr->palette[palette].green, +- info_ptr->palette[palette].red, ++ png_palette[palette].blue, ++ png_palette[palette].green, ++ png_palette[palette].red, + 0xFF); /* alpha */ + + palette = pix & 0x03; + set_pixel_bgra (rawptr, 12, +- info_ptr->palette[palette].blue, +- info_ptr->palette[palette].green, +- info_ptr->palette[palette].red, ++ png_palette[palette].blue, ++ png_palette[palette].green, ++ png_palette[palette].red, + 0xFF); /* alpha */ + rawptr += 16; + } diff --git a/staging/libpng/PKGBUILD b/staging/libpng/PKGBUILD new file mode 100644 index 000000000..433f422dd --- /dev/null +++ b/staging/libpng/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 146824 2012-01-18 19:24:58Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> +# Contributor: Travis Willard <travis@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=libpng +pkgver=1.5.7 +_apngver=1.5.7 +pkgrel=1 +pkgdesc="A collection of routines used to create PNG format graphics files" +arch=('i686' 'x86_64') +url="http://www.libpng.org/pub/png/libpng.html" +license=('custom') +depends=('zlib' 'sh') +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" + "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz") +md5sums=('c3ae9ce4e81ec0aafdd4ac961586ee0d' + '6c6a674048cec94db1bc35decf0d142c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Add animated PNG (apng) support + # see http://sourceforge.net/projects/libpng-apng/ + patch -p1 -i "$srcdir/libpng-$_apngver-apng.patch" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + cd contrib/pngminus + make PNGLIB="-L$pkgdir/usr/lib -lpng" -f makefile.std png2pnm pnm2png + install -m755 png2pnm pnm2png "$pkgdir/usr/bin/" + install -D -m644 ../../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/staging/librsvg/PKGBUILD b/staging/librsvg/PKGBUILD new file mode 100644 index 000000000..90ffdcd13 --- /dev/null +++ b/staging/librsvg/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 146839 2012-01-18 20:16:37Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=librsvg +pkgver=2.34.2 +pkgrel=2 +pkgdesc="A SVG viewing library" +arch=(i686 x86_64) +license=('LGPL') +depends=('gdk-pixbuf2' 'pango' 'libcroco') +makedepends=('intltool' 'gtk2') +optdepends=('gtk2: for rsvg-view support') +options=('!libtool' '!emptydirs') +url="http://librsvg.sourceforge.net/" +install=librsvg.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.34/$pkgname-$pkgver.tar.xz) +sha256sums=('5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in + ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ + --with-croco --disable-static \ + --with-svgz + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/staging/librsvg/librsvg.install b/staging/librsvg/librsvg.install new file mode 100644 index 000000000..4d48b071f --- /dev/null +++ b/staging/librsvg/librsvg.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/gdk-pixbuf-query-loaders --update-cache +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/libtiff/PKGBUILD b/staging/libtiff/PKGBUILD new file mode 100644 index 000000000..16d6dded5 --- /dev/null +++ b/staging/libtiff/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 146823 2012-01-18 19:24:43Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=libtiff +pkgver=4.0.0 +pkgrel=1 +pkgdesc="Library for manipulation of TIFF images" +arch=('i686' 'x86_64') +url="http://www.remotesensing.org/libtiff/" +license=('custom') +depends=('libjpeg' 'zlib' 'xz') +makedepends=('freeglut') +optdepends=('freeglut: for using tiffgt') +options=('!libtool') +source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) +sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522') + +build() { + cd "${srcdir}/tiff-${pkgver}" + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/tiff-${pkgver}" + make check +} + +package() { + cd "${srcdir}/tiff-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/libunique3/PKGBUILD b/staging/libunique3/PKGBUILD new file mode 100644 index 000000000..f641e0925 --- /dev/null +++ b/staging/libunique3/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 146851 2012-01-18 20:41:52Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +pkgname=libunique3 +pkgver=3.0.2 +pkgrel=2 +pkgdesc="Library for writing single instance applications for GTK3" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('gtk3') +makedepends=('gtk-doc' 'gobject-introspection') +options=('!libtool') +url="http://live.gnome.org/LibUnique" +source=(http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique-$pkgver.tar.xz) +sha256sums=('a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038') + +build() { + cd "$srcdir/libunique-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --disable-dbus + make +} + +package() { + cd "$srcdir/libunique-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/staging/libwmf/PKGBUILD b/staging/libwmf/PKGBUILD new file mode 100644 index 000000000..0222a1832 --- /dev/null +++ b/staging/libwmf/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 146861 2012-01-18 21:36:12Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=libwmf +pkgver=0.2.8.4 +pkgrel=9 +pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)" +arch=('i686' 'x86_64') +url="http://wvware.sourceforge.net/libwmf.html" +license=('LGPL') +depends=('libpng' 'libx11' 'libjpeg' 'gsfonts') +makedepends=('gtk2' 'libxt') +optdepends=('gdk-pixbuf2: for pixbuf loader') +options=('!libtool' '!docs' '!emptydirs') +install=libwmf.install +source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz + libwmf-0.2.8.4-libpng-1.5.patch libwmf-0.2.8.4-useafterfree.patch) +sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' + '42aa4c2a82e4e14044c875a7f439baea732a355a' + 'ea6d28880840e86c96f9079bfd591da54dcffa5c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/libwmf-0.2.8.4-libpng-1.5.patch" + patch -p1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch" + ./configure --prefix=/usr \ + --with-gsfontdir=/usr/share/fonts/Type1 \ + --with-fontdir=/usr/share/fonts/Type1 \ + --with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + #Remove fonts, these are in gsfonts + rm -rf "${pkgdir}/usr/share/fonts" + #Remove static GTK loader, can't use it anyways + rm -f "${pkgdir}"/usr/lib/gtk-2.0/*/loaders/io-wmf.a +} diff --git a/staging/libwmf/libwmf-0.2.8.4-libpng-1.5.patch b/staging/libwmf/libwmf-0.2.8.4-libpng-1.5.patch new file mode 100644 index 000000000..3528c74eb --- /dev/null +++ b/staging/libwmf/libwmf-0.2.8.4-libpng-1.5.patch @@ -0,0 +1,12 @@ +diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h libwmf-0.2.8.4/src/ipa/ipa/bmp.h +--- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h 2011-05-23 19:14:23.000000000 +0200 ++++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2011-05-23 19:15:11.000000000 +0200 +@@ -66,7 +66,7 @@ + return; + } + +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)"); + png_destroy_write_struct (&png_ptr,&info_ptr); + wmf_free (API,buffer); diff --git a/staging/libwmf/libwmf-0.2.8.4-useafterfree.patch b/staging/libwmf/libwmf-0.2.8.4-useafterfree.patch new file mode 100644 index 000000000..328c5411f --- /dev/null +++ b/staging/libwmf/libwmf-0.2.8.4-useafterfree.patch @@ -0,0 +1,10 @@ +--- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list 2009-04-24 04:06:44.000000000 -0400 ++++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c 2009-04-24 04:08:30.000000000 -0400 +@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe + { more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle)); + if (more == 0) return; + im->clip->max += 8; ++ im->clip->list = more; + } + im->clip->list[im->clip->count] = (*rect); + im->clip->count++; diff --git a/staging/libwmf/libwmf.install b/staging/libwmf/libwmf.install new file mode 100644 index 000000000..9c99a901b --- /dev/null +++ b/staging/libwmf/libwmf.install @@ -0,0 +1,13 @@ +post_install() { + if [ -x usr/bin/gdk-pixbuf-query-loaders ]; then + gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/staging/libxfcegui4/PKGBUILD b/staging/libxfcegui4/PKGBUILD new file mode 100644 index 000000000..d00dda2c5 --- /dev/null +++ b/staging/libxfcegui4/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 146865 2012-01-18 23:54:43Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Tobias Kieslich <tobias funnychar archlinux.org> + +pkgname=libxfcegui4 +pkgver=4.8.1 +pkgrel=4 +pkgdesc="Various Gtk widgets for Xfce" +arch=('i686' 'x86_64') +url="http://www.xfce.org/" +license=('GPL2') +depends=('startup-notification' "xfconf>=4.8.0" "libglade" 'libsm' + 'hicolor-icon-theme') +makedepends=('intltool') +options=('!libtool') +install=$pkgname.install +source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) +sha256sums=('309a81823cdfdb7301bc6a5199e14f0df29b58dae89a9302c7839b9b94812443') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/libxfcegui4/libxfcegui4.install b/staging/libxfcegui4/libxfcegui4.install new file mode 100644 index 000000000..abf924aa2 --- /dev/null +++ b/staging/libxfcegui4/libxfcegui4.install @@ -0,0 +1,14 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + + +# vim:set ts=2 sw=2 et: diff --git a/staging/links/PKGBUILD b/staging/links/PKGBUILD new file mode 100644 index 000000000..185990ac7 --- /dev/null +++ b/staging/links/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 146834 2012-01-18 20:01:18Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=links +pkgver=2.5 +pkgrel=1 +pkgdesc="A text WWW browser, similar to Lynx" +arch=('i686' 'x86_64') +url="http://links.twibright.com/" +license=('GPL') +depends=('bzip2' 'xz' 'zlib' 'openssl' 'gpm') +makedepends=('libtiff' 'libpng' 'libxt') +optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks') +provides=('links-g') +conflicts=('links-g') +replaces=('links-g') +source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop) +sha1sums=('fe4bc37be8aebd9196c35ffef724435cea94349c' + 'f600e27c2a71184444f7dd07a10230aa44463a02') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + (cd intl; ./gen-intl; ./synclang) + ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \ + --enable-graphics --with-x --with-fb + make + mv links xlinks + + ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \ + --disable-graphics --without-x --without-fb + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 xlinks "${pkgdir}/usr/bin/xlinks" + ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz" + + install -D -m644 "${srcdir}/links.desktop" "${pkgdir}/usr/share/applications/links.desktop" + install -d "${pkgdir}/usr/share/pixmaps" + install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm "${pkgdir}/usr/share/pixmaps/" + + install -d "${pkgdir}/usr/share/doc/links/calibration" + install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/" +} diff --git a/staging/links/links.desktop b/staging/links/links.desktop new file mode 100644 index 000000000..9d6338a5b --- /dev/null +++ b/staging/links/links.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Links +Exec=xlinks -g +Icon=links_32x32.xpm +Type=Application +Terminal=false +Categories=Network;WebBrowser; diff --git a/staging/neverball/PKGBUILD b/staging/neverball/PKGBUILD new file mode 100644 index 000000000..2413373e9 --- /dev/null +++ b/staging/neverball/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 146885 2012-01-19 03:40:43Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=neverball +pkgver=1.5.4 +pkgrel=4 +pkgdesc="3D game similar to Super Monkey Ball or Marble Madness" +arch=('i686' 'x86_64') +url="http://neverball.org/" +license=('GPL') +depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs') +makedepends=('mesa') +source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz neverball-1.5.4-underlink.patch) +sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7' + 'f71982b7187d569c57b30c4c40fedd6c0e72baca') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h + patch -p0 -i ../neverball-1.5.4-underlink.patch + + if [ "${CARCH}" = "i686" ] ;then + make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS="" + else + make ENABLE_NLS=1 DATADIR=/usr/share/neverball + fi +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}/usr/bin" + install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball} + install -d "${pkgdir}"/usr/share/man/man{1,6} + + install -m755 neverball neverputt mapc "${pkgdir}/usr/bin" + cp -r locale/* "${pkgdir}/usr/share/locale/" + cp -r data/* "${pkgdir}/usr/share/neverball/" + install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/" + install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/" + install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/" + install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1" + install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6" + + ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png" + ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png" + find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \; +} diff --git a/staging/neverball/neverball-1.5.4-underlink.patch b/staging/neverball/neverball-1.5.4-underlink.patch new file mode 100644 index 000000000..1a848cad3 --- /dev/null +++ b/staging/neverball/neverball-1.5.4-underlink.patch @@ -0,0 +1,22 @@ +--- Makefile.old 2011-06-22 06:30:52.441788160 +0200 ++++ Makefile 2011-06-22 06:31:59.754087534 +0200 +@@ -138,7 +138,7 @@ + endif + + ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \ +- -lvorbisfile $(OGL_LIBS) ++ -lvorbisfile $(OGL_LIBS) -lX11 + + #------------------------------------------------------------------------------ + +--- Makefile.old 2012-01-18 21:28:23.000000000 -0500 ++++ Makefile 2012-01-18 21:28:55.000000000 -0500 +@@ -131,7 +131,7 @@ + OGL_LIBS := -framework OpenGL + endif + +-BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) ++BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm + + ifdef DARWIN + BASE_LIBS += -L/opt/local/lib diff --git a/staging/php/PKGBUILD b/staging/php/PKGBUILD index fa85df37b..baced205a 100644 --- a/staging/php/PKGBUILD +++ b/staging/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145825 2012-01-02 11:52:31Z pierre $ +# $Id: PKGBUILD 146829 2012-01-18 19:53:06Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,9 +21,9 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.3.8 -_suhosinver=5.3.7-0.9.10 -pkgrel=7 +pkgver=5.3.9 +_suhosinver=5.3.9-0.9.10 +pkgrel=2 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -36,13 +36,13 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm') -md5sums=('704cd414a0565d905e1074ffdc1fadfb' - '08582e502fed8221c6577042ca45ddb8' - '5bf4473f658404aa9a97bf026ecef8e9' - '65606c606df97a0760dfe5aaf9893afc' +md5sums=('dd3288ed5c08cd61ac5bf619cb357521' + 'c099b3d7eac95018ababd41ded7f3066' + 'c15d18f846be1d69144a5d0056ee6506' + 'ffc338e8ce2a990f6f2a486355bbab65' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' - '09005dabd90c48ddd392b3dbf05f8a82' + '740ec5fe2ecfd9d7febd4081c90ec65b' '07c4e412909ac65a44ec90e7a2c4bade') build() { diff --git a/staging/php/php-fpm.conf.in.patch b/staging/php/php-fpm.conf.in.patch index b4dd32f96..b923edb38 100644 --- a/staging/php/php-fpm.conf.in.patch +++ b/staging/php/php-fpm.conf.in.patch @@ -1,5 +1,5 @@ ---- sapi/fpm/php-fpm.conf.in 2011-07-04 23:22:56.000000000 +0200 -+++ sapi/fpm/php-fpm.conf.in 2011-08-12 16:56:23.686606725 +0200 +--- sapi/fpm/php-fpm.conf.in 2011-10-08 23:04:10.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2012-01-11 10:50:14.905161442 +0100 @@ -12,7 +12,7 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p arguement) @@ -17,8 +17,8 @@ +pid = run/php-fpm/php-fpm.pid ; Error log file - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ -@@ -102,7 +102,8 @@ + ; If it's set to "syslog", log is sent to syslogd instead of being written +@@ -140,7 +140,8 @@ ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. @@ -28,7 +28,7 @@ ; Set listen(2) backlog. A value of '-1' means unlimited. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) -@@ -121,9 +122,9 @@ +@@ -151,9 +152,9 @@ ; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user ; mode is set to 0666 @@ -38,38 +38,10 @@ +listen.owner = @php_fpm_user@ +listen.group = @php_fpm_group@ +listen.mode = 0660 - - ; Unix user/group of processes - ; Note: The user is mandatory. If the group is not set, the default user's group -@@ -163,23 +164,23 @@ - ; The number of child processes created on startup. - ; Note: Used only when pm is set to 'dynamic' - ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 --;pm.start_servers = 20 -+pm.start_servers = 20 - - ; The desired minimum number of idle server processes. - ; Note: Used only when pm is set to 'dynamic' - ; Note: Mandatory when pm is set to 'dynamic' --;pm.min_spare_servers = 5 -+pm.min_spare_servers = 5 - - ; The desired maximum number of idle server processes. - ; Note: Used only when pm is set to 'dynamic' - ; Note: Mandatory when pm is set to 'dynamic' --;pm.max_spare_servers = 35 -+pm.max_spare_servers = 35 - ; The number of requests each child process should execute before respawning. - ; This can be useful to work around memory leaks in 3rd party libraries. For - ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. - ; Default Value: 0 --;pm.max_requests = 500 -+pm.max_requests = 500 - - ; The URI to view the FPM status page. If this value is not set, no URI will be - ; recognized as a status page. By default, the status page shows the following -@@ -333,7 +334,7 @@ + ; List of ipv4 addresses of FastCGI clients which are allowed to connect. + ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +@@ -442,7 +443,7 @@ ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot diff --git a/staging/php/php.ini.patch b/staging/php/php.ini.patch index 46c842921..3dc5b6560 100644 --- a/staging/php/php.ini.patch +++ b/staging/php/php.ini.patch @@ -1,5 +1,5 @@ ---- php.ini-production 2011-02-09 01:25:44.000000000 +0100 -+++ php.ini-production 2011-03-19 11:11:44.496987763 +0100 +--- php.ini-production 2011-12-15 11:31:02.000000000 +0100 ++++ php.ini-production 2012-01-11 10:43:02.069936043 +0100 @@ -376,7 +376,7 @@ ; or per-virtualhost web server configuration file. This directive is ; *NOT* affected by whether Safe Mode is turned On or Off. @@ -9,7 +9,7 @@ ; This directive allows you to disable certain functions for security reasons. ; It receives a comma-delimited list of function names. This directive is -@@ -781,7 +781,7 @@ +@@ -793,7 +793,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -18,7 +18,7 @@ ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" -@@ -804,7 +804,7 @@ +@@ -816,7 +816,7 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir @@ -27,7 +27,7 @@ ; On windows: ; extension_dir = "ext" -@@ -938,53 +938,49 @@ +@@ -950,53 +950,49 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; @@ -52,7 +52,7 @@ -;extension=php_mysql.dll -;extension=php_mysqli.dll -;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client --;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client +-;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client -;extension=php_openssl.dll -;extension=php_pdo_firebird.dll -;extension=php_pdo_mssql.dll diff --git a/staging/qrencode/PKGBUILD b/staging/qrencode/PKGBUILD new file mode 100644 index 000000000..cfa810614 --- /dev/null +++ b/staging/qrencode/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 146830 2012-01-18 19:53:58Z bluewind $ +# Maintainer: Florian Pritz< flo@xinu.at> +# Contributor: Dany Martineau <dany.luc.martineau@gmail.com> + +pkgname=qrencode +pkgver=3.2.0 +pkgrel=2 +pkgdesc="C library for encoding data in a QR Code symbol." +arch=(i686 x86_64) +depends=('libpng>=1.5.0') +makedepends=(sdl) +url="http://megaui.net/fukuchi/works/qrencode/index.en.html" +license=('GPL') +options=(!libtool) +source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('7e90615eb314abcd2eb2eab5c8155b97') + +build() { + cd "${srcdir}/$pkgname-$pkgver" +# autoreconf + ./autogen.sh + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/$pkgname-$pkgver" + + make prefix="$pkgdir/usr" install +} diff --git a/staging/qt/PKGBUILD b/staging/qt/PKGBUILD new file mode 100644 index 000000000..24ae69a78 --- /dev/null +++ b/staging/qt/PKGBUILD @@ -0,0 +1,126 @@ +# $Id: PKGBUILD 146853 2012-01-18 20:54:27Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=qt +pkgname=('qt' 'qt-private-headers') +pkgver=4.8.0 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL') +makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' + 'mysql' 'unixodbc' 'cups' 'gtk2') +options=('!libtool') +_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" +source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' + 'qtconfig.desktop') +md5sums=('e8a5fdbeba2927c948d9f477a6abe904' + 'fc211414130ab2764132e7370f8e5caa' + '85179f5e0437514f8639957e1d8baf62' + 'f11852b97583610f3dbb669ebc3e21bc' + '6b771c8a81dd90b45e8a79afa0e5bbfd') + +build() { + cd "${srcdir}"/${_pkgfqn} + + export QT4DIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf + + ./configure -confirm-license -opensource \ + -prefix /usr \ + -docdir /usr/share/doc/qt \ + -plugindir /usr/lib/qt/plugins \ + -importdir /usr/lib/qt/imports \ + -datadir /usr/share/qt \ + -translationdir /usr/share/qt/translations \ + -sysconfdir /etc \ + -examplesdir /usr/share/doc/qt/examples \ + -demosdir /usr/share/doc/qt/demos \ + -plugin-sql-{psql,mysql,sqlite,odbc} \ + -system-sqlite \ + -no-phonon \ + -no-phonon-backend \ + -no-webkit \ + -graphicssystem raster \ + -openssl-linked \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -silent \ + -no-rpath \ + -optimized-qmake \ + -reduce-relocations \ + -dbus-linked \ + -no-openvg + make +} + +package_qt() { + pkgdesc='A cross-platform application and UI framework' + depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') + optdepends=('postgresql-libs: PostgreSQL driver' + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support') + install='qt.install' + + cd "${srcdir}"/${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install + + # install missing icons and desktop files + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -D -m644 ${icon} \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" + done + install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \ + "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png" + install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" + install -p -D -m644 tools/designer/src/designer/images/designer.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" + install -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \ + "${pkgdir}/usr/share/applications/" + + # install license addition + install -D -m644 LGPL_EXCEPTION.txt \ + ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt + + # Fix wrong path in pkgconfig files + find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt-private-headers(){ + pkgdesc="Qt private headers for development" + depends=("qt=${pkgver}") + + install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} + install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script} + + for i in QtCore QtDeclarative QtGui QtScript; do + cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \ + "${pkgdir}"/usr/include/${i}/ + done + + for i in corelib declarative gui script; do + cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/ + done +} diff --git a/staging/qt/assistant.desktop b/staging/qt/assistant.desktop new file mode 100644 index 000000000..a9e98c44b --- /dev/null +++ b/staging/qt/assistant.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt Assistant +Comment=Shows Qt documentation and examples +Exec=/usr/bin/assistant +Icon=assistant +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development;Documentation; diff --git a/staging/qt/designer.desktop b/staging/qt/designer.desktop new file mode 100644 index 000000000..9b7b6e9aa --- /dev/null +++ b/staging/qt/designer.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Qt Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt applications +Exec=/usr/bin/designer +Icon=designer +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/staging/qt/linguist.desktop b/staging/qt/linguist.desktop new file mode 100644 index 000000000..8cbe86599 --- /dev/null +++ b/staging/qt/linguist.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Linguist +Comment=Add translations to Qt applications +Exec=/usr/bin/linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/staging/qt/qt.install b/staging/qt/qt.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/qt/qt.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/qt/qtconfig.desktop b/staging/qt/qtconfig.desktop new file mode 100644 index 000000000..46dcf9e3d --- /dev/null +++ b/staging/qt/qtconfig.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Config +Comment=Configure Qt behavior, styles, fonts +Exec=/usr/bin/qtconfig +Icon=qtlogo +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Settings; +NoDisplay=true diff --git a/staging/rrdtool/PKGBUILD b/staging/rrdtool/PKGBUILD new file mode 100644 index 000000000..ec9476a0b --- /dev/null +++ b/staging/rrdtool/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 146899 2012-01-19 04:20:31Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=rrdtool +pkgver=1.4.5 +pkgrel=5 +pkgdesc="Data logging and graphing application" +arch=('i686' 'x86_64') +url="http://www.rrdtool.org" +license=('GPL' 'custom') +depends=('libxml2' 'pango' 'ttf-dejavu') +makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua') +optdepends=('tcl: to use corresponding binding' \ + 'python2: to use corresponding binding' \ + 'ruby: to use corresponding binding' \ + 'lua: to use corresponding binding') +options=('!libtool' '!emptydirs' '!makeflags') +source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) +sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl |' bindings/perl-shared/Makefile.PL + PYTHON=python2 ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ + --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ + --enable-ruby --enable-ruby-site-install --enable-python \ + --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/scim-tables/PKGBUILD b/staging/scim-tables/PKGBUILD new file mode 100644 index 000000000..06f296f43 --- /dev/null +++ b/staging/scim-tables/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 146905 2012-01-19 04:58:35Z bisson $ +# Contributor: damir <damir@archlinux.org> +# Contributor: Gan Lu <rhythm.gan@gmail.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=scim-tables +pkgver=0.5.10 +pkgrel=2 +pkgdesc='Generic table input method module for SCIM' +url='http://www.scim-im.org/' +arch=('i686' 'x86_64') +license=('GPL') +depends=('scim') +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz") +sha1sums=('c6e6fbd9999ceba5cb982349fee8391e16a9c2fe') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-static=no + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/sox/PKGBUILD b/staging/sox/PKGBUILD new file mode 100644 index 000000000..4ac83085c --- /dev/null +++ b/staging/sox/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 146873 2012-01-19 01:56:50Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=sox +pkgver=14.3.2 +pkgrel=5 +pkgdesc="The Swiss Army knife of sound processing tools" +arch=('i686' 'x86_64') +url="http://sox.sourceforge.net/" +license=('GPL' 'LGPL') +depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr') +makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') +optdepends=('libao: for ao plugin' + 'ffmpeg: for ffmpeg plugin' + 'libmad: for mp3 plugin' + 'libid3tag: for mp3 plugin' + 'wavpack: for wavpack plugin' + 'libpulse: for pulse plugin') +options=('!libtool') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + sox-14.3.2-ffmpeg.patch) +sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3' + '86caa6aa86a0bf7a048522114d4efd11acbbda70') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch" + sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-dyn-default --with-distro="Arch Linux" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/sox/sox-14.3.2-ffmpeg.patch b/staging/sox/sox-14.3.2-ffmpeg.patch new file mode 100644 index 000000000..5289b9b47 --- /dev/null +++ b/staging/sox/sox-14.3.2-ffmpeg.patch @@ -0,0 +1,40 @@ +Index: sox-14.3.2/src/ffmpeg.c +=================================================================== +--- sox-14.3.2.orig/src/ffmpeg.c ++++ sox-14.3.2/src/ffmpeg.c +@@ -91,7 +91,7 @@ static int stream_component_open(priv_t + + if (!codec || avcodec_open(enc, codec) < 0) + return -1; +- if (enc->codec_type != CODEC_TYPE_AUDIO) { ++ if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { + lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); + return -1; + } +@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft) + /* Find audio stream (FIXME: allow different stream to be selected) */ + for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) { + AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec; +- if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) { ++ if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) { + ffmpeg->audio_index = i; + break; + } +@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo + + c = st->codec; + c->codec_id = codec_id; +- c->codec_type = CODEC_TYPE_AUDIO; ++ c->codec_type = AVMEDIA_TYPE_AUDIO; + + /* put sample parameters */ + c->bit_rate = 256000; /* FIXME: allow specification */ +@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t + av_init_packet(&pkt); + pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples); + pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base); +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + pkt.stream_index = ffmpeg->audio_st->index; + pkt.data = ffmpeg->audio_buf_aligned; + diff --git a/staging/transfig/LICENSE b/staging/transfig/LICENSE new file mode 100644 index 000000000..b944bb992 --- /dev/null +++ b/staging/transfig/LICENSE @@ -0,0 +1,23 @@ +/* + * TransFig: Facility for Translating Fig code + * Copyright (c) 1991 by Micah Beck + * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul + * + * Any party obtaining a copy of these files is granted, free of charge, a + * full and unrestricted irrevocable, world-wide, paid up, royalty-free, + * nonexclusive right and license to deal in this software and + * documentation files (the "Software"), including without limitation the + * rights to use, copy, modify, merge, publish and/or distribute copies of + * the Software, and to permit persons who receive copies from any such + * party to do so, with the only requirement being that this copyright + * notice remain intact. + * + */ + +THE LAWRENCE BERKELEY NATIONAL LABORATORY DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, +INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. diff --git a/staging/transfig/PKGBUILD b/staging/transfig/PKGBUILD new file mode 100644 index 000000000..5c03217ca --- /dev/null +++ b/staging/transfig/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 146871 2012-01-19 01:34:27Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=transfig +pkgver=3.2.5d +pkgrel=1 +pkgdesc="Format conversion utility that can be used with xfig" +arch=('i686' 'x86_64') +url="http://www.xfig.org" +license=('custom') +depends=('libpng' 'libxpm') +makedepends=('imake') +source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE \ + transfig-3.2.5d-libpng-1.5.patch) +sha1sums=('90ff277cc9b3fa0d0313052fcf5e3ffad8652abc' + 'b8b712871615308b8b6add92f86d218437d652f2' + '9f9f332b0b31e58e59542bc1568df9617b71710a') + +build() { + cd "${srcdir}/${pkgname}.${pkgver}" + sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/' transfig/Imakefile + sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile + patch -p1 -i ../transfig-3.2.5d-libpng-1.5.patch + + xmkmf + make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles + make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig +} + +package() { + cd "${srcdir}/${pkgname}.${pkgver}" + + make DESTDIR="${pkgdir}" XFIGLIBDIR=/usr/share/xfig \ + FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \ + install install.man + install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/transfig/transfig-3.2.5d-libpng-1.5.patch b/staging/transfig/transfig-3.2.5d-libpng-1.5.patch new file mode 100644 index 000000000..e6f15e43e --- /dev/null +++ b/staging/transfig/transfig-3.2.5d-libpng-1.5.patch @@ -0,0 +1,39 @@ +http://bugs.gentoo.org/show_bug.cgi?id=356751 + +Index: transfig.3.2.5d/fig2dev/dev/readpng.c +=================================================================== +--- transfig.3.2.5d.orig/fig2dev/dev/readpng.c ++++ transfig.3.2.5d/fig2dev/dev/readpng.c +@@ -62,7 +62,7 @@ read_png(file,filetype,pic,llx,lly) + } + + /* set long jump here */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* if we get here there was a problem reading the file */ + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + return 0; +@@ -78,15 +78,17 @@ read_png(file,filetype,pic,llx,lly) + png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, + &interlace_type, &compression_type, &filter_type); + +- if (info_ptr->valid & PNG_INFO_gAMA) +- png_set_gamma(png_ptr, 2.2, info_ptr->gamma); +- else +- png_set_gamma(png_ptr, 2.2, 0.45); ++ png_fixed_point gamma = 0.45; ++ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma); ++ png_set_gamma(png_ptr, 2.2, gamma); + +- if (info_ptr->valid & PNG_INFO_bKGD) ++ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { + /* set the background to the one supplied */ +- png_set_background(png_ptr, &info_ptr->background, ++ png_color_16p background; ++ png_get_bKGD(png_ptr,info_ptr,&background); ++ png_set_background(png_ptr, background, + PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); ++ } + else { + /* blend the canvas background using the alpha channel */ + if (bgspec) { diff --git a/staging/tumbler/PKGBUILD b/staging/tumbler/PKGBUILD new file mode 100644 index 000000000..f08533acc --- /dev/null +++ b/staging/tumbler/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 146889 2012-01-19 03:45:36Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Jan Jezek <honzin.jezek@gmail.com> + +pkgname=tumbler +pkgver=0.1.23 +pkgrel=2 +pkgdesc="D-Bus service for applications to request thumbnails" +arch=('i686' 'x86_64') +url="http://git.xfce.org/xfce/tumbler/" +license=('GPL2' 'LGPL') +groups=('xfce4') +depends=('poppler-glib' 'dbus-glib' 'gdk-pixbuf2') +makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10') +optdepends=('ffmpegthumbnailer: for video thumbnails' + 'gstreamer0.10: for video thumbnails') +options=('!libtool') +source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2) +sha256sums=('b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --disable-static \ + --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/windowmaker-crm-git/PKGBUILD b/staging/windowmaker-crm-git/PKGBUILD new file mode 100644 index 000000000..c8ab1a721 --- /dev/null +++ b/staging/windowmaker-crm-git/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 146857 2012-01-18 21:05:19Z daniel $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> + +pkgname=windowmaker-crm-git +pkgver=20120109 +pkgrel=2 +pkgdesc="An X11 window manager with a NEXTSTEP look and feel - git version from Carlos R. Mafra" +arch=(i686 x86_64) +url="http://www.windowmaker.org" +license=('GPL' 'custom') +depends=('libxinerama' 'libxrandr' 'libpng' 'libxpm' 'libxft' 'libtiff>=3.9.1' 'giflib' 'libxmu') +options=('!libtool') +provides=('windowmaker') +conflicts=('windowmaker') +source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop) +md5sums=('abe70f9cc7606c73a9bbe498cacf925a' + '2fba97bebfd691836b92b8f0db79ff13') + +build() { + cd $srcdir/windowmaker-$pkgver + [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ + --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ + --enable-usermenu --enable-modelock --enable-xrandr + make +} + +package() { + cd $srcdir/windowmaker-$pkgver + + make DESTDIR=$pkgdir install + install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL + install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop + +} diff --git a/staging/windowmaker-crm-git/libpng-1.4.patch b/staging/windowmaker-crm-git/libpng-1.4.patch new file mode 100644 index 000000000..5dbe5fd25 --- /dev/null +++ b/staging/windowmaker-crm-git/libpng-1.4.patch @@ -0,0 +1,12 @@ +diff -Naur windowmaker-20091221-orig/wrlib/load.c windowmaker-20091221/wrlib/load.c +--- windowmaker-20091221-orig/wrlib/load.c 2010-01-21 17:01:10.000000000 -0500 ++++ windowmaker-20091221/wrlib/load.c 2010-01-21 17:02:38.000000000 -0500 +@@ -327,7 +327,7 @@ + + #ifdef USE_PNG + /* check for PNG */ +- if (png_check_sig(buffer, 8)) ++ if (!png_sig_cmp(buffer, 0, 8)) + return IM_PNG; + #endif + diff --git a/staging/windowmaker-crm-git/wmaker.desktop b/staging/windowmaker-crm-git/wmaker.desktop new file mode 100644 index 000000000..f819c7577 --- /dev/null +++ b/staging/windowmaker-crm-git/wmaker.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=windowmaker +Exec=/usr/bin/wmaker +Type=Application diff --git a/staging/windowmaker/PKGBUILD b/staging/windowmaker/PKGBUILD new file mode 100644 index 000000000..7d885b745 --- /dev/null +++ b/staging/windowmaker/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 146855 2012-01-18 21:00:09Z daniel $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> +pkgname=windowmaker +pkgver=0.95.0 +pkgrel=2 +pkgdesc="An X11 window manager with a NEXTSTEP look and feel" +arch=(i686 x86_64) +url="http://www.windowmaker.org/" +license=('GPL' 'custom') +depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') +options=('!libtool') +source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop) +md5sums=('2d89834b4019e0a08641709ea7235db2' + '2fba97bebfd691836b92b8f0db79ff13') + +build() { + cd $srcdir/windowmaker-$pkgver + [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ + --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ + --enable-usermenu --enable-modelock --enable-xrandr + make +} + +package() { + cd $srcdir/windowmaker-$pkgver + + make DESTDIR=$pkgdir install + install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL + install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop +} + diff --git a/staging/windowmaker/libpng-1.4.patch b/staging/windowmaker/libpng-1.4.patch new file mode 100644 index 000000000..419e8faca --- /dev/null +++ b/staging/windowmaker/libpng-1.4.patch @@ -0,0 +1,12 @@ +diff -Naur WindowMaker-0.92.0-orig/wrlib/load.c WindowMaker-0.92.0/wrlib/load.c +--- WindowMaker-0.92.0-orig/wrlib/load.c 2010-01-21 16:10:39.000000000 -0500 ++++ WindowMaker-0.92.0/wrlib/load.c 2010-01-21 16:13:15.000000000 -0500 +@@ -348,7 +348,7 @@ + + #ifdef USE_PNG + /* check for PNG */ +- if (png_check_sig(buffer, 8)) ++ if (!png_sig_cmp(buffer, 0, 8)) + return IM_PNG; + #endif + diff --git a/staging/windowmaker/windowmaker-gcc4.patch.tar.bz2 b/staging/windowmaker/windowmaker-gcc4.patch.tar.bz2 Binary files differnew file mode 100644 index 000000000..fae12a98d --- /dev/null +++ b/staging/windowmaker/windowmaker-gcc4.patch.tar.bz2 diff --git a/staging/windowmaker/wmaker.desktop b/staging/windowmaker/wmaker.desktop new file mode 100644 index 000000000..f819c7577 --- /dev/null +++ b/staging/windowmaker/wmaker.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=windowmaker +Exec=/usr/bin/wmaker +Type=Application diff --git a/staging/wxgtk/PKGBUILD b/staging/wxgtk/PKGBUILD new file mode 100644 index 000000000..cc950e017 --- /dev/null +++ b/staging/wxgtk/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 146863 2012-01-18 23:43:49Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=wxgtk +pkgver=2.8.12.1 +pkgrel=3 +pkgdesc="GTK+ implementation of wxWidgets API for GUI" +arch=('i686' 'x86_64') +url="http://wxwidgets.org" +license=('custom:wxWindows') +depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm') +makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa') +#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2) +source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) +sha1sums=('05688dc03d61631750f5904273122bb40a2115f5') + +build() { + cd "${srcdir}/wxPython-src-${pkgver}" +# cd "${srcdir}/wxGTK-${pkgver}" + ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ + --enable-graphics_ctx --disable-optimize --enable-mediactrl --with-regex=builtin \ + --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ + --disable-precomp-headers + make + make -C locale allmo + cd contrib/src + make +} + +package() { + cd "${srcdir}/wxPython-src-${pkgver}" +# cd "${srcdir}/wxGTK-${pkgver}" + make DESTDIR="${pkgdir}" install + cd contrib/src + make DESTDIR="${pkgdir}" install + install -D -m644 ../../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/xaos/PKGBUILD b/staging/xaos/PKGBUILD new file mode 100644 index 000000000..1240d0b00 --- /dev/null +++ b/staging/xaos/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 146867 2012-01-19 00:03:29Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=xaos +pkgver=3.5 +pkgrel=5 +pkgdesc="A fast portable real-time interactive fractal zoomer" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/xaos/" +license=('GPL') +depends=('gsl' 'libpng' 'aalib') +options=('!makeflags') +install=xaos.install +source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz xaos-3.5-libpng15.patch) +sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801' + '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../xaos-3.5-libpng15.patch + ./configure --prefix=/usr --with-gsl --with-aa-driver + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/xaos/xaos-3.5-libpng15.patch b/staging/xaos/xaos-3.5-libpng15.patch new file mode 100644 index 000000000..beece8339 --- /dev/null +++ b/staging/xaos/xaos-3.5-libpng15.patch @@ -0,0 +1,131 @@ +http://code.google.com/p/gnuxaos/issues/detail?id=55 + +--- src/util/png.c ++++ src/util/png.c +@@ -3,6 +3,7 @@ + #include <aconfig.h> + #ifdef USE_PNG + #include <png.h> ++#include <zlib.h> + #endif + #include <stdlib.h> + #include <stdio.h> +@@ -31,6 +32,9 @@ + png_structp png_ptr; + png_infop info_ptr; + png_color palette[256]; ++ png_color_8 sig_bit; ++ int color_type; ++ int bit_depth; + volatile unsigned short a = 255; + volatile unsigned char *b = (volatile unsigned char *) &a; + #ifdef _undefined_ +@@ -59,7 +63,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); + return "No memory to create png info structure"; + } +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(file); + return strerror(errno); +@@ -78,57 +82,70 @@ + png_set_compression_window_bits(png_ptr, 15); + png_set_compression_method(png_ptr, 8); + +- info_ptr->width = image->width; +- info_ptr->height = image->height; +- /*info_ptr->gamma=1.0; */ +- info_ptr->gamma = 0.5; +- info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs; +- info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth); +- info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight); ++ switch (image->palette->type) ++ { ++ case C256: ++ color_type = PNG_COLOR_TYPE_PALETTE; ++ bit_depth = image->bytesperpixel * 8; ++ break; ++ case SMALLITER: ++ case LARGEITER: ++ case GRAYSCALE: ++ color_type = PNG_COLOR_TYPE_GRAY; ++ bit_depth = image->bytesperpixel * 8; ++ break; ++ case TRUECOLOR: ++ case TRUECOLOR24: ++ case TRUECOLOR16: ++ color_type = PNG_COLOR_TYPE_RGB; ++ bit_depth = 8; ++ break; ++ } + ++ png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth, ++ color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, ++ PNG_FILTER_TYPE_BASE); + + switch (image->palette->type) { + case C256: + { + int i; +- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; +- info_ptr->bit_depth = image->bytesperpixel * 8; +- info_ptr->palette = palette; +- info_ptr->valid |= PNG_INFO_PLTE; ++ png_color png_palette[257]; ++ int png_num_palette; + for (i = 0; i < image->palette->end; i++) +- info_ptr->palette[i].red = image->palette->rgb[i][0], +- info_ptr->palette[i].green = image->palette->rgb[i][1], +- info_ptr->palette[i].blue = image->palette->rgb[i][2], +- info_ptr->num_palette = image->palette->end; ++ png_palette[i].red = image->palette->rgb[i][0], ++ png_palette[i].green = image->palette->rgb[i][1], ++ png_palette[i].blue = image->palette->rgb[i][2], ++ png_num_palette = image->palette->end; ++ png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette); + } + break; +- case SMALLITER: +- case LARGEITER: +- case GRAYSCALE: +- info_ptr->color_type = PNG_COLOR_TYPE_GRAY; +- info_ptr->bit_depth = image->bytesperpixel * 8; +- break; + case TRUECOLOR: + case TRUECOLOR24: + case TRUECOLOR16: +- info_ptr->color_type = PNG_COLOR_TYPE_RGB; +- info_ptr->bit_depth = 8; +- info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec; +- info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec; +- info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec; ++ sig_bit.red = 8 - image->palette->info.truec.rprec; ++ sig_bit.green = 8 - image->palette->info.truec.gprec; ++ sig_bit.blue = 8 - image->palette->info.truec.bprec; ++ png_set_sBIT(png_ptr, info_ptr, &sig_bit); + break; + } +- info_ptr->interlace_type = 0; ++ ++ png_write_info (png_ptr, info_ptr); ++ + #ifdef _undefined_ + png_set_text(png_ptr, info_ptr, comments, + sizeof(comments) / sizeof(png_text)); + #endif + +- png_write_info(png_ptr, info_ptr); ++ png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */); ++ png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth), ++ (png_uint_32) (100 / image->pixelheight), ++ PNG_RESOLUTION_UNKNOWN); ++ + /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */ + png_set_packing(png_ptr); + if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16)) +- png_set_shift(png_ptr, &(info_ptr->sig_bit)); ++ png_set_shift (png_ptr, &sig_bit); + if (*b == 255) + png_set_swap(png_ptr); + png_set_bgr(png_ptr); diff --git a/staging/xaos/xaos.install b/staging/xaos/xaos.install new file mode 100644 index 000000000..afee50a72 --- /dev/null +++ b/staging/xaos/xaos.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(xaos.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/staging/xfce4-datetime-plugin/PKGBUILD b/staging/xfce4-datetime-plugin/PKGBUILD new file mode 100644 index 000000000..c4227bd32 --- /dev/null +++ b/staging/xfce4-datetime-plugin/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 146891 2012-01-19 03:56:41Z foutrelis $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Aurelien Foret <orelien@chez.com> + +pkgname=xfce4-datetime-plugin +pkgver=0.6.1 +pkgrel=2 +pkgdesc="A date and time display plugin for the Xfce panel" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://xfce-goodies.berlios.de/" +groups=('xfce4-goodies') +depends=('xfce4-panel>=4.7.4' 'libxfcegui4') +makedepends=('intltool') +options=('!libtool') +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2) +md5sums=('e82f51ff0e75a63e5cbd139e43e094f9') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-static + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/staging/xfce4-notes-plugin/PKGBUILD b/staging/xfce4-notes-plugin/PKGBUILD new file mode 100644 index 000000000..ff9642b45 --- /dev/null +++ b/staging/xfce4-notes-plugin/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 146893 2012-01-19 03:57:20Z foutrelis $ +# Maintainer: Andreas Radke <andyrtr at archlinux.org> +# Contributor: Ben Mazer <contrasutra@myrealbox.com> + +pkgname=xfce4-notes-plugin +pkgver=1.7.7 +pkgrel=3 +pkgdesc="A notes plugin for the Xfce4 panel" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://xfce-goodies.berlios.de/" +groups=('xfce4-goodies') +depends=('xfce4-panel>=4.7.0' 'libxfcegui4' 'libunique' 'hicolor-icon-theme') +makedepends=('intltool') +options=('!libtool') +install=${pkgname}.install +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.7/${pkgname}-${pkgver}.tar.bz2) +md5sums=('42b924b23f2fec6a1099e9b7a87db4a3') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/staging/xfce4-notes-plugin/xfce4-notes-plugin.install b/staging/xfce4-notes-plugin/xfce4-notes-plugin.install new file mode 100644 index 000000000..fee9e5d11 --- /dev/null +++ b/staging/xfce4-notes-plugin/xfce4-notes-plugin.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + diff --git a/staging/xfce4-quicklauncher-plugin/PKGBUILD b/staging/xfce4-quicklauncher-plugin/PKGBUILD new file mode 100644 index 000000000..73de5a343 --- /dev/null +++ b/staging/xfce4-quicklauncher-plugin/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 146895 2012-01-19 03:58:10Z foutrelis $ +# Maintainer: +# Contributor: Tobias Kieslich <tobias (at) archlinux.org> + +pkgname=xfce4-quicklauncher-plugin +pkgver=1.9.4 +pkgrel=6 +pkgdesc="plugin that creates 4 little application launcher in the Xfce4 panel" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://xfce-goodies.berlios.de/" +groups=('xfce4-goodies') +depends=('xfce4-panel>=4.7.4' 'libxfcegui4') +makedepends=('intltool') +options=('!libtool') +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.9/${pkgname}-${pkgver}.tar.bz2 + xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch + xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch + xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch + xfce4-quicklauncher-plugin-1.9.4-save-settings.patch + xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch) +md5sums=('299e17f196ecfa5fb018cf65abb19b56' + 'a7826c9f8199a2f1e914fd39b7f9e2bf' + '4ea4d06ab7284e78ddc4d60304f02cdf' + '5e8126c05def1211fb4a2a65f2812a1b' + '474237b205035214df1c723407251ade' + '9e7f789129b08c787978c7a72a55fae7') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + # Fedora patches + patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch + patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch + patch -Np1 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch + patch -Np1 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch + patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch new file mode 100644 index 000000000..907c1f23e --- /dev/null +++ b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch @@ -0,0 +1,10 @@ +--- panel-plugin/quicklauncher.desktop.in.in.orig 2009-07-04 00:46:34.000000000 +0200 ++++ panel-plugin/quicklauncher.desktop.in.in 2009-07-04 00:46:51.000000000 +0200 +@@ -4,4 +4,6 @@ + _Name=Quicklauncher + _Comment=Program with several launchers + Icon=gnome-fs-executable +-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libquicklauncher.so ++X-XFCE-Module=quicklauncher ++X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@ ++X-XFCE-Unique=false diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch new file mode 100644 index 000000000..96f256770 --- /dev/null +++ b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch @@ -0,0 +1,103 @@ +diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/configure xfce4-quicklauncher-plugin-1.9.4.new/configure +--- xfce4-quicklauncher-plugin-1.9.4/configure 2007-06-27 21:07:14.000000000 +0200 ++++ xfce4-quicklauncher-plugin-1.9.4.new/configure 2008-03-04 22:11:23.000000000 +0100 +@@ -21181,7 +21181,7 @@ + + + +- ALL_LINGUAS="cs el eu fr gl hu ja pl ru vi" ++ ALL_LINGUAS="cs el en eu fr gl hu ja pl ru vi" + + + for ac_header in locale.h +diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/po/en.po xfce4-quicklauncher-plugin-1.9.4.new/po/en.po +--- xfce4-quicklauncher-plugin-1.9.4/po/en.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-quicklauncher-plugin-1.9.4.new/po/en.po 2008-03-04 22:10:58.000000000 +0100 +@@ -0,0 +1,87 @@ ++# English translation of xfce4-quicklauncher-plugin. ++# Copyright (C) 2007 THE xfce4-quicklauncher-plugin'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the xfce4-quicklauncher-plugin package. ++# Jeff Bailes <thepizzaking@gmail.com>, 2007. ++# , fuzzy ++# ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce4-quicklauncher-plugin\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2007-05-17 21:37+0200\n" ++"PO-Revision-Date: 2007-03-31 10:17+1000\n" ++"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n" ++"Language-Team: English\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit" ++ ++#: ../panel-plugin/callbacks.c:79 ++msgid "Configure Quicklauncher" ++msgstr "Configure Quicklauncher" ++ ++#: ../panel-plugin/callbacks.c:93 ++msgid "Lines: " ++msgstr "Lines: " ++ ++#: ../panel-plugin/callbacks.c:123 ++msgid "Espace entre les lanceurs :" ++msgstr "Space between launchers" ++ ++#: ../panel-plugin/callbacks.c:131 ++msgid "afficher les tooltips" ++msgstr "Show tooltips" ++ ++#: ../panel-plugin/callbacks.c:135 ++msgid "afficher les labels" ++msgstr "Show labels" ++ ++#: ../panel-plugin/callbacks.c:216 ++msgid "icone" ++msgstr "icon" ++ ++#: ../panel-plugin/callbacks.c:222 ++msgid "commande" ++msgstr "command" ++ ++#: ../panel-plugin/callbacks.c:228 ++msgid "nom" ++msgstr "name" ++ ++#: ../panel-plugin/callbacks.c:327 ++msgid "Open icon" ++msgstr "Open icon" ++ ++#: ../panel-plugin/main.c:163 ../panel-plugin/quicklauncher.desktop.in.in.h:2 ++msgid "Quicklauncher" ++msgstr "Quicklauncher" ++ ++#: ../panel-plugin/main.c:166 ++msgid "Allows you to add launchers easily and display them on many lines." ++msgstr "Allows you to add launchers easily and display them on many lines." ++ ++#: ../panel-plugin/main.c:168 ++msgid "Other plugins available here" ++msgstr "Other plugins available here" ++ ++#: ../panel-plugin/main.c:320 ++msgid "Lock" ++msgstr "Lock" ++ ++#: ../panel-plugin/main.c:323 ++msgid "Parameters" ++msgstr "Parameters" ++ ++#: ../panel-plugin/main.c:326 ++msgid "Applications" ++msgstr "Applications" ++ ++#: ../panel-plugin/main.c:329 ++msgid "Help" ++msgstr "Help" ++ ++#: ../panel-plugin/quicklauncher.desktop.in.in.h:1 ++msgid "Program with several launchers" ++msgstr "Program with several launchers" ++ diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch new file mode 100644 index 000000000..9845ce122 --- /dev/null +++ b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch @@ -0,0 +1,27 @@ +--- panel-plugin/main.c.org 2008-05-13 09:29:29.000000000 -0600 ++++ panel-plugin/main.c 2008-05-13 09:29:33.000000000 -0600 +@@ -148,6 +148,7 @@ + t_qck_launcher_opt_dlg* dlg; + xfce_panel_plugin_block_menu(plugin); + dlg = create_qck_launcher_dlg(); ++ gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin)); + qck_launcher_opt_dlg_set_quicklauncher(quicklauncher); + gtk_dialog_run(GTK_DIALOG(dlg->dialog)); + xfce_panel_plugin_unblock_menu(plugin); +@@ -160,6 +161,7 @@ + GtkWidget *about; + const gchar* authors[2] = {"Bountykiller <masse_nicolas@yahoo.fr>", NULL}; + about = gtk_about_dialog_new(); ++ gtk_window_set_screen (GTK_WINDOW (about), gtk_widget_get_screen (plugin)); + gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(about), _("Quicklauncher")); + gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), NULL); + gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about), (const gchar**) authors); +@@ -461,7 +463,7 @@ + if(launcher->quicklauncher->_last_zoomed_launcher == launcher) + { + g_return_val_if_fail(launcher->clicked_img, FALSE); +- xfce_exec(launcher->command, FALSE, FALSE, NULL); ++ xfce_exec_on_screen(gtk_widget_get_screen (box), launcher->command, FALSE, FALSE, NULL); + gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img); + } + else diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch new file mode 100644 index 000000000..85dd21729 --- /dev/null +++ b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch @@ -0,0 +1,12 @@ +Index: xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c +=================================================================== +--- xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c (révision 3779) ++++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c (révision 3780) +@@ -151,6 +151,7 @@ + gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin)); + qck_launcher_opt_dlg_set_quicklauncher(quicklauncher); + gtk_dialog_run(GTK_DIALOG(dlg->dialog)); ++ quicklauncher_save(plugin, quicklauncher); + xfce_panel_plugin_unblock_menu(plugin); + } + diff --git a/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch new file mode 100644 index 000000000..8314d7a3c --- /dev/null +++ b/staging/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch @@ -0,0 +1,11 @@ +--- panel-plugin/main.c.orig 2009-09-09 21:15:01.000000000 +0200 ++++ panel-plugin/main.c 2009-09-09 21:23:12.000000000 +0200 +@@ -320,7 +320,7 @@ + launcher = launcher_new(_("Lock"), "xflock4", XFCE_ICON_CATEGORY_SYSTEM, + NULL, quicklauncher); + quicklauncher_add_element(quicklauncher, launcher); +- launcher = launcher_new(_("Parameters"),"xfce-setting-show", XFCE_ICON_CATEGORY_SETTINGS, ++ launcher = launcher_new(_("Parameters"),"xfce4-settings-manager", XFCE_ICON_CATEGORY_SETTINGS, + NULL, quicklauncher); + quicklauncher_add_element(quicklauncher, launcher); + launcher = launcher_new(_("Applications"), "xfce4-appfinder", XFCE_ICON_CATEGORY_UTILITY, diff --git a/staging/xfce4-sensors-plugin/PKGBUILD b/staging/xfce4-sensors-plugin/PKGBUILD new file mode 100644 index 000000000..de4048cec --- /dev/null +++ b/staging/xfce4-sensors-plugin/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 146897 2012-01-19 03:58:55Z foutrelis $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Merk Matthias <macem@chello.at> + +pkgname=xfce4-sensors-plugin +pkgver=1.2.3 +pkgrel=3 +pkgdesc="A lm_sensors plugin for the Xfce panel" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin" +groups=('xfce4-goodies') +depends=('xfce4-panel' 'lm_sensors' 'libnotify>=0.7.1' 'hicolor-icon-theme') #'libxfcegui4' +makedepends=('pkgconfig' 'intltool' 'hddtemp>=0.3.beta15.45-2' 'gnu-netcat' 'xfce4-dev-tools') +optdepends=('gnu-netcat: for hddtemp access') +options=(!libtool !makeflags) +install=${pkgname}.install +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.2/${pkgname}-${pkgver}.tar.bz2) +md5sums=('2edf376d140449ca42c4e4f591e626f8') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --datadir=/usr/share \ + --datarootdir=/usr/share \ + --disable-static \ + --with-pathhddtemp=/usr/sbin/hddtemp \ + --disable-debug + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/staging/xfce4-sensors-plugin/xfce4-sensors-plugin.install b/staging/xfce4-sensors-plugin/xfce4-sensors-plugin.install new file mode 100644 index 000000000..17ca8f78a --- /dev/null +++ b/staging/xfce4-sensors-plugin/xfce4-sensors-plugin.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/staging/xfig/LICENSE b/staging/xfig/LICENSE new file mode 100644 index 000000000..5b38ccff8 --- /dev/null +++ b/staging/xfig/LICENSE @@ -0,0 +1,33 @@ +Excerpt of the README from xfig/transfig - legal notice: +--------------------------------------------------------------------------- + +THE LAWRENCE BERKELEY NATIONAL LABORATORY DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, +INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +*************************************************************************** +NEW COPYRIGHT/PERMISSION NOTICE: + +The xfig copyright and permission notice has changed (again) slightly in +version 3.2.5. It now states that: + + FIG : Facility for Interactive Generation of figures + Copyright (c) 1985-1988 by Supoj Sutanthavibul + Parts Copyright (c) 1989-2002 by Brian V. Smith + Parts Copyright (c) 1991 by Paul King + + Any party obtaining a copy of these files is granted, free of charge, a + full and unrestricted irrevocable, world-wide, paid up, royalty-free, + nonexclusive right and license to deal in this software and documentation + files (the "Software"), including without limitation the rights to use, + copy, modify, merge, publish distribute, sublicense and/or sell copies of + the Software, and to permit persons who receive copies from any such + party to do so, with the only requirement being that the above copyright + and this permission notice remain intact. + +The license for 3.2.4 didn't allow selling xfig unless it was simply included in a +collection of programs (e.g. a CD) that one was selling. diff --git a/staging/xfig/PKGBUILD b/staging/xfig/PKGBUILD new file mode 100644 index 000000000..4314a549a --- /dev/null +++ b/staging/xfig/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 146901 2012-01-19 04:44:44Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=xfig +pkgver=3.2.5b +pkgrel=6 +pkgdesc="An interactive drawing tool" +arch=('i686' 'x86_64') +url="http://www.xfig.org/userman/" +license=('custom') +depends=('libpng' 'libjpeg' 'xaw3d' 'libxi' 'desktop-file-utils' 'gsfonts') +makedepends=('imake') +optdepends=('transfig: to use the frontend to convert fig files') +options=('!makeflags' '!emptydirs') +install=xfig.install +source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \ + xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \ + xfig-3.2.5-enable-Xaw3d.patch xfig-3.2.5-urwfonts.patch \ + xfig-3.2.5-fhs.patch xfig-3.2.5-missing-protos.patch \ + xfig.3.2.5-modularX.patch xfig-3.2.5b-fix-eps-reading.patch \ + xfig-3.2.5b-libpng-1.5.patch LICENSE xfig.desktop) +sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542' + '926ad99c7221baa4aa9e9737722958860b2700fc' + 'b7c03fb70066ff476a4039a8c0f8930c15edef68' + '33bff26b42ce164e79de11808b5b34b363f0d59f' + 'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb' + '39bec6bac9746b643b05fd1286826113ede07ff6' + 'bd76cd50be6a5789cfd6f182309cfd7056be04f3' + 'a1285f4e61ad2eec040460ab03e8022098e7f78e' + '12a64ddaf65a73e23ef74f31483515a0e262768c' + '83032eb61c8dc96d5fc509a1ce632528457d4598' + '31edf4cfab708820ea3f114d095dfef5aa88e5aa' + '9011b8fa6143e37525b28cc9800a3bf2d6b008d2') + +build() { + cd "${srcdir}/${pkgname}.${pkgver}" + patch -p1 < ../xfig-3.2.4-redhat.patch + patch -p1 < ../xfig-3.2.5-fhs.patch + patch -p1 < ../xfig.3.2.5-modularX.patch + patch -p1 < ../xfig-3.2.5-enable-Xaw3d.patch + patch -p1 < ../xfig-3.2.5-color-resources.patch + patch -p1 < ../xfig-3.2.5-urwfonts.patch + patch -p1 < ../xfig-3.2.5-missing-protos.patch + patch -p1 < ../xfig-3.2.5b-fix-eps-reading.patch + patch -p1 < ../xfig-3.2.5b-libpng-1.5.patch + chmod 755 Libraries + + xmkmf + make DOCDIR=/usr/share/doc +} + +package() { + cd "${srcdir}/${pkgname}.${pkgver}" + make DESTDIR="${pkgdir}" DOCDIR=/usr/share/doc install.all + rm "${pkgdir}/usr/lib/X11/app-defaults" + + find "${pkgdir}/usr/share/xfig/Libraries" -type f -exec chmod 0644 {} \; + find "${pkgdir}/usr/share/xfig/Libraries" -type d -exec chmod 0755 {} \; + find "${pkgdir}/usr/share/doc/xfig" -type f -exec chmod 0644 {} \; + find "${pkgdir}/usr/share/doc/xfig" -type d -exec chmod 0755 {} \; + + install -D -m644 ../xfig.desktop "${pkgdir}/usr/share/applications/xfig.desktop" + install -D -m644 xfig.png "${pkgdir}/usr/share/pixmaps/xfig.png" + install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/xfig/xfig-3.2.4-redhat.patch b/staging/xfig/xfig-3.2.4-redhat.patch new file mode 100644 index 000000000..da6f150b3 --- /dev/null +++ b/staging/xfig/xfig-3.2.4-redhat.patch @@ -0,0 +1,31 @@ +--- xfig.3.2.4/Fig.ad.redhat 2002-12-19 01:05:41.000000000 +0100 ++++ xfig.3.2.4/Fig.ad 2003-05-06 11:45:15.000000000 +0200 +@@ -11,7 +11,7 @@ + Fig*AllowShellResize: false + + ! Image editor - can edit imported image +-Fig.image_editor: xv ++Fig.image_editor: xdg-open + + ! name of ghostscript (not ghostview) + Fig.ghostscript: gs +@@ -20,16 +20,16 @@ + ! This is for viewing the xfig html reference. + ! For netscape, this command will open the help pages in a running netscape, + ! or start a new netscape if one isn't already running +-Fig.browser: firefox -remote 'openFile(%f)' || firefox %f ++Fig.browser: xdg-open %f + + ! pdfviewer - put your favorite pdf viewer here. + ! This is for viewing the xfig how-to guide and man pages +-Fig.pdfviewer: xpdf %f ++Fig.pdfviewer: xdg-open %f + + ! Spell check program - put your favorite spelling check program here. + ! It must write the misspelled words to standard output. + +-Fig.spellcheckcommand: spell %f ++Fig.spellcheckcommand: aspell %f + + ! delay before spinner automatically counts when pressed (milliseconds) + Fig.spinner_delay: 1000 diff --git a/staging/xfig/xfig-3.2.5-color-resources.patch b/staging/xfig/xfig-3.2.5-color-resources.patch new file mode 100644 index 000000000..6cf1af906 --- /dev/null +++ b/staging/xfig/xfig-3.2.5-color-resources.patch @@ -0,0 +1,39 @@ +diff -up xfig.3.2.5/Fig-color.bisque.ad~ xfig.3.2.5/Fig-color.bisque.ad +--- xfig.3.2.5/Fig-color.bisque.ad~ 2007-11-16 13:47:45.000000000 +0100 ++++ xfig.3.2.5/Fig-color.bisque.ad 2007-11-16 13:47:52.000000000 +0100 +@@ -93,7 +93,7 @@ Fig*sideruler.background: gray95 + Fig*topruler.background: gray95 + Fig*sideruler.background: gray95 + Fig*List*background: gray95 +-Fig*Scrollbar.background: gray95 ++! Fig*Scrollbar.background: gray95 + + Fig*cancel.background: navajowhite1 + Fig*dismiss.background: navajowhite1 +@@ -104,8 +104,8 @@ Fig*menu_divider.foreground: red + Fig*menu_divider.foreground: red + + !##### Shadows +-Fig*shadowWidth: 2 +-Fig*Label.shadowWidth: 1 ++! Fig*shadowWidth: 2 ++! Fig*Label.shadowWidth: 1 + Fig*horizontal.shadowWidth: 2 + Fig*Scrollbar.shadowWidth: 2 + ! no shadows for update indicators +@@ -136,3 +136,15 @@ Fig*color_box*topShadowPixel: gray80 + + Fig*toggle*bottomShadowPixel: gray80 + Fig*toggle*topShadowPixel: gray50 ++ ++! repare damage done to scrollbar shadows non color resources file ++ ++Fig*horizontal.topShadowPixel: gray95 ++Fig*horizontal.bottomShadowPixel: gray50 ++Fig*horizontal.topShadow: gray95 ++Fig*horizontal.bottomShadow: gray50 ++ ++Fig*Scrollbar.topShadow: gray95 ++Fig*Scrollbar.bottomShadow: gray50 ++Fig*Scrollbar.topShadowPixel: gray95 ++Fig*Scrollbar.bottomShadowPixel: gray50 diff --git a/staging/xfig/xfig-3.2.5-enable-Xaw3d.patch b/staging/xfig/xfig-3.2.5-enable-Xaw3d.patch new file mode 100644 index 000000000..f4d113808 --- /dev/null +++ b/staging/xfig/xfig-3.2.5-enable-Xaw3d.patch @@ -0,0 +1,18 @@ +diff -up xfig.3.2.5/Imakefile.no-Xaw3d xfig.3.2.5/Imakefile +--- xfig.3.2.5/Imakefile.no-Xaw3d 2007-11-16 10:38:18.000000000 +0100 ++++ xfig.3.2.5/Imakefile 2007-11-16 10:38:49.000000000 +0100 +@@ -50,8 +50,8 @@ XAPPLOADDIR = /usr/share/X11/app-default + XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has + XCOMM some new features, including "Tips", which replace xfig's "help balloons" + XCOMM NOTE: This is the default for many X systems now. + +-XCOMM #define XAW3D1_5E ++#define XAW3D1_5E + + #ifdef XAW3D1_5E + DUSEXAW3D = -DXAW3D -DXAW3D1_5E +- XAWLIB = -lXaw3d15e ++ XAWLIB = -lXaw3d + #else + XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c + XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o diff --git a/staging/xfig/xfig-3.2.5-fhs.patch b/staging/xfig/xfig-3.2.5-fhs.patch new file mode 100644 index 000000000..a17d908a7 --- /dev/null +++ b/staging/xfig/xfig-3.2.5-fhs.patch @@ -0,0 +1,12 @@ +--- xfig.3.2.5/Imakefile.fhs 2006-10-11 01:19:22.000000000 +0200 ++++ xfig.3.2.5/Imakefile 2007-04-16 14:04:45.000000000 +0200 +@@ -169,8 +169,7 @@ + XFIGLIBDIR = $(LIBDIR)/xfig + + XCOMM XFIGDOCDIR tells where the html and pdf documentation should go +-XCOMM XFIGDOCDIR = $(DOCDIR)/xfig +-XFIGDOCDIR = /usr/local/xfig/doc ++XFIGDOCDIR = $(DOCDIR)/xfig + + XCOMM MANDIR tells where the standard man pages should go (no need to change it + XCOMM if you want the man pages installed in the standard place on your system diff --git a/staging/xfig/xfig-3.2.5-missing-protos.patch b/staging/xfig/xfig-3.2.5-missing-protos.patch new file mode 100644 index 000000000..181c52a69 --- /dev/null +++ b/staging/xfig/xfig-3.2.5-missing-protos.patch @@ -0,0 +1,11 @@ +diff -up xfig.3.2.5/u_draw.c~ xfig.3.2.5/u_draw.c +--- xfig.3.2.5/u_draw.c~ 2008-04-03 15:58:23.000000000 +0200 ++++ xfig.3.2.5/u_draw.c 2008-04-03 15:58:23.000000000 +0200 +@@ -43,6 +43,7 @@ + #include "w_zoom.h" + #include "u_redraw.h" + #include "w_cursor.h" ++#include <X11/ImUtil.h> + + static Boolean add_point(int x, int y); + static void init_point_array(void); diff --git a/staging/xfig/xfig-3.2.5-urwfonts.patch b/staging/xfig/xfig-3.2.5-urwfonts.patch new file mode 100644 index 000000000..7bc766bd9 --- /dev/null +++ b/staging/xfig/xfig-3.2.5-urwfonts.patch @@ -0,0 +1,79 @@ +--- xfig.3.2.4/u_fonts.c 2002-09-09 13:36:58.000000000 -0400 ++++ new-xfig-3.2.4/u_fonts.c 2006-10-11 00:29:07.000000000 -0400 +@@ -22,41 +22,41 @@ + /* X11 font names */ + + struct _xfstruct x_fontinfo[NUM_FONTS] = { +- {"-*-times-medium-r-normal--", (struct xfont*) NULL}, +- {"-*-times-medium-i-normal--", (struct xfont*) NULL}, +- {"-*-times-bold-r-normal--", (struct xfont*) NULL}, +- {"-*-times-bold-i-normal--", (struct xfont*) NULL}, +- {"-*-avantgarde-book-r-normal--", (struct xfont*) NULL}, +- {"-*-avantgarde-book-o-normal--", (struct xfont*) NULL}, +- {"-*-avantgarde-demi-r-normal--", (struct xfont*) NULL}, +- {"-*-avantgarde-demi-o-normal--", (struct xfont*) NULL}, +- {"-*-bookman-light-r-normal--", (struct xfont*) NULL}, +- {"-*-bookman-light-i-normal--", (struct xfont*) NULL}, +- {"-*-bookman-demi-r-normal--", (struct xfont*) NULL}, +- {"-*-bookman-demi-i-normal--", (struct xfont*) NULL}, +- {"-*-courier-medium-r-normal--", (struct xfont*) NULL}, +- {"-*-courier-medium-o-normal--", (struct xfont*) NULL}, +- {"-*-courier-bold-r-normal--", (struct xfont*) NULL}, +- {"-*-courier-bold-o-normal--", (struct xfont*) NULL}, +- {"-*-helvetica-medium-r-normal--", (struct xfont*) NULL}, +- {"-*-helvetica-medium-o-normal--", (struct xfont*) NULL}, +- {"-*-helvetica-bold-r-normal--", (struct xfont*) NULL}, +- {"-*-helvetica-bold-o-normal--", (struct xfont*) NULL}, +- {"-*-helvetica-medium-r-narrow--", (struct xfont*) NULL}, +- {"-*-helvetica-medium-o-narrow--", (struct xfont*) NULL}, +- {"-*-helvetica-bold-r-narrow--", (struct xfont*) NULL}, +- {"-*-helvetica-bold-o-narrow--", (struct xfont*) NULL}, +- {"-*-new century schoolbook-medium-r-normal--", (struct xfont*) NULL}, +- {"-*-new century schoolbook-medium-i-normal--", (struct xfont*) NULL}, +- {"-*-new century schoolbook-bold-r-normal--", (struct xfont*) NULL}, +- {"-*-new century schoolbook-bold-i-normal--", (struct xfont*) NULL}, +- {"-*-palatino-medium-r-normal--", (struct xfont*) NULL}, +- {"-*-palatino-medium-i-normal--", (struct xfont*) NULL}, +- {"-*-palatino-bold-r-normal--", (struct xfont*) NULL}, +- {"-*-palatino-bold-i-normal--", (struct xfont*) NULL}, +- {"-*-symbol-medium-r-normal--", (struct xfont*) NULL}, +- {"-*-itc zapf chancery-medium-i-normal--", (struct xfont*) NULL}, +- {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL}, ++ {"-urw-nimbus roman no9 l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus roman no9 l-medium-i-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus roman no9 l-bold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus roman no9 l-bold-i-normal--", (struct xfont*) NULL}, ++ {"-urw-urw gothic l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw gothic l-medium-o-normal--", (struct xfont*) NULL}, ++ {"-urw-urw gothic l-semibold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw gothic l-semibold-o-normal--", (struct xfont*) NULL}, ++ {"-urw-urw bookman l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw bookman l-medium-i-normal--", (struct xfont*) NULL}, ++ {"-urw-urw bookman l-bold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw bookman l-bold-i-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus mono l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus mono l-medium-o-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus mono l-bold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus mono l-bold-o-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l-medium-i-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l-bold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l-bold-i-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l condensed-medium-r-condensed--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l condensed-medium-i-condensed--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l condensed-bold-r-condensed--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l condensed-bold-i-condensed--", (struct xfont*) NULL}, ++ {"-urw-century schoolbook l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-century schoolbook l-medium-i-normal--", (struct xfont*) NULL}, ++ {"-urw-century schoolbook l-bold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-century schoolbook l-bold-i-normal--", (struct xfont*) NULL}, ++ {"-urw-urw palladio l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw palladio l-medium-i-normal--", (struct xfont*) NULL}, ++ {"-urw-urw palladio l-bold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw palladio l-bold-i-normal--", (struct xfont*) NULL}, ++ {"-urw-standard symbols l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw chancery l-medium-i-normal--", (struct xfont*) NULL}, ++ {"-urw-dingbats-medium-r-normal--", (struct xfont*) NULL}, + }; + + /* Use the following font names for any font that doesn't exist in the table above. diff --git a/staging/xfig/xfig-3.2.5b-fix-eps-reading.patch b/staging/xfig/xfig-3.2.5b-fix-eps-reading.patch new file mode 100644 index 000000000..7601d20ea --- /dev/null +++ b/staging/xfig/xfig-3.2.5b-fix-eps-reading.patch @@ -0,0 +1,46 @@ +diff -ur xfig.3.2.5b/f_readeps.c xfig.3.2.5b.new/f_readeps.c +--- xfig.3.2.5b/f_readeps.c 2009-03-30 17:52:18.000000000 +0200 ++++ xfig.3.2.5b.new/f_readeps.c 2010-11-25 16:53:54.328247928 +0100 +@@ -252,12 +252,13 @@ + { + char buf[300]; + FILE *tmpfp, *pixfile, *gsfile; +- char *psnam, *driver; ++ char *driver; + int status, wid, ht, nbitmap, fd; + char tmpfile[PATH_MAX], + pixnam[PATH_MAX], + errnam[PATH_MAX], +- gscom[2 * PATH_MAX]; ++ gscom[2 * PATH_MAX], ++ psnam[PATH_MAX]; + + wid = urx - llx; + ht = ury - lly; +@@ -307,19 +308,14 @@ + /* for color, use pcx */ + driver = "pcx256"; + } +- /* avoid absolute paths (for Cygwin with gswin32) by changing directory */ +- if (tmpfile[0] == '/') { +- psnam = strrchr(tmpfile, '/'); +- *psnam = 0; +- sprintf(gscom, "cd \"%s/\";", tmpfile); +- *psnam++ = '/'; /* Restore name for unlink() below */ +- } else { +- psnam = tmpfile; +- gscom[0] = '\0'; ++ /* Canonicalize the eps file filename, needed to "defeat" -dSAFER */ ++ if (!realpath(tmpfile, psnam)) { ++ file_msg("Cannot canonicalize %s: %s\n", tmpfile, strerror(errno)); ++ return False; + } +- sprintf(&gscom[strlen(gscom)], +- "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1", +- appres.ghostscript, driver, wid, ht, pixnam, errnam); ++ sprintf(gscom, ++ "%s -r72x72 -sDEVICE=%s -g%dx%d -sOutputFile=%s -dDELAYSAFER -c '<< /PermitFileReading [ (%s)] >> setuserparams .locksafe' -dSAFER -q - > %s 2>&1", ++ appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam); + if (appres.DEBUG) + fprintf(stderr,"calling: %s\n",gscom); + if ((gsfile = popen(gscom, "w")) == 0) { diff --git a/staging/xfig/xfig-3.2.5b-libpng-1.5.patch b/staging/xfig/xfig-3.2.5b-libpng-1.5.patch new file mode 100644 index 000000000..7d9c3f15e --- /dev/null +++ b/staging/xfig/xfig-3.2.5b-libpng-1.5.patch @@ -0,0 +1,70 @@ +Index: xfig.3.2.5b/f_readpng.c +=================================================================== +--- xfig.3.2.5b.orig/f_readpng.c ++++ xfig.3.2.5b/f_readpng.c +@@ -73,7 +73,7 @@ read_png(FILE *file, int filetype, F_pic + } + + /* set long jump recovery here */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* if we get here there was a problem reading the file */ + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + close_picfile(file,filetype); +@@ -90,15 +90,17 @@ read_png(FILE *file, int filetype, F_pic + png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, + &interlace_type, &compression_type, &filter_type); + +- if (info_ptr->valid & PNG_INFO_gAMA) +- png_set_gamma(png_ptr, 2.2, info_ptr->gamma); +- else +- png_set_gamma(png_ptr, 2.2, 0.45); ++ png_fixed_point gamma = 0.45; ++ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma); ++ png_set_gamma(png_ptr, 2.2, gamma); + +- if (info_ptr->valid & PNG_INFO_bKGD) ++ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { + /* set the background to the one supplied */ +- png_set_background(png_ptr, &info_ptr->background, ++ png_color_16p background; ++ png_get_bKGD(png_ptr,info_ptr,&background); ++ png_set_background(png_ptr, background, + PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); ++ } + else { + /* blend the canvas background using the alpha channel */ + background.red = x_bg_color.red >> 8; +@@ -136,7 +138,11 @@ read_png(FILE *file, int filetype, F_pic + + if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) { + png_get_hIST(png_ptr, info_ptr, &histogram); ++#if PNG_LIBPNG_VER_MAJOR <= 1 && PNG_LIBPNG_VER_MINOR < 5 + png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0); ++#else ++ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0); ++#endif + } + } + if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { +Index: xfig.3.2.5b/f_wrpng.c +=================================================================== +--- xfig.3.2.5b.orig/f_wrpng.c ++++ xfig.3.2.5b/f_wrpng.c +@@ -20,6 +20,7 @@ + #include "w_msgpanel.h" + #include "w_setup.h" + #include <png.h> ++#include <zlib.h> + + /* + * Write PNG file from rgb data +@@ -59,7 +60,7 @@ write_png(FILE *file, unsigned char *dat + } + + /* set long jump recovery here */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* if we get here there was a problem reading the file */ + png_destroy_write_struct(&png_ptr, &info_ptr); + return False; diff --git a/staging/xfig/xfig.3.2.5-modularX.patch b/staging/xfig/xfig.3.2.5-modularX.patch new file mode 100644 index 000000000..3b5ac5937 --- /dev/null +++ b/staging/xfig/xfig.3.2.5-modularX.patch @@ -0,0 +1,28 @@ +--- xfig.3.2.5/Imakefile.modularX 2007-04-16 14:27:49.000000000 +0200 ++++ xfig.3.2.5/Imakefile 2007-04-16 14:29:18.000000000 +0200 +@@ -45,7 +45,7 @@ + XCOMM different tree than the "correct" tree that your X system expects. The usual + XCOMM purpose of DESTDIR is to test an install process by installing in a benign area. + +-XCOMM XAPPLOADDIR = /home/user/xfig ++XAPPLOADDIR = /usr/share/X11/app-defaults + + XCOMM Uncomment the following definition for XAW3D if you want to use + XCOMM the 3d Athena Widget Set (highly recommended!) +@@ -166,12 +166,12 @@ + XCOMM XFIGLIBDIR = $(LIBDIR) + + XCOMM use this if you want the multi-key data base file in the standard X11 tree +-XFIGLIBDIR = $(LIBDIR)/xfig ++XFIGLIBDIR = /usr/share/xfig + + XCOMM XFIGDOCDIR tells where the html and pdf documentation should go + XFIGDOCDIR = $(DOCDIR)/xfig + + XCOMM MANDIR tells where the standard man pages should go (no need to change it + XCOMM if you want the man pages installed in the standard place on your system +-MANDIR = $(MANSOURCEPATH)$(MANSUFFIX) ++MANDIR = /usr/share/man/man1 + XCOMM MANDIR = /usr/local/xfig/man + + XCOMM If your system doesn't have strstr undefine the following definition diff --git a/staging/xfig/xfig.desktop b/staging/xfig/xfig.desktop new file mode 100644 index 000000000..c634a28e9 --- /dev/null +++ b/staging/xfig/xfig.desktop @@ -0,0 +1,47 @@ +[Desktop Entry] +Encoding=UTF-8 +Categories=Application;Graphics; +MimeType=image/fig;image/x-xfig; +Exec=xfig +Icon=xfig +Type=Application +Name=Xfig +Name[eo]=XDesegno +Name[et]=Ffig +Name[ja]=xfig +Name[no]=X-figur +Comment=Xfig drawing application +Comment[bg]=Xfig ïðîãðàìà çà ðèñóâàíå +Comment[ca]=Aplicació de dibuix Xfig +Comment[cs]=Aplikace pro kreslení vektorových obrázků +Comment[da]=Xfig tegneprogram +Comment[de]=Xfig-Zeichenprogramm +Comment[el]=Xfig +Comment[eo]=Desegnilo "Xfig" +Comment[es]=Aplicación de diseño vectorial (objetos) +Comment[et]=XFig joonistusprogramm +Comment[fi]=Xfig vektoripiirto-ohjelma +Comment[fr]=Programme de dessin objet Xfig +Comment[gl]=Aplicación de debuxo (obxectos) +Comment[he]=Xfig רויצה םושיי +Comment[hr]=Program za crtanje +Comment[hu]=Rajzolóprogram +Comment[is]=Hlutbundið teikniforrit +Comment[it]=Applicazione di disegno Xfig +Comment[lt]=Xfig braižymo programa +Comment[mk]=Едноставна апликација за векторско цртање +Comment[nl]=Xfig-tekenprogramma +Comment[no]=Xfig-tegneprogram +Comment[no_NY]=Teikneprogrammet Xfig +Comment[pl]=Aplikacja do kreślenia +Comment[pt]=Aplicação de desenho +Comment[ro]=Program de desenare vectorială +Comment[ru]=Приложения для рисования векторной графики +Comment[sk]=Xfig aplikácia pre kreslenie vektorových obrázkov +Comment[sl]=Program za risanje Xfig +Comment[sr]=Xfig prgram za vektorsko crtanje +Comment[sv]=Xfig ritprogram +Comment[ta]=Xfig Ũþø ÀÂýÀ¡Î +Comment[tr]=Xfig çizim uygulaması +Comment[uk]=Xfig +Comment[zh_CN.GB2312]=Xfig 绘图应用程序 diff --git a/staging/xfig/xfig.install b/staging/xfig/xfig.install new file mode 100644 index 000000000..f01585f79 --- /dev/null +++ b/staging/xfig/xfig.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q + } + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} |