diff options
| author | root <root@rshg054.dnsready.net> | 2012-01-20 23:14:48 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-01-20 23:14:48 +0000 |
| commit | a1922d0ec660fdc1892f2783515f781c090df0a9 (patch) | |
| tree | 6d38a09231ff439c051261d41bfa066870e1fccb | |
| parent | eefecc8813e0c062a2058b33209cb30830f824b6 (diff) | |
Fri Jan 20 23:14:48 UTC 2012
190 files changed, 9117 insertions, 83 deletions
diff --git a/community-staging/bwbar/PKGBUILD b/community-staging/bwbar/PKGBUILD new file mode 100644 index 000000000..9d2a2eba3 --- /dev/null +++ b/community-staging/bwbar/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 62406 2012-01-19 19:54:11Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Mark Rosenstand <mark@borkware.net> + +pkgname=bwbar +pkgver=1.2.3 +pkgrel=3 +arch=(i686 x86_64) +pkgdesc="Generates text and graphical readout of the current bandwidth usage." +url="http://www.kernel.org/pub/software/web/bwbar/" +license=("GPL") +depends=('libpng') +#source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.gz) +md5sums=('766265ddf0615b552ff19d12f78be719') + +build() { + cd $srcdir/$pkgname-$pkgver + sed -i '1,1i#include <zlib.h>' bwbar.c + sed -i 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|' bwbar.c + ./configure + make + install -D -m755 bwbar $pkgdir/usr/bin/bwbar +} diff --git a/community-staging/caph/PKGBUILD b/community-staging/caph/PKGBUILD new file mode 100644 index 000000000..3ba543785 --- /dev/null +++ b/community-staging/caph/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 62387 2012-01-19 18:48:33Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: jose <jose1711 [at] gmail (dot) com> + +pkgname=caph +arch=('i686' 'x86_64') +pkgver=1.1 +pkgrel=2 +pkgdesc="A sandbox game based on physics which uses doodles as a primary gameplay element" +license=('GPL') +url="http://sourceforge.net/projects/caphgame/" +depends=('sdl' 'libgl' 'libpng') +makedepends=('mesa') +source=("http://sourceforge.net/projects/caphgame/files/caph/caphgame-${pkgver}/caph-${pkgver}.tar.bz2" + "caph.desktop") +md5sums=('dbc2cfbb5cd98a77c5b731515d3a77b9' + '79c6448995026f77fd912dd109b50287') + +build() { + cd $srcdir/caph-${pkgver}/src + mkdir -p $pkgdir/usr/{bin,share/{caph/maps,doc/caph}} + ./confg + ./build +} + +package() { + cd $srcdir/caph-${pkgver}/src + install -D -m755 ./caph $pkgdir/usr/bin/caph + install -D -m644 ../doc/caph/* $pkgdir/usr/share/doc/caph/ || true + install -D -m644 ../share/caph/* $pkgdir/usr/share/caph/ || true + install -D -m644 ../share/caph/maps/* $pkgdir/usr/share/caph/maps || true + install -D -m644 $srcdir/caph.desktop $pkgdir/usr/share/applications/caph.desktop + install -D -m644 ../share/caph/brush.png $pkgdir/usr/share/pixmaps/caph.png +} + +# vim: sw=2:ts=2 et: diff --git a/community-staging/caph/caph.desktop b/community-staging/caph/caph.desktop new file mode 100644 index 000000000..6cc6c711c --- /dev/null +++ b/community-staging/caph/caph.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=Caph +Comment=Sandbox game based on physics +Exec=caph +Icon=caph.png +Categories=Game;LogicGame; diff --git a/community-staging/clanlib/PKGBUILD b/community-staging/clanlib/PKGBUILD new file mode 100644 index 000000000..60e6cada0 --- /dev/null +++ b/community-staging/clanlib/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 62388 2012-01-19 18:49:44Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=clanlib +pkgver=2.3.4 +pkgrel=2 +pkgdesc="A multi-platform game development library." +arch=('i686' 'x86_64') +url="http://clanlib.org/" +license=('zlib') +depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite3') +makedepends=('doxygen' 'graphviz') +options=('!libtool') +source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz) +md5sums=('cc89f632aa194399e909bbbd13beca1b') + +build() { + cd ${srcdir}/ClanLib-${pkgver} + + ./configure --prefix=/usr --enable-docs + + make + # Somehow this breaks. :( + #make html +} + +package() { + cd ${srcdir}/ClanLib-${pkgver} + + make DESTDIR=${pkgdir} install + #make DESTDIR=${pkgdir} install-html + + install -d ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ +} + +# vim: sw=2:ts=2 et: diff --git a/community-staging/darktable/PKGBUILD b/community-staging/darktable/PKGBUILD new file mode 100644 index 000000000..48c078e89 --- /dev/null +++ b/community-staging/darktable/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 62299 2012-01-19 06:47:22Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Christian Himpel <chressie at gmail dot com> +# Contributor: Johannes Hanika <hanatos at gmail dot com> + +pkgname=darktable +pkgver=0.9.3 +_pkgver=0.9 +pkgrel=5 +pkgdesc="Utility to organize and develop raw images" +arch=('i686' 'x86_64') +url=http://darktable.sf.net/ +license=('GPL3') +depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' + 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3') +makedepends=('intltool>=0.40' 'cmake' 'librsvg') +# 'gnome-doc-utils' 'libxslt' 'fop') +optdepends=('librsvg') +install=darktable.install +options=(!libtool) +source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) +md5sums=('49253a3a2990a4bf8e0b0a19295f19bd') + +build() { + cd $srcdir/$pkgname-$pkgver +# mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt + mkdir -p build + cd build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DDONT_INSTALL_GCONF_SCHEMAS=True \ + -DBINARY_PACKAGE_BUILD=1 \ + -DUSE_GCONF_BACKEND=Off \ + -DBUILD_USERMANUAL=False \ + .. + make +} + +package() { + cd $srcdir/$pkgname-$pkgver/build + make DESTDIR=$pkgdir install + mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" +# mkdir -p "${pkgdir}/usr/share/gconf/schemas/" +# mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/" +} diff --git a/community-staging/darktable/darktable.install b/community-staging/darktable/darktable.install new file mode 100644 index 000000000..9fd6af293 --- /dev/null +++ b/community-staging/darktable/darktable.install @@ -0,0 +1,23 @@ +pkgname=darktable + +post_install() { +# usr/sbin/gconfpkg --install ${pkgname} + [ -x `which update-desktop-database` ] && update-desktop-database -q +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { +# usr/sbin/gconfpkg --uninstall ${pkgname} + true +} + +post_remove() { + [ -x `which update-desktop-database` ] && update-desktop-database -q +} diff --git a/community-staging/dia/PKGBUILD b/community-staging/dia/PKGBUILD new file mode 100644 index 000000000..0a2d5e7b5 --- /dev/null +++ b/community-staging/dia/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 62396 2012-01-19 19:26:59Z spupykin $ +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Gregor Ibic <gregor.ibic@intelicom.si> + +pkgname=dia +pkgver=0.97.2 +pkgrel=2 +pkgdesc="A GTK+ based diagram creation program" +arch=('i686' 'x86_64') +license=('GPL') +url="http://live.gnome.org/Dia" +install=dia.install +depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2') +makedepends=('intltool' 'python2' 'docbook-xsl') +optdepends=('python2') +options=('!libtool' 'docs') +source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz" + "dia-overflow-fix.patch") +md5sums=('1e1180a513fb567709b09bc19f12105e' + '8fd9a2ad35b5a6fd8c758d7c73dbfe66') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + export PYTHON=/usr/bin/python2 + sed -i 's#python2\.1#python2 python2.1#' configure +# patch -p1 <$srcdir/dia-overflow-fix.patch + + ./configure --prefix=/usr \ + --with-cairo \ + --with-python \ + --disable-gnome \ + --with-hardbooks + sed -i 's#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data doc tests installer#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data tests installer#' Makefile + make + cd doc + make html +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + cd doc + make DESTDIR="${pkgdir}" install-html + ln -sf dia/html "${pkgdir}"/usr/share/dia/help +} diff --git a/community-staging/dia/dia-overflow-fix.patch b/community-staging/dia/dia-overflow-fix.patch new file mode 100644 index 000000000..a6e64f3c6 --- /dev/null +++ b/community-staging/dia/dia-overflow-fix.patch @@ -0,0 +1,28 @@ +diff -wbBur dia-0.97.1/plug-ins/xfig/xfig-export.c dia-0.97.1.my/plug-ins/xfig/xfig-export.c +--- dia-0.97.1/plug-ins/xfig/xfig-export.c 2009-11-07 17:28:34.000000000 +0300 ++++ dia-0.97.1.my/plug-ins/xfig/xfig-export.c 2010-11-15 17:44:05.640896280 +0300 +@@ -417,6 +417,9 @@ + if (text[i] > 127) { + newlen += 3; + } ++ if (text[i] == '\\') { ++ newlen += 1; ++ } + } + returntext = g_malloc(sizeof(char)*(newlen+1)); + j = 0; +@@ -1085,10 +1088,10 @@ + figtext = figText(renderer, (unsigned char *) text); + /* xfig texts are specials */ + fprintf(renderer->file, "4 %d %d %d 0 %d %s 0.0 6 0.0 0.0 %d %d %s\\001\n", +- figAlignment(renderer, alignment), +- figColor(renderer, color), +- figDepth(renderer), +- figFont(renderer), ++ (int)figAlignment(renderer, alignment), ++ (int)figColor(renderer, color), ++ (int)figDepth(renderer), ++ (int)figFont(renderer), + xfig_dtostr(d_buf, figFontSize(renderer)), + (int)figCoord(renderer, pos->x), + (int)figCoord(renderer, pos->y), diff --git a/community-staging/dia/dia.install b/community-staging/dia/dia.install new file mode 100644 index 000000000..a49438e1f --- /dev/null +++ b/community-staging/dia/dia.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/dillo/PKGBUILD b/community-staging/dillo/PKGBUILD new file mode 100644 index 000000000..0bd758f9a --- /dev/null +++ b/community-staging/dillo/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 62398 2012-01-19 19:37:30Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: dorphell <dorphell@archlinux.org> + +pkgname=dillo +pkgver=3.0.2 +pkgrel=2 +pkgdesc="A small, fast graphical web browser built on FLTK" +arch=(i686 x86_64) +url="http://www.dillo.org" +license=('GPL') +depends=('fltk' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor' + 'libxi' 'libxinerama') +backup=(etc/dillo/{dillorc,dpidrc}) +source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2) +md5sums=('81b82112cefcc7d54fe2972a21f42930') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-dlgui \ + --enable-ssl + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/directfb/DirectFB-1.4.9-libpng-1.5.patch b/community-staging/directfb/DirectFB-1.4.9-libpng-1.5.patch new file mode 100644 index 000000000..e428afbaf --- /dev/null +++ b/community-staging/directfb/DirectFB-1.4.9-libpng-1.5.patch @@ -0,0 +1,244 @@ +From 83180b25e90721e717bf37c5332c22713508786e Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sun, 20 Feb 2011 19:18:19 -0500 +Subject: [PATCH] png: add support for libpng 1.5.x + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + .../idirectfbimageprovider_png.c | 56 ++++++++++++------- + 1 files changed, 35 insertions(+), 21 deletions(-) + +diff --git a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c +index 6d65ea3..7d82c5c 100644 +--- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c ++++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c +@@ -207,7 +207,7 @@ Construct( IDirectFBImageProvider *thiz, + if (!data->png_ptr) + goto error; + +- if (setjmp( data->png_ptr->jmpbuf )) { ++ if (setjmp( png_jmpbuf( data->png_ptr ))) { + D_ERROR( "ImageProvider/PNG: Error reading header!\n" ); + goto error; + } +@@ -292,7 +292,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz, + rect = dst_data->area.wanted; + } + +- if (setjmp( data->png_ptr->jmpbuf )) { ++ if (setjmp( png_jmpbuf( data->png_ptr ))) { + D_ERROR( "ImageProvider/PNG: Error during decoding!\n" ); + + if (data->stage < STAGE_IMAGE) +@@ -327,6 +327,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz, + } + else { + CoreSurfaceBufferLock lock; ++ png_byte bit_depth = png_get_bit_depth( data->png_ptr, data->info_ptr ); + + ret = dfb_surface_lock_buffer( dst_surface, CSBR_BACK, CSAID_CPU, CSAF_WRITE, &lock ); + if (ret) +@@ -334,7 +335,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz, + + switch (data->color_type) { + case PNG_COLOR_TYPE_PALETTE: +- if (dst_surface->config.format == DSPF_LUT8 && data->info_ptr->bit_depth == 8) { ++ if (dst_surface->config.format == DSPF_LUT8 && bit_depth == 8) { + /* + * Special indexed PNG to LUT8 loading. + */ +@@ -377,7 +378,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz, + } + else { + if (data->color_type == PNG_COLOR_TYPE_GRAY) { +- int num = 1 << data->info_ptr->bit_depth; ++ int num = 1 << bit_depth; + + for (x=0; x<num; x++) { + int value = x * 255 / (num - 1); +@@ -386,7 +387,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz, + } + } + +- switch (data->info_ptr->bit_depth) { ++ switch (bit_depth) { + case 8: + for (y=0; y<data->height; y++) { + u8 *S = data->image + data->pitch * y; +@@ -441,7 +442,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz, + + default: + D_ERROR( "ImageProvider/PNG: Unsupported indexed bit depth %d!\n", +- data->info_ptr->bit_depth ); ++ bit_depth ); + } + + dfb_scale_linear_32( image_argb, data->width, data->height, +@@ -594,16 +595,26 @@ png_info_callback( png_structp png_read_ptr, + NULL, NULL, NULL ); + + if (png_get_valid( data->png_ptr, data->info_ptr, PNG_INFO_tRNS )) { ++ png_bytep trans; ++ png_color_16p trans_color; ++ int num_trans; ++ ++ png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color ); ++ + data->color_keyed = true; + + /* generate color key based on palette... */ + if (data->color_type == PNG_COLOR_TYPE_PALETTE) { + u32 key; +- png_colorp palette = data->info_ptr->palette; +- png_bytep trans = data->info_ptr->trans_alpha; +- int num_colors = MIN( MAXCOLORMAPSIZE, +- data->info_ptr->num_palette ); +- u8 cmap[3][num_colors]; ++ png_colorp palette; ++ int num_colors; ++ u8 *cmap[3]; ++ ++ png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors ); ++ num_colors = MIN( MAXCOLORMAPSIZE, num_colors ); ++ cmap[0] = alloca (num_colors); ++ cmap[1] = alloca (num_colors); ++ cmap[2] = alloca (num_colors); + + for (i=0; i<num_colors; i++) { + cmap[0][i] = palette[i].red; +@@ -613,7 +624,7 @@ png_info_callback( png_structp png_read_ptr, + + key = FindColorKey( num_colors, &cmap[0][0] ); + +- for (i=0; i<data->info_ptr->num_trans; i++) { ++ for (i=0; i<num_trans; i++) { + if (!trans[i]) { + palette[i].red = (key & 0xff0000) >> 16; + palette[i].green = (key & 0x00ff00) >> 8; +@@ -625,20 +636,23 @@ png_info_callback( png_structp png_read_ptr, + } + else { + /* ...or based on trans rgb value */ +- png_color_16p trans = &data->info_ptr->trans_color; +- +- data->color_key = (((trans->red & 0xff00) << 8) | +- ((trans->green & 0xff00)) | +- ((trans->blue & 0xff00) >> 8)); ++ data->color_key = (((trans_color->red & 0xff00) << 8) | ++ ((trans_color->green & 0xff00)) | ++ ((trans_color->blue & 0xff00) >> 8)); + } + } + + switch (data->color_type) { + case PNG_COLOR_TYPE_PALETTE: { +- png_colorp palette = data->info_ptr->palette; +- png_bytep trans = data->info_ptr->trans_alpha; +- int num_trans = data->info_ptr->num_trans; +- int num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette ); ++ png_colorp palette; ++ png_bytep trans; ++ png_color_16p trans_color; ++ int num_trans; ++ int num_colors; ++ ++ png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors ); ++ num_colors = MIN( MAXCOLORMAPSIZE, num_colors ); ++ png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color ); + + for (i=0; i<num_colors; i++) { + data->colors[i].a = (i < num_trans) ? trans[i] : 0xff; +-- +1.7.4.1 + +From 7a2a36fada3ecdd7f48fcfd782a552598477a8f5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sun, 20 Feb 2011 19:38:50 -0500 +Subject: [PATCH] tools: add support for libpng 1.5.x + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + tools/directfb-csource.c | 20 +++++++++++++------- + tools/mkdfiff.c | 2 +- + tools/mkdgifft.cpp | 2 +- + 3 files changed, 15 insertions(+), 9 deletions(-) + +diff --git a/tools/directfb-csource.c b/tools/directfb-csource.c +index 8f2cbf0..487ea3c 100644 +--- a/tools/directfb-csource.c ++++ b/tools/directfb-csource.c +@@ -338,7 +338,7 @@ static DFBResult load_image (const char *filename, + if (!png_ptr) + goto cleanup; + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { + if (desc->preallocated[0].data) { + free (desc->preallocated[0].data); + desc->preallocated[0].data = NULL; +@@ -405,17 +405,22 @@ static DFBResult load_image (const char *filename, + } + + switch (src_format) { +- case DSPF_LUT8: +- if (info_ptr->num_palette) { ++ case DSPF_LUT8: { ++ png_colorp png_palette; ++ int num_palette; ++ ++ png_get_PLTE( png_ptr, info_ptr, &png_palette, &num_palette ); ++ ++ if (num_palette) { + png_byte *alpha; + int i, num; + +- *palette_size = MIN (info_ptr->num_palette, 256); ++ *palette_size = MIN (num_palette, 256); + for (i = 0; i < *palette_size; i++) { + palette[i].a = 0xFF; +- palette[i].r = info_ptr->palette[i].red; +- palette[i].g = info_ptr->palette[i].green; +- palette[i].b = info_ptr->palette[i].blue; ++ palette[i].r = png_palette[i].red; ++ palette[i].g = png_palette[i].green; ++ palette[i].b = png_palette[i].blue; + } + if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) { + png_get_tRNS (png_ptr, info_ptr, &alpha, &num, NULL); +@@ -424,6 +429,7 @@ static DFBResult load_image (const char *filename, + } + } + break; ++ } + case DSPF_RGB32: + png_set_filler (png_ptr, 0xFF, + #ifdef WORDS_BIGENDIAN +diff --git a/tools/mkdfiff.c b/tools/mkdfiff.c +index 68a3b4f..edb58a7 100644 +--- a/tools/mkdfiff.c ++++ b/tools/mkdfiff.c +@@ -97,7 +97,7 @@ load_image (const char *filename, + if (!png_ptr) + goto cleanup; + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { + if (desc->preallocated[0].data) { + free (desc->preallocated[0].data); + desc->preallocated[0].data = NULL; +diff --git a/tools/mkdgifft.cpp b/tools/mkdgifft.cpp +index 96e4220..d4b6bf4 100644 +--- a/tools/mkdgifft.cpp ++++ b/tools/mkdgifft.cpp +@@ -595,7 +595,7 @@ load_image (const char *filename, + if (!png_ptr) + goto cleanup; + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { + if (desc->preallocated[0].data) { + free (desc->preallocated[0].data); + desc->preallocated[0].data = NULL; +-- +1.7.4.1 + diff --git a/community-staging/directfb/PKGBUILD b/community-staging/directfb/PKGBUILD new file mode 100644 index 000000000..8232fd4df --- /dev/null +++ b/community-staging/directfb/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 62433 2012-01-20 01:45:50Z ebelanger $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=directfb +pkgver=1.4.14 +pkgrel=2 +pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device" +arch=('i686' 'x86_64') +url="http://www.directfb.org" +license=('LGPL') +depends=('gcc-libs' 'libjpeg' 'sdl' 'sysfsutils' 'libpng' 'freetype2') +options=('!libtool') +changelog=$pkgname.changelog +source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz DirectFB-1.4.9-libpng-1.5.patch) +md5sums=('de0745d25a6ac9e337d4d5572df85471' + '84f3181e96692efc5ff68e5dac19541f') + +build() { + cd "${srcdir}/DirectFB-${pkgver}" + patch -p1 -i ../DirectFB-1.4.9-libpng-1.5.patch + ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-zlib \ + --enable-x11 --enable-sdl --disable-vnc --disable-osx \ + --enable-video4linux2 --enable-voodoo + make +} + +package() { + cd "${srcdir}/DirectFB-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/directfb/directfb.changelog b/community-staging/directfb/directfb.changelog new file mode 100644 index 000000000..721fd1deb --- /dev/null +++ b/community-staging/directfb/directfb.changelog @@ -0,0 +1,40 @@ +2010-11-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + + * directfb 1.4.11-1 + * Upstream update + +2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + + * directfb 1.4.5-1 + * Upstream update + +2010-01-20 Eric Belanger <eric@archlinux.org> + + * directfb 1.4.3-1 + * Upstream update + +2009-11-08 Eric Belanger <eric@archlinux.org> + + * directfb 1.4.2-1 + * Upstream update + +2009-07-13 Eric Belanger <eric@archlinux.org> + + * directfb 1.4.1-1 + * Upstream update + +2009-05-03 Eric Belanger <eric@archlinux.org> + + * directfb 1.2.8-1 + * Upstream update + +2009-03-06 Eric Belanger <eric@archlinux.org> + + * directfb 1.2.7-1 + * Upstream update + +2008-07-29 Eric Belanger <eric@archlinux.org> + + * directfb 1.2.0-1 + * Upstream update + * Added ChangeLog diff --git a/community-staging/djview4/PKGBUILD b/community-staging/djview4/PKGBUILD new file mode 100644 index 000000000..a2600bec6 --- /dev/null +++ b/community-staging/djview4/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 62347 2012-01-19 14:18:32Z bisson $ +# Contributor: Paulo Matias <matias.archlinux-br.org> +# Contributor: Leslie P. Polzer <polzer.gnu.org> +# Contributor: erm67 <erm67.yahoo.it> +# Contributor: Daniel J Griffiths +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=djview4 +pkgver=4.8 +pkgrel=2 +pkgdesc='Portable DjVu viewer and browser plugin' +url='http://djvu.sourceforge.net/djview4.html' +license=('GPL') +arch=('i686' 'x86_64') +depends=('qt' 'djvulibre') +source=("http://downloads.sourceforge.net/djvu/djview-${pkgver}.tar.gz") +sha1sums=('266d207afb63a1ee63eed054190bf88888fda572') + +install=install + +build() { + cd "${srcdir}/djview-${pkgver}" + QTDIR=/usr ./configure --prefix=/usr + sed 's/netscape/mozilla/g' -i nsdejavu/Makefile + sed 's/swap/rofl_swap/g' -i src/qdjvuwidget.cpp + make +} + +package() { + cd "${srcdir}/djview-${pkgver}" + make DESTDIR="${pkgdir}" install-djview install-nsdejavu + + cd desktopfiles + install -Dm644 hi32-djview4.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/djvulibre-djview4.png + install -Dm644 hi64-djview4.png "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/djvulibre-djview4.png + install -Dm644 hi64-djview4.png "${pkgdir}"/usr/share/pixmaps/djvulibre-djview4.png + install -Dm644 djvulibre-djview4.desktop "${pkgdir}"/usr/share/applications/djvulibre-djview4.desktop +} diff --git a/community-staging/djview4/install b/community-staging/djview4/install new file mode 100644 index 000000000..f2bd04ceb --- /dev/null +++ b/community-staging/djview4/install @@ -0,0 +1,13 @@ +post_install() { + if type xdg-icon-resource &>/dev/null; then + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/efax-gtk/PKGBUILD b/community-staging/efax-gtk/PKGBUILD new file mode 100644 index 000000000..faf04dd39 --- /dev/null +++ b/community-staging/efax-gtk/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 62427 2012-01-19 22:13:20Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=efax-gtk +pkgver=3.2.9 +pkgrel=2 +pkgdesc="A GUI front end for the 'efax' fax program" +arch=('i686' 'x86_64') +url="http://efax-gtk.sourceforge.net/" +license=('GPL') +depends=('dbus-glib' 'ghostscript' 'c++-gtk-utils') +makedepends=('pkg-config') +optdepends=('heirloom-mailx: to use the mail_fax script') +backup=('etc/efax-gtkrc') +install=efax-gtk.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.src.tgz") +md5sums=('57fac8815c8f49fc7415d3558eb3f842') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-spooldir=/usr/bin + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -m 755 mail_fax print_fax "${pkgdir}/usr/bin" +} diff --git a/community-staging/efax-gtk/efax-gtk.install b/community-staging/efax-gtk/efax-gtk.install new file mode 100644 index 000000000..69e30acd6 --- /dev/null +++ b/community-staging/efax-gtk/efax-gtk.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/fbgrab/PKGBUILD b/community-staging/fbgrab/PKGBUILD new file mode 100644 index 000000000..2c19d04c5 --- /dev/null +++ b/community-staging/fbgrab/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 62335 2012-01-19 09:22:30Z spupykin $ +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org + +pkgname=fbgrab +pkgver=1.0 +pkgrel=6 +pkgdesc="A framebuffer screenshot grabber" +arch=(i686 x86_64) +url="http://hem.bredband.net/gmogmo/fbgrab/" +license=("GPL") +depends=('libpng') +makedepends=('libpng') +source=(http://hem.bredband.net/gmogmo/fbgrab/fbgrab-1.0.tar.gz) +md5sums=('7af4d8774684182ed690d5da82d6d234') + +build() { + cd $startdir/src/$pkgname-$pkgver + sed -i '1,1i#include <zlib.h>' fbgrab.c + gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab + strip fbgrab + install -D -m755 $startdir/src/$pkgname-$pkgver/fbgrab $startdir/pkg/usr/bin/fbgrab + install -D -m644 $startdir/src/$pkgname-$pkgver/fbgrab.1.man $startdir/pkg/usr/share/man/man1/fbgrab.1 +} diff --git a/community-staging/fbreader/PKGBUILD b/community-staging/fbreader/PKGBUILD new file mode 100644 index 000000000..3f0e64cc3 --- /dev/null +++ b/community-staging/fbreader/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 62331 2012-01-19 09:20:32Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=fbreader +pkgver=0.12.10 +pkgrel=3 +pkgdesc="An e-book reader for Linux" +arch=('i686' 'x86_64') +url="http://www.fbreader.org/" +license=('GPL') +depends=('fribidi' 'bzip2' 'curl' 'gtk2' 'liblinebreak' 'sqlite3') +source=(http://www.fbreader.org/files/sources/fbreader-sources-$pkgver.tgz + build-fix.patch) +md5sums=('da9ec4721efdb0ec0aaa182bff16ad82' + '66ac17d8640625b6d2a806de4aa4e76c') + +build() { + export CPPFLAGS="-I/usr/include/cairo" + export TARGET_ARCH=desktop + export UI_TYPE=gtk + export TARGET_STATUS=release + export srcdir + + cd $srcdir/fbreader-$pkgver + patch -p0 makefiles/config.mk <$srcdir/build-fix.patch + sed -i 's#Library::Library &Library::Instance()#Library \&Library::Instance()#' fbreader/src/library/Library.cpp + make INSTALLDIR=/usr + make INSTALLDIR=/usr DESTDIR=$pkgdir install +} diff --git a/community-staging/fbreader/build-fix.patch b/community-staging/fbreader/build-fix.patch new file mode 100644 index 000000000..7316464b8 --- /dev/null +++ b/community-staging/fbreader/build-fix.patch @@ -0,0 +1,20 @@ +--- config.mk.orig 2010-02-23 18:22:10.000000000 +0000 ++++ config.mk 2010-02-28 13:55:11.000000000 +0000 +@@ -21,7 +21,7 @@ + ARCHIVER_LIBS ?= -lz -lbz2 + NETWORK_LIBS ?= -lcurl + +-CFLAGS += -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\" ++CFLAGS += -I$(srcdir)/liblinebreak-20080321 -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\" + ifeq "$(ZLSHARED)" "yes" + CFLAGS += -fPIC -DZLSHARED + endif +@@ -38,6 +38,8 @@ + LDFLAGS += -pg + endif + ++LDFLAGS += -L$(srcdir)/liblinebreak-20080321/DebugDir ++ + ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include + + ZLSHARED ?= yes diff --git a/community-staging/fbshot/PKGBUILD b/community-staging/fbshot/PKGBUILD new file mode 100644 index 000000000..b807e4e09 --- /dev/null +++ b/community-staging/fbshot/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 62337 2012-01-19 09:23:07Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: sp42b <sp42b|a_t|gmx.net> + +pkgname=fbshot +pkgver=0.3 +pkgrel=4 +pkgdesc="Takes screenshots (PNG) from your framebuffer device (e.g. console)." +arch=('i686' 'x86_64') +url="http://www.sfires.net/fbshot/" +license=('GPL') +depends=('libpng') +source=(http://www.sfires.net/stuff/fbshot/$pkgname-$pkgver.tar.gz) +md5sums=('2cc6cc25cdc4cd447a8b0a9662907635') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i '1,1i#include <zlib.h>' fbshot.c + make + install -Dm755 fbshot $pkgdir/usr/bin/fbshot + install -Dm644 fbshot.1.man $pkgdir/usr/share/man/man1/fbshot.1 +} diff --git a/community-staging/fbv/ChangeLog b/community-staging/fbv/ChangeLog new file mode 100644 index 000000000..7fd5bbf99 --- /dev/null +++ b/community-staging/fbv/ChangeLog @@ -0,0 +1,2 @@ +2007-06-26 tardo <tardo@nagi-fanboi.net> +* Built for x86_64 diff --git a/community-staging/fbv/PKGBUILD b/community-staging/fbv/PKGBUILD new file mode 100644 index 000000000..53fb5d756 --- /dev/null +++ b/community-staging/fbv/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 62339 2012-01-19 09:24:56Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Aectann <aectann@infoline.su> + +pkgname=fbv +pkgver=1.0b +pkgrel=5 +pkgdesc="FrameBuffer image viewer" +arch=('i686' 'x86_64') +url="http://s-tech.elsat.net.pl/fbv/" +license=('GPL') +depends=('libpng' 'libungif' 'libjpeg') +source=(http://s-tech.elsat.net.pl/fbv/$pkgname-$pkgver.tar.gz) +md5sums=('3e466375b930ec22be44f1041e77b55d') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man + sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lungif -lgif|' Make.conf + sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c + make + mkdir -p $pkgdir/usr/bin + mkdir -p $pkgdir/usr/share/man/man1 + make DESTDIR=$pkgdir install +} diff --git a/community-staging/fltk2/PKGBUILD b/community-staging/fltk2/PKGBUILD new file mode 100644 index 000000000..4df613913 --- /dev/null +++ b/community-staging/fltk2/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 62329 2012-01-19 09:03:23Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=fltk2 +pkgver=2.0 +_pkgver=2.0.x-alpha-r9166 +pkgrel=8 +pkgdesc="Graphical user interface toolkit for X" +arch=(i686 x86_64) +license=('LGPL') +url="http://www.fltk.org/" +depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext' 'libxi' 'libxinerama') +makedepends=('mesa') +source=(http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/fltk-${_pkgver}.tar.bz2) +md5sums=('d5e7cd859d2aeb9bb6e13ee298e8b2aa') + +build() { + cd $srcdir/fltk-${_pkgver} + [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared + patch -p0 src/filename_list.cxx <<EOF +66c66 +< int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort); +--- +> int n = scandir(d, list, 0, (int(*)(const dirent64**,const dirent64**))sort); +EOF + make + make DESTDIR=$pkgdir install +} diff --git a/community-staging/fox/PKGBUILD b/community-staging/fox/PKGBUILD new file mode 100644 index 000000000..8c087c309 --- /dev/null +++ b/community-staging/fox/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 62305 2012-01-19 07:32:20Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Ben <ben@benmazer.net> + +pkgname=fox +pkgver=1.6.44 +pkgrel=2 +pkgdesc="Free Objects for X: GUI Toolkit for C++" +arch=('i686' 'x86_64') +url="http://www.fox-toolkit.org/" +license=('LGPL' 'custom') +depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libtiff') +optdepends=('perl') +options=('!libtool') +source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz) +md5sums=('6ccc8cbcfa6e4c8b6e4deeeb39c36434') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + export CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" + ./configure --prefix=/usr \ + --enable-release \ + --with-xft=yes \ + --with-opengl=yes \ + --with-xim \ + --with-xshm \ + --with-shape \ + --with-xcursor \ + --with-xrender \ + --with-xrandr \ + --with-xfixes \ + --with-xinput + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + cd ${srcdir}/${pkgname}-${pkgver}/tests + make ControlPanel + install -m755 ${srcdir}/${pkgname}-${pkgver}/tests/.libs/ControlPanel ${pkgdir}/usr/bin/ + install -Dm644 ../LICENSE_ADDENDUM ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community-staging/freewrl/PKGBUILD b/community-staging/freewrl/PKGBUILD new file mode 100644 index 000000000..4399a72f2 --- /dev/null +++ b/community-staging/freewrl/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 62333 2012-01-19 09:21:12Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=freewrl +pkgver=1.22.10 +pkgrel=8 +pkgdesc="VRML viewer" +arch=('i686' 'x86_64') +url="http://freewrl.sourceforge.net/" +license=('GPL') +depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox' + 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js') +makedepends=('java-environment') +options=(!libtool) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + build-fix.patch) +md5sums=('07fd8f193d14799ffb95a59a4887fc88' + '52e4b6aacebcaf18cbec8975e0eb7fd8') + +build() { + . /etc/profile.d/jre.sh + . /etc/profile.d/jdk.sh + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/build-fix.patch + export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)" + export JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) -lmozjs185" + ./configure \ + --prefix=/usr --with-fontsdir=/usr/share/fonts/TTF --enable-libeai \ + --enable-libcurl --with-expat=/usr --with-target=x11 --disable-plugin \ + --disable-mozilla-js --disable-xulrunner-js --disable-firefox-js \ + --disable-seamonkey-js + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/community-staging/freewrl/build-fix.patch b/community-staging/freewrl/build-fix.patch new file mode 100644 index 000000000..c0de71d07 --- /dev/null +++ b/community-staging/freewrl/build-fix.patch @@ -0,0 +1,1201 @@ +diff -wbBur freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c +--- freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c 2010-08-19 06:20:36.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c 2011-07-04 01:19:07.000000000 +0400 +@@ -54,7 +54,7 @@ + #include "ColladaParser.h" + + #if HAVE_EXPAT_H +-# include <expat.h> ++# include </usr/include/expat.h> + #endif + + #define PROTOINSTANCE_MAX_LEVELS 10 +diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldGet.c freewrl-1.22.10.my/src/lib/world_script/fieldGet.c +--- freewrl-1.22.10/src/lib/world_script/fieldGet.c 2010-10-13 23:45:26.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/fieldGet.c 2011-07-04 20:21:21.000000000 +0400 +@@ -412,7 +412,7 @@ + /* create a new SFFloat object */ + + fp = (float *)fp_in; +- newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp)); ++ newjsval = JS_NewJSVal(cx,(double)*fp); + fp_in = offsetPointer_deref(float *,fp_in,elementlen); + + /* put this object into the MF class */ +@@ -449,7 +449,7 @@ + /* create a new SFTime object */ + + fp = (float *)fp_in; +- newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp)); ++ newjsval = JS_NewJSVal(cx,(double)*fp); + fp_in = offsetPointer_deref(float *,fp_in,elementlen); + + /* put this object into the MF class */ +diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldSet.c freewrl-1.22.10.my/src/lib/world_script/fieldSet.c +--- freewrl-1.22.10/src/lib/world_script/fieldSet.c 2010-09-22 00:00:25.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/fieldSet.c 2011-07-04 20:03:53.000000000 +0400 +@@ -748,7 +748,7 @@ + + #ifdef SETFIELDVERBOSE + strval = JS_ValueToString(scriptContext, JSglobal_return_val); +- strp = JS_GetStringBytes(strval); ++ strp = JS_EncodeString(scriptContext, strval); + printf ("start of setField_javascriptEventOut, to %ld:%d = %p, fieldtype %d string %s\n",(long)tn, tptr, memptr, fieldType, strp); + #endif + +@@ -813,7 +813,7 @@ + case FIELDTYPE_SFImage: { + /* the string should be saved as an SFImage */ + strval = JS_ValueToString(scriptContext, JSglobal_return_val); +- strp = JS_GetStringBytes(strval); ++ strp = JS_EncodeString(scriptContext, strval); + + Parser_scanStringValueToMem(tn, tptr, FIELDTYPE_SFImage, strp, FALSE); + break; +@@ -824,7 +824,7 @@ + uintptr_t *newptr; + + strval = JS_ValueToString(scriptContext, JSglobal_return_val); +- strp = JS_GetStringBytes(strval); ++ strp = JS_EncodeString(scriptContext, strval); + + /* copy the string over, delete the old one, if need be */ + /* printf ("fieldSet SFString, tn %d tptr %d offset from struct %d\n", +@@ -844,7 +844,7 @@ + struct X3D_Node *mynode; + + strval = JS_ValueToString(scriptContext, JSglobal_return_val); +- strp = JS_GetStringBytes(strval); ++ strp = JS_EncodeString(scriptContext, strval); + + /* we will have at least one node here, in an ascii string */ + while ((*strp > '\0') && (*strp <= ' ')) strp ++; +@@ -1227,7 +1227,7 @@ + JSString *_tmpStr; + + _tmpStr = JS_ValueToString(cx, mainElement); +- strp = JS_GetStringBytes(_tmpStr); ++ strp = JS_EncodeString(scriptContext, _tmpStr); + printf ("sub element %d is \"%s\" \n",i,strp); + + if (JSVAL_IS_OBJECT(mainElement)) printf ("sub element %d is an OBJECT\n",i); +@@ -1329,7 +1329,7 @@ + JSString *strval; + + strval = JS_ValueToString(cx, mainElement); +- strp = JS_GetStringBytes(strval); ++ strp = JS_EncodeString(cx, strval); + + #ifdef SETFIELDVERBOSE + printf ("getJSMultiNumType, got string %s\n",strp); +@@ -1441,7 +1441,7 @@ + return; + } + strval = JS_ValueToString(cx, _v); +- valStr = JS_GetStringBytes(strval); ++ valStr = JS_EncodeString(cx, strval); + + /* printf ("new string %d is %s\n",i,valStr); */ + +diff -wbBur freewrl-1.22.10/src/lib/world_script/jsUtils.c freewrl-1.22.10.my/src/lib/world_script/jsUtils.c +--- freewrl-1.22.10/src/lib/world_script/jsUtils.c 2010-06-03 23:38:37.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/jsUtils.c 2011-07-04 20:21:44.000000000 +0400 +@@ -134,7 +134,7 @@ + nf = OBJECT_TO_JSVAL(me); + + #ifdef JSVRMLCLASSESVERBOSE +- printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf))); ++ printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf))); + #endif + + if (!setSFNodeField (cx, par, pf, &nf)) { +@@ -197,7 +197,7 @@ + char *_id_c; + + _idStr = JS_ValueToString(cx, *newval); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + oldS = (struct Uni_String *) *((uintptr_t *)Data); + +@@ -305,12 +305,12 @@ + + case FIELDTYPE_SFFloat: { + memcpy ((void *) &fl, Data, datalen); +- *newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)fl)); ++ *newval = JS_NewJSVal(cx,(double)fl); + break; + } + case FIELDTYPE_SFTime: { + memcpy ((void *) &dl, Data, datalen); +- *newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,dl)); ++ *newval = JS_NewJSVal(cx,dl); + break; + } + case FIELDTYPE_SFBool: +@@ -824,7 +824,7 @@ + struct X3D_Node *node; + + _idStr = JS_ValueToString(context, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(context, _idStr); + + #ifdef JSVRMLCLASSESVERBOSE + printf ("\ngetSFNodeField called on name %s object %u\n",_id_c, obj); +@@ -912,7 +912,7 @@ + + /* get the id field... */ + +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + + #ifdef JSVRMLCLASSESVERBOSE + printf ("\nsetSFNodeField called on name %s object %u, jsval %u\n",_id_c, obj, *vp); +@@ -1131,10 +1131,10 @@ + char *_id_c = "(no value in string)"; + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); + /* printf ("hmmm...js_SetPropertyCheck called on string \"%s\" object %u, jsval %u\n",_id_c, obj, *vp); */ + } else if (JSVAL_IS_DOUBLE(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyCheck called on double %s object %u, jsval %u\n",_id_c, obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1192,7 +1192,7 @@ + /* get the id field... */ + + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); + printf ("\n...js_GetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1211,7 +1211,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1229,7 +1229,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug1 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1247,7 +1247,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); + printf ("...js_SetPropertyDebug2 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1265,7 +1265,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug3 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1283,7 +1283,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug4 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1301,7 +1301,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug5 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1319,7 +1319,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug6 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1337,7 +1337,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug7 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1355,7 +1355,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug8 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1373,7 +1373,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug9 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c +--- freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c 2010-08-02 23:55:57.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c 2011-07-04 20:06:25.000000000 +0400 +@@ -336,7 +336,7 @@ + return JS_FALSE; + } + _str = JS_ValueToString(context, argv[0]); +- _costr = JS_GetStringBytes(_str); ++ _costr = JS_EncodeString(context, _str); + + /* sanitize string, for the EAI_RW call (see EAI_RW code) */ + tptr = _costr; +@@ -385,10 +385,10 @@ + return JS_FALSE; + } + _str[0] = JS_ValueToString(context, argv[0]); +- _costr[0] = JS_GetStringBytes(_str[0]); ++ _costr[0] = JS_EncodeString(context, _str[0]); + + _str[1] = JS_ValueToString(context, argv[1]); +- _costr[1] = JS_GetStringBytes(_str[1]); ++ _costr[1] = JS_EncodeString(context, _str[1]); + + /* we use the EAI code for this - so reformat this for the EAI format */ + { +@@ -575,7 +575,7 @@ + /* third parameter should be a string */ + if (JSVAL_IS_STRING(argv[2])) { + _str[1] = JSVAL_TO_STRING(argv[2]); +- fieldStr = JS_GetStringBytes(_str[1]); ++ fieldStr = JS_EncodeString(context, _str[1]); + #ifdef JSVERBOSE + printf ("field string is :%s:\n",fieldStr); + #endif +@@ -590,7 +590,7 @@ + + /* get the URL listing as a string */ + _str[0] = JS_ValueToString(context, argv[0]); +- _costr0 = JS_GetStringBytes(_str[0]); ++ _costr0 = JS_EncodeString(context, _str[0]); + + + #ifdef JSVERBOSE +@@ -690,7 +690,7 @@ + for (count=0; count < argc; count++) { + if (JSVAL_IS_STRING(argv[count])) { + _str = JSVAL_TO_STRING(argv[count]); +- _id_c = JS_GetStringBytes(_str); ++ _id_c = JS_EncodeString(context, _str); + #if defined(AQUA) || defined(_MSC_VER) + BrowserPrintConsoleMessage(_id_c); /* statusbar hud */ + consMsgCount = 0; /* reset the "Maximum" count */ +@@ -850,7 +850,7 @@ + + /* parameter should be a string */ + if (JSVAL_IS_STRING(argv[0])) { +- target = JS_GetStringBytes( JSVAL_TO_STRING(argv[0])); ++ target = JS_EncodeString(context, JSVAL_TO_STRING(argv[0])); + #ifdef JSVERBOSE + printf ("field string is %s\n",target); + #endif +@@ -930,7 +930,7 @@ + + /* parameters should be a string */ + if (JSVAL_IS_STRING(argv[0])) { +- targetDevice = JS_GetStringBytes( JSVAL_TO_STRING(argv[0])); ++ targetDevice = JS_EncodeString(cx, JSVAL_TO_STRING(argv[0])); + #ifdef JSVERBOSE + printf ("field string is %s\n",targetDevice); + #endif +@@ -939,7 +939,7 @@ + return -1; + } + if (JSVAL_IS_STRING(argv[1])) { +- targetController = JS_GetStringBytes( JSVAL_TO_STRING(argv[1])); ++ targetController = JS_EncodeString(cx, JSVAL_TO_STRING(argv[1])); + #ifdef JSVERBOSE + printf ("field string is %s\n",targetController); + #endif +diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c +--- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c 2010-09-22 23:40:48.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c 2011-07-04 20:08:03.000000000 +0400 +@@ -935,7 +935,7 @@ + printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd); + return JS_FALSE; + } +- val = DOUBLE_TO_JSVAL(dp); ++ val = DOUBLE_TO_JSVAL(*dp); + + } + } +@@ -1108,7 +1108,7 @@ + + printf ("HAVE STRING HERE!\n"); + _str = JS_ValueToString(cx, id); +- asciiStr = JS_GetStringBytes(_str); ++ asciiStr = JS_EncodeString(context, _str); + printf ("we have as a parameter :%s:\n",asciiStr); + #endif + +@@ -1185,7 +1185,7 @@ + if (_tmpStr==NULL) { + _tmp_valStr = "NULL"; + } else { +- _tmp_valStr = JS_GetStringBytes(_tmpStr); ++ _tmp_valStr = JS_EncodeString(cx, _tmpStr); + } + } + +@@ -1281,7 +1281,7 @@ + #endif + + str = JS_ValueToString(cx, id); +- p = JS_GetStringBytes(str); ++ p = JS_EncodeString(cx, str); + #ifdef JSVRMLCLASSESVERBOSE + printf("\tid string %s\n ",p); + #endif +@@ -1368,12 +1368,12 @@ + char * _c; + printf ("doMFSetProperty, for object %u, vp %u\n", obj,*vp); + _str = JS_ValueToString(cx, id); +- _c = JS_GetStringBytes(_str); ++ _c = JS_EncodeString(cx, _str); + printf ("id is %s\n",_c); + + _sstr = JS_ValueToString(cx, *vp); + printf ("looking up value for %d %x object %p\n",*vp,*vp,obj); +- _cc = JS_GetStringBytes(_sstr); ++ _cc = JS_EncodeString(cx, _sstr); + printf("\tdoMFSetProperty:%d: obj = %p, id = %s, vp = %s\n",type, + obj, _c, _cc); + if (JSVAL_IS_OBJECT(*vp)) { printf ("doMFSet, vp is an OBJECT\n"); } +@@ -1397,7 +1397,7 @@ + + if (!JS_ValueToInt32(cx, *vp, &i)) { + _sstr = JS_ValueToString(cx, *vp); +- _cc = JS_GetStringBytes(_sstr); ++ _cc = JS_EncodeString(cx, _sstr); + printf ("can not convert %s to an integer in doMFAddProperty for type %d\n",_cc,type); + return JS_FALSE; + } +@@ -1408,7 +1408,7 @@ + #ifdef JSVRMLCLASSESVERBOSE + printf ("doMFSetProperty - ensure that this is a DOUBLE "); + _sstr = JS_ValueToString(cx, *vp); +- _cc = JS_GetStringBytes(_sstr); ++ _cc = JS_EncodeString(cx, _sstr); + printf ("value is %s \n",_cc); + #endif + +@@ -1420,7 +1420,7 @@ + printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + + } + } +@@ -1511,7 +1511,7 @@ + nf = OBJECT_TO_JSVAL(me); + + #ifdef JSVRMLCLASSESVERBOSE +- printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf))); ++ printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf))); + #endif + + if (!setSFNodeField (cx, par, pf, &nf)) { +@@ -1535,7 +1535,7 @@ + unsigned int i, j = 0; + + _str = JS_ValueToString(cx, *vp); +- _buff = JS_GetStringBytes(_str); ++ _buff = JS_EncodeString(cx, _str); + _buff_len = strlen(_buff) + 1; + + #ifdef JSVRMLCLASSESVERBOSE +@@ -1719,14 +1719,14 @@ + size_t len = 0; + + _idStr = JS_ValueToString(context, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(context, _idStr); + + /* "register" this ECMA value for routing changed flag stuff */ + setInECMATable(context, _id_c); + + if (JSVAL_IS_STRING(*vp)) { + _vpStr = JS_ValueToString(context, *vp); +- _vp_c = JS_GetStringBytes(_vpStr); ++ _vp_c = JS_EncodeString(context, _vpStr); + + len = strlen(_vp_c); + +@@ -1752,7 +1752,7 @@ + } else { + #ifdef JSVRMLCLASSESVERBOSE + _vpStr = JS_ValueToString(context, *vp); +- _vp_c = JS_GetStringBytes(_vpStr); ++ _vp_c = JS_EncodeString(cx, _vpStr); + printf("setECMANative: obj = %p, id = \"%s\", vp = %s\n", + obj, _id_c, _vp_c); + #endif +@@ -1770,9 +1770,9 @@ + JSString *_idStr, *_vpStr; + char *_id_c, *_vp_c; + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + _vpStr = JS_ValueToString(cx, *vp); +- _vp_c = JS_GetStringBytes(_vpStr); ++ _vp_c = JS_EncodeString(cx, _vpStr); + printf("getAssignProperty: obj = %p, id = \"%s\", vp = %s\n", + obj, _id_c, _vp_c); + printf ("what is vp? \n"); +@@ -1803,7 +1803,7 @@ + + if (JSVAL_IS_STRING(id)) { + _str = JSVAL_TO_STRING(id); +- _id_c = JS_GetStringBytes(_str); ++ _id_c = JS_EncodeString(cx, _str); + if (!JS_ConvertValue(cx, *vp, JSTYPE_OBJECT, &newVal)) { + printf( "JS_ConvertValue failed in setAssignProperty.\n"); + return JS_FALSE; +@@ -1834,9 +1834,9 @@ + if (JSVAL_IS_DOUBLE(id)) printf ("id is an DOUBLE\n"); + if (JSVAL_IS_INT(id)) printf ("id is an INT\n"); + +- printf ("id is %s\n",JS_GetStringBytes(JS_ValueToString(cx,id))); +- printf ("initVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,initVal))); +- printf ("newVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,newVal))); ++ printf ("id is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,id))); ++ printf ("initVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,initVal))); ++ printf ("newVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,newVal))); + + #endif + +@@ -1859,7 +1859,7 @@ + } else { + #ifdef JSVRMLCLASSESVERBOSE + _str = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_str); ++ _id_c = JS_EncodeString(cx, _str); + printf("setAssignProperty: obj = %p, id = \"%s\"\n", + obj, _id_c); + #endif +diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h +--- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h 2010-10-13 23:45:26.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h 2011-07-04 20:24:53.000000000 +0400 +@@ -30,6 +30,21 @@ + #ifndef __FREEWRL_JS_VRML_CLASSES_H__ + #define __FREEWRL_JS_VRML_CLASSES_H__ + ++static inline jsval JS_NewJSVal(JSContext *cx, jsdouble d) ++{ ++ jsval ret; ++ JS_NewNumberValue(cx, d, &ret); ++ return ret; ++} ++ ++static inline jsdouble * JS_NewDouble(JSContext *cx, jsdouble d) ++{ ++ static jsdouble ret; ++ jsval rv; ++ JS_NewNumberValue(cx, d, &rv); ++ ret = JSVAL_TO_DOUBLE(rv); ++ return &ret; ++} + + #ifndef UNUSED + #define UNUSED(v) ((void) v) +@@ -80,14 +95,14 @@ + + + #define SET_JS_TICKTIME_FALSE(possibleRetVal) { jsval zimbo; \ +- zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime)); \ ++ zimbo = JS_NewJSVal(cx, TickTime); \ + if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) { \ + printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \ + return possibleRetVal; \ + }} + + #define SET_JS_TICKTIME() { jsval zimbo; \ +- zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime)); \ ++ zimbo = JS_NewJSVal(cx, TickTime); \ + if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) { \ + printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \ + return FALSE; \ +diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c +--- freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c 2010-09-22 23:40:48.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c 2011-07-04 20:08:44.000000000 +0400 +@@ -596,7 +596,7 @@ + return; + } + +- val = DOUBLE_TO_JSVAL(dp); ++ val = DOUBLE_TO_JSVAL(*dp); + + if (!JS_SetElement(cx, obj, (jsint) i, &val)) { + printf( "JS_DefineElement failed for arg %u in VrmlMatrixSetTransform.\n", i); +@@ -1212,7 +1212,7 @@ + /* + if (JSVAL_IS_STRING(id)==TRUE) { + printf(" is a common string :%s:\n", +- JS_GetStringBytes(JS_ValueToString(cx, id))); ++ JS_EncodeString(cx, JS_ValueToString(cx, id))); + } + if (JSVAL_IS_OBJECT(id)==TRUE) { + printf (" parameter is an object\n"); +@@ -1231,7 +1231,7 @@ + _index = JSVAL_TO_INT(id); + + if (_index >= _length) { +- *vp = DOUBLE_TO_JSVAL(&zerojsdouble); ++ *vp = DOUBLE_TO_JSVAL(zerojsdouble); + if (!JS_DefineElement(cx, obj, (jsint) _index, *vp, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) { + printf( "JS_DefineElement failed in VrmlMatrixGetProperty.\n"); + return JS_FALSE; +@@ -1331,7 +1331,7 @@ + printf("MFStringAddProperty: vp = %p\n", obj); + if (JSVAL_IS_STRING(*vp)==TRUE) { + printf(" is a common string :%s:\n", +- JS_GetStringBytes(JS_ValueToString(cx, *vp))); ++ JS_EncodeString(cx, JS_ValueToString(cx, *vp))); + } + if (JSVAL_IS_OBJECT(*vp)==TRUE) { + printf (" parameter is an object\n"); +@@ -1345,7 +1345,7 @@ + printf("MFStringAddProperty: id = %p\n", obj); + if (JSVAL_IS_STRING(id)==TRUE) { + printf(" is a common string :%s:\n", +- JS_GetStringBytes(JS_ValueToString(cx, id))); ++ JS_EncodeString(cx, JS_ValueToString(cx, id))); + } + if (JSVAL_IS_OBJECT(id)==TRUE) { + printf (" parameter is an object\n"); +@@ -1494,7 +1494,7 @@ + if (JSVAL_IS_STRING(argv[i])==TRUE) { + printf (" Common String, is"); + _str = JS_ValueToString(cx, argv[i]); +- printf (JS_GetStringBytes(_str)); ++ printf (JS_EncodeString(cx, _str)); + printf (".."); + + } +diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c +--- freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c 2010-09-25 00:22:05.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c 2011-07-04 20:09:01.000000000 +0400 +@@ -161,7 +161,7 @@ + printf( "JS_NewDouble failed for %f in SFColorGetHSV.\n", xp[i]); + return JS_FALSE; + } +- _v = DOUBLE_TO_JSVAL(dp); ++ _v = DOUBLE_TO_JSVAL(*dp); + JS_SetElement(cx, result, (jsint)i, &_v); + } + +@@ -336,7 +336,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -346,7 +346,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -356,7 +356,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } +@@ -387,13 +387,13 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val); + break; + + } +@@ -422,18 +422,18 @@ + *rval = OBJECT_TO_JSVAL(_arrayObj); + + /* construct new double before conversion? */ +- _v = DOUBLE_TO_JSVAL(&hue); ++ _v = DOUBLE_TO_JSVAL(hue); + if (!JS_SetElement(cx, _arrayObj, 0, &_v)) { + printf( "JS_SetElement failed for hue in SFColorRGBAGetHSV.\n"); + return JS_FALSE; + } +- _v = DOUBLE_TO_JSVAL(&saturation); ++ _v = DOUBLE_TO_JSVAL(saturation); + if (!JS_SetElement(cx, _arrayObj, 1, &_v)) { + printf( "JS_SetElement failed for saturation in SFColorRGBAGetHSV.\n"); + return JS_FALSE; + } + +- _v = DOUBLE_TO_JSVAL(&value); ++ _v = DOUBLE_TO_JSVAL(value); + if (!JS_SetElement(cx, _arrayObj, 2, &_v)) { + printf( "JS_SetElement failed for value in SFColorRGBAGetHSV.\n"); + return JS_FALSE; +@@ -601,7 +601,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -611,7 +611,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -621,7 +621,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 3: + d = (ptr->v).c[3]; +@@ -631,7 +631,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } +@@ -662,16 +662,16 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val); + break; + case 3: +- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(_val); + break; + + } +@@ -983,7 +983,7 @@ + } else if (argc == 1) { + /* is this a string, or a number indicating a node? */ + myStr = JS_ValueToString(cx, argv[0]); +- cString = JS_GetStringBytes(myStr); ++ cString = JS_EncodeString(cx, myStr); + #ifdef JSVRMLCLASSESVERBOSE + printf ("SFNodeConstr, argc =1l string %s\n",cString); + #endif +@@ -1067,13 +1067,13 @@ + char *_id_c; + + _idStr = JS_ValueToString(cx, argv[0]); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + /* printf ("first string :%s:\n",_id_c); */ + + cString = STRDUP(_id_c); + + _idStr = JS_ValueToString(cx, argv[1]); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + /* printf ("second string :%s:\n",_id_c); */ + + if (sscanf (_id_c,"%p",&newHandle) != 1) { +@@ -1190,7 +1190,7 @@ + jsval rval; + + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + #ifdef JSVRMLCLASSESVERBOSE + printf ("start of SFNodeGetProperty... id is %s\n",_id_c); +@@ -1264,10 +1264,10 @@ + + + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + _valStr = JS_ValueToString(cx, *vp); +- _val_c = JS_GetStringBytes(_valStr); ++ _val_c = JS_EncodeString(cx, _valStr); + + #ifdef JSVRMLCLASSESVERBOSE + printf("SFNodeSetProperty: obj = %p, id = %s, vp = %s\n", +@@ -1904,7 +1904,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -1914,7 +1914,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -1924,7 +1924,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 3: + d = (ptr->v).c[3]; +@@ -1934,7 +1934,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } +@@ -1969,16 +1969,16 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 3: +- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv); + break; + } + } +@@ -2051,7 +2051,7 @@ + * it get created in javascript? */ + if (param_isString) { + _str = JS_ValueToString(cx, *argv); +- charString = JS_GetStringBytes(_str); ++ charString = JS_EncodeString(cx, _str); + + if (sscanf(charString, "%lf %lf", + &(pars[0]), &(pars[1])) != 2) { +@@ -2143,7 +2143,7 @@ + printf( "JS_NewDouble failed for %f in SFVec2f.\n",d); + return JS_FALSE; + } +- *rval = DOUBLE_TO_JSVAL(dp); ++ *rval = DOUBLE_TO_JSVAL(*dp); + } + + #ifdef JSVRMLCLASSESVERBOSE +@@ -2332,7 +2332,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -2342,7 +2342,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } +@@ -2373,13 +2373,13 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); + break; + } + } +@@ -2458,7 +2458,7 @@ + * it get created in javascript? */ + if (param_isString) { + _str = JS_ValueToString(cx, *argv); +- charString = JS_GetStringBytes(_str); ++ charString = JS_EncodeString(cx, _str); + + if (sscanf(charString, "%lf %lf %lf", + &(pars[0]), &(pars[1]), &(pars[2])) != 3) { +@@ -2580,7 +2580,7 @@ + printf( "JS_NewDouble failed for %f in SFVec3f.\n",d); + return JS_FALSE; + } +- *rval = DOUBLE_TO_JSVAL(dp); ++ *rval = DOUBLE_TO_JSVAL(*dp); + } + #ifdef JSVRMLCLASSESVERBOSE + if (retSFVec3f){ +@@ -2792,9 +2792,9 @@ + char *_id_c; + + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + _idStr = JS_ValueToString(cx, *vp); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + #endif + +@@ -2813,7 +2813,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -2823,7 +2823,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -2833,7 +2833,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } else { +@@ -2869,13 +2869,13 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); + break; + } + } +@@ -2949,7 +2949,7 @@ + * it get created in javascript? */ + if (param_isString) { + _str = JS_ValueToString(cx, *argv); +- charString = JS_GetStringBytes(_str); ++ charString = JS_EncodeString(cx, _str); + + if (sscanf(charString, "%lf %lf %lf", + &(pars[0]), &(pars[1]), &(pars[2])) != 3) { +@@ -3071,7 +3071,7 @@ + printf( "JS_NewDouble failed for %f in SFVec3d.\n",d); + return JS_FALSE; + } +- *rval = DOUBLE_TO_JSVAL(dp); ++ *rval = DOUBLE_TO_JSVAL(*dp); + } + #ifdef JSVRMLCLASSESVERBOSE + if (retSFVec3d){ +@@ -3282,9 +3282,9 @@ + char *_id_c; + + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + _idStr = JS_ValueToString(cx, *vp); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + #endif + +@@ -3303,7 +3303,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -3313,7 +3313,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -3323,7 +3323,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } else { +@@ -3359,13 +3359,13 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[0] = JSVAL_TO_DOUBLE(myv); + break; + case 1: +- (ptr->v).c[1] = *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[1] = JSVAL_TO_DOUBLE(myv); + break; + case 2: +- (ptr->v).c[2] = *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[2] = JSVAL_TO_DOUBLE(myv); + break; + } + } +@@ -3513,9 +3513,9 @@ + char *_id_c; + + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + _idStr = JS_ValueToString(cx, *vp); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + #endif + +@@ -3534,7 +3534,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -3544,7 +3544,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -3554,7 +3554,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 3: + d = (ptr->v).c[3]; +@@ -3564,7 +3564,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } else { +@@ -3600,16 +3600,16 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 3: +- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv); + break; + } + } +@@ -3758,9 +3758,9 @@ + char *_id_c; + + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + _idStr = JS_ValueToString(cx, *vp); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + #endif + +@@ -3779,7 +3779,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -3789,7 +3789,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -3799,7 +3799,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 3: + d = (ptr->v).c[3]; +@@ -3809,7 +3809,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } else { +@@ -3845,16 +3845,16 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 3: +- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv); + break; + } + } +diff -wbBur freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c +--- freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c 2010-09-22 20:54:59.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c 2011-07-04 01:19:07.000000000 +0400 +@@ -54,7 +54,7 @@ + #include "X3DProtoScript.h" + + #if HAVE_EXPAT_H +-# include <expat.h> ++# include </usr/include/expat.h> + #endif + //#define X3DPARSERVERBOSE 1 + diff --git a/community-staging/fxdesktop/PKGBUILD b/community-staging/fxdesktop/PKGBUILD new file mode 100644 index 000000000..8e691467c --- /dev/null +++ b/community-staging/fxdesktop/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 62325 2012-01-19 08:58:33Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sander Jansen <sander@knology.net> + +pkgname=fxdesktop +pkgver=0.1.12 +pkgrel=5 +pkgdesc="Lightweight Desktop Environment" +arch=('i686' 'x86_64') +url="http://code.google.com/p/fxdesktop/" +license=('GPL') +depends=('fox>=1.6.0' ) +source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.bz2) +md5sums=('9489e7369b5e052e0b6836a3b0670832') + +build() { + cd $srcdir/$pkgname-$pkgver + # Override default flags + export CFLAGS="-Wall -O2 -pipe" + export CXXFLAGS="-Wall -O2 -pipe" + [ "$CARCH" = "x86_64" ] && (sed -i -e 's|lib64|lib|g' build/config.linux_x86_64) + # Compile + ./gb --prefix=/usr + ./gb --package-root=$pkgdir/usr install +} diff --git a/community-staging/fxprocessview/PKGBUILD b/community-staging/fxprocessview/PKGBUILD new file mode 100644 index 000000000..e5c049e53 --- /dev/null +++ b/community-staging/fxprocessview/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 62327 2012-01-19 08:59:08Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sander Jansen <sander@knology.net> + +pkgname=fxprocessview +pkgver=0.5.0 +pkgrel=4 +pkgdesc="Process Viewer" +arch=('i686' 'x86_64') +license=('GPL') +depends=('fox>=1.4.0') +url="http://code.google.com/p/fxdesktop/" +source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.gz \ + build-fix.patch) +md5sums=('5d3cc8d7aec770997c281a743ddfda5a' + '2d2c3d54dcd2404149955f12cccb21a5') + +build() { + cd $srcdir/$pkgname-$pkgver + # Override default flags + export CFLAGS="-Wall -O2 -pipe" + export CXXFLAGS="-Wall -O2 -pipe" + # Compile + patch -Np1 <../build-fix.patch + ./gb + # gb does not return valid error code + [ -f src/fxprocessview ] + # make sure destination exists + mkdir -p $pkgdir/usr/bin + # Install + ./gb install --package-root=$pkgdir/usr +} diff --git a/community-staging/fxprocessview/build-fix.patch b/community-staging/fxprocessview/build-fix.patch new file mode 100644 index 000000000..7c883454c --- /dev/null +++ b/community-staging/fxprocessview/build-fix.patch @@ -0,0 +1,41 @@ +diff -wbBur fxprocessview-0.5.0/src/processlist.cpp fxprocessview-0.5.0.my/src/processlist.cpp +--- fxprocessview-0.5.0/src/processlist.cpp 2005-07-15 06:39:17.000000000 +0400 ++++ fxprocessview-0.5.0.my/src/processlist.cpp 2007-03-07 19:21:34.000000000 +0300 +@@ -696,7 +696,7 @@ + + long FXProcessList::onCmdUserMode(FXObject* sender,FXSelector,void* ){ + if (userfilter.empty()){ +- userfilter=FXFile::getCurrentUserName(); ++ userfilter=FXSystem::currentUserName(); + } + else { + userfilter=""; +@@ -942,12 +942,17 @@ + + + +- FXint num_processes = FXFile::listFiles(dirlist,"/proc","[0123456789]*",LIST_MATCH_ALL|LIST_NO_FILES|LIST_NO_PARENT); ++ FXint num_processes = FXDir::listFiles(dirlist,"/proc","[0123456789]*",FXDir::MatchAll | FXDir::NoFiles | FXDir::NoParent); + task_total=num_processes; + for (FXint i=0;i<num_processes;i++){ + + /// Check the Owner +- owner = FXFile::owner("/proc/" + dirlist[i]); ++ FXStat stat; ++ FXStat::statFile("/proc/" + dirlist[i], stat); ++ owner = FXSystem::userName(stat.user()); ++ ++// owner = FXSystem::userName(FXStat::user("/proc/" + dirlist[i])); ++ + if (!userfilter.empty() && (owner!=userfilter)) continue; + + /// Read in Process Stat +@@ -1027,7 +1032,7 @@ + } + + filename = "/proc/" + dirlist[i] + "/cmdline"; +- if (FXFile::exists(filename)) { ++ if (FXStat::exists(filename)) { + fp = fopen(filename.text(),"r"); + if (fp) { + if (fgets(buffer,80,fp)!=NULL){ diff --git a/community-staging/geda-gaf/ChangeLog b/community-staging/geda-gaf/ChangeLog new file mode 100644 index 000000000..c8b902cc5 --- /dev/null +++ b/community-staging/geda-gaf/ChangeLog @@ -0,0 +1,53 @@ +2012-01-19 Kyle Keen <keenerd@gmail.com> + * 1.6.2-2 + - libpng15 rebuild + +2010-12-26 Stefan Husmann <stefan-husmann@t-online.de> + * 1.6.1-2 + - adopted, moved to [community] + - added some optional dependencies + - added some sed-commands for python2 compatibility + +2010-02-14 Jared Casper <jaredcasper@gmail.com> + * 1.6.1-1 + - Version bump + +2009-10-10 Jared Casper <jaredcasper@gmail.com> + * 1.6.0-2 + - Fixed a bug causing icon problems + +2009-10-05 Jared Casper <jaredcasper@gmail.com> + * 1.6.0-1 + - Merged with geda-libs and renamed to geda-gaf to match up with + the release tarball name + +2009-05-03 Jared Casper <jaredcasper@gmail.com> + * 1.4.3-2 + - Added gettext dep (noted by sergej) + - Added '|| return 1's to configure and make commands + - A bit of other random cleanup of deps + +2009-01-03 Jared Casper <jaredcasper@gmail.com> + * 1.4.3-1 + - Version bump + - Fix dependencies (s/=>/>=/) + +2008-12-20 Jared Casper <jaredcasper@gmail.com> + * 1.4.2-1 + - Version bump + - Update from comments + +2008-09-28 Jared Casper <jaredcasper@gmail.com> + * 1.4.1-1 + - Version bump + - Added icon cache update + - Added icon cache and desktop update to post_update + +2008-05-07 Jared Casper <jaredcasper@gmail.com> + + * 1.4.0-1 + - adopted by Jared Casper + - Update PKGBUILD to current standards and latest version (1.4.0) + - add configure options and install script to handle desktop issues + - added ChangeLog + diff --git a/community-staging/geda-gaf/PKGBUILD b/community-staging/geda-gaf/PKGBUILD new file mode 100644 index 000000000..b3e6278b9 --- /dev/null +++ b/community-staging/geda-gaf/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Jared Casper <jaredcasper@gmail.com> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> + +pkgname=geda-gaf +pkgver=1.6.2 +pkgrel=2 +pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project" +arch=('i686' 'x86_64') +url="http://www.gpleda.org" +license=('GPL') +depends=('gtk2' 'guile' 'libstroke' 'shared-mime-info' 'hicolor-icon-theme') +makedepends=('pkgconfig' 'perlxml' 'flex' 'gawk') +optdepends=('python2: for two of the commands (garchive, tragesym)' + 'gawk: for sw2asc') +replaces=('geda-suite' 'geda-libs') +install=geda-gaf.install +source=(http://geda.seul.org/release/v1.6/$pkgver/$pkgname-$pkgver.tar.gz) +md5sums=('35ae86aebc174ec1fc03863fde4c843c') + +build () +{ + cd "$srcdir/$pkgname-$pkgver/" + ./configure --prefix=/usr --disable-update-xdg-database + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/" + make DESTDIR="$pkgdir/" install + sed -i 's+/usr/bin/env python+/usr/bin/env python2+' \ + "$pkgdir/usr/bin/garchive" + sed -i 's+/usr/bin/python+/usr/bin/python2+' \ + "$pkgdir/usr/bin/tragesym" + sed -i 's+/usr/bin/python+/usr/bin/python2+' \ + "$pkgdir/usr/share/doc/$pkgname/examples/lightning_detector/bom" +} + diff --git a/community-staging/geda-gaf/geda-gaf.install b/community-staging/geda-gaf/geda-gaf.install new file mode 100644 index 000000000..ad5e587cc --- /dev/null +++ b/community-staging/geda-gaf/geda-gaf.install @@ -0,0 +1,19 @@ +post_install() { +if [ -x /usr/bin/gtk-update-icon-cache ]; then + echo Updating icon cache... + /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor +fi +if [ -x /usr/bin/update-desktop-database ]; then + echo Updating desktop database.. + /usr/bin/update-desktop-database /usr/share/applications +fi +update-mime-database usr/share/mime +} + +post_upgrade() { +post_install +} + +post_remove() { +post_install +}
\ No newline at end of file diff --git a/community-staging/glpng/Makefile b/community-staging/glpng/Makefile new file mode 100644 index 000000000..d6772798f --- /dev/null +++ b/community-staging/glpng/Makefile @@ -0,0 +1,30 @@ +CFLAGS+=-fPIC -Iinclude +LDFLAGS+=-lpng -lGL +SHAREDLIBFLAGS=-shared +DESTDIR=/usr/local +LIB=lib + +all: libglpng.a libglpng.so.1.45 + +libglpng.a: glpng.o + ar rv $@ $< + +libglpng.so.1.45: glpng.o + gcc $(CFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname=libglpng.so.1 -Wl,--whole-archive $< -Wl,--no-whole-archive $(LDFLAGS) -o $@ + +glpng.o: src/glpng.c + gcc $(CFLAGS) -c $< + +clean: + rm glpng.o libglpng.* + +install: + for i in include include/GL $(LIB); do \ + install -m 755 -d $(DESTDIR)/$$i; \ + done + install -p -m 644 include/GL/glpng.h $(DESTDIR)/include/GL + install -m 755 libglpng.* $(DESTDIR)/$(LIB) + ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so.1 + ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so + +.PHONY: clean install diff --git a/community-staging/glpng/PKGBUILD b/community-staging/glpng/PKGBUILD new file mode 100644 index 000000000..c2530ae09 --- /dev/null +++ b/community-staging/glpng/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 62385 2012-01-19 18:48:18Z jelle $ +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=glpng +pkgver=1.45 +pkgrel=5 +pkgdesc="Toolkit for loading PNG images as OpenGL textures" +arch=('i686' 'x86_64') +url="http://www.fifi.org/doc/libglpng-dev/glpng.html" +license=('custom') +depends=('libpng' 'libgl') +makedepends=('mesa') +source=(http://ftp.de.debian.org/debian/pool/main/libg/libglpng/libglpng_${pkgver}.orig.tar.gz + Makefile + libpng15.patch + license) +build() { + cd "$srcdir/libglpng-1.45.orig" + + patch -Np1 -i "$srcdir/libpng15.patch" + + cp "$srcdir/Makefile" . + make libglpng.so.1.45 +} + +package() { + cd "$srcdir/libglpng-1.45.orig" + make DESTDIR="$pkgdir/usr" install + install -Dm644 "$srcdir/license" \ + "$pkgdir/usr/share/licenses/glpng/license" +} +md5sums=('9e0daad8e39fbf3179c73c0d3f74f104' + '0b24e9cb527d4ed1c43dd743d49d2b54' + 'f3f0c0a3f867c5856d922c18677ef2a2' + 'cd066652a6e5dbd7c1fc303b8e03417a') diff --git a/community-staging/glpng/libpng15.patch b/community-staging/glpng/libpng15.patch new file mode 100644 index 000000000..89e9bf67e --- /dev/null +++ b/community-staging/glpng/libpng15.patch @@ -0,0 +1,83 @@ +diff -aur libglpng-1.45.orig/include/GL/glpng.h libglpng-1.45.new/include/GL/glpng.h +--- libglpng-1.45.orig/include/GL/glpng.h 2000-07-10 21:27:00.000000000 +0200 ++++ libglpng-1.45.new/include/GL/glpng.h 2012-01-19 19:34:43.994280259 +0100 +@@ -57,7 +57,7 @@ + #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
+ + /* Transparency parameters */
+-#define PNG_CALLBACK -3 /* Call the callback function to generate alpha */ ++#define PNG_CALLBACKT -3 /* Call the callback function to generate alpha */ + #define PNG_ALPHA -2 /* Use alpha channel in PNG file, if there is one */ + #define PNG_SOLID -1 /* No transparency */ + #define PNG_STENCIL 0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise */ +diff -aur libglpng-1.45.orig/src/glpng.c libglpng-1.45.new/src/glpng.c +--- libglpng-1.45.orig/src/glpng.c 2000-07-10 21:27:10.000000000 +0200 ++++ libglpng-1.45.new/src/glpng.c 2012-01-19 19:39:37.379311651 +0100 +@@ -29,7 +29,7 @@ + #include <GL/gl.h>
+ #include <stdlib.h> + #include <math.h> +-#include "png/png.h" ++#include <png.h> +
+ /* Used to decide if GL/gl.h supports the paletted extension */
+ #ifdef GL_COLOR_INDEX1_EXT
+@@ -113,6 +113,7 @@ + } + } +
++#ifdef _WIN32 + static int ExtSupported(const char *x) { + static const GLubyte *ext = NULL; + const char *c; +@@ -129,6 +130,7 @@ + + return 0; + } ++#endif +
+ #define GET(o) ((int)*(data + (o)))
+
+@@ -269,14 +271,14 @@ + if (pinfo == NULL) return 0; + + fread(header, 1, 8, fp); +- if (!png_check_sig(header, 8)) return 0; ++ if (!png_sig_cmp(header, 0, 8)) return 0; + + png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + info = png_create_info_struct(png); + endinfo = png_create_info_struct(png); + + // DH: added following lines
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ png_destroy_read_struct(&png, &info, &endinfo);
+ return 0;
+@@ -373,14 +375,14 @@ + png_uint_32 i; + + fread(header, 1, 8, fp); +- if (!png_check_sig(header, 8)) return 0; ++ if (png_sig_cmp(header, 0, 8)) return 0; + + png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + info = png_create_info_struct(png); + endinfo = png_create_info_struct(png); + + // DH: added following lines
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ png_destroy_read_struct(&png, &info, &endinfo);
+ return 0;
+@@ -559,7 +561,7 @@ + #define ALPHA *q + + switch (trans) { +- case PNG_CALLBACK: ++ case PNG_CALLBACKT: + FORSTART + ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b); + FOREND diff --git a/community-staging/glpng/license b/community-staging/glpng/license new file mode 100644 index 000000000..a526262b5 --- /dev/null +++ b/community-staging/glpng/license @@ -0,0 +1,21 @@ +/* + * PNG loader library for OpenGL v1.45 (10/07/00) + * by Ben Wyatt ben@wyatt100.freeserve.co.uk + * Using LibPNG 1.0.2 and ZLib 1.1.3 + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the author be held liable for any damages arising from the + * use of this software. + * + * Permission is hereby granted to use, copy, modify, and distribute this + * source code, or portions hereof, for any purpose, without fee, subject to + * the following restrictions: + * + * 1. The origin of this source code must not be misrepresented. You must not + * claim that you wrote the original software. If you use this software in + * a product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered versions must be plainly marked as such and must not be + * misrepresented as being the original source. + * 3. This notice must not be removed or altered from any source distribution. + */ diff --git a/community-staging/gnustep-gui/ChangeLog b/community-staging/gnustep-gui/ChangeLog new file mode 100644 index 000000000..15622ab88 --- /dev/null +++ b/community-staging/gnustep-gui/ChangeLog @@ -0,0 +1,2 @@ +2007-06-27 tardo <tardo@nagi-fanboi.net> +* version upgrade diff --git a/community-staging/gnustep-gui/PKGBUILD b/community-staging/gnustep-gui/PKGBUILD new file mode 100644 index 000000000..584d5a038 --- /dev/null +++ b/community-staging/gnustep-gui/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 62400 2012-01-19 19:38:10Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Sebastian Sareyko <public@nooms.de> + +pkgname=gnustep-gui +pkgver=0.20.0 +pkgrel=3 +pkgdesc="The GNUstep GUI class library" +arch=('i686' 'x86_64') +url="http://www.gnustep.org/" +license=('LGPL') +depends=('gnustep-base' 'libungif' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao') +makedepends=('gcc-objc') +conflicts=('gnustep-gui-svn') +groups=('gnustep-core') +options=('!makeflags') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) +md5sums=('0d3765aa97db1dd20bdbd0690f4aca6b') + +build() { + cd $srcdir/$pkgname-$pkgver + . /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep + sed -i 's|#include "GNUstepBase/preface.h"|//#include "GNUstepBase/preface.h" |' Source/GSGuiPrivate.h + make + make DESTDIR=$pkgdir install +} diff --git a/community-staging/gpac/PKGBUILD b/community-staging/gpac/PKGBUILD new file mode 100644 index 000000000..dec36fb2e --- /dev/null +++ b/community-staging/gpac/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 62409 2012-01-19 20:53:21Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=gpac +pkgver=3824 +pkgrel=2 +pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" +arch=('i686' 'x86_64') +url="http://gpac.sourceforge.net" +license=('LGPL') +depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa') +makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad') +optdepends=('jack: for jack support' 'a52dec: for A52 support' + 'faad2: for AAC support' 'libmad: for mp3 support') +options=('!makeflags') +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('bf7039c2585d539475babc7996851627efd7ec59') + +# source PKGBUILD && mksource +mksource() { + [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) + _svnver=$pkgver + _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac" + _svnmod="$pkgname-$pkgver" + mkdir ${pkgname}-$pkgver + pushd ${pkgname}-$pkgver + svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod + echo "#define GPAC_SVN_REVISION \"$_svnver\"" > ${pkgname}-$pkgver/include/gpac/version.h + find . -depth -type d -name .svn -exec rm -rf {} \; + tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* + popd +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install-lib +} diff --git a/community-staging/grafx2/PKGBUILD b/community-staging/grafx2/PKGBUILD new file mode 100644 index 000000000..c885baea2 --- /dev/null +++ b/community-staging/grafx2/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 62301 2012-01-19 07:23:27Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Simon Parzer <simon.parzer@gmail.com> +pkgname=grafx2 +pkgver=2.3 +pkgrel=3 +pkgdesc="Pixelart-oriented painting program" +arch=('x86_64' 'i686') +url="http://code.google.com/p/grafx2/" +license=('GPL2') +install=grafx2.install +depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils') +source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.1781-src.tgz" + "grafx2.desktop") +md5sums=('916a35c4762e85b4210a1041fbbfd830' + '9b3ecb5c2d44b987d65257184f46e6c4') + +build() { + cd "$srcdir/$pkgname/src" + + msg2 "Compiling..." + make +} + +package() { + cd "$srcdir/$pkgname/src" + + msg2 "Packaging files..." + make prefix="/usr" DESTDIR="$pkgdir" install + msg2 "Packaging shortcut..." + install -Dm644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + msg2 "Packaging documentation..." + install -Dm644 "$srcdir/$pkgname/doc/README.txt" \ + "$pkgdir/usr/share/doc/$pkgname/readme.txt" + msg2 "Packaging license..." + install -Dm644 "$srcdir/$pkgname/doc/gpl-2.0.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + msg2 "Cleaning up..." + rmdir "$pkgdir/usr/share/grafx2/scripts/libs" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/grafx2/grafx2.desktop b/community-staging/grafx2/grafx2.desktop new file mode 100644 index 000000000..d58bc5ed3 --- /dev/null +++ b/community-staging/grafx2/grafx2.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +GenericName=GrafX2 +Name=GrafX2 +Comment=Pixelart-oriented painting program +Exec=grafx2 %U +TryExec=grafx2 +Icon=grafx2 +Terminal=false +Type=Application +Categories=Graphics;2DGraphics;RasterGraphics +MimeType=image/bmp;image/gif;image/png;image/x-tga;image/tiff diff --git a/community-staging/grafx2/grafx2.install b/community-staging/grafx2/grafx2.install new file mode 100644 index 000000000..12589796c --- /dev/null +++ b/community-staging/grafx2/grafx2.install @@ -0,0 +1,16 @@ +pkgname=grafx2 + +post_upgrade() { + gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor + update-desktop-database -q +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/gsql/PKGBUILD b/community-staging/gsql/PKGBUILD new file mode 100644 index 000000000..67af0c006 --- /dev/null +++ b/community-staging/gsql/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 62366 2012-01-19 17:48:19Z spupykin $ +# Contributor: Michael Kanis <mkanis@gmx.de> + +pkgname=gsql +pkgver=0.2.2 +pkgrel=4 +pkgdesc="Integrated database development tool for GNOME" +url="http://gsql.org/" +license=('GPL') +arch=('i686' 'x86_64') +depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf' + 'desktop-file-utils' 'libnotify') +makedepends=('libmysqlclient' 'postgresql-libs' 'libssh') +optdepends=('libmysqlclient' 'postgresql-libs' 'libssh') +install=gsql.install +options=(!libtool) +source=(http://gsql.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) +md5sums=('8f3322a75390584729e84a8570e08bea') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's/notify_notification_new (subj, message, NULL, NULL);/notify_notification_new (subj, message, NULL);/' libgsql/notify.c + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas +} diff --git a/community-staging/gsql/gsql.install b/community-staging/gsql/gsql.install new file mode 100644 index 000000000..e069ea8fc --- /dev/null +++ b/community-staging/gsql/gsql.install @@ -0,0 +1,24 @@ +pkgname=gsql + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community-staging/htmldoc/PKGBUILD b/community-staging/htmldoc/PKGBUILD new file mode 100644 index 000000000..27af9e340 --- /dev/null +++ b/community-staging/htmldoc/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 62369 2012-01-19 17:50:49Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Simon Rutishauser <simon.rutishauser@gmx.ch> + +pkgname=htmldoc +pkgver=1.8.27 +pkgrel=7 +pkgdesc="Produce PDF or Postscript from HTML documents including TOCs and Indices" +arch=(i686 x86_64) +url="http://www.htmldoc.org" +license=('GPL') +depends=('libjpeg' 'libpng' 'openssl' 'fltk' 'gcc-libs' 'libxft' 'libxpm') +source=(ftp://ftp.easysw.com/pub/${pkgname}/${pkgver}/${pkgname}-$pkgver-source.tar.bz2) +md5sums=('35589e7b8fe9c54e11be87cd5aec4dcc') + +build() { + cd $srcdir/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/${pkgname}-${pkgver} + + make install \ + prefix=${pkgdir}/usr \ + bindir=$pkgdir/usr/bin \ + datadir=$pkgdir/usr/share \ + datarootdir=$pkgdir/usr/share \ + docdir=$pkgdir/usr/share/doc/htmldoc \ + exec_prefix=$pkgdir/usr \ + mandir=$pkgdir/usr/share/man \ + prefix=$pkgdir/usr \ + sysconfdir=$pkgdir/etc + + # freedesktop stuff + install -Dm 644 desktop/htmldoc-128.png \ + $pkgdir/usr/share/pixmaps/htmldoc.png + echo "MimeType=application/vnd.htmldoc-book;" >> desktop/htmldoc.desktop + sed -i 's|X-Red-Hat.*$||' desktop/htmldoc.desktop + install -Dm 644 desktop/htmldoc.desktop \ + $pkgdir/usr/share/applications/htmldoc.desktop +} diff --git a/community-staging/icoutils/PKGBUILD b/community-staging/icoutils/PKGBUILD new file mode 100644 index 000000000..8f8813cbd --- /dev/null +++ b/community-staging/icoutils/PKGBUILD @@ -0,0 +1,27 @@ +# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> +# Contributor: neodreams <yanbrodeur@videotron.ca> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=icoutils +pkgver=0.29.1 +pkgrel=2 +pkgdesc='Extracts and converts images in MS Windows(R) icon and cursor files.' +arch=('i686' 'x86_64') +license=('GPL') +url='http://www.nongnu.org/icoutils/' +depends=('libpng>=1.0.0' 'perl-libwww>=5.64') +source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('b58f375e0f8731595e8d0ecdc3a0acb9') + +build() { + cd ${pkgname}-${pkgver} + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/jwm/PKGBUILD b/community-staging/jwm/PKGBUILD new file mode 100644 index 000000000..4c96d14c6 --- /dev/null +++ b/community-staging/jwm/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 62417 2012-01-19 21:22:13Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=jwm +pkgver=2.1.0 +pkgrel=2 +pkgdesc="A lightweight window manager for the X11 Window System" +arch=('i686' 'x86_64') +url="http://joewing.net/programs/jwm/" +license=('GPL2') +depends=('libx11' 'libxft' 'libjpeg>=7' 'libxpm' 'libxinerama' 'libpng') +backup=('etc/system.jwmrc') +source=(http://joewing.net/programs/jwm/releases/jwm-$pkgver.tar.bz2) +md5sums=('e8fab21b2410eb82032b7c3472af642c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --disable-fribidi + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make BINDIR="$pkgdir/usr/bin" MANDIR="$pkgdir/usr/share/man" \ + SYSCONF="$pkgdir/etc" install +} diff --git a/community-staging/kovpn/ChangeLog b/community-staging/kovpn/ChangeLog new file mode 100644 index 000000000..d8e35c402 --- /dev/null +++ b/community-staging/kovpn/ChangeLog @@ -0,0 +1,2 @@ +2007-06-25 Georg Grabler (STiAT) <ggrabler@gmail.com> +* Added libtool option diff --git a/community-staging/kovpn/PKGBUILD b/community-staging/kovpn/PKGBUILD new file mode 100644 index 000000000..5b5ccfb63 --- /dev/null +++ b/community-staging/kovpn/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 62371 2012-01-19 17:53:21Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> + +pkgname=kovpn +pkgver=0.3pre7 +_pkgver=0.3.pre7 +pkgrel=6 +pkgdesc="An OpenVPN client management interface for KDE" +arch=('i686' 'x86_64') +url="http://www.kde-apps.org/content/show.php?content=37043" +license=('GPL') +depends=('openvpn' 'kdelibs3' 'xdg-utils') +makedepends=('automake' 'autoconf') +options=('libtool') +install=kovpn.install +DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' + 'http::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' + 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') +source=("https://projects.fslab.de/projects/kovpn/chrome/site/kovpn-${_pkgver}.tar.bz2" + "kovpn-disable-dcop.patch::https://bugs.archlinux.org/task/15464?getfile=4173") +md5sums=('19b61cf9f84088baffbd5bb0a287422c' + '21171b74f76289daea1cc61eedaa4dba') + +build() { + cd $srcdir/$pkgname-$_pkgver + + unset LDFLAGS + . /etc/profile.d/qt3.sh + export PATH=$QTDIR/bin:$PATH + export QMAKESPEC=$QTDIR/mkspecs/linux-g++ + + patch -Np1 -i ../kovpn-disable-dcop.patch + sed -i 's#automake\*1.10\*#automake*1.10* | automake*1.11*#' admin/cvs.sh + make -f admin/Makefile.common cvs + ./configure --prefix=/opt/kde --without-arts --with-qt-dir=/opt/qt + make + make prefix=$pkgdir/usr install +} diff --git a/community-staging/kovpn/kovpn.install b/community-staging/kovpn/kovpn.install new file mode 100644 index 000000000..b4ee8556f --- /dev/null +++ b/community-staging/kovpn/kovpn.install @@ -0,0 +1,12 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true +} + diff --git a/community-staging/leptonica/PKGBUILD b/community-staging/leptonica/PKGBUILD new file mode 100644 index 000000000..b032a5595 --- /dev/null +++ b/community-staging/leptonica/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 62320 2012-01-19 08:26:31Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Christoph Drexler <chrdr at gmx dot at> + +pkgname=leptonica +pkgver=1.68 +pkgrel=3 +pkgdesc="Software that is broadly useful for image processing and image analysis applications" +arch=('i686' 'x86_64') +url="http://www.leptonica.com/" +license=('custom') +depends=('glibc') +makedepends=('giflib' 'gnuplot' 'libjpeg' 'libpng' 'libtiff' 'zlib') +# 'webp' +optdepends=('giflib: for supporting gif files' + 'gnuplot: gnuplot support' + 'libjpeg: for supporting jpeg files' + 'libpng: for supporting png files' + 'libtiff: for supporting tiff files' + 'zlib: for supporting compressed files') +# 'webp: for supporting webp files' +source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz) +md5sums=('5cd7092f9ff2ca7e3f3e73bfcd556403') + +build() { + cd ${srcdir}/leptonica-${pkgver} + sed -i '1,1i#include <zlib.h>' src/pngio.c + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/leptonica-${pkgver} + make DESTDIR=${pkgdir} install + install -D leptonica-license.txt ${pkgdir}/usr/share/licenses/leptonica/leptonica-license.txt +} diff --git a/community-staging/libinfinity/PKGBUILD b/community-staging/libinfinity/PKGBUILD new file mode 100644 index 000000000..f74a2ed82 --- /dev/null +++ b/community-staging/libinfinity/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 62402 2012-01-19 19:43:12Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Gregory Haynes <greg@greghaynes.net> + +pkgname=libinfinity +pkgver=0.5.1 +pkgrel=3 +pkgdesc="An implementation of the Infininote protocol written in GObject-based C" +arch=('i686' 'x86_64') +url="http://gobby.0x539.de" +license=('GPL') +depends=('gnutls>=1.7.2' 'gsasl>=0.2.21' 'glib2>=2.16' 'libxml2>=2.0' 'gtk2') +makedepends=('gtk-doc' 'pkgconfig') +optdepends=('avahi: zeroconf support' + 'gtk2: gtk support') +options=('!libtool') +source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('85e6d75e101fe25503653d2202054eff') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --localstatedir=/var + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + rm -rf $pkgdir/var +} diff --git a/community-staging/libmatchbox/PKGBUILD b/community-staging/libmatchbox/PKGBUILD new file mode 100644 index 000000000..e5fe9b49f --- /dev/null +++ b/community-staging/libmatchbox/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 62375 2012-01-19 18:03:30Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> + +pkgname=libmatchbox +pkgver=1.9 +pkgrel=5 +pkgdesc="Base library for Matchbox WM" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('pango' 'libpng' 'libjpeg>=7' 'xsettings-client' 'libxext') +options=('!libtool') +url="http://matchbox-project.org/" +source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 + libpng15.patch) +md5sums=('9f73e7515cc4679171a5db180dc1343b' + '09f782c76fe313efd0e87fabb276e2fe') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's|png_check_sig( header, 8 )|png_sig_cmp( header, 0, 8 ) == 0|' libmb/mbpixbuf.c + patch -Rp1 <$srcdir/libpng15.patch + LDFLAGS="-lX11" ./configure --prefix=/usr --enable-pango --enable-jpeg --enable-xsettings + make + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/libmatchbox/libpng15.patch b/community-staging/libmatchbox/libpng15.patch new file mode 100644 index 000000000..6c4ddef4d --- /dev/null +++ b/community-staging/libmatchbox/libpng15.patch @@ -0,0 +1,23 @@ +diff -wbBur libmatchbox-1.9/libmb/mbpixbuf.c libmatchbox-1.9.org/libmb/mbpixbuf.c +--- libmatchbox-1.9/libmb/mbpixbuf.c 2012-01-19 21:57:56.000000000 +0400 ++++ libmatchbox-1.9.org/libmb/mbpixbuf.c 2006-07-26 23:12:25.000000000 +0400 +@@ -247,7 +247,7 @@ + return NULL; + } + +- if ( setjmp( png_jmpbuf(png_ptr) ) ) { ++ if ( setjmp( png_ptr->jmpbuf ) ) { + png_destroy_read_struct( &png_ptr, &info_ptr, NULL); + fclose(fd); + return NULL; +@@ -269,8 +269,8 @@ + ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA )) + png_set_gray_to_rgb(png_ptr); + +- if ( png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA +- || png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA ++ if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ++ || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA + ) + *has_alpha = 1; + else diff --git a/community-staging/mtpaint/PKGBUILD b/community-staging/mtpaint/PKGBUILD new file mode 100644 index 000000000..82f6480bd --- /dev/null +++ b/community-staging/mtpaint/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 62300 2012-01-19 07:19:24Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Roman Kyrylych <roman@archlinux.org> +# Contributor: yosh64 <yosh64.at.gmail.dot.com> +pkgname=mtpaint +pkgver=3.40 +pkgrel=2 +pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork" +arch=('x86_64' 'i686') +url="http://mtpaint.sourceforge.net/" +license=('GPL3') +depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2') +install=mtpaint.install +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" + "libpng15.patch") +sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890' + 'be51d45d1146d6c61d1c2c12d1712134da5048dd7314e2741ff336cac6838de3') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i "$srcdir/libpng15.patch" + ./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff + sed -i 's:-lpng:-lpng -lgif:' _conf.txt + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: + diff --git a/community-staging/mtpaint/libpng15.patch b/community-staging/mtpaint/libpng15.patch new file mode 100644 index 000000000..7df3b2127 --- /dev/null +++ b/community-staging/mtpaint/libpng15.patch @@ -0,0 +1,21 @@ +diff -upr mtpaint-3.31.orig/src/png.c mtpaint-3.31/src/png.c +--- mtpaint-3.31.orig/src/png.c 2010-01-25 00:43:07.000000000 +0200 ++++ mtpaint-3.31/src/png.c 2010-01-25 00:43:39.000000000 +0200 +@@ -539,7 +539,7 @@ static int load_png(char *file_name, ls_ + if (settings->bpp == 3) + { + png_set_strip_16(png_ptr); +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + png_set_palette_to_rgb(png_ptr); + png_set_gray_to_rgb(png_ptr); + +@@ -644,7 +644,7 @@ static int load_png(char *file_name, ls_ + png_set_strip_alpha(png_ptr); + png_set_packing(png_ptr); + 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); + for (i = 0; i < height; i++) + { + row_pointers[i] = settings->img[CHN_IMAGE] + i * width; diff --git a/community-staging/mtpaint/mtpaint.install b/community-staging/mtpaint/mtpaint.install new file mode 100644 index 000000000..99a538dea --- /dev/null +++ b/community-staging/mtpaint/mtpaint.install @@ -0,0 +1,13 @@ +post_upgrade() { + update-desktop-database -q +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/mypaint/PKGBUILD b/community-staging/mypaint/PKGBUILD new file mode 100644 index 000000000..5fc81ca34 --- /dev/null +++ b/community-staging/mypaint/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 62404 2012-01-19 19:47:12Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jon Nordby <jononor@gmail.com> + +pkgname=mypaint +pkgver=1.0.0 +pkgrel=2 +pkgdesc="A fast and easy painting application for digital painters, with brush dynamics" +arch=('i686' 'x86_64') +url="http://mypaint.intilinux.com/" +license=('GPL' 'LGPL') +depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2') +makedepends=('scons>=0.97' 'swig>=1.3.39') +install=mypaint.install +source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('dcd43933746a4579e7994f506e097823') + +build() { + cd $srcdir/$pkgname-$pkgver + # python2 fix + sed -i 's_python generate.py_python2 generate.py_' brushlib/SConscript + for file in $(find . -name '*.py' -print); do + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + scons +} + +package() { + cd $srcdir/$pkgname-$pkgver + scons prefix="$pkgdir"/usr install +} diff --git a/community-staging/mypaint/mypaint.install b/community-staging/mypaint/mypaint.install new file mode 100644 index 000000000..5f0358791 --- /dev/null +++ b/community-staging/mypaint/mypaint.install @@ -0,0 +1,13 @@ +post_install() { + [ -x `which update-mime-database` ] && update-mime-database usr/share/mime + [ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + /bin/true +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-staging/openscenegraph/PKGBUILD b/community-staging/openscenegraph/PKGBUILD new file mode 100644 index 000000000..326fc0cbc --- /dev/null +++ b/community-staging/openscenegraph/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 62394 2012-01-19 19:14:13Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Hans Janssen <janserv@gmail.com> +# Contributor: my64 <packages@obordes.com> +# Contributor: Colin Pitrat <colin.pitrat@gmail.com> + +pkgname=openscenegraph +pkgver=3.0.1 +pkgrel=4 +pkgdesc="An Open Source, high performance real-time graphics toolkit" +arch=('i686' 'x86_64') +license=('custom:OSGPL') +url="http://www.openscenegraph.org" +depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') +makedepends=('cmake' 'libvncserver') +optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib') +conflicts=('openthreads') +provides=('openthreads') +source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip + osg-xine-1.2.patch) +#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip") +md5sums=('c43a25d023e635c3566b2083d8e6d956' + 'b05a486fdc2aaf06b29efb5e0714672e') + +build() { + cd OpenSceneGraph-$pkgver + [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp + patch -p1 <$srcdir/osg-xine-1.2.patch + make +} + +package() { + cd OpenSceneGraph-$pkgver + make DESTDIR="$pkgdir" install + install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true +} diff --git a/community-staging/openscenegraph/osg-xine-1.2.patch b/community-staging/openscenegraph/osg-xine-1.2.patch new file mode 100644 index 000000000..c73b588dc --- /dev/null +++ b/community-staging/openscenegraph/osg-xine-1.2.patch @@ -0,0 +1,14 @@ +diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c +--- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20 14:46:20.000000000 +0300 ++++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c 2012-01-05 02:15:38.000000000 +0400 +@@ -2769,8 +2769,8 @@ + clear(rgb_class, sizeof(rgbout_class_t)); + + rgb_class->driver_class.open_plugin = open_plugin; +- rgb_class->driver_class.get_identifier = get_identifier; +- rgb_class->driver_class.get_description = get_description; ++ rgb_class->driver_class.identifier = get_identifier(NULL); ++ rgb_class->driver_class.description = get_description(NULL); + rgb_class->driver_class.dispose = dispose_class; + + return(rgb_class); diff --git a/community-staging/podofo/PKGBUILD b/community-staging/podofo/PKGBUILD new file mode 100644 index 000000000..a71825b8a --- /dev/null +++ b/community-staging/podofo/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 62345 2012-01-19 12:22:37Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > +# Contributor: Preecha Patumchareonpol <yumyai at gmail.com> + +pkgname=podofo +pkgver=0.9.1 +pkgrel=3 +pkgdesc="A C++ library to work with the PDF file format" +arch=('i686' 'x86_64') +url="http://podofo.sourceforge.net" +license=('GPL') +depends=( 'gcc-libs' 'fontconfig' 'libpng' 'libtiff') +makedepends=('cmake') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('cec586ab69f92bc88d38b5d4b8eee5a0') + +build() { + cd ${pkgname}-${pkgver} + + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ + -DPODOFO_BUILD_SHARED=1 \ + -DPODOFO_HAVE_JPEG_LIB=1 \ + -DPODOFO_HAVE_PNG_LIB=1 \ + -DPODOFO_HAVE_TIFF_LIB=1 + make +} + +package() { + cd ${pkgname}-${pkgver}/build + make DESTDIR=$pkgdir install +} diff --git a/community-staging/scantailor/PKGBUILD b/community-staging/scantailor/PKGBUILD new file mode 100644 index 000000000..32059f4c2 --- /dev/null +++ b/community-staging/scantailor/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 62307 2012-01-19 07:47:58Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Denis Terskov aka neurosurgeon <terskov.den@gmail.com> + +pkgname=scantailor +pkgver=0.9.10 +pkgrel=2 +pkgdesc="Interactive post-processing tool for scanned pages" +arch=(i686 x86_64) +url="http://scantailor.sourceforge.net" +license="GPL" +depends=('qt') +makedepends=('cmake' 'boost') +options=('!makeflags') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + build-fix.patch) +md5sums=('f962c93a2d63b449fa3f6612ade3b028' + '0aeb1bae724b5cae208ae8af95e8ed9b') + +build() { + cd $srcdir/$pkgname-$pkgver + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + patch -p1 <$srcdir/build-fix.patch + cmake . + cmake \ + -DCMAKE_CXX_FLAGS="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ + -DCMAKE_CXX_FLAGS_DEBUG="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ + -DCMAKE_CXX_FLAGS_RELEASE="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release . + make + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/scantailor/build-fix.patch b/community-staging/scantailor/build-fix.patch new file mode 100644 index 000000000..85b620020 --- /dev/null +++ b/community-staging/scantailor/build-fix.patch @@ -0,0 +1,16 @@ +diff -wbBur scantailor-0.9.10/zones/EditableZoneSet.h scantailor-0.9.10.my/zones/EditableZoneSet.h +--- scantailor-0.9.10/zones/EditableZoneSet.h 2011-07-31 00:47:25.000000000 +0400 ++++ scantailor-0.9.10.my/zones/EditableZoneSet.h 2011-08-03 01:59:40.000000000 +0400 +@@ -76,6 +77,12 @@ + + EditableZoneSet(); + ++ EditableZoneSet(const EditableZoneSet& zs) ++ { ++ m_splineMap = zs.m_splineMap; ++ m_defaultProps = zs.m_defaultProps; ++ } ++ + const_iterator begin() const { return iterator(m_splineMap.begin()); } + + const_iterator end() const { return iterator(m_splineMap.end()); } diff --git a/community-staging/xloadimage/PKGBUILD b/community-staging/xloadimage/PKGBUILD new file mode 100644 index 000000000..6d56ec5c4 --- /dev/null +++ b/community-staging/xloadimage/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 62316 2012-01-19 08:03:43Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Eric Belanger <belanger@astro.umontreal.ca> +# Contributor: Link Dupont <link@subpop.net> + +pkgname=xloadimage +pkgver=4.1 +pkgrel=12 +pkgdesc="An utility to view many different types of images under X11" +arch=(i686 x86_64) +#url="http://world.std.com/~jimf/xloadimage.html" +url="http://sioseis.ucsd.edu/xloadimage.html" +license=("MIT") +depends=('libtiff' 'libpng' 'libx11' 'libxext') +makedepends=('patch' 'imake') +source=(http://archlinux-stuff.googlecode.com/files/xloadimage.$pkgver-1.tar.gz + license.txt + enable-image-types.patch + png15-tiff4.patch) +md5sums=('86b42b1b628a9c00008b7deec21e1175' + 'cc16a51aeb5083b8ff07939dfe244130' + '3a2703925011276fd2d2bd139b676487' + 'c797cfc3f4588b96275d82c2c9cc7025') + +build() { + cd $srcdir/$pkgname.$pkgver + + patch -p1 <$srcdir/enable-image-types.patch + patch -p1 <$srcdir/png15-tiff4.patch + xmkmf + make + + install -D -m755 xloadimage $pkgdir/usr/bin/xloadimage + install -D -m755 uufilter $pkgdir/usr/bin/uufilter + install -D -m644 xloadimagerc $pkgdir/etc/xloadimagerc.example + install -D -m644 xloadimage.man $pkgdir/usr/man/man1/xloadimage.1x + install -D -m644 uufilter.man $pkgdir/usr/man/man1/uufilter.1x + install -D -m644 $srcdir/license.txt $pkgdir/usr/share/licenses/$pkgname/license.txt + ln -s /usr/bin/xloadimage $pkgdir/usr/bin/xsetbg + + mv $pkgdir/usr/man $pkgdir/usr/share/ +} diff --git a/community-staging/xloadimage/enable-image-types.patch b/community-staging/xloadimage/enable-image-types.patch new file mode 100644 index 000000000..b61e36b87 --- /dev/null +++ b/community-staging/xloadimage/enable-image-types.patch @@ -0,0 +1,74 @@ +diff -wbBur xloadimage.4.1/imagetypes.h xloadimage.4.1.my/imagetypes.h +--- xloadimage.4.1/imagetypes.h 2011-02-11 11:47:37.000000000 +0000 ++++ xloadimage.4.1.my/imagetypes.h 2011-02-11 16:04:35.000000000 +0000 +@@ -94,15 +94,9 @@ + {niffIdent, niffLoad, niffDump, "niff", "Native Image File Format (NIFF)"}, + {sunRasterIdent, sunRasterLoad, NULL, "sunraster", "Sun Rasterfile"}, + {gifIdent, gifLoad, NULL, "gif", "GIF Image"}, +-#ifdef HAVE_LIBJPEG + {jpegIdent, jpegLoad, jpegDump, "jpeg", "JFIF-style JPEG Image"}, +-#endif +-#ifdef HAVE_LIBTIFF + {tiffIdent, tiffLoad, tiffDump, "tiff", "TIFF image"}, +-#endif +-#ifdef HAVE_LIBPNG + {pngIdent, pngLoad, NULL, "png", "PNG image"}, +-#endif + {fbmIdent, fbmLoad, NULL, "fbm", "FBM Image"}, + {cmuwmIdent, cmuwmLoad, NULL, "cmuraster", "CMU WM Raster"}, + {pbmIdent, pbmLoad, pbmDump, "pbm", "Portable Bit Map (PBM, PGM, PPM)"}, +diff -wbBur xloadimage.4.1/Imakefile xloadimage.4.1.my/Imakefile +--- xloadimage.4.1/Imakefile 2011-02-11 12:05:53.000000000 +0000 ++++ xloadimage.4.1.my/Imakefile 2011-02-11 16:06:21.000000000 +0000 +@@ -40,7 +40,7 @@ + PNG_SRC = png.c + PNG_OBJ = png.o + +- EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) ++ EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -DHAVE_LIBJPEG -DHAVE_LIBTIFF -DHAVE_LIBPNG + LOCAL_LIBRARIES = $(TIFF_LIB) $(JPEG_LIB) $(PNG_LIB) $(XLIB) + + SRCS = new.c niff.c value.c zio.c cmuwmraster.c faces.c fbm.c gif.c imagetypes.c img.c mac.c mcidas.c mc_tables.c pbm.c pcx.c pdsuncomp.c rle.c rlelib.c sunraster.c vff.c vicar.c xbitmap.c xpixmap.c xwd.c bright.c clip.c compress.c dither.c fill.c halftone.c merge.c reduce.c rotate.c smooth.c undither.c zoom.c config.c misc.c options.c root.c send.c window.c xloadimage.c $(TIFF_SRC) $(JPEG_SRC) $(PNG_SRC) +diff -wbBur xloadimage.4.1/Makefile xloadimage.4.1.my/Makefile +--- xloadimage.4.1/Makefile 2011-02-11 12:06:16.000000000 +0000 ++++ xloadimage.4.1.my/Makefile 2011-02-11 16:06:24.000000000 +0000 +@@ -2,7 +2,7 @@ + # $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $ + + # ---------------------------------------------------------------------- +-# Makefile generated from "Imake.tmpl" and </tmp/IIf.yUZBVe> ++# Makefile generated from "Imake.tmpl" and </tmp/IIf.7u155R> + # $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ + # $XdotOrg: xc/config/cf/Imake.tmpl,v 1.9 2005/01/24 06:37:31 daniels Exp $ + # +@@ -1063,7 +1063,7 @@ + PNG_SRC = png.c + PNG_OBJ = png.o + +- EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) ++ EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -DHAVE_LIBJPEG -DHAVE_LIBTIFF -DHAVE_LIBPNG + LOCAL_LIBRARIES = $(TIFF_LIB) $(JPEG_LIB) $(PNG_LIB) $(XLIB) + + SRCS = new.c niff.c value.c zio.c cmuwmraster.c faces.c fbm.c gif.c imagetypes.c img.c mac.c mcidas.c mc_tables.c pbm.c pcx.c pdsuncomp.c rle.c rlelib.c sunraster.c vff.c vicar.c xbitmap.c xpixmap.c xwd.c bright.c clip.c compress.c dither.c fill.c halftone.c merge.c reduce.c rotate.c smooth.c undither.c zoom.c config.c misc.c options.c root.c send.c window.c xloadimage.c $(TIFF_SRC) $(JPEG_SRC) $(PNG_SRC) +diff -wbBur xloadimage.4.1/png.c xloadimage.4.1.my/png.c +--- xloadimage.4.1/png.c 2011-02-11 11:47:37.000000000 +0000 ++++ xloadimage.4.1.my/png.c 2011-02-11 16:06:50.000000000 +0000 +@@ -18,6 +18,7 @@ + * + */ + ++#define _GETOPT_H + + #include "image.h" /* xloadimage declarations */ + #ifdef HAVE_LIBPNG +diff -wbBur xloadimage.4.1/jpeg.c xloadimage.4.1.my/jpeg.c +--- xloadimage.4.1/jpeg.c 2011-02-11 14:47:37.000000000 +0300 ++++ xloadimage.4.1.my/jpeg.c 2011-11-21 14:32:30.000000000 +0400 +@@ -319,6 +319,7 @@ + if (verbose) + printf(" Using arithmetic coding.\n"); + cinfo->arith_code = TRUE; ++ } + #else + fprintf(stderr, "jpegDump: sorry, arithmetic coding not supported\n"); + } diff --git a/community-staging/xloadimage/license.txt b/community-staging/xloadimage/license.txt new file mode 100644 index 000000000..be7eec597 --- /dev/null +++ b/community-staging/xloadimage/license.txt @@ -0,0 +1,19 @@ +/* + * Copyright 1989, 1993 Jim Frost + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation. The author makes no representations + * about the suitability of this software for any purpose. It is + * provided "as is" without express or implied warranty. + * + * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN + * NO EVENT SHALL THE AUTHOR 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/community-staging/xloadimage/png15-tiff4.patch b/community-staging/xloadimage/png15-tiff4.patch new file mode 100644 index 000000000..8536e36f3 --- /dev/null +++ b/community-staging/xloadimage/png15-tiff4.patch @@ -0,0 +1,50 @@ +diff -wbBur xloadimage.4.1/png.c xloadimage.4.1.my/png.c +--- xloadimage.4.1/png.c 2011-02-11 14:47:37.000000000 +0300 ++++ xloadimage.4.1.my/png.c 2012-01-19 11:58:44.000000000 +0400 +@@ -75,7 +75,7 @@ + { + debug(" #error "); + output_warn( png_ptr, str); +- longjmp(png_ptr->jmpbuf, 1); /* return control to outer routine */ ++ longjmp(png_jmpbuf(png_ptr), 1); /* return control to outer routine */ + } + + +@@ -164,7 +164,7 @@ + png_destroy_read_struct(png_pp, info_pp, end_pp); + return 0; + } +- if (setjmp((*png_pp)->jmpbuf)) { ++ if (setjmp(png_jmpbuf(*png_pp))) { + /* On error */ + png_destroy_read_struct(png_pp, info_pp, end_pp); + return 0; +@@ -220,7 +220,7 @@ + zclose(zinput_file); + return 0; + } +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* On error */ + freeImage(image); + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); +diff -wbBur xloadimage.4.1/tiff.c xloadimage.4.1.my/tiff.c +--- xloadimage.4.1/tiff.c 2011-02-11 14:47:38.000000000 +0300 ++++ xloadimage.4.1.my/tiff.c 2012-01-19 12:00:00.000000000 +0400 +@@ -34,14 +34,14 @@ + struct tiff_info *info; + { + ZFILE *zf; +- TIFFHeader th; ++ TIFFHeaderCommon th; + TIFF *tiff; + + zf = zopen(fullname); + + /* read TIFF header and see if it looks right + */ +- if ((zread(zf, (byte *)&th, sizeof(TIFFHeader)) == sizeof(TIFFHeader)) && ++ if ((zread(zf, (byte *)&th, sizeof(TIFFHeaderCommon)) == sizeof(TIFFHeaderCommon)) && + ((th.tiff_magic == TIFF_BIGENDIAN) || + (th.tiff_magic == TIFF_LITTLEENDIAN))) { + diff --git a/community-staging/xmoto/PKGBUILD b/community-staging/xmoto/PKGBUILD new file mode 100644 index 000000000..0a865690d --- /dev/null +++ b/community-staging/xmoto/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Travis Willard <travisw@wmpub.ca> +# Contributor: Denis (dtonator@gmail.com) + +pkgname=xmoto +pkgver=0.5.9 +pkgrel=1 +pkgdesc="A challenging 2D motocross platform game, where physics play an important role." +arch=('i686' 'x86_64') +url="http://xmoto.tuxfamily.org" +license=('GPL') +depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.11.1' 'curl' + 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'libxdg-basedir' 'libxml++') +install=xmoto.install +source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" + 'xmoto-0.5.9-libpng15.patch') +sha1sums=('07757accce78151dc8873bef8270df0e56196772' + '27f52bd30772f67898e0bfd8c1e12478a4848192') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np1 -i "${srcdir}/xmoto-0.5.9-libpng15.patch" + + # build and install + ./configure LDFLAGS="-L/usr/lib" --prefix=/usr --disable-sdltest + + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} mangdir=/usr/share/man/man6 install + + # install desktop file + install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.desktop \ + ${pkgdir}/usr/share/applications/xmoto.desktop + + # install icon for desktop file + install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.xpm \ + ${pkgdir}/usr/share/pixmaps/xmoto.xpm +} diff --git a/community-staging/xmoto/xmoto-0.5.9-libpng15.patch b/community-staging/xmoto/xmoto-0.5.9-libpng15.patch new file mode 100644 index 000000000..0410c81c5 --- /dev/null +++ b/community-staging/xmoto/xmoto-0.5.9-libpng15.patch @@ -0,0 +1,10 @@ +--- a/src/image/tim_png.cpp 2011-10-11 22:18:11.000000000 +0200 ++++ b/src/image/tim_png.cpp 2012-01-19 19:58:24.000000000 +0100 +@@ -24,6 +24,7 @@ + */ + #include <stdio.h> + #include <string.h> ++#include <zlib.h> + #include "tim.h" + #include "png.h" + diff --git a/community-staging/xmoto/xmoto.desktop b/community-staging/xmoto/xmoto.desktop new file mode 100644 index 000000000..5ae6fe226 --- /dev/null +++ b/community-staging/xmoto/xmoto.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Icon=/usr/share/xmoto/xmoto_icone_x.ico +Exec=/usr/bin/xmoto +Terminal=false +StartupNotify=false + +Name=XMoto +GenericName=Game +Comment=is a 2D physics-based motocross game. + +Categories=Game; diff --git a/community-staging/xmoto/xmoto.install b/community-staging/xmoto/xmoto.install new file mode 100644 index 000000000..52399d4c1 --- /dev/null +++ b/community-staging/xmoto/xmoto.install @@ -0,0 +1,15 @@ +post_install() { + /usr/bin/update-desktop-database +} + +post_upgrade() { + /usr/bin/update-desktop-database +} + +post_remove() { + /usr/bin/update-desktop-database +} + +op=$1 +shift +$op $* diff --git a/community-staging/xnc/PKGBUILD b/community-staging/xnc/PKGBUILD new file mode 100644 index 000000000..e28c00401 --- /dev/null +++ b/community-staging/xnc/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 62341 2012-01-19 09:59:20Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=xnc +pkgver=5.0.4 +pkgrel=6 +pkgdesc="X nortern captain file manager" +arch=(i686 x86_64) +url="http://xnc.jinr.ru/" +license=('GPL') +depends=('gcc-libs' 'libpng' 'libtiff' 'libsm' 'libxext' 'libjpeg>=7') +makedepends=('libxt') +options=('!makeflags') +#source=(http://xnc.jinr.ru/src-5/xnc-$pkgver.src.tar.gz xnc-gcc44.patch) +source=(ftp://ftp.archlinux.org/other/community/xnc/xnc-$pkgver.src.tar.gz + xnc-gcc44.patch + libpng15.patch) +md5sums=('62446cdfdf5730f125fb351a658c0bd3' + 'c0037a081824bca691e59a4ec68b6686' + '7159af1c645fda860f0e5057100651ad') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 <$srcdir/xnc-gcc44.patch + patch -p1 <$srcdir/libpng15.patch + ./configure --prefix=/usr --mandir=/usr/share/man + make + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/xnc/libpng15.patch b/community-staging/xnc/libpng15.patch new file mode 100644 index 000000000..53b941b81 --- /dev/null +++ b/community-staging/xnc/libpng15.patch @@ -0,0 +1,63 @@ +diff -wbBur xnc-5.0.4/src/lib/image2/sdl_image/IMG_png.c xnc-5.0.4.my/src/lib/image2/sdl_image/IMG_png.c +--- xnc-5.0.4/src/lib/image2/sdl_image/IMG_png.c 2002-08-05 14:43:09.000000000 +0400 ++++ xnc-5.0.4.my/src/lib/image2/sdl_image/IMG_png.c 2012-01-19 13:46:48.000000000 +0400 +@@ -138,7 +138,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in png_create_read_struct() earlier. + */ +- if ( setjmp(png_ptr->jmpbuf) ) { ++ if ( setjmp(png_jmpbuf(png_ptr)) ) { + IMG_SetError("Error reading the PNG file."); + goto done; + } +@@ -207,9 +207,9 @@ + Rmask = 0x000000FF; + Gmask = 0x0000FF00; + Bmask = 0x00FF0000; +- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; ++ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; + } else { +- int s = (info_ptr->channels == 4) ? 0 : 8; ++ int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; + Rmask = 0xFF000000 >> s; + Gmask = 0x00FF0000 >> s; + Bmask = 0x0000FF00 >> s; +@@ -217,7 +217,7 @@ + } + } + surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, +- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); ++ bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask); + if ( surface == NULL ) { + IMG_SetError("Out of memory"); + goto done; +@@ -252,6 +252,10 @@ + /* read rest of file, get additional chunks in info_ptr - REQUIRED */ + png_read_end(png_ptr, info_ptr); + ++ png_colorp plte; ++ int num_palette; ++ png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette); ++ + /* Load the palette, if any */ + palette = surface->format->palette; + if ( palette ) { +@@ -262,12 +266,12 @@ + palette->colors[i].g = i; + palette->colors[i].b = i; + } +- } else if (info_ptr->num_palette > 0 ) { +- palette->ncolors = info_ptr->num_palette; +- for( i=0; i<info_ptr->num_palette; ++i ) { +- palette->colors[i].b = info_ptr->palette[i].blue; +- palette->colors[i].g = info_ptr->palette[i].green; +- palette->colors[i].r = info_ptr->palette[i].red; ++ } else if (num_palette > 0 ) { ++ palette->ncolors = num_palette; ++ for( i=0; i<num_palette; ++i ) { ++ palette->colors[i].b = plte[i].blue; ++ palette->colors[i].g = plte[i].green; ++ palette->colors[i].r = plte[i].red; + } + } + } diff --git a/community-staging/xnc/xnc-gcc44.patch b/community-staging/xnc/xnc-gcc44.patch new file mode 100644 index 000000000..120d9d467 --- /dev/null +++ b/community-staging/xnc/xnc-gcc44.patch @@ -0,0 +1,72 @@ +diff -wbBur xnc-5.0.4/src/include/commonfuncs.h xnc-5.0.4.my/src/include/commonfuncs.h +--- xnc-5.0.4/src/include/commonfuncs.h 2002-10-16 10:44:17.000000000 +0400 ++++ xnc-5.0.4.my/src/include/commonfuncs.h 2011-11-17 18:59:19.000000000 +0400 +@@ -15,7 +15,7 @@ + extern int path_to_fullpath(char* dest, char *srcdir); + extern void add_path_content(char *curdir, const char *cont, int vms_host=0); + extern void upper_path(char *curdir, int vms_host=0); +-extern char* get_first_content(const char *curdir, char *cont); ++extern const char* get_first_content(const char *curdir, char *cont); + extern void get_last_content(char *curdir, char *cont); + extern void get_last_and_rest_content(char* curdir, char* last, char* rest); + extern void str_swap(char *str1, char *str2); +diff -wbBur xnc-5.0.4/src/lib/tool/commonfuncs.cxx xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx +--- xnc-5.0.4/src/lib/tool/commonfuncs.cxx 2002-10-16 10:44:20.000000000 +0400 ++++ xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx 2011-11-17 18:59:19.000000000 +0400 +@@ -117,9 +117,9 @@ + } + + //Get first content of dirname +-char* get_first_content(const char *curdir, char *cont) ++const char* get_first_content(const char *curdir, char *cont) + { +- char *b=strchr(curdir,'/'); ++ const char *b=strchr(curdir,'/'); + if(b) + { + strncpy(cont,curdir,b-curdir); +diff -wbBur xnc-5.0.4/src/lib/vfs/afs.cxx xnc-5.0.4.my/src/lib/vfs/afs.cxx +--- xnc-5.0.4/src/lib/vfs/afs.cxx 2003-11-27 18:36:43.000000000 +0300 ++++ xnc-5.0.4.my/src/lib/vfs/afs.cxx 2011-11-17 18:59:19.000000000 +0400 +@@ -29,7 +29,7 @@ + // The return value is static, so copy it before using the + // method again! + +-char *create_dirs(char *rootdir, char* dirlist) ++char *create_dirs(char *rootdir, const char* dirlist) + { + char str[L_MAXPATH]; + char cont[FLIST_NAME]; +@@ -1350,7 +1350,7 @@ + add_path_content(curdir, to_dir); + } else //If we here then we doing cd not to subdir but to subdir/subdir... + { +- char *s=to_dir; ++ const char *s=to_dir; + if(*s) + { + do +diff -wbBur xnc-5.0.4/src/lib/vfs/ftpfs.cxx xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx +--- xnc-5.0.4/src/lib/vfs/ftpfs.cxx 2002-10-30 15:47:38.000000000 +0300 ++++ xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx 2011-11-17 18:59:19.000000000 +0400 +@@ -1413,7 +1413,7 @@ + return; + if(strcmp(dir,"/")) + { +- char *s=dir; ++ const char *s=dir; + if(*s=='/') //Skip leading '/' + s++; + do +diff -wbBur xnc-5.0.4/src/man_page.cxx xnc-5.0.4.my/src/man_page.cxx +--- xnc-5.0.4/src/man_page.cxx 2002-10-02 16:54:33.000000000 +0400 ++++ xnc-5.0.4.my/src/man_page.cxx 2011-11-17 18:59:00.000000000 +0400 +@@ -81,7 +81,7 @@ + buf[j] = 0; + manf->size = j; + delete buf; +- fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC); ++ fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC, 0600); + write(fp, buf2, j); + close(fp); + delete manf; diff --git a/community-staging/xplanet/PKGBUILD b/community-staging/xplanet/PKGBUILD new file mode 100644 index 000000000..a0abe1efa --- /dev/null +++ b/community-staging/xplanet/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 62310 2012-01-19 07:48:40Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: dorphell <dorphell@archlinux.org> +# Committer: Judd Vinet <jvinet@zeroflux.org> + +pkgname=xplanet +pkgver=1.2.2 +pkgrel=2 +pkgdesc="An Xearth wannabe" +arch=(i686 x86_64) +url="http://xplanet.sourceforge.net/" +license=('GPL') +depends=('pango' 'libungif' 'libtiff' 'libxss') +source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz) +md5sums=('b38c3b4cfdd772643f876a9bb15f288b') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --with-freetype + make + make prefix=$pkgdir/usr install +} diff --git a/community/libdbi-drivers/PKGBUILD b/community/libdbi-drivers/PKGBUILD index 18e3d97ac..69e379160 100644 --- a/community/libdbi-drivers/PKGBUILD +++ b/community/libdbi-drivers/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> -# Contributor: Olivier Médoc <o_medoc@yahoo.fr> +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> +# Contributor: Olivier Médoc <o_medoc@yahoo.fr> # Contributor: Ashok `ScriptDevil` Gautham <ScriptDevil.Arch@gmail.com> pkgname=libdbi-drivers diff --git a/community/libopenraw/PKGBUILD b/community/libopenraw/PKGBUILD index dfc0fcd36..3d6834987 100644 --- a/community/libopenraw/PKGBUILD +++ b/community/libopenraw/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 59667 2011-11-29 09:17:08Z arodseth $ +# $Id: PKGBUILD 62429 2012-01-19 22:28:28Z foutrelis $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: <boromil@gmail.com> pkgname=libopenraw pkgver=0.0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Library for decoding RAW files" -arch=('x86_64' 'i686') +arch=('i686' 'x86_64') url="http://libopenraw.freedesktop.org/" license=('LGPL') -makedepends=('boost' 'libjpeg' 'libxml2') +depends=('gdk-pixbuf2') +makedepends=('boost' 'libxml2') options=('!libtool') source=("http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.bz2") md5sums=('3611d8aea870d25314665ef53093288e') diff --git a/community/luarocks/PKGBUILD b/community/luarocks/PKGBUILD index bd6ae2be6..8acf5904b 100644 --- a/community/luarocks/PKGBUILD +++ b/community/luarocks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61062 2011-12-21 13:24:55Z cbrannon $ +# $Id: PKGBUILD 62343 2012-01-19 11:02:08Z cbrannon $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=luarocks -pkgver=2.0.7 +pkgver=2.0.7.1 pkgrel=1 pkgdesc='Deployment and management system for Lua modules' arch=('i686' 'x86_64') @@ -33,4 +33,4 @@ package() { install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -md5sums=('3a9f80418025e2c43ac369ee6837b659') +md5sums=('37003e5c78792e353acde684426bdeac') diff --git a/community/perl-file-rsyncp/PKGBUILD b/community/perl-file-rsyncp/PKGBUILD new file mode 100644 index 000000000..7ed76655e --- /dev/null +++ b/community/perl-file-rsyncp/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 62351 2012-01-19 15:52:14Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgname=perl-file-rsyncp +pkgver=0.70 +pkgrel=1 +pkgdesc='Perl interface to rsync file list encoding and decoding' +arch=('i686' 'x86_64') +license=('GPL' 'PerlArtistic') +options=('!emptydirs' '!makeflags') +url='http://search.cpan.org/dist/File-RsyncP' +source=("http://search.cpan.org/CPAN/authors/id/C/CB/CBARRATT/File-RsyncP-$pkgver.tar.gz") +md5sums=('f244372d15a2991b8700f62e73ac51e4') + +build() { + cd File-RsyncP-$pkgver + USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd File-RsyncP-$pkgver + make test +} + +package() { + cd File-RsyncP-$pkgver + make install DESTDIR="$pkgdir/" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/perl-io-dirent/PKGBUILD b/community/perl-io-dirent/PKGBUILD new file mode 100644 index 000000000..f176527e9 --- /dev/null +++ b/community/perl-io-dirent/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 62356 2012-01-19 16:17:05Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgname=perl-io-dirent +pkgver=0.05 +pkgrel=1 +pkgdesc='Perl IO::Dirent module - Access to dirent structs returned by readdir' +arch=('i686' 'x86_64') +license=('GPL' 'PerlArtistic') +url='http://search.cpan.org/~scottw/IO-Dirent/' +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/S/SC/SCOTTW/IO-Dirent-$pkgver.tar.gz") +md5sums=('248ab22c31a310c3482fd99592ae550c') + +build() { + cd IO-Dirent-$pkgver + USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd IO-Dirent-$pkgver + make test +} + +package() { + cd IO-Dirent-$pkgver + make install DESTDIR="$pkgdir/" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/qucs/PKGBUILD b/community/qucs/PKGBUILD index db22d851f..0f049b051 100644 --- a/community/qucs/PKGBUILD +++ b/community/qucs/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 43749 2011-03-29 15:48:34Z spupykin $ +# $Id: PKGBUILD 62313 2012-01-19 07:59:07Z arodseth $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Víctor Martínez Romanos <vmromanos@gmail.com> +# Contributor: VÃctor MartÃnez Romanos <vmromanos@gmail.com> pkgname=qucs pkgver=0.0.16 diff --git a/community/tix/PKGBUILD b/community/tix/PKGBUILD index 6d7ed383d..e84b40f36 100644 --- a/community/tix/PKGBUILD +++ b/community/tix/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 40224 2011-02-22 01:59:57Z stephane $ +# $Id: PKGBUILD 62313 2012-01-19 07:59:07Z arodseth $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Brice Méalier <mealier_brice@yahoo.fr> +# Contributor: Brice Méalier <mealier_brice@yahoo.fr> pkgname=tix pkgver=8.4.3 diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD index caf0eb347..0532eff09 100644 --- a/community/tomoyo-tools/PKGBUILD +++ b/community/tomoyo-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58253 2011-11-09 13:16:03Z spupykin $ +# $Id: PKGBUILD 62318 2012-01-19 08:04:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> pkgname=tomoyo-tools -_basever=2.4.0 +_basever=2.5.0 _timestamp=20111025 -_file=52848 +_file=53357 pkgver=${_basever}.${_timestamp} pkgrel=1 pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernels 2.6.36 - 3.0' @@ -17,7 +17,7 @@ depends=('ncurses') conflicts=('ccs-tools') install=tomoyo-tools.install source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz") -md5sums=('eeee0afbccae2291e16dbbb64cf85370') +md5sums=('99999779698ea5f44c74d49e8c640ec1') build() { cd "${srcdir}/${pkgname}" diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index 448c9f7fb..6a6681d09 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 58264 2011-11-09 15:50:55Z jelle $ +# $Id: PKGBUILD 62359 2012-01-19 16:30:10Z ibiru $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=vhba-module pkgver=20110915 -#_kernver='3.1.0-ARCH' -_extramodules=extramodules-3.1-ARCH +_extramodules=extramodules-3.2-ARCH _kernver="$(cat /lib/modules/${_extramodules}/version)" -pkgrel=2 +pkgrel=3 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" license=('GPL2') -depends=('linux>=3.1' 'linux<3.2') -makedepends=('linux-headers>=3.1') +depends=('linux>=3.2' 'linux<3.3') +makedepends=('linux-headers>=3.2') install=vhba-module.install source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz) md5sums=('fb90cd8fc4cd74d08c92e8235f99f1f4') diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install index eca9bb285..665a1d3c5 100644 --- a/community/vhba-module/vhba-module.install +++ b/community/vhba-module/vhba-module.install @@ -1,7 +1,7 @@ post_install() { echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot." echo ">> This module needs to be recompiled for every kernel version upgrade." - EXTRAMODULES='extramodules-3.1-ARCH' + EXTRAMODULES='extramodules-3.2-ARCH' depmod $(cat /lib/modules/$EXTRAMODULES/version) } @@ -10,7 +10,7 @@ post_upgrade() { } post_remove() { - EXTRAMODULES='extramodules-3.1-ARCH' + EXTRAMODULES='extramodules-3.2-ARCH' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index 0b570aa92..c622f21c6 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146071 2012-01-05 04:59:04Z pierre $ +# $Id: PKGBUILD 146957 2012-01-19 17:48:26Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl -_ver=1.0.0f +_ver=1.0.0g # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 @@ -19,8 +19,8 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" 'fix-manpages.patch' 'no-rpath.patch' 'ca-dir.patch') -md5sums=('e358705fb4a8827b5e9224a73f442025' - 'fc1673f53946f1e7b408465f272484d8' +md5sums=('07ecbe4324f140d157478637d6beccf1' + '34315cf0fbbd1d18435948eb9712fcdf' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' '3bf51be3a1bbd262be46dc619f92aa90') diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index de6e057b6..9fc4a5700 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 146455 2012-01-11 15:21:16Z stephane $ +# $Id: PKGBUILD 146927 2012-01-19 10:01:03Z bluewind $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> # Contributor: judd <jvinet.zeroflux.org> # Contributor: francois <francois.archlinux.org> pkgname=perl pkgver=5.14.2 -pkgrel=6 +pkgrel=7 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -17,6 +17,7 @@ source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh perlbin.csh provides.pl +digest_eval_hole.diff 0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch) install=perl.install options=('makeflags' '!purge') @@ -24,6 +25,7 @@ md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26' '5ed2542fdb9a60682f215bd33701e61a' '1f0cbbee783e8a6d32f01be5118e0d5e' '31fc0b5bb4935414394c5cfbec2cb8e5' + '490852b3d77c3b3866d0d75f5fbf5c5d' 'c25d86206d649046538c3daab7874564') build() { @@ -37,6 +39,8 @@ build() { arch_opts="" fi + patch -Np1 -i $srcdir/digest_eval_hole.diff + ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ -Dprivlib=/usr/share/perl5/core_perl \ diff --git a/core/perl/digest_eval_hole.diff b/core/perl/digest_eval_hole.diff new file mode 100644 index 000000000..47904137b --- /dev/null +++ b/core/perl/digest_eval_hole.diff @@ -0,0 +1,61 @@ +From 4b6a7324284e7435a361c58f7ddb32fc0c635bd0 Mon Sep 17 00:00:00 2001 +From: "Michael G. Schwern" <schwern@pobox.com> +Date: Mon, 3 Oct 2011 19:05:29 +0100 +Subject: Close the eval "require $module" security hole in + Digest->new($algorithm) + +Also the filter was incomplete. + +Bug-Debian: http://bugs.debian.org/644108 + +Patch-Name: fixes/digest_eval_hole.diff +--- + cpan/Digest/Digest.pm | 6 ++++-- + cpan/Digest/t/security.t | 14 ++++++++++++++ + 2 files changed, 18 insertions(+), 2 deletions(-) + create mode 100644 cpan/Digest/t/security.t + +diff --git a/cpan/Digest/Digest.pm b/cpan/Digest/Digest.pm +index 384dfc8..d714434 100644 +--- a/cpan/Digest/Digest.pm ++++ b/cpan/Digest/Digest.pm +@@ -24,7 +24,7 @@ sub new + shift; # class ignored + my $algorithm = shift; + my $impl = $MMAP{$algorithm} || do { +- $algorithm =~ s/\W+//; ++ $algorithm =~ s/\W+//g; + "Digest::$algorithm"; + }; + $impl = [$impl] unless ref($impl); +@@ -35,7 +35,9 @@ sub new + ($class, @args) = @$class if ref($class); + no strict 'refs'; + unless (exists ${"$class\::"}{"VERSION"}) { +- eval "require $class"; ++ my $pm_file = $class . ".pm"; ++ $pm_file =~ s{::}{/}g; ++ eval { require $pm_file }; + if ($@) { + $err ||= $@; + next; +diff --git a/cpan/Digest/t/security.t b/cpan/Digest/t/security.t +new file mode 100644 +index 0000000..5cba122 +--- /dev/null ++++ b/cpan/Digest/t/security.t +@@ -0,0 +1,14 @@ ++#!/usr/bin/env perl ++ ++# Digest->new() had an exploitable eval ++ ++use strict; ++use warnings; ++ ++use Test::More tests => 1; ++ ++use Digest; ++ ++$LOL::PWNED = 0; ++eval { Digest->new(q[MD;5;$LOL::PWNED = 42]) }; ++is $LOL::PWNED, 0; diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index 9c33cefba..e04077a1b 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 122574 2011-05-04 17:23:19Z ibiru $ +# $Id: PKGBUILD 146919 2012-01-19 07:41:51Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=cifs-utils -pkgver=4.9 -pkgrel=3 +pkgver=5.2 +pkgrel=1 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64) url="http://wiki.samba.org/index.php/LinuxCIFS_utils" license=('GPL') -depends=('libcap' 'keyutils' 'krb5' 'talloc') +depends=('libcap-ng' 'keyutils' 'krb5' 'talloc') source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2) -md5sums=('908d904e6b9e58f09f530de151a88ef8') +# deinstall smbclient first! build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,3 +24,4 @@ package() { # set mount.cifs uid, to enable none root mounting form fstab chmod +s $pkgdir/sbin/mount.cifs } +md5sums=('2ca839553cccd0c3042f7dd8737cc9de') diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 5f607d52a..219ad0edb 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146804 2012-01-18 16:24:18Z ibiru $ +# $Id: PKGBUILD 146931 2012-01-19 10:12:16Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell pkgver=3.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeShell" @@ -15,12 +15,16 @@ optdepends=('network-manager-applet: shell integration for networkmanager') options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('68967b9d58ad0551d7d3d28a276526a15faf1fc1d27f4624eb405663910e2eb8') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + revert-notificationdaemon-group-based-on-pid-and-titles.patch) +sha256sums=('68967b9d58ad0551d7d3d28a276526a15faf1fc1d27f4624eb405663910e2eb8' + '9e0337cd25d29d7215561d6fa30612d69c89fe7c27aa563a0c0b8a5b6f6cf12a') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -R -i "$srcdir/revert-notificationdaemon-group-based-on-pid-and-titles.patch" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ --localstatedir=/var --disable-static \ diff --git a/extra/gnome-shell/revert-notificationdaemon-group-based-on-pid-and-titles.patch b/extra/gnome-shell/revert-notificationdaemon-group-based-on-pid-and-titles.patch new file mode 100644 index 000000000..cdb9140bf --- /dev/null +++ b/extra/gnome-shell/revert-notificationdaemon-group-based-on-pid-and-titles.patch @@ -0,0 +1,224 @@ +From 7e654ab3ca6e8ac75ba5e45c2a411eb1c2904b26 Mon Sep 17 00:00:00 2001 +From: Marina Zhurakhinskaya <marinaz@redhat.com> +Date: Tue, 20 Dec 2011 05:51:35 +0000 +Subject: notificationDaemon: group sources based on a combination of pid and title + +That way different system notifications, such as the ones about battery power +and the ones about software updates, are shown with separate message tray +sources. + +https://bugzilla.gnome.org/show_bug.cgi?id=664138 +--- +diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js +index f40205d..c691efe 100644 +--- a/js/ui/notificationDaemon.js ++++ b/js/ui/notificationDaemon.js +@@ -92,7 +92,7 @@ NotificationDaemon.prototype = { + _init: function() { + DBus.session.exportObject('/org/freedesktop/Notifications', this); + +- this._sources = {}; ++ this._sources = []; + this._senderToPid = {}; + this._notifications = {}; + this._busProxy = new Bus(); +@@ -150,14 +150,30 @@ NotificationDaemon.prototype = { + } + }, + ++ _lookupSource: function(title, pid, trayIcon) { ++ for (let i = 0; i < this._sources.length; i++) { ++ let source = this._sources[i]; ++ if (source.pid == pid && ++ (source.initialTitle == title || source.trayIcon || trayIcon)) ++ return source; ++ } ++ return null; ++ }, ++ + // Returns the source associated with ndata.notification if it is set. +- // Otherwise, returns the source associated with the pid if one is +- // stored in this._sources and the notification is not transient. +- // Otherwise, creates a new source as long as pid is provided. ++ // Otherwise, returns the source associated with the title and pid if ++ // such source is stored in this._sources and the notification is not ++ // transient. If the existing or requested source is associated with ++ // a tray icon and passed in pid matches a pid of an existing source, ++ // the title match is ignored to enable representing a tray icon and ++ // notifications from the same application with a single source. ++ // ++ // If no existing source is found, a new source is created as long as ++ // pid is provided. + // + // Either a pid or ndata.notification is needed to retrieve or + // create a source. +- _getSource: function(title, pid, ndata, sender) { ++ _getSource: function(title, pid, ndata, sender, trayIcon) { + if (!pid && !(ndata && ndata.notification)) + return null; + +@@ -174,20 +190,24 @@ NotificationDaemon.prototype = { + // with a transient one from the same sender, so we + // always create a new source object for new transient notifications + // and never add it to this._sources . +- if (!isForTransientNotification && this._sources[pid]) { +- let source = this._sources[pid]; +- source.setTitle(title); +- return source; ++ if (!isForTransientNotification) { ++ let source = this._lookupSource(title, pid, trayIcon); ++ if (source) { ++ source.setTitle(title); ++ return source; ++ } + } + +- let source = new Source(title, pid, sender); ++ let source = new Source(title, pid, sender, trayIcon); + source.setTransient(isForTransientNotification); + + if (!isForTransientNotification) { +- this._sources[pid] = source; ++ this._sources.push(source); + source.connect('destroy', Lang.bind(this, + function() { +- delete this._sources[pid]; ++ let index = this._sources.indexOf(source); ++ if (index >= 0) ++ this._sources.splice(index, 1); + })); + } + +@@ -261,7 +281,7 @@ NotificationDaemon.prototype = { + let sender = DBus.getCurrentMessageContext().sender; + let pid = this._senderToPid[sender]; + +- let source = this._getSource(appName, pid, ndata, sender); ++ let source = this._getSource(appName, pid, ndata, sender, null); + + if (source) { + this._notifyForSource(source, ndata); +@@ -282,7 +302,7 @@ NotificationDaemon.prototype = { + if (!ndata) + return; + +- source = this._getSource(appName, pid, ndata, sender); ++ source = this._getSource(appName, pid, ndata, sender, null); + + // We only store sender-pid entries for persistent sources. + // Removing the entries once the source is destroyed +@@ -432,8 +452,8 @@ NotificationDaemon.prototype = { + if (!tracker.focus_app) + return; + +- for (let id in this._sources) { +- let source = this._sources[id]; ++ for (let i = 0; i < this._sources.length; i++) { ++ let source = this._sources[i]; + if (source.app == tracker.focus_app) { + source.destroyNonResidentNotifications(); + return; +@@ -456,12 +476,11 @@ NotificationDaemon.prototype = { + }, + + _onTrayIconAdded: function(o, icon) { +- let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null, null); +- source.setTrayIcon(icon); ++ let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null, null, icon); + }, + + _onTrayIconRemoved: function(o, icon) { +- let source = this._sources[icon.pid]; ++ let source = this._lookupSource(icon.pid, null, true); + if (source) + source.destroy(); + } +@@ -476,10 +495,12 @@ function Source(title, pid, sender) { + Source.prototype = { + __proto__: MessageTray.Source.prototype, + +- _init: function(title, pid, sender) { ++ _init: function(title, pid, sender, trayIcon) { + MessageTray.Source.prototype._init.call(this, title); + +- this._pid = pid; ++ this.initialTitle = title; ++ ++ this.pid = pid; + if (sender) + // TODO: dbus-glib implementation of watch_name() doesn’t return an id to be used for + // unwatch_name() or implement unwatch_name(), however when we move to using GDBus implementation, +@@ -496,7 +517,12 @@ Source.prototype = { + this.title = this.app.get_name(); + else + this.useNotificationIcon = true; +- this._trayIcon = null; ++ ++ this.trayIcon = trayIcon; ++ if (this.trayIcon) { ++ this._setSummaryIcon(this.trayIcon); ++ this.useNotificationIcon = false; ++ } + }, + + _onNameVanished: function() { +@@ -523,7 +549,7 @@ Source.prototype = { + }, + + handleSummaryClick: function() { +- if (!this._trayIcon) ++ if (!this.trayIcon) + return false; + + let event = Clutter.get_current_event(); +@@ -544,11 +570,11 @@ Source.prototype = { + let id = global.connect('notify::stage-input-mode', Lang.bind(this, + function () { + global.disconnect(id); +- this._trayIcon.click(event); ++ this.trayIcon.click(event); + })); + Main.overview.hide(); + } else { +- this._trayIcon.click(event); ++ this.trayIcon.click(event); + } + return true; + }, +@@ -557,31 +583,25 @@ Source.prototype = { + if (this.app) + return; + +- this.app = Shell.WindowTracker.get_default().get_app_from_pid(this._pid); ++ this.app = Shell.WindowTracker.get_default().get_app_from_pid(this.pid); + if (!this.app) + return; + + // Only override the icon if we were previously using + // notification-based icons (ie, not a trayicon) or if it was unset before +- if (!this._trayIcon) { ++ if (!this.trayIcon) { + this.useNotificationIcon = false; + this._setSummaryIcon(this.app.create_icon_texture (this.ICON_SIZE)); + } + }, + +- setTrayIcon: function(icon) { +- this._setSummaryIcon(icon); +- this.useNotificationIcon = false; +- this._trayIcon = icon; +- }, +- + open: function(notification) { + this.destroyNonResidentNotifications(); + this.openApp(); + }, + + _lastNotificationRemoved: function() { +- if (!this._trayIcon) ++ if (!this.trayIcon) + this.destroy(); + }, + +-- +cgit v0.9.0.2 diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD index ce99e9c8a..3bf677188 100644 --- a/extra/libass/PKGBUILD +++ b/extra/libass/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 143794 2011-11-29 11:56:48Z giovanni $ +# $Id: PKGBUILD 146950 2012-01-19 15:31:00Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> pkgname=libass pkgver=0.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="A portable library for SSA/ASS subtitles rendering" arch=('i686' 'x86_64') url="http://code.google.com/p/libass/" license=('BSD') -depends=('enca' 'fontconfig' 'libpng' 'fribidi') +depends=('enca' 'fontconfig' 'fribidi') makedepends=('pkg-config') options=(!libtool) source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index bf13443ab..6491559d8 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145165 2011-12-18 18:44:31Z pierre $ +# $Id: PKGBUILD 146963 2012-01-19 18:03:44Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd pkgver=1.4.30 -pkgrel=1 +pkgrel=2 pkgdesc='a secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') @@ -22,8 +22,8 @@ source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver} sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b' '941ab747aeb97ca111fb670d21eefecdf745debc5e139bc5bd6881ee66b2742a' 'ceff3a88e876f6104c094379d507b89bc504777d0f98a0930406a70624fcf024' - '6c5892830e77731d27e3ebb64a0d87ab9139c68eb703aec6741c591814cef26f' - '44267e8b670faaf5712ad0bc9fd84b8c52281ddd22ef2c22d4b474dbb1cf5d2a') + '550aa1abaced6bc9e8d65c2b069bfc96bf4d06734b17eeb140c5d00705de1230' + 'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/lighttpd/lighttpd.conf b/extra/lighttpd/lighttpd.conf index 4ca1b23a4..ed192352a 100644 --- a/extra/lighttpd/lighttpd.conf +++ b/extra/lighttpd/lighttpd.conf @@ -9,4 +9,4 @@ server.document-root = "/srv/http" server.errorlog = "/var/log/lighttpd/error.log" dir-listing.activate = "enable" index-file.names = ( "index.html" ) -mimetype.assign = ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png" ) +mimetype.assign = ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png", "" => "application/octet-stream" ) diff --git a/extra/lighttpd/lighttpd.logrotate.d b/extra/lighttpd/lighttpd.logrotate.d index 5ff32a0c5..5be47b863 100644 --- a/extra/lighttpd/lighttpd.logrotate.d +++ b/extra/lighttpd/lighttpd.logrotate.d @@ -1,5 +1,8 @@ /var/log/lighttpd/*log { missingok + copytruncate + notifempty + sharedscripts postrotate /etc/rc.d/lighttpd reload >/dev/null || true endscript diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD index 23c2a1437..e31812148 100644 --- a/extra/lirc/PKGBUILD +++ b/extra/lirc/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 142392 2011-11-08 22:38:56Z thomas $ +# $Id: PKGBUILD 146925 2012-01-19 10:00:36Z thomas $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=8 +pkgrel=10 epoch=1 -_extramodules=extramodules-3.1-ARCH +_extramodules=extramodules-3.2-ARCH _kernver="$(cat /lib/modules/${_extramodules}/version)" arch=('i686' 'x86_64') url="http://www.lirc.org/" license=('GPL') -makedepends=('help2man' 'linux-headers>=3.1' 'linux-headers<3.2' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +makedepends=('help2man' 'linux-headers>=3.2' 'linux-headers<3.3' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -61,7 +61,7 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'linux>=3.1' 'linux<3.2') + depends=('lirc-utils' 'linux>=3.2' 'linux<3.3') replaces=('lirc+pctv') install=lirc.install diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install index 1e7c4f4a1..9bf905742 100644 --- a/extra/lirc/lirc.install +++ b/extra/lirc/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.1-ARCH +EXTRAMODULES=extramodules-3.2-ARCH post_install() { # updating module dependencies diff --git a/extra/php-suhosin/PKGBUILD b/extra/php-suhosin/PKGBUILD index 94a5c9c25..45adeb4ee 100644 --- a/extra/php-suhosin/PKGBUILD +++ b/extra/php-suhosin/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 135864 2011-08-19 20:05:56Z pierre $ +# $Id: PKGBUILD 146961 2012-01-19 17:54:16Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-suhosin -pkgver=0.9.32.1 -pkgrel=3 +pkgver=0.9.33 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc='An advanced protection system for PHP installations' url='http://www.hardened-php.net/suhosin/' license='PHP' -source=("http://download.suhosin.org/suhosin-${pkgver}.tar.gz") +source=("http://download.suhosin.org/suhosin-${pkgver}.tgz" + "http://download.suhosin.org/suhosin-${pkgver}.tgz.sig") depends=('php') conflicts=('php-suhosin-extension') replaces=('php-suhosin-extension') backup=('etc/php/conf.d/suhosin.ini') -md5sums=('26a86f0f684a656c3e789e3eb4ec1db3') +md5sums=('0ce498a02a8281e4274ea8e390c2b487' + '6e9536cc71342bab0efb1e9a84f688a6') build() { cd ${srcdir}/suhosin-${pkgver} diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index fb9ca5360..69f4609af 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,34 +1,44 @@ -# $Id: PKGBUILD 144453 2011-12-06 03:29:55Z eric $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# $Id: PKGBUILD 146987 2012-01-19 22:31: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=1 +pkgrel=3 pkgdesc="D-Bus service for applications to request thumbnails" +arch=('i686' 'x86_64') url="http://git.xfce.org/xfce/tumbler/" license=('GPL2' 'LGPL') -arch=('i686' 'x86_64') groups=('xfce4') -depends=('poppler-glib' 'dbus-glib' 'gdk-pixbuf2') -makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10') -optdepends=('ffmpegthumbnailer: for video thumbnails' - 'gstreamer0.10: for video thumbnails') +depends=('dbus-glib' 'gdk-pixbuf2') +makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10' 'poppler-glib' + 'libgsf' 'libopenraw' 'freetype2') +optdepends=('ffmpegthumbnailer: for video thumbnails' + 'gstreamer0.10: for video thumbnails' + 'poppler-glib: for PDF thumbnails' + 'libgsf: for ODF thumbnails' + 'libopenraw: for RAW thumbnails' + 'freetype2: for font thumbnails') options=('!libtool') -source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('c6cf6821f5d884cbf2c26f45f2fecc74') +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 + 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 + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/multilib-staging/lib32-cairo/PKGBUILD b/multilib-staging/lib32-cairo/PKGBUILD new file mode 100644 index 000000000..394a26fbe --- /dev/null +++ b/multilib-staging/lib32-cairo/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 62413 2012-01-19 21:13:41Z bluewind $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +_pkgbasename=cairo +pkgname=lib32-$_pkgbasename +pkgver=1.10.2 +pkgrel=3 +pkgdesc="Cairo vector graphics library (32-bit)" +arch=('x86_64') +url="http://cairographics.org/" +license=('LGPL' 'MPL') +depends=('lib32-libpng' 'lib32-libxrender' 'lib32-fontconfig' + 'lib32-pixman' 'lib32-glib2' ${_pkgbasename}) +makedepends=('gcc-multilib') +source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.gz + cairo-1.10.0-buggy_gradients.patch) +sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e' + '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + ./configure --prefix=/usr --libdir=/usr/lib32 \ + --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-tee + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/{include,share,bin} +} diff --git a/multilib-staging/lib32-cairo/cairo-1.10.0-buggy_gradients.patch b/multilib-staging/lib32-cairo/cairo-1.10.0-buggy_gradients.patch new file mode 100644 index 000000000..368e356d3 --- /dev/null +++ b/multilib-staging/lib32-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/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD b/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD index eef9aca26..28b102d55 100644 --- a/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD +++ b/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD @@ -3,7 +3,7 @@ _pkgbasename=gdk-pixbuf2 pkgname=lib32-$_pkgbasename pkgver=2.24.1 -pkgrel=1 +pkgrel=2 pkgdesc="An image loading library (32-bit)" arch=('x86_64') url="http://www.gtk.org/" diff --git a/multilib-staging/lib32-libcups/PKGBUILD b/multilib-staging/lib32-libcups/PKGBUILD new file mode 100644 index 000000000..010da0cf7 --- /dev/null +++ b/multilib-staging/lib32-libcups/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 62421 2012-01-19 21:25:14Z bluewind $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +_pkgbasename=libcups +pkgname=lib32-$_pkgbasename +pkgver=1.5.0 +pkgrel=2 +pkgdesc="The CUPS Printing System - client libraries (32-bit)" +arch=('x86_64') +license=('GPL') +url="http://www.cups.org/" +depends=(lib32-krb5 lib32-libtiff lib32-libpng $_pkgbasename) +makedepends=(gcc-multilib) +source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2) +md5sums=('e54ed09ede2340fc3014913333520fe4') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd ${srcdir}/cups-${pkgver} + + aclocal -I config-scripts + autoconf -I config-scripts + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-ldap --enable-raw-printing --disable-gssapi --disable-dbus \ + --enable-ssl=no --disable-gnutls --enable-threads \ + --with-optim="$CFLAGS" --libdir=/usr/lib32 + make +} + +package() { + cd ${srcdir}/cups-${pkgver} + make BUILDROOT=${pkgdir} install-libs +} + diff --git a/multilib-staging/lib32-libtiff/PKGBUILD b/multilib-staging/lib32-libtiff/PKGBUILD new file mode 100644 index 000000000..2d6eb6a8e --- /dev/null +++ b/multilib-staging/lib32-libtiff/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 62312 2012-01-19 07:50:29Z bluewind $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> + +_pkgbasename=libtiff +pkgname=lib32-$_pkgbasename +pkgver=4.0.0 +pkgrel=1 +pkgdesc="Library for manipulation of TIFF images (32-bit)" +arch=('x86_64') +url="http://www.remotesensing.org/libtiff/" +license=('custom') +depends=('lib32-libjpeg' 'lib32-zlib' $_pkgbasename) +makedepends=(gcc-multilib) +options=('!libtool') +source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) +sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/tiff-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --libdir=/usr/lib32 + make +} + +check() { + cd "${srcdir}/tiff-${pkgver}" + make check +} + +package() { + cd "${srcdir}/tiff-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/{include,share,bin} + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/multilib-staging/lib32-libtiff/libtiff-CVE-2009-2285.patch b/multilib-staging/lib32-libtiff/libtiff-CVE-2009-2285.patch new file mode 100644 index 000000000..435a84b53 --- /dev/null +++ b/multilib-staging/lib32-libtiff/libtiff-CVE-2009-2285.patch @@ -0,0 +1,22 @@ +Index: tiff-3.8.2/libtiff/tif_lzw.c +=================================================================== +--- tiff-3.8.2.orig/libtiff/tif_lzw.c ++++ tiff-3.8.2/libtiff/tif_lzw.c +@@ -421,7 +421,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize + NextCode(tif, sp, bp, code, GetNextCode); + if (code == CODE_EOI) + break; +- if (code == CODE_CLEAR) { ++ if (code >= CODE_CLEAR) { + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "LZWDecode: Corrupted LZW table at scanline %d", + tif->tif_row); +@@ -624,7 +624,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0, + NextCode(tif, sp, bp, code, GetNextCodeCompat); + if (code == CODE_EOI) + break; +- if (code == CODE_CLEAR) { ++ if (code >= CODE_CLEAR) { + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "LZWDecode: Corrupted LZW table at scanline %d", + tif->tif_row); diff --git a/multilib-staging/lib32-qt/PKGBUILD b/multilib-staging/lib32-qt/PKGBUILD new file mode 100644 index 000000000..205e21a76 --- /dev/null +++ b/multilib-staging/lib32-qt/PKGBUILD @@ -0,0 +1,86 @@ +# $Id: PKGBUILD 62425 2012-01-19 21:55:49Z bluewind $ +# Maintainer: Florian Pritz <flo@xssn.at> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +_pkgbasename=qt +pkgname=lib32-$_pkgbasename +pkgver=4.8.0 +pkgrel=2 +pkgdesc='A cross-platform application and UI framework (32-bit)' +arch=('x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL') +depends=(lib32-{fontconfig,sqlite3,alsa-lib,glib2,dbus-core,openssl} + lib32-lib{png,tiff,mng,gl,sm,xrandr,xv,xi} $_pkgbasename) +optdepends=('lib32-libxinerama: Xinerama support' + 'lib32-libxcursor: Xcursor support' + 'lib32-libxfixes: Xfixes support') +makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes,gtk2}) +options=('!libtool') +_pkgfqn="${_pkgbasename}-everywhere-opensource-src-${pkgver}" +source=("ftp://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz") +md5sums=('e8a5fdbeba2927c948d9f477a6abe904') + +build() { + cd $srcdir/$_pkgfqn + + export QT4DIR=$srcdir/$_pkgfqn + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + # some of those are likely unnecessary, but I'm too lazy to find and remove them + sed -i "/^QMAKE_LINK\s/s|g++|g++ -m32|g" mkspecs/common/g++-base.conf + sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/g++-base.conf + sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/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} -m32|g" mkspecs/common/gcc-base.conf + sed -i "s|-Wl,-O1|-m32 -Wl,-O1|" mkspecs/common/g++-unix.conf + sed -e "s|-O2|$CXXFLAGS -m32|" \ + -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \ + -e "/^QMAKE_LINK\s/s|g++|g++ -m32|g" \ + -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \ + -i mkspecs/common/g++.conf + + ./configure -confirm-license -opensource -v -platform linux-g++-32 \ + -prefix /usr \ + -libdir /usr/lib32 \ + -plugindir /usr/lib32/qt/plugins \ + -importdir /usr/lib32/qt/imports \ + -datadir /usr/share/qt \ + -translationdir /usr/share/qt/translations \ + -sysconfdir /etc \ + -system-sqlite \ + -no-phonon \ + -no-phonon-backend \ + -no-webkit \ + -graphicssystem raster \ + -openssl-linked \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -nomake tools \ + -optimized-qmake \ + -no-rpath \ + -dbus-linked \ + -reduce-relocations \ + -no-openvg + + make +} + +package() { + cd $srcdir/$_pkgfqn + make INSTALL_ROOT=$pkgdir install + + # Fix wrong path in pkgconfig files + find ${pkgdir}/usr/lib32/pkgconfig -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; + # Fix wrong path in prl files + find ${pkgdir}/usr/lib32 -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + rm -rf "${pkgdir}"/usr/{include,share,bin} + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/staging/abiword/PKGBUILD b/staging/abiword/PKGBUILD new file mode 100644 index 000000000..68ff94733 --- /dev/null +++ b/staging/abiword/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 146946 2012-01-19 14:59:03Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Maël Lavault <moimael@neuf.fr> + +pkgbase=abiword +pkgname=('abiword' 'abiword-plugins') +pkgver=2.8.6 +pkgrel=7 +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.abisource.com" +makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' + 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup') +options=('!makeflags' '!libtool') +source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz" + 'compat_libwpg_0_9.patch' + 'abiword-2.8.6-no-undefined.patch' + 'abiword-2.8.6-libpng15.patch') +md5sums=('f883b0a7f26229a9c66fd6a1a94381aa' + '09446a2ebba8288fc611e88f7cf17298' + '42e2614b6e0aad457d91f6ce20b6f225' + '40e370e7e88c5437140ef18037abfbd3') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch" + # fix a gcc 4.6.x build issue, patch from Fedora + patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch" + patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch" + + libtoolize --force + autoreconf + + ./configure --prefix=/usr \ + --enable-clipart \ + --enable-templates \ + --enable-collab-backend-xmpp \ + --enable-collab-backend-tcp \ + --enable-collab-backend-service \ + --disable-collab-backend-sugar \ + --enable-plugins --without-gnomevfs \ + --with-gio \ + --with-goffice \ + --disable-static \ + --with-psiconv-config=/nothere + make +} + +package_abiword() { + pkgdesc="A fully-featured word processor" + depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils') + install=$pkgname.install + optdepends=('abiword-plugins') + conflicts=("abiword-plugins<${pkgver}-${pkgrel}") + + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -i plugins/Makefile \ + -e 's/ collab / /' \ + -e 's/ wpg / /' \ + -e 's/ wmf / /' \ + -e 's/ grammar / /' \ + -e 's/ mathview / /' \ + -e 's/ aiksaurus / /' \ + -e 's/ latex / /' \ + -e 's/ ots / /' \ + -e 's/ wordperfect / /' + make DESTDIR="${pkgdir}" install +} + +package_abiword-plugins() { + pkgdesc="Additional plugins for Abiword" + depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' + 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf') + + cd "${srcdir}/${pkgbase}-${pkgver}/plugins" + for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do + make -C ${dir} DESTDIR="${pkgdir}" install + done +} diff --git a/staging/abiword/abiword-2.8.6-libpng15.patch b/staging/abiword/abiword-2.8.6-libpng15.patch new file mode 100644 index 000000000..7eded4c83 --- /dev/null +++ b/staging/abiword/abiword-2.8.6-libpng15.patch @@ -0,0 +1,100 @@ +$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $ + +Fix build with png-1.5. + +--- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig 2009-06-25 04:02:06.000000000 +0000 ++++ plugins/bmp/xp/ie_impGraphic_BMP.cpp +@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap + + /* Clean Up Memory Used */ + +- FREEP(m_pPNGInfo->palette); ++ png_colorp palette; ++ int num_palette; ++ png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette ); ++ FREEP(palette); + DELETEP(pBB); + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); + +@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P + UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB) + { + /* Reset error handling for libpng */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); + return UT_ERROR; +@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P + UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB) + { + /* Reset error handling for libpng */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); + return UT_ERROR; + +$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $ + +Fix build with png-1.5. + +--- plugins/garble/xp/abiword-garble-png.cpp.orig 2009-09-05 15:34:44.000000000 +0000 ++++ plugins/garble/xp/abiword-garble-png.cpp +@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void* + png_set_strip_alpha( png_ptr ); + png_set_interlace_handling( png_ptr ); + png_set_bgr( png_ptr ); +- rowbytes = info_ptr->rowbytes; ++ rowbytes = png_get_rowbytes( png_ptr, info_ptr ); + png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); + } + +$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $ + +Fix build with png-1.5. + +--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig 2009-07-01 04:02:04.000000000 +0000 ++++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp +@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import + /** needed for the stejmp context */ + UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf) + { +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + DELETEP(m_pPngBB); + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $ + +Fix build with png-1.5. + +--- src/af/util/xp/ut_png.cpp.orig 2008-02-24 03:33:07.000000000 +0000 ++++ src/af/util/xp/ut_png.cpp +@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL)); diff --git a/staging/abiword/abiword-2.8.6-no-undefined.patch b/staging/abiword/abiword-2.8.6-no-undefined.patch new file mode 100644 index 000000000..c07000edb --- /dev/null +++ b/staging/abiword/abiword-2.8.6-no-undefined.patch @@ -0,0 +1,21 @@ +diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am +--- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 15:11:01.000000000 +0200 ++++ abiword-2.8.6/src/Makefile.am 2011-08-02 23:35:51.904761961 +0200 +@@ -107,7 +107,7 @@ + + AbiWord_LDFLAGS = \ + $(DEPS_LIBS) \ +- --no-undefined \ ++ -Wl,--no-undefined \ + -avoid-version \ + -export-dynamic \ + -headerpad_max_install_names +@@ -129,7 +129,7 @@ + + abiword_LDFLAGS = \ + $(platform_ldflags) \ +- --no-undefined \ ++ -Wl,--no-undefined \ + -avoid-version \ + -export-dynamic + diff --git a/staging/abiword/abiword.install b/staging/abiword/abiword.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/staging/abiword/abiword.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/staging/abiword/compat_libwpg_0_9.patch b/staging/abiword/compat_libwpg_0_9.patch new file mode 100644 index 000000000..cf36e188e --- /dev/null +++ b/staging/abiword/compat_libwpg_0_9.patch @@ -0,0 +1,371 @@ +diff -Nur abiword-2.8.6.orig//plugin-configure.m4 abiword-2.8.6/plugin-configure.m4 +--- abiword-2.8.6.orig//plugin-configure.m4 2010-06-13 14:17:27.000000000 -0700 ++++ abiword-2.8.6/plugin-configure.m4 2010-12-06 13:59:43.083048588 -0800 +@@ -794,7 +794,7 @@ + AC_SUBST([OPENXML_LIBS]) + + +-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" ++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" + wpg_deps="no" + + if test "$enable_wpg" != ""; then +@@ -1497,8 +1497,8 @@ + AC_SUBST([EML_LIBS]) + + +-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' ++wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" ++wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 abiword-2.8.6/plugins/wordperfect/plugin.m4 +--- abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 2010-05-30 07:50:46.000000000 -0700 ++++ abiword-2.8.6/plugins/wordperfect/plugin.m4 2010-12-06 13:59:53.929715254 -0800 +@@ -1,6 +1,6 @@ + +-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' ++wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" ++wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp +--- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-02-06 13:06:11.000000000 -0800 ++++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-12-06 13:59:53.926381921 -0800 +@@ -60,7 +60,7 @@ + + // Stream class + +-#include <libwpd/WPXStream.h> ++#include <libwpd-stream/libwpd-stream.h> + + #include <gsf/gsf-input.h> + #include <gsf/gsf-infile.h> +@@ -70,12 +70,7 @@ + #include <libwps/libwps.h> + #endif + +-class AbiWordperfectInputStream : +-#ifdef HAVE_LIBWPS +- public WPSInputStream +-#else +- public WPXInputStream +-#endif ++class AbiWordperfectInputStream : public WPXInputStream + { + public: + AbiWordperfectInputStream(GsfInput *input); +@@ -86,7 +81,7 @@ + + virtual WPXInputStream * getDocumentOLEStream(const char * name); + +- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); ++ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); + virtual int seek(long offset, WPX_SEEK_TYPE seekType); + virtual long tell(); + virtual bool atEOS(); +@@ -98,11 +93,7 @@ + }; + + AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) : +-#ifdef HAVE_LIBWPS +- WPSInputStream(), +-#else +- WPXInputStream(true), +-#endif ++ WPXInputStream(), + m_input(input), + m_ole(NULL) + { +@@ -117,9 +108,9 @@ + g_object_unref(G_OBJECT(m_input)); + } + +-const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead) ++const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) + { +- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); ++ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); + + if (buf == NULL) + numBytesRead = 0; +@@ -256,19 +247,12 @@ + { + AbiWordperfectInputStream gsfInput(input); + +- WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true); ++ WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput); + + switch (confidence) + { + case WPD_CONFIDENCE_NONE: +- // libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document) +- // however, we'll let the text importer handle such cases +- case WPD_CONFIDENCE_POOR: + return UT_CONFIDENCE_ZILCH; +- case WPD_CONFIDENCE_LIKELY: +- return UT_CONFIDENCE_SOSO; +- case WPD_CONFIDENCE_GOOD: +- return UT_CONFIDENCE_GOOD; + case WPD_CONFIDENCE_EXCELLENT: + return UT_CONFIDENCE_PERFECT; + default: +@@ -328,7 +312,7 @@ + UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input) + { + AbiWordperfectInputStream gsfInput(input); +- WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this)); ++ WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL); + + if (error != WPD_OK) + { +@@ -381,9 +365,9 @@ + float marginLeft = 1.0f, marginRight = 1.0f; + + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + + if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */ + /* marginTop != m_marginBottom || marginBottom != m_marginBottom */ ) +@@ -456,15 +440,15 @@ + float marginTop = 0.0f, marginBottom = 0.0f; + float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f; + if (propList["fo:margin-top"]) +- marginTop = propList["fo:margin-top"]->getFloat(); ++ marginTop = propList["fo:margin-top"]->getDouble(); + if (propList["fo:margin-bottom"]) +- marginBottom = propList["fo:margin-bottom"]->getFloat(); ++ marginBottom = propList["fo:margin-bottom"]->getDouble(); + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + if (propList["fo:text-indent"]) +- textIndent = propList["fo:text-indent"]->getFloat(); ++ textIndent = propList["fo:text-indent"]->getDouble(); + + m_topMargin = marginTop; + m_bottomMargin = marginBottom; +@@ -487,7 +471,7 @@ + + float lineSpacing = 1.0f; + if (propList["fo:line-height"]) +- lineSpacing = propList["fo:line-height"]->getFloat(); ++ lineSpacing = propList["fo:line-height"]->getDouble(); + + UT_String tmpBuffer; + UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f", +@@ -504,7 +488,7 @@ + propBuffer += tmpBuffer; + if (i()["style:position"]) + { +- UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat()); ++ UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble()); + propBuffer += tmpBuffer; + } + +@@ -640,9 +624,9 @@ + + // TODO: support spaceAfter + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + + if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount) + m_bSectionChanged = true; +@@ -709,9 +693,9 @@ + if (propList["style:num-format"]) + listType = propList["style:num-format"]->getStr().cstr()[0]; + if (propList["text:space-before"]) +- listLeftOffset = propList["text:space-before"]->getFloat(); ++ listLeftOffset = propList["text:space-before"]->getDouble(); + if (propList["text:min-label-width"]) +- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); ++ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); + + if (!m_pCurrentListDefinition || + m_pCurrentListDefinition->getOutlineHash() != listID || +@@ -749,9 +733,9 @@ + if (propList["libwpd:level"]) + level = propList["libwpd:level"]->getInt(); + if (propList["text:space-before"]) +- listLeftOffset = propList["text:space-before"]->getFloat(); ++ listLeftOffset = propList["text:space-before"]->getDouble(); + if (propList["text:min-label-width"]) +- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); ++ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); + + if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID) + { +@@ -871,10 +855,10 @@ + + UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel) + + m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) +- - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); ++ - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); + propBuffer += tempBuffer; + UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) +- + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); ++ + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); + propBuffer += tempBuffer; + + listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME; +@@ -1263,7 +1247,7 @@ + virtual UT_Error _loadFile(GsfInput * input) + { + AbiWordperfectInputStream gsfInput(input); +- WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this)); ++ WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this)); + + if (error != WPS_OK) + { +@@ -1302,18 +1286,12 @@ + { + AbiWordperfectInputStream gsfInput(input); + +- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true); ++ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput); + + switch (confidence) + { + case WPS_CONFIDENCE_NONE: + return UT_CONFIDENCE_ZILCH; +- case WPS_CONFIDENCE_POOR: +- return UT_CONFIDENCE_POOR; +- case WPS_CONFIDENCE_LIKELY: +- return UT_CONFIDENCE_SOSO; +- case WPS_CONFIDENCE_GOOD: +- return UT_CONFIDENCE_GOOD; + case WPS_CONFIDENCE_EXCELLENT: + return UT_CONFIDENCE_PERFECT; + default: +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h +--- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h 2009-06-19 01:55:49.000000000 -0700 ++++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h 2010-12-06 13:59:53.929715254 -0800 +@@ -30,13 +30,7 @@ + #define IE_IMP_WP_H + + #include <stdio.h> +-#ifdef _WIN32 +-#define POINT WPX_POINT +-#endif + #include <libwpd/libwpd.h> +-#ifdef _WIN32 +-#undef POINT +-#endif + #include "ie_imp.h" + #include "ut_string.h" + #include "ut_string_class.h" +@@ -98,7 +92,7 @@ + IE_Imp ** ppie); + }; + +-class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl ++class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface + { + public: + IE_Imp_WordPerfect(PD_Document * pDocument); +@@ -154,6 +148,21 @@ + virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {} + virtual void closeTable(); + ++ virtual void definePageStyle(const WPXPropertyList&) {} ++ virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} ++ virtual void defineCharacterStyle(const WPXPropertyList&) {} ++ virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} ++ virtual void insertSpace() {} ++ virtual void insertField(const WPXString&, const WPXPropertyList&) {} ++ virtual void openComment(const WPXPropertyList&) {} ++ virtual void closeComment() {} ++ virtual void openTextBox(const WPXPropertyList&) {} ++ virtual void closeTextBox() {} ++ virtual void openFrame(const WPXPropertyList&) {} ++ virtual void closeFrame() {} ++ virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {} ++ virtual void insertEquation(const WPXPropertyList&, const WPXString&) {} ++ + + protected: + virtual UT_Error _loadFile(GsfInput * input); +diff -Nur abiword-2.8.6.orig//plugins/wpg/plugin.m4 abiword-2.8.6/plugins/wpg/plugin.m4 +--- abiword-2.8.6.orig//plugins/wpg/plugin.m4 2010-05-30 07:50:46.000000000 -0700 ++++ abiword-2.8.6/plugins/wpg/plugin.m4 2010-12-06 13:59:53.929715254 -0800 +@@ -1,5 +1,5 @@ + +-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" ++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" + wpg_deps="no" + + if test "$enable_wpg" != ""; then +diff -Nur abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp +--- abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp 2008-08-15 14:52:32.000000000 -0700 ++++ abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp 2010-12-06 13:59:53.923048588 -0800 +@@ -31,11 +31,10 @@ + #include <gsf/gsf-input-memory.h> + #include <gsf/gsf-input-stdio.h> + #include <gsf/gsf-infile-msole.h> +-#include <libwpd/WPXStream.h> ++#include <libwpd-stream/libwpd-stream.h> + #include "xap_Module.h" + + using libwpg::WPGraphics; +-using libwpg::WPGString; + + ABI_PLUGIN_DECLARE("WPG") + +@@ -48,7 +47,7 @@ + virtual bool isOLEStream(); + virtual WPXInputStream * getDocumentOLEStream(); + virtual WPXInputStream * getDocumentOLEStream(const char * name); +- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); ++ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); + virtual int seek(long offset, WPX_SEEK_TYPE seekType); + virtual long tell(); + virtual bool atEOS(); +@@ -60,7 +59,7 @@ + }; + + AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) : +- WPXInputStream(true), ++ WPXInputStream(), + m_input(input), + m_ole(NULL) + { +@@ -75,9 +74,9 @@ + g_object_unref(G_OBJECT(m_input)); + } + +-const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead) ++const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) + { +- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); ++ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); + + if (buf == NULL) + numBytesRead = 0; +@@ -245,10 +244,10 @@ + UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg) + { + AbiWordPerfectGraphicsInputStream gsfInput(input); +- WPGString svgOutput; ++ WPXString svgOutput; + if (WPGraphics::generateSVG(&gsfInput, svgOutput)) + { +- GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false); ++ GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false); + UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg); + g_object_unref(svgInput); + return result; diff --git a/staging/amule/PKGBUILD b/staging/amule/PKGBUILD new file mode 100644 index 000000000..22280b542 --- /dev/null +++ b/staging/amule/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 146942 2012-01-19 13:36:15Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Henrik Ronellenfitsch <searinox@web.de> +# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> +# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> + +pkgname=amule +pkgver=10708 +pkgrel=2 +pkgdesc="An eMule-like client for ed2k p2p network" +arch=('i686' 'x86_64') +url="http://www.amule.org" +license=('GPL') +depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') +source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") +md5sums=('3c1c2a03b24c9ec7ba6fd675382f26a3') + +build() { + cd "${srcdir}/aMule-SVN-r${pkgver}" + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-cas \ + --enable-wxcas \ + --enable-amule-daemon \ + --enable-amulecmd \ + --enable-amule-gui \ + --enable-alc \ + --enable-alcc \ + --enable-webserver \ + --disable-debug \ + --enable-optimize \ + --enable-ccache \ + --enable-geoip \ + --enable-upnp + + make +} + +package() { + cd "${srcdir}/aMule-SVN-r${pkgver}" + + make DESTDIR=${pkgdir}/ install +} diff --git a/staging/autopano-sift-c/PKGBUILD b/staging/autopano-sift-c/PKGBUILD new file mode 100644 index 000000000..35f76e38a --- /dev/null +++ b/staging/autopano-sift-c/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 146969 2012-01-19 19:16:11Z eric $ +# Maintainer: Tobias Kieslich <tobias@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> + +pkgname=autopano-sift-c +pkgver=2.5.1 +pkgrel=3 +pkgdesc="Identify key feature points within arbitrary images" +arch=('i686' 'x86_64') +url="http://hugin.sourceforge.net/" +license=('GPL2') +depends=('libxml2' 'libpano13' 'gcc-libs') +makedepends=('cmake') +provides=('autopano-sift') +conflicts=('autopano-sift') +replaces=('autopano-sift') +source=(http://downloads.sourceforge.net/sourceforge/hugin/autopano-sift-C-${pkgver}.tar.gz) +md5sums=('b9bade07e8c4f2ea383c22a082c260e0') + +build() { + cd "${srcdir}/autopano-sift-C-${pkgver}" + cmake -DCMAKE_INSTALL_PREFIX=/usr . + sed -i 's/-lz/-lz -lm/' CMakeFiles/{autopano,generatekeys}.dir/link.txt + make +} + +package() { + cd "${srcdir}/autopano-sift-C-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/celestia/PKGBUILD b/staging/celestia/PKGBUILD new file mode 100644 index 000000000..495903615 --- /dev/null +++ b/staging/celestia/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 146981 2012-01-19 21:57:20Z giovanni $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor : Damir Perisa <damir.perisa@bluewin.ch> + +pkgname=celestia +pkgver=1.6.1 +pkgrel=2 +pkgdesc="Real-time space simulation" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.shatters.net/celestia/" +depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg') +options=('!makeflags') +source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz" + 'celestia-1.6.1-gcc46.patch' + 'celestia-1.6.1-libpng15.patch' + 'celestia-1.6.1-linking.patch') +sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7' + '7c08ca391603806d788cb8f3342acedafc924eef' + '46ecc4e10b24191384bc848c206652498843adf0' + '534c8eee18d13a868c91f0b870ebecc05f3e7ae1') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # build patch + patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch" + patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch" + patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch" + + # This version of Celestia has a bug in the font rendering and requires -fsigned-char + export CFLAGS="$CFLAGS -fsigned-char" + export CXXFLAGS="$CXXFLAGS -fsigned-char" + + autoreconf + ./configure --prefix=/usr \ + --with-lua=/usr \ + --datadir=/usr/share \ + --with-gtk \ + --disable-rpath \ + --with-lua + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} + diff --git a/staging/celestia/celestia-1.5.1-gcc44.patch b/staging/celestia/celestia-1.5.1-gcc44.patch new file mode 100644 index 000000000..b1ee896f0 --- /dev/null +++ b/staging/celestia/celestia-1.5.1-gcc44.patch @@ -0,0 +1,20 @@ +--- src/celengine/overlay.h.orig 2009-07-08 02:27:08.000000000 -0400 ++++ src/celengine/overlay.h 2009-07-08 02:27:28.000000000 -0400 +@@ -10,6 +10,7 @@ + #ifndef _OVERLAY_H_ + #define _OVERLAY_H_ + ++#include <cstdio> + #include <string> + #include <iostream> + #include <celtxf/texturefont.h> +--- src/celengine/star.cpp.orig 2009-07-08 02:40:52.000000000 -0400 ++++ src/celengine/star.cpp 2009-07-08 02:41:08.000000000 -0400 +@@ -8,6 +8,7 @@ + // of the License, or (at your option) any later version. + + #include <celmath/mathlib.h> ++#include <cstdio> + #include <cstring> + #include <cassert> + #include "celestia.h" diff --git a/staging/celestia/celestia-1.6.1-gcc46.patch b/staging/celestia/celestia-1.6.1-gcc46.patch new file mode 100644 index 000000000..ddf4036f2 --- /dev/null +++ b/staging/celestia/celestia-1.6.1-gcc46.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/show_bug.cgi?id=366073 + +Patch written by Nils Larsson <ni1s@nerdshack.com> +--- src/celengine/frametree.h ++++ src/celengine/frametree.h +@@ -14,6 +14,7 @@ + #define _CELENGINE_FRAMETREE_H_ + + #include <vector> ++#include <cstddef> + + class Star; + class Body; diff --git a/staging/celestia/celestia-1.6.1-gentoo.patch b/staging/celestia/celestia-1.6.1-gentoo.patch new file mode 100644 index 000000000..57fffe159 --- /dev/null +++ b/staging/celestia/celestia-1.6.1-gentoo.patch @@ -0,0 +1,23 @@ +--- src/celestia/Makefile.am 2011-06-07 19:15:51.502000147 +0200 ++++ src/celestia/Makefile.am.new 2011-06-07 19:15:47.208000302 +0200 +@@ -15,6 +15,7 @@ + if ENABLE_GTK + SUBDIRS += gtk + celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a ++LIBS += $(GTK_LIBS) + endif + + COMMONSOURCES = \ + +Index: src/celengine/frametree.h +=================================================================== +--- src/celengine/frametree.h (revision 5163) ++++ src/celengine/frametree.h (arbetskopia) +@@ -14,6 +14,7 @@ + #define _CELENGINE_FRAMETREE_H_ + + #include <vector> ++#include <cstddef> + + class Star; + class Body; diff --git a/staging/celestia/celestia-1.6.1-libpng15.patch b/staging/celestia/celestia-1.6.1-libpng15.patch new file mode 100644 index 000000000..5dffbab24 --- /dev/null +++ b/staging/celestia/celestia-1.6.1-libpng15.patch @@ -0,0 +1,14 @@ +imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope + +--- src/celestia/imagecapture.cpp ++++ src/celestia/imagecapture.cpp +@@ -31,6 +31,9 @@ + #include "png.h" + #endif + ++// Z_BEST_COMPRESSION ++#include <zlib.h> ++ + // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng + #ifndef png_jmpbuf + #define png_jmpbuf(png_ptr) png_ptr->jmpbuf diff --git a/staging/celestia/celestia-1.6.1-linking.patch b/staging/celestia/celestia-1.6.1-linking.patch new file mode 100644 index 000000000..d610d5243 --- /dev/null +++ b/staging/celestia/celestia-1.6.1-linking.patch @@ -0,0 +1,54 @@ +Fix linking issues: + * underlinking GLUT (bug #372123, #387609) + * as-needed (bug #281258) + +--- a/src/celestia/Makefile.am ++++ b/src/celestia/Makefile.am +@@ -7,14 +7,15 @@ + + if ENABLE_KDE + SUBDIRS += kde +-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ +- $(LIBSOCKET) -lDCOP kde/libkdegui.a ++celestiaKDELIBS = kde/libkdegui.a + celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP + endif + + if ENABLE_GTK + SUBDIRS += gtk +-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a ++celestiaGTKLIBS = gtk/libgtkgui.a ++LIBS += $(GTK_LIBS) + endif + + COMMONSOURCES = \ +@@ -62,6 +63,7 @@ + + if ENABLE_GLUT + GLUTSOURCES = glutmain.cpp ++GLUTLIBS = -lGL + endif + + if ENABLE_THEORA +@@ -80,15 +82,16 @@ + celestia_LDADD = \ + $(celestiaKDELIBS) \ + $(celestiaGTKLIBS) \ +- $(DL_LIBS) \ +- $(LUA_LIBS) \ +- $(THEORA_LIBS) \ + ../celengine/libcelengine.a \ + ../celtxf/libceltxf.a \ + ../cel3ds/libcel3ds.a \ + ../celmath/libcelmath.a \ + ../celutil/libcelutil.a \ +- $(SPICE_LIBS) ++ $(LUA_LIBS) \ ++ $(THEORA_LIBS) \ ++ $(GLUTLIBS) \ ++ $(SPICE_LIBS) \ ++ $(DL_LIBS) + + noinst_HEADERS = $(wildcard *.h) + noinst_DATA = ../../celestia diff --git a/staging/dvdauthor/PKGBUILD b/staging/dvdauthor/PKGBUILD new file mode 100644 index 000000000..849754c1e --- /dev/null +++ b/staging/dvdauthor/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 146985 2012-01-19 22:25:27Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Travis Willard <travisw@wmpub.ca> +# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> +# Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de> + +pkgname=dvdauthor +pkgver=0.7.0 +pkgrel=4 +pkgdesc="DVD authoring tools" +arch=('i686' 'x86_64') +url="http://dvdauthor.sourceforge.net/" +license=('GPL') +depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') +options=('!makeflags') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'dvdauthor-0.7.0-libpng15.patch') +md5sums=('33a447fb98ab3293ac40f869eedc17ff' + '9ea90bbea6adb0469c8c1b2f7d033f11') + +build() { + cd "${srcdir}/${pkgname}" + + patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch" + + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}" + + make DESTDIR="${pkgdir}" install +} diff --git a/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch b/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch new file mode 100644 index 000000000..2bb636380 --- /dev/null +++ b/staging/dvdauthor/dvdauthor-0.7.0-libpng15.patch @@ -0,0 +1,19 @@ +--- src/spuunmux.c ++++ src/spuunmux.c +@@ -39,6 +39,7 @@ + #include <netinet/in.h> + + #include <png.h> ++#include <zlib.h> + + #include "rgb.h" + #include "common.h" +@@ -610,7 +611,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + return -1; + } /*if*/ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); diff --git a/staging/enblend-enfuse/PKGBUILD b/staging/enblend-enfuse/PKGBUILD new file mode 100644 index 000000000..b8e04522a --- /dev/null +++ b/staging/enblend-enfuse/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 146965 2012-01-19 18:31:50Z eric $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Dominik Ryba <domryba@post.pl> + +pkgname=enblend-enfuse +pkgver=4.0 +pkgrel=5 +pkgdesc="Intelligent blend tool for overlapping picture" +arch=("i686" "x86_64") +license=('GPL') +url="http://enblend.sourceforge.net" +depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'lcms' 'libpng') +makedepends=('boost') +replaces=('enblend') +conflicts=('enblend') +provides=('enblend') +install=${pkgname}.install +source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} \ + libpng-1.4.patch enblend-4.0-libpng15.patch) +sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' + 'aac6364b29b0a9d6c61c3db0982f52ce1579e934' + 'eae6cf48ea082865130302d0b4d1ca0b884a563b' + '71e961d90be842eafe9d473d8d70b04b29077036') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" + sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx + patch -p1 -i ../libpng-1.4.patch + patch -p0 -i ../enblend-4.0-libpng15.patch + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" + make DESTDIR="${pkgdir}" install + install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info" + install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info" +} diff --git a/staging/enblend-enfuse/enblend-4.0-libpng15.patch b/staging/enblend-enfuse/enblend-4.0-libpng15.patch new file mode 100644 index 000000000..d4465ccad --- /dev/null +++ b/staging/enblend-enfuse/enblend-4.0-libpng15.patch @@ -0,0 +1,220 @@ +--- src/vigra_impex/png.cxx ++++ src/vigra_impex/png.cxx +@@ -81,7 +81,7 @@ + static void PngError( png_structp png_ptr, png_const_charp error_msg ) + { + png_error_message = std::string(error_msg); +- longjmp( png_ptr->jmpbuf, 1 ); ++ longjmp( png_jmpbuf( png_ptr ), 1 ); + } + + // called on non-fatal errors +@@ -213,7 +213,7 @@ + vigra_postcondition( png != 0, "could not create the read struct." ); + + // create info struct +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf( png ))) { + png_destroy_read_struct( &png, &info, NULL ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() ); + } +@@ -221,14 +221,14 @@ + vigra_postcondition( info != 0, "could not create the info struct." ); + + // init png i/o +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf( png ))) { + png_destroy_read_struct( &png, &info, NULL ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); + } + png_init_io( png, file.get() ); + + // specify that the signature was already read +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf( png ))) { + png_destroy_read_struct( &png, &info, NULL ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() ); + } +@@ -244,13 +244,13 @@ + void PngDecoderImpl::init() + { + // read all chunks up to the image data +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() ); + png_read_info( png, info ); + + // pull over the header fields + int interlace_method, compression_method, filter_method; +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() ); + png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type, + &interlace_method, &compression_method, &filter_method ); +@@ -264,7 +264,7 @@ + + // transform palette to rgb + if ( color_type == PNG_COLOR_TYPE_PALETTE) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() ); + png_set_palette_to_rgb(png); + color_type = PNG_COLOR_TYPE_RGB; +@@ -273,7 +273,7 @@ + + // expand gray values to at least one byte size + if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); + png_set_expand_gray_1_2_4_to_8(png); + bit_depth = 8; +@@ -283,7 +283,7 @@ + #if 0 + // strip alpha channel + if ( color_type & PNG_COLOR_MASK_ALPHA ) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() ); + png_set_strip_alpha(png); + color_type ^= PNG_COLOR_MASK_ALPHA; +@@ -323,12 +323,12 @@ + + // read icc profile + #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) +- char * dummyName; ++ png_charpp dummyName; + int dummyCompType; +- char * profilePtr; ++ png_bytepp profilePtr; + png_uint_32 profileLen; +- if (info->valid & PNG_INFO_iCCP) { +- png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; ++ if (png_get_valid(png, info, PNG_INFO_iCCP)) { ++ png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ; + iccProfilePtr = (unsigned char *) profilePtr; + iccProfileLength = profileLen; + } +@@ -340,7 +340,7 @@ + // image gamma + double image_gamma = 0.45455; + if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() ); + png_get_gAMA( png, info, &image_gamma ); + } +@@ -349,26 +349,26 @@ + double screen_gamma = 2.2; + + // set gamma correction +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() ); + png_set_gamma( png, screen_gamma, image_gamma ); + #endif + + // interlace handling, get number of read passes needed +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str()); + n_interlace_passes = png_set_interlace_handling(png); + + // update png library state to reflect any changes that were made +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() ); + png_read_update_info( png, info ); + +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str()); + n_channels = png_get_channels(png, info); + +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str()); + rowsize = png_get_rowbytes(png, info); + +@@ -379,7 +379,7 @@ + void PngDecoderImpl::nextScanline() + { + for (int i=0; i < n_interlace_passes; i++) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str()); + png_read_row(png, row_data.begin(), NULL); + } +@@ -545,7 +545,7 @@ + vigra_postcondition( png != 0, "could not create the write struct." ); + + // create info struct +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf( png ))) { + png_destroy_write_struct( &png, &info ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() ); + } +@@ -556,7 +556,7 @@ + } + + // init png i/o +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf( png ))) { + png_destroy_write_struct( &png, &info ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); + } +@@ -571,7 +571,7 @@ + void PngEncoderImpl::finalize() + { + // write the IHDR +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() ); + png_set_IHDR( png, info, width, height, bit_depth, color_type, + PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, +@@ -579,7 +579,7 @@ + + // set resolution + if (x_resolution > 0 && y_resolution > 0) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() ); + png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5), + (png_uint_32) (y_resolution / 0.0254 + 0.5), +@@ -588,7 +588,7 @@ + + // set offset + if (position.x > 0 && position.y > 0) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() ); + png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL); + } +@@ -597,12 +597,12 @@ + // set icc profile + if (iccProfile.size() > 0) { + png_set_iCCP(png, info, "icc", 0, +- (char *)iccProfile.begin(), iccProfile.size()); ++ iccProfile.begin(), iccProfile.size()); + } + #endif + + // write the info struct +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() ); + png_write_info( png, info ); + +@@ -634,10 +634,10 @@ + } + + // write the whole image +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() ); + png_write_image( png, row_pointers.begin() ); +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() ); + png_write_end(png, info); + } diff --git a/staging/enblend-enfuse/enblend-enfuse.install b/staging/enblend-enfuse/enblend-enfuse.install new file mode 100644 index 000000000..24ea28a4e --- /dev/null +++ b/staging/enblend-enfuse/enblend-enfuse.install @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(enblend.info enfuse.info) + +post_install() { + [[ -x usr/bin/install-info ]] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $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.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/enblend-enfuse/libpng-1.4.patch b/staging/enblend-enfuse/libpng-1.4.patch new file mode 100644 index 000000000..3bf852b58 --- /dev/null +++ b/staging/enblend-enfuse/libpng-1.4.patch @@ -0,0 +1,14 @@ +diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx +--- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx 2010-01-19 22:09:36.000000000 -0500 ++++ enblend-enfuse-3.2/src/vigra_impex/png.cxx 2010-01-19 22:13:43.000000000 -0500 +@@ -275,8 +275,8 @@ + // expand gray values to at least one byte size + if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { + if (setjmp(png->jmpbuf)) +- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); +- png_set_gray_1_2_4_to_8(png); ++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); ++ png_set_expand_gray_1_2_4_to_8(png); + bit_depth = 8; + } + diff --git a/staging/fltk/PKGBUILD b/staging/fltk/PKGBUILD new file mode 100644 index 000000000..2a830946f --- /dev/null +++ b/staging/fltk/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 146979 2012-01-19 21:29:09Z eric $ +# Maintainer: + +pkgbase=fltk +pkgname=('fltk' 'fltk-docs' 'fltk-games') +pkgver=1.3.0 +pkgrel=3 +arch=('i686' 'x86_64') +license=('custom:LGPL') +url="http://www.fltk.org/" +makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \ + 'alsa-lib' 'desktop-file-utils') +source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz) +md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3') + +build() { + cd "$srcdir/$pkgbase-$pkgver" + sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \ + -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile + ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared + make + cd documentation + make html +} + +package_fltk() { + pkgdesc="Graphical user interface toolkit for X" + depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \ + 'desktop-file-utils' 'xdg-utils') + options=('!docs') + install=fltk.install + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + (cd fluid; make DESTDIR="$pkgdir" install install-linux) + chmod 644 "$pkgdir"/usr/lib/*.a + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_fltk-docs() { + pkgdesc="Graphical user interface toolkit for X (documentation)" + + cd "$srcdir/$pkgbase-$pkgver/documentation" + install -d "$pkgdir"/usr/share/doc/fltk/ + for _file in html/* ; do + install -m644 $_file "$pkgdir"/usr/share/doc/fltk/ + done + cd ../test + make DESTDIR="$pkgdir" install + install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_fltk-games() { + pkgdesc="Example games that accompany FLTK: blocks, checkers and sudoku" + depends=('alsa-lib' 'fltk') + install=fltk-games.install + + cd "$srcdir/$pkgbase-$pkgver/test" + make DESTDIR="$pkgdir" install-linux + (cd ../documentation; make DESTDIR="$pkgdir" install-linux) + install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/fltk/fltk-games.install b/staging/fltk/fltk-games.install new file mode 100644 index 000000000..f3fe2b08b --- /dev/null +++ b/staging/fltk/fltk-games.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/fltk/fltk.install b/staging/fltk/fltk.install new file mode 100644 index 000000000..f89ec8213 --- /dev/null +++ b/staging/fltk/fltk.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/fvwm/PKGBUILD b/staging/fvwm/PKGBUILD new file mode 100644 index 000000000..89af20969 --- /dev/null +++ b/staging/fvwm/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 146983 2012-01-19 22:19:37Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=fvwm +pkgver=2.6.3 +pkgrel=2 +pkgdesc="A multiple large virtual desktop window manager originally derived from twm" +arch=('i686' 'x86_64') +url="http://www.fvwm.org" +license=('GPL' 'custom') +depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor') +makedepends=('libxslt') +provides=('fvwm-devel') +conflicts=('fvwm-devel') +replaces=('fvwm-devel') +options=('!emptydirs' '!makeflags') +source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop) +sha1sums=('7a04dae0e4a17f4d908589e704b48246b7c05e39' + '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-stroke-library + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 sample.fvwmrc/{decor_examples,DecorMwm,DecorWin95,new-features,system.*} "${pkgdir}/usr/share/doc/fvwm" + install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/staging/fvwm/fvwm.desktop b/staging/fvwm/fvwm.desktop new file mode 100644 index 000000000..e297a6109 --- /dev/null +++ b/staging/fvwm/fvwm.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=FVWM +Comment=The fvwm window manager +Type=XSession +Exec=/usr/bin/fvwm +TryExec=/usr/bin/fvwm diff --git a/staging/gif2png/PKGBUILD b/staging/gif2png/PKGBUILD new file mode 100644 index 000000000..2e530eaba --- /dev/null +++ b/staging/gif2png/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 146933 2012-01-19 11:45:57Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: eric <eric@archlinux.org> +# Contributor: Andrew Rose <ody@netrux.com> + +pkgname=gif2png +pkgver=2.5.4 +pkgrel=3 +pkgdesc="A GIF to PNG image format converter" +arch=('i686' 'x86_64') +url="http://www.catb.org/~esr/gif2png/" +license=('ZLIB') +depends=('libpng') +optdepends=('python2: for using web2png') +source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gif2png-2.5.4-libpng15.patch') +md5sums=('d63ea3fc6b6119589e8d4d6fead30df9' + 'd4d6d31e04e7448315eae56bb12d4df6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's#env python#env python2#' web2png + patch -Np0 -i ${srcdir}/gif2png-2.5.4-libpng15.patch + + ./configure --prefix=/usr \ + --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/staging/gif2png/gif2png-2.5.4-libpng15.patch b/staging/gif2png/gif2png-2.5.4-libpng15.patch new file mode 100644 index 000000000..9e5c333bb --- /dev/null +++ b/staging/gif2png/gif2png-2.5.4-libpng15.patch @@ -0,0 +1,43 @@ +ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/graphics/gif2png/patches/patch-aa + +--- gif2png.c ++++ gif2png.c +@@ -10,6 +10,7 @@ + #include <string.h> + #include <stdlib.h> + #include <unistd.h> /* for isatty() */ ++#include <zlib.h> + + #if !defined(TRUE) + #define FALSE 0 +@@ -120,8 +121,8 @@ int writefile(struct GIFelement *s,struc + int colors_used = 0; + byte remap[MAXCMSIZE]; + int low_prec; +- png_struct *png_ptr = xalloc(sizeof (png_struct)); +- png_info *info_ptr = xalloc(sizeof (png_info)); ++ png_struct *png_ptr; ++ png_info *info_ptr; + int p; + int gray_bitdepth; + png_color pal_rgb[MAXCMSIZE], *pltep; +@@ -136,6 +137,19 @@ int writefile(struct GIFelement *s,struc + png_text software; + png_text comment; + ++ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); ++ if (png_ptr == NULL) { ++ fprintf(stderr, "gif2png: fatal error, out of memory\n"); ++ fprintf(stderr, "gif2png: exiting ungracefully\n"); ++ exit(1); ++ } ++ info_ptr = png_create_info_struct(png_ptr); ++ if (info_ptr == NULL) { ++ fprintf(stderr, "gif2png: fatal error, out of memory\n"); ++ fprintf(stderr, "gif2png: exiting ungracefully\n"); ++ exit(1); ++ } ++ + /* these volatile declarations prevent gcc warnings ("variable might be + * clobbered by `longjmp' or `vfork'") */ + volatile int gray = TRUE; diff --git a/staging/glhack/PKGBUILD b/staging/glhack/PKGBUILD new file mode 100644 index 000000000..6ac706ee1 --- /dev/null +++ b/staging/glhack/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 146929 2012-01-19 10:08:04Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=glhack +pkgver=1.2 +pkgrel=6 +pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D" +arch=('i686' 'x86_64') +url="http://glhack.sourceforge.net/" +license=('custom') +depends=('sdl' 'libpng' 'libgl') +makedepends=('mesa') +options=('!makeflags') +install=glhack.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz glhack-libpng15.patch) +sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae' + '4cf1a13e76cc1f1eb3708d42c74b85b7f321092d') + +build(){ + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../glhack-libpng15.patch + sed -i 's|/usr/lib/games|/usr/share|' include/config.h + sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h + sed -i -e 's|PREFIX = /usr|PREFIX = $(DESTDIR)/usr|' Makefile + sed -i -e 's|VARDIR = /var/lib/games/glhack|VARDIR = $(DESTDIR)/var/games/glhack|' Makefile + sed -i -e 's|/usr/man/man6|$(DESTDIR)/usr/share/man/man6|' doc/Makefile + sed -i -e 's|GAMEDIR = $(PREFIX)/lib/games/$(GAME)|GAMEDIR = $(PREFIX)/share/$(GAME)|' Makefile + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}"/usr/share/man/man{5,6} + make DESTDIR="$pkgdir" install + install -D -m644 dat/license "${pkgdir}/usr/share/licenses/${pkgname}/license" + +# Renaming man pages which conflicts with nethack + cd "${pkgdir}/usr/share/man/man6" + for manpage in dgn_comp dlb lev_comp nethack recover; do + mv $manpage.6 $manpage-glhack.6 + done + cd "${srcdir}/${pkgname}-${pkgver}" + + mv "${pkgdir}/usr/share/glhack/glhack" "${pkgdir}/usr/bin/glhack" + mv "${pkgdir}/usr/share/glhack/recover_glhack" "${pkgdir}/usr/bin/recover_glhack" + + chown -R root:root "${pkgdir}/usr/share/glhack" + + rm -r "${pkgdir}"/var/games/glhack + install -d "${pkgdir}/var/games/glhack/save" + chmod -R 775 "${pkgdir}/var/games" + chown -R root:games "${pkgdir}/var/games" +} diff --git a/staging/glhack/glhack-libpng15.patch b/staging/glhack/glhack-libpng15.patch new file mode 100644 index 000000000..d8e644d1c --- /dev/null +++ b/staging/glhack/glhack-libpng15.patch @@ -0,0 +1,11 @@ +--- win/gl/gl_image.c.old 2012-01-19 04:01:26.000000000 -0500 ++++ win/gl/gl_image.c 2012-01-19 04:03:04.000000000 -0500 +@@ -486,7 +486,7 @@ + /* set error handling since we are using the setjmp/longjmp method + * (this is the normal method of doing things with libpng). + */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + sdlgl_warning("Problem within LibPNG (unknown)\n"); + goto failed; diff --git a/staging/glhack/glhack.install b/staging/glhack/glhack.install new file mode 100644 index 000000000..78e1655bc --- /dev/null +++ b/staging/glhack/glhack.install @@ -0,0 +1,24 @@ +post_install() { + touch var/games/glhack/{record,perm,logfile} + chown root:games var/games/glhack/{record,perm,logfile} + chmod 664 var/games/glhack/{record,perm,logfile} +} + +pre_upgrade() { + install -d -m775 var/games/glhack + chown root:games var/games/glhack + [ -e usr/share/glhack/record ] && cp usr/share/glhack/record var/games/glhack + [ -e usr/share/glhack/perm ] && cp usr/share/glhack/perm var/games/glhack + [ -e usr/share/glhack/logfile ] && cp usr/share/glhack/logfile var/games/glhack + if [ -d usr/share/glhack/save ]; then + chmod g-s usr/share/glhack/save + mv usr/share/glhack/save var/games/glhack + else + install -d -m775 var/games/glhack/save + fi + chown root:games var/games/glhack/save +} + +post_upgrade() { + post_install +} diff --git a/staging/graphicsmagick/PKGBUILD b/staging/graphicsmagick/PKGBUILD new file mode 100644 index 000000000..7ca0a92e3 --- /dev/null +++ b/staging/graphicsmagick/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 146915 2012-01-19 05:34:57Z bisson $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Anton Leontiev <bunder@t-25.ru> + +pkgname=graphicsmagick +pkgver=1.3.13 +pkgrel=2 +pkgdesc='Image processing system' +url='http://www.graphicsmagick.org/' +arch=('i686' 'x86_64') +license=('MIT') +makedepends=('perl') +depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz' + 'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl') +options=('!libtool') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz") +sha1sums=('b85b21785bb072fd795f7fc6ac902cffae4e96e6') + +build() { + cd "${srcdir}/GraphicsMagick-${pkgver}" + + ./configure \ + --prefix=/usr \ + --with-perl \ + --enable-shared \ + --disable-static \ + --with-gs-font-dir=/usr/share/fonts/Type1 \ + + make +} + +package() { + cd "${srcdir}/GraphicsMagick-${pkgver}" + + make DESTDIR="${pkgdir}" install + + # Install MIT license + install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}/Copyright.txt" + + # Install perl bindings + # The patching was introduced in order to build perl module without installing package itself and + # not to introduce unnecessary path into LD_RUN_PATH + cd PerlMagick + sed -i -e "s:'LDDLFLAGS' => \"\(.*\)\":'LDDLFLAGS' => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL + perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}" + sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile + make + make install + + # Remove perllocal.pod and .packlist + rm -rf "${pkgdir}/usr/lib/perl5/core_perl" + rm "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Graphics/Magick/.packlist" +} diff --git a/staging/graphviz/LICENSE b/staging/graphviz/LICENSE new file mode 100644 index 000000000..16cc69a52 --- /dev/null +++ b/staging/graphviz/LICENSE @@ -0,0 +1,87 @@ +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the Program. + +Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. diff --git a/staging/graphviz/PKGBUILD b/staging/graphviz/PKGBUILD new file mode 100644 index 000000000..41270f5fb --- /dev/null +++ b/staging/graphviz/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 146913 2012-01-19 05:23:33Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> + +pkgname=graphviz +pkgver=2.28.0 +pkgrel=7 +pkgdesc='Graph visualization software' +url='http://www.graphviz.org/' +license=('custom:EPL') +arch=('i686' 'x86_64') +depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts') +makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt') +optdepends=('mono: sharp bindings' + 'guile: guile bindings' + 'lua: lua bindings' + 'ocaml: ocaml bindings' + 'perl: perl bindings' + 'php: php bindings' + 'python2: python bindings' + 'r: r bindings' + 'ruby: ruby bindings' + 'tcl: tcl bindings' + 'qt: gvedit') +source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" + 'LICENSE') +sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d' + 'e78277e502c29abb74b9587a5dc951ec392554ea') + +options=('!libtool') +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i "/RUBY_INCLUDES=\"/s|\"$| `eval echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,}`\"|" configure + sed -i '/LIBPOSTFIX="64"/d' configure + export PYTHON=python2 + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # cf. http://www.graphviz.org/License.php + install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE +} diff --git a/staging/graphviz/install b/staging/graphviz/install new file mode 100644 index 000000000..65fba522b --- /dev/null +++ b/staging/graphviz/install @@ -0,0 +1,12 @@ +post_install() { + rm -f usr/lib/graphviz/config{,6} + usr/bin/dot -c +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/graphviz/config{,6} +} diff --git a/staging/gtkglext/PKGBUILD b/staging/gtkglext/PKGBUILD new file mode 100644 index 000000000..60357e286 --- /dev/null +++ b/staging/gtkglext/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 146971 2012-01-19 19:43:46Z giovanni $ +# Maintainer: +# Contributor: Ben <ben@benmazer.net> + +pkgname=gtkglext +pkgver=1.2.0 +pkgrel=7 +pkgdesc="opengl extensions for gtk2" +arch=('i686' 'x86_64') +url="http://gtkglext.sourceforge.net/" +license=('LGPL') +depends=('gtk2' 'mesa' 'libxmu') +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" + 'gtk2.20.patch') +md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4' + 'e5a87ec3f2d0e616c6f32f90c3f7237f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/gtk2.20.patch" + sed '/AC_PATH_XTRA/d' -i configure.in + + autoreconf --force --install + ./configure --prefix=/usr \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/staging/gtkglext/gtk2.20.patch b/staging/gtkglext/gtk2.20.patch new file mode 100644 index 000000000..54b34c11e --- /dev/null +++ b/staging/gtkglext/gtk2.20.patch @@ -0,0 +1,77 @@ +diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c +--- gtkglext-1.2.0.orig/gtk/gtkglwidget.c 2004-02-20 11:38:36.000000000 +0200 ++++ gtkglext-1.2.0/gtk/gtkglwidget.c 2010-04-20 19:29:42.941917275 +0300 +@@ -127,7 +127,7 @@ + * Synchronize OpenGL and window resizing request streams. + */ + +- if (GTK_WIDGET_REALIZED (widget) && private->is_realized) ++ if (gtk_widget_get_realized (widget) && private->is_realized) + { + gldrawable = gdk_window_get_gl_drawable (widget->window); + gdk_gl_drawable_wait_gdk (gldrawable); +@@ -154,7 +154,7 @@ + * Remove OpenGL-capability from widget->window. + */ + +- if (GTK_WIDGET_REALIZED (widget)) ++ if (gtk_widget_get_realized (widget)) + gdk_window_unset_gl_capability (widget->window); + + private->is_realized = FALSE; +@@ -174,7 +174,7 @@ + */ + + toplevel = gtk_widget_get_toplevel (widget); +- if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel)) ++ if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel)) + { + GTK_GL_NOTE (MISC, + g_message (" - Install colormap to the top-level window.")); +@@ -194,7 +194,7 @@ + * Set a background of "None" on window to avoid AIX X server crash. + */ + +- if (GTK_WIDGET_REALIZED (widget)) ++ if (gtk_widget_get_realized (widget)) + { + GTK_GL_NOTE (MISC, + g_message (" - window->bg_pixmap = %p", +@@ -250,8 +250,8 @@ + GTK_GL_NOTE_FUNC (); + + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); +- g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE); +- g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE); ++ g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE); ++ g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE); + g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE); + + /* +@@ -432,7 +432,7 @@ + GTK_GL_NOTE_FUNC (); + + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); + + gldrawable = gdk_window_get_gl_drawable (widget->window); + if (gldrawable == NULL) +@@ -474,7 +474,7 @@ + GLWidgetPrivate *private; + + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); + + private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private); + if (private == NULL) +@@ -501,7 +501,7 @@ + gtk_widget_get_gl_window (GtkWidget *widget) + { + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); + + return gdk_window_get_gl_window (widget->window); + } diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD new file mode 100644 index 000000000..f481c13d3 --- /dev/null +++ b/staging/hugin/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 146975 2012-01-19 20:40:48Z eric $ +# Maintainer: Tobias Kieslich <tobias@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Dominik Ryba <domryba@post.pl> + +pkgname=hugin +pkgver=2011.4.0 +pkgrel=1 +pkgdesc="A frontend to the panorama-tools" +arch=('i686' 'x86_64') +url="http://hugin.sourceforge.net/" +license=('GPL') +depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' + 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool') +makedepends=('zip' 'cmake' 'boost' 'tclap') +install=hugin.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b') + +build() { + cd "${srcdir}" + mkdir build && cd build + cmake "${srcdir}/${pkgname}-${pkgver}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ + -DENABLE_LAPACK=yes + make +} + +package(){ + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/hugin/hugin.install b/staging/hugin/hugin.install new file mode 100644 index 000000000..362749233 --- /dev/null +++ b/staging/hugin/hugin.install @@ -0,0 +1,15 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} diff --git a/staging/imagemagick/PKGBUILD b/staging/imagemagick/PKGBUILD new file mode 100644 index 000000000..91331d359 --- /dev/null +++ b/staging/imagemagick/PKGBUILD @@ -0,0 +1,84 @@ +# $Id: PKGBUILD 146973 2012-01-19 20:16:27Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgbase=imagemagick +pkgname=('imagemagick' 'imagemagick-doc') +pkgver=6.7.4.7 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.imagemagick.org/" +license=('custom') +depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'libjpeg-turbo') +makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') +source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ + perlmagick.rpath.patch) +sha1sums=('87cde464a569d8b34ef8edae817fbe4f51f8c2d0' + '23405f80904b1de94ebd7bd6fe2a332471b8c283') + +build() { + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + + sed '/AC_PATH_XTRA/d' -i configure.ac + autoreconf + patch -p0 -i ../perlmagick.rpath.patch + + LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \ + ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ + --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ + --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ + --with-perl --with-perl-options="INSTALLDIRS=vendor" \ + --without-gvc --without-djvu --without-autotrace --without-webp \ + --without-jbig --without-fpx --without-dps --without-fftw --without-lqr + make +} + +check() { + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + make check +} + +package_imagemagick() { + pkgdesc="An image viewing/manipulation program" + optdepends=('ghostscript: for Ghostscript support' + 'openexr: for OpenEXR support' + 'libwmf: for WMF support' + 'librsvg: for SVG support' + 'libxml2: for XML support' + 'jasper: for JPEG-2000 support' + 'libpng: for PNG support') + backup=('etc/ImageMagick/coder.xml' + 'etc/ImageMagick/colors.xml' + 'etc/ImageMagick/delegates.xml' + 'etc/ImageMagick/log.xml' + 'etc/ImageMagick/magic.xml' + 'etc/ImageMagick/mime.xml' + 'etc/ImageMagick/policy.xml' + 'etc/ImageMagick/sRGB.icc' + 'etc/ImageMagick/thresholds.xml' + 'etc/ImageMagick/type.xml' + 'etc/ImageMagick/type-dejavu.xml' + 'etc/ImageMagick/type-ghostscript.xml' + 'etc/ImageMagick/type-windows.xml') + options=('!makeflags' '!docs' 'libtool') + + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + make DESTDIR="${pkgdir}" install + chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" + install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" + +#Cleaning + find "${pkgdir}" -name '*.bs' -delete + rm -f "${pkgdir}"/usr/lib/*.la +} + +package_imagemagick-doc() { + pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" + depends=() + options=('!makeflags') + + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + make DESTDIR="${pkgdir}" install-data-html + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE" + install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE" +} diff --git a/staging/imagemagick/perlmagick.rpath.patch b/staging/imagemagick/perlmagick.rpath.patch new file mode 100644 index 000000000..958c0f2ee --- /dev/null +++ b/staging/imagemagick/perlmagick.rpath.patch @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300 ++++ Makefile.in 2009-05-26 16:23:27.000000000 -0300 +@@ -10067,6 +10067,7 @@ + + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) ++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile + + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE) + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install diff --git a/staging/kdelibs3/PKGBUILD b/staging/kdelibs3/PKGBUILD new file mode 100644 index 000000000..e59d262b1 --- /dev/null +++ b/staging/kdelibs3/PKGBUILD @@ -0,0 +1,94 @@ +# $Id: PKGBUILD 146921 2012-01-19 08:17:01Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=kdelibs3 +pkgver=3.5.10 +pkgrel=12 +pkgdesc='KDE3 Core Libraries' +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper' + 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates') +makedepends=('cups' 'hspell') +optdepends=('hspell: for Hebrew spell-checking support') +options=('libtool') +install=kdelibs3.install +source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2" + 'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz' + 'acinclude.patch' + 'kde3.profile' + 'kde4-compatibility.patch' + 'kconf_updaterc' + 'openssl.patch' + 'kdelibs3-missing-include.patch') +sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82' + 'c8ca21e4848a627760746d0a8a64bf4f90684c3e' + '50c9de71b102507fb78b192ecc22a5fc3e031bc3' + 'fbd6e773edf3e8bb8e1272629984025e041da2ca' + '5fbbf7a5e2032878815fa055bfb5020f478d2b25' + '35e56fe4c5f71685e64b13f448dcacc620166e06' + '50e92950498463defb9149ffcf8cbc2e8cd1063b' + 'e5f5b8c060a2db9cedb82bf18caadfa869921779') + +build() { + cd "$srcdir"/kdelibs-${pkgver} + + . /etc/profile.d/qt3.sh + . "$srcdir"/kde3.profile + + patch -p0 -i "$srcdir"/kde-3.5-1074156.patch + patch -p1 -i "$srcdir"/acinclude.patch + patch -p1 -i "$srcdir"/kde4-compatibility.patch + patch -p1 -i "${srcdir}"/openssl.patch + patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch + + sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh + make -f admin/Makefile.common cvs + + ./configure --prefix=/opt/kde \ + --with-distribution='Arch Linux' \ + --with-alsa \ + --disable-debug \ + --disable-dnssd \ + --disable-dnotify \ + --enable-inotify \ + --enable-sendfile \ + --without-lua \ + --with-hspell \ + --enable-gcc-hidden-visibility \ + --enable-final \ + --enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/qt/lib" \ + --without-arts \ + --disable-libfam + make +} + +package() { + cd "$srcdir"/kdelibs-${pkgver} + + make DESTDIR="$pkgdir" install + + # disable broken kconf_update by default + install -D -m644 "$srcdir"/kconf_updaterc \ + "$pkgdir"/opt/kde/share/config/kconf_updaterc + + # install KDE3 profile + install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh + # make KDE3 styles available to Qt3 + install -d -m755 "$pkgdir"/opt/qt/plugins + ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/opt/qt/plugins/styles + + # cert bundle seems to be hardcoded + # link it to the one from ca-certificates + rm -f "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt + ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt + + # we don't have khelpcenter anyway + rm -rf "$pkgdir"/opt/kde/share/doc + + install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ + echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf +} diff --git a/staging/kdelibs3/acinclude.patch b/staging/kdelibs3/acinclude.patch new file mode 100644 index 000000000..0610d6df5 --- /dev/null +++ b/staging/kdelibs3/acinclude.patch @@ -0,0 +1,66 @@ +2009-12-10 Stepan Kasal <skasal@redhat.com> + +The change of implementation of AC_REQUIRE in 2.64 caused a regression +in the arts project. +This can be fixed by shuffling some macro calls. + +I suppose that most of this patch will not be needed with a future +release of Autoconf. +But the last chunk of this patch is a real bug in this source and +should go upstream. + +--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200 ++++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100 +@@ -3081,8 +3081,18 @@ + fi + ]) + ++AC_DEFUN([AC_CHECK_COMPILERS_CC], ++[ ++ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS ++ CFLAGS=" $CFLAGS" ++ AC_PROG_CC ++ CXXFLAGS=" $CXXFLAGS" ++ AC_PROG_CXX ++]) ++ + AC_DEFUN([AC_CHECK_COMPILERS], + [ ++ AC_REQUIRE([AC_CHECK_COMPILERS_CC]) + AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]), + [ +@@ -3141,11 +3151,6 @@ + [kde_use_profiling="no"] + ) + +- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS +- CFLAGS=" $CFLAGS" +- +- AC_PROG_CC +- + AC_PROG_CPP + + if test "$GCC" = "yes"; then +@@ -3174,10 +3179,6 @@ + LDFLAGS="" + fi + +- CXXFLAGS=" $CXXFLAGS" +- +- AC_PROG_CXX +- + KDE_CHECK_FOR_BAD_COMPILER + + if test "$GXX" = "yes" || test "$CXX" = "KCC"; then +@@ -3503,8 +3504,8 @@ + AC_REQUIRE([AC_LIBTOOL_DLOPEN]) + AC_REQUIRE([KDE_CHECK_LIB64]) + +-AC_OBJEXT +-AC_EXEEXT ++AC_REQUIRE([AC_OBJEXT]) ++AC_REQUIRE([AC_EXEEXT]) + + AM_PROG_LIBTOOL + AC_LIBTOOL_CXX diff --git a/staging/kdelibs3/kconf_updaterc b/staging/kdelibs3/kconf_updaterc new file mode 100644 index 000000000..24c2623fb --- /dev/null +++ b/staging/kdelibs3/kconf_updaterc @@ -0,0 +1,2 @@ +updateInfoAdded=false +autoUpdateDisabled=true diff --git a/staging/kdelibs3/kde3.profile b/staging/kdelibs3/kde3.profile new file mode 100755 index 000000000..ef09631ff --- /dev/null +++ b/staging/kdelibs3/kde3.profile @@ -0,0 +1,6 @@ +export PATH=$PATH:/opt/kde/bin +if [ ! -z $XDG_DATA_DIRS ]; then + export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde/share +else + export XDG_DATA_DIRS=/opt/kde/share +fi diff --git a/staging/kdelibs3/kde4-compatibility.patch b/staging/kdelibs3/kde4-compatibility.patch new file mode 100644 index 000000000..129c314ae --- /dev/null +++ b/staging/kdelibs3/kde4-compatibility.patch @@ -0,0 +1,1012 @@ +diff -Nura kdelibs-3.5.10/kdecore/kcrash.cpp kdelibs-3.5.10.new/kdecore/kcrash.cpp +--- kdelibs-3.5.10/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100 ++++ kdelibs-3.5.10.new/kdecore/kcrash.cpp 2009-08-06 06:18:06.000000000 +0200 +@@ -158,7 +158,7 @@ + int i = 0; + + // argument 0 has to be drkonqi +- argv[i++] = "drkonqi"; ++ argv[i++] = "/usr/lib/kde4/libexec/drkonqi"; + + #if defined Q_WS_X11 + // start up on the correct display +@@ -325,7 +325,7 @@ + _exit(253); + if(!geteuid() && setuid(getuid()) < 0) + _exit(253); +- execvp("drkonqi", const_cast< char** >( argv )); ++ execvp("/usr/lib/kde4/libexec/drkonqi", const_cast< char** >( argv )); + _exit(errno); + } + else +diff -Nura kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10.new/kded/Makefile.am +--- kdelibs-3.5.10/kded/Makefile.am 2005-10-10 17:06:29.000000000 +0200 ++++ kdelibs-3.5.10.new/kded/Makefile.am 2009-08-06 06:21:37.000000000 +0200 +@@ -58,7 +58,7 @@ + servicetype_DATA = kdedmodule.desktop + servicetypedir = $(kde_servicetypesdir) + +-xdg_menu_DATA = applications.menu ++xdg_menu_DATA = kde-applications.menu + + update_DATA = kded.upd + updatedir = $(kde_datadir)/kconf_update +diff -Nura kdelibs-3.5.10/kded/Makefile.in kdelibs-3.5.10.new/kded/Makefile.in +--- kdelibs-3.5.10/kded/Makefile.in 2008-08-20 18:05:57.000000000 +0200 ++++ kdelibs-3.5.10.new/kded/Makefile.in 2009-08-06 06:22:19.000000000 +0200 +@@ -535,7 +535,7 @@ + + servicetype_DATA = kdedmodule.desktop + servicetypedir = $(kde_servicetypesdir) +-xdg_menu_DATA = applications.menu ++xdg_menu_DATA = kde-applications.menu + update_DATA = kded.upd + updatedir = $(kde_datadir)/kconf_update + #>- all: all-am +@@ -1173,7 +1173,7 @@ + -rm -f kded.moc vfolder_menu.moc kdedmodule.moc kbuildsycoca.moc + + #>+ 2 +-KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am ++KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h kde-applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am + + #>+ 2 + docs-am: +diff -Nura kdelibs-3.5.10/kded/applications.menu kdelibs-3.5.10.new/kded/applications.menu +--- kdelibs-3.5.10/kded/applications.menu 2005-09-10 10:27:40.000000000 +0200 ++++ kdelibs-3.5.10.new/kded/applications.menu 1970-01-01 01:00:00.000000000 +0100 +@@ -1,469 +0,0 @@ +- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" +- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> +- +-<Menu> +- <Name>Applications</Name> +- <Directory>kde-main.directory</Directory> +- <!-- Search the default locations --> +- <KDELegacyDirs/> +- <DefaultAppDirs/> +- <DefaultDirectoryDirs/> +- <DefaultLayout> +- <Merge type="menus"/> +- <Merge type="files"/> +- <Separator/> +- <Menuname>More</Menuname> +- </DefaultLayout> +- <Layout> +- <Merge type="menus"/> +- <Menuname>Applications</Menuname> +- <Merge type="files"/> +- </Layout> +- +- <Menu> +- <Name>Applications</Name> +- <Directory>kde-unknown.directory</Directory> +- <OnlyUnallocated/> +- <Include> +- <Not> +- <!-- Don't list non-KDE core applications --> +- <And> +- <Category>Core</Category> +- <Not><Category>KDE</Category></Not> +- </And> +- <!-- Don't list SUSE's YaST in here --> +- <Category>X-SuSE-YaST</Category> +- </Not> +- </Include> +- </Menu> +- <Menu> +- <Name>Development</Name> +- <Directory>kde-development.directory</Directory> +- <Menu> +- <Name>X-KDE-KDevelopIDE</Name> +- <Directory>kde-development-kdevelop.directory</Directory> +- <Include> +- <And> +- <Category>Development</Category> +- <Category>X-KDE-KDevelopIDE</Category> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Translation</Name> +- <Directory>kde-development-translation.directory</Directory> +- <Include> +- <And> +- <Category>Development</Category> +- <Category>Translation</Category> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Web Development</Name> +- <Directory>kde-development-webdevelopment.directory</Directory> +- <Include> +- <And> +- <Category>Development</Category> +- <Category>WebDevelopment</Category> +- </And> +- </Include> +- </Menu> +- <Include> +- <And> +- <Category>Development</Category> +- <Not><Category>X-KDE-KDevelopIDE</Category></Not> +- <Not><Category>Translation</Category></Not> +- <Not><Category>WebDevelopment</Category></Not> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Science</Name> +- <Directory>kde-science.directory</Directory> +- <Include> +- <And><!-- Include /any/ Science app which is not an Education app --> +- <Or> +- <Category>Astronomy</Category> +- <Category>Biology</Category> +- <Category>Chemistry</Category> +- <Category>Geology</Category> +- <Category>MedicalSoftware</Category> +- <Category>Physics</Category> +- <Category>Math</Category> +- <Category>Science</Category> +- </Or> +- <Not><Category>Education</Category></Not> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Edutainment</Name> +- <Directory>kde-edutainment.directory</Directory> +- <Menu> +- <Name>Languages</Name> +- <Directory>kde-edu-languages.directory</Directory> +- <Include> +- <And> +- <Category>Education</Category> +- <Or> +- <Category>Languages</Category> +- <Category>X-KDE-Edu-Language</Category> +- </Or> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Mathematics</Name> +- <Directory>kde-edu-mathematics.directory</Directory> +- <Include> +- <And> +- <Category>Education</Category> +- <Category>Math</Category> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Miscellaneous</Name> +- <Directory>kde-edu-miscellaneous.directory</Directory> +- <Include> +- <And> +- <Category>Education</Category> +- <Not> +- <Category>Languages</Category> +- <Category>X-KDE-Edu-Language</Category> +- <Category>Math</Category> +- <Category>Science</Category> +- <Category>Teaching</Category> +- <Category>X-KDE-Edu-Teaching</Category> +- </Not> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Science</Name> +- <Directory>kde-edu-science.directory</Directory> +- <Include> +- <And> +- <Category>Education</Category> +- <Category>Science</Category> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Tools</Name> +- <Directory>kde-edu-tools.directory</Directory> +- <Include> +- <And> +- <Category>Education</Category> +- <Or> +- <Category>Teaching</Category> +- <Category>X-KDE-Edu-Teaching</Category> +- </Or> +- </And> +- </Include> +- </Menu> +- </Menu> +- <Menu> +- <Name>Games</Name> +- <Directory>kde-games.directory</Directory> +- <Menu> +- <Name>Arcade</Name> +- <Directory>kde-games-arcade.directory</Directory> +- <Include> +- <And> +- <Category>Game</Category> +- <Category>ArcadeGame</Category> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Board</Name> +- <Directory>kde-games-board.directory</Directory> +- <Include> +- <And> +- <Category>Game</Category> +- <Category>BoardGame</Category> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Card</Name> +- <Directory>kde-games-card.directory</Directory> +- <Include> +- <And> +- <Category>Game</Category> +- <Category>CardGame</Category> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Kidsgames</Name> +- <Directory>kde-games-kids.directory</Directory> +- <Include> +- <And> +- <Category>Game</Category> +- <Or> +- <Category>X-KDE-KidsGame</Category> +- <Category>KidsGame</Category> +- </Or> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>TacticStrategy</Name> +- <Directory>kde-games-strategy.directory</Directory> +- <Include> +- <And> +- <Category>Game</Category> +- <Category>StrategyGame</Category> +- </And> +- </Include> +- </Menu> +- <Include> +- <And> +- <Category>Game</Category> +- <Not> +- <Category>ArcadeGame</Category> +- <Category>BoardGame</Category> +- <Category>CardGame</Category> +- <Category>X-KDE-KidsGame</Category> +- <Category>KidsGame</Category> +- <Category>StrategyGame</Category> +- </Not> +- </And> +- </Include> +- <Menu> +- <Name>Toys</Name> +- <Directory>kde-toys.directory</Directory> +- <Include> +- <Category>Amusement</Category> +- </Include> +- </Menu> +- </Menu> +- <Menu> +- <Name>Graphics</Name> +- <Directory>kde-graphics.directory</Directory> +- <Include> +- <And> +- <Category>Graphics</Category> +- <Not><Category>X-KDE-More</Category></Not> +- </And> +- </Include> +- <Menu> +- <Name>More</Name> +- <Directory>kde-more.directory</Directory> +- <Include> +- <And> +- <Category>Graphics</Category> +- <Category>X-KDE-More</Category> +- </And> +- </Include> +- </Menu> +- </Menu> +- <Menu> +- <Name>Internet</Name> +- <Directory>kde-internet.directory</Directory> +- <Include> +- <And> +- <Category>Network</Category> +- <Not><Category>X-KDE-More</Category></Not> +- </And> +- </Include> +- <Menu> +- <Name>Terminal</Name> +- <Directory>kde-internet-terminal.directory</Directory> +- </Menu> +- <Menu> +- <Name>More</Name> +- <Directory>kde-more.directory</Directory> +- <Include> +- <And> +- <Category>Network</Category> +- <Category>X-KDE-More</Category> +- </And> +- </Include> +- </Menu> +- </Menu> +- <Menu> +- <Name>Multimedia</Name> +- <Directory>kde-multimedia.directory</Directory> +- <Include> +- <And> +- <Category>AudioVideo</Category> +- <Not><Category>X-KDE-More</Category></Not> +- </And> +- </Include> +- <Menu> +- <Name>More</Name> +- <Directory>kde-more.directory</Directory> +- <Include> +- <And> +- <Category>AudioVideo</Category> +- <Category>X-KDE-More</Category> +- </And> +- </Include> +- </Menu> +- </Menu> +- <Menu> +- <Name>Office</Name> +- <Directory>kde-office.directory</Directory> +- <Layout> +- <Merge type="menus"/> +- <Filename>kde-koshell.desktop</Filename> +- <Filename>kde-Kontact.desktop</Filename> +- <Separator/> +- <Filename>kde-kword.desktop</Filename> +- <Filename>kde-kspread.desktop</Filename> +- <Filename>kde-kpresenter.desktop</Filename> +- <Merge type="files"/> +- <Separator/> +- <Menuname>More</Menuname> +- </Layout> +- <Include> +- <And> +- <Category>Office</Category> +- <Not><Category>X-KDE-More</Category></Not> +- </And> +- </Include> +- <Menu> +- <Name>More</Name> +- <Directory>kde-more.directory</Directory> +- <Include> +- <And> +- <Category>Office</Category> +- <Category>X-KDE-More</Category> +- </And> +- </Include> +- </Menu> +- </Menu> +- <Menu> +- <Name>Settingsmenu</Name> +- <Directory>kde-settingsmenu.directory</Directory> +- <Include> +- <Category>Settings</Category> +- </Include> +- </Menu> +- <Menu> +- <Name>System</Name> +- <Directory>kde-system.directory</Directory> +- <Include> +- <And> +- <Category>System</Category> +- <Not><Category>X-KDE-More</Category></Not> +- </And> +- </Include> +- <Menu> +- <Name>More</Name> +- <Directory>kde-more.directory</Directory> +- <Include> +- <And> +- <Category>System</Category> +- <Category>X-KDE-More</Category> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>ScreenSavers</Name> +- <Directory>kde-system-screensavers.directory</Directory> +- </Menu> +- <Menu> +- <Name>Terminal</Name> +- <Directory>kde-system-terminal.directory</Directory> +- </Menu> +- </Menu> +- <Menu> +- <Name>Utilities</Name> +- <Directory>kde-utilities.directory</Directory> +- <Include> +- <And> +- <Category>Utility</Category> +- <Not><Category>Accessibility</Category></Not> +- <Not><Category>X-KDE-Utilities-Desktop</Category></Not> +- <Not><Category>X-KDE-Utilities-File</Category></Not> +- <Not><Category>X-KDE-Utilities-Peripherals</Category></Not> +- <Not><Category>X-KDE-Utilities-PIM</Category></Not> +- <Not><Category>X-KDE-More</Category></Not> +- </And> +- </Include> +- <Menu> +- <Name>Accessibility</Name> +- <Directory>kde-utilities-accessibility.directory</Directory> +- <Include> +- <And> +- <Category>Utility</Category> +- <Category>Accessibility</Category> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Desktop</Name> +- <Directory>kde-utilities-desktop.directory</Directory> +- <Include> +- <And> +- <Category>Utility</Category> +- <Category>X-KDE-Utilities-Desktop</Category> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Editors</Name> +- <Directory>kde-editors.directory</Directory> +- <Include> +- <Category>TextEditor</Category> +- </Include> +- </Menu> +- <Menu> +- <Name>File</Name> +- <Directory>kde-utilities-file.directory</Directory> +- <Include> +- <And> +- <Category>Utility</Category> +- <Category>X-KDE-Utilities-File</Category> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>Peripherals</Name> +- <Directory>kde-utilities-peripherals.directory</Directory> +- <Include> +- <And> +- <Category>Utility</Category> +- <Category>X-KDE-Utilities-Peripherals</Category> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>PIM</Name> +- <Directory>kde-utilities-pim.directory</Directory> +- <Include> +- <And> +- <Category>Utility</Category> +- <Category>X-KDE-Utilities-PIM</Category> +- </And> +- </Include> +- </Menu> +- <Menu> +- <Name>XUtilities</Name> +- <Directory>kde-utilities-xutils.directory</Directory> +- </Menu> +- <Menu> +- <Name>More</Name> +- <Directory>kde-more.directory</Directory> +- <Include> +- <And> +- <Category>Utility</Category> +- <Category>X-KDE-More</Category> +- </And> +- </Include> +- </Menu> +- </Menu> +- <Include> +- <And> +- <Category>KDE</Category> +- <Category>Core</Category> +- </And> +- </Include> +- <DefaultMergeDirs/> +- <MergeFile>applications-kmenuedit.menu</MergeFile> +-</Menu> +diff -Nura kdelibs-3.5.10/kded/kbuildsycoca.cpp kdelibs-3.5.10.new/kded/kbuildsycoca.cpp +--- kdelibs-3.5.10/kded/kbuildsycoca.cpp 2007-05-14 09:52:43.000000000 +0200 ++++ kdelibs-3.5.10.new/kded/kbuildsycoca.cpp 2009-08-06 06:23:48.000000000 +0200 +@@ -379,7 +379,7 @@ + connect(g_vfolder, SIGNAL(newService(const QString &, KService **)), + this, SLOT(slotCreateEntry(const QString &, KService **))); + +- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); ++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); + + KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false); + entry->setLayoutInfo(kdeMenu->layoutList); +diff -Nura kdelibs-3.5.10/kded/kde-applications.menu kdelibs-3.5.10.new/kded/kde-applications.menu +--- kdelibs-3.5.10/kded/kde-applications.menu 1970-01-01 01:00:00.000000000 +0100 ++++ kdelibs-3.5.10.new/kded/kde-applications.menu 2005-09-10 10:27:40.000000000 +0200 +@@ -0,0 +1,469 @@ ++ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" ++ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> ++ ++<Menu> ++ <Name>Applications</Name> ++ <Directory>kde-main.directory</Directory> ++ <!-- Search the default locations --> ++ <KDELegacyDirs/> ++ <DefaultAppDirs/> ++ <DefaultDirectoryDirs/> ++ <DefaultLayout> ++ <Merge type="menus"/> ++ <Merge type="files"/> ++ <Separator/> ++ <Menuname>More</Menuname> ++ </DefaultLayout> ++ <Layout> ++ <Merge type="menus"/> ++ <Menuname>Applications</Menuname> ++ <Merge type="files"/> ++ </Layout> ++ ++ <Menu> ++ <Name>Applications</Name> ++ <Directory>kde-unknown.directory</Directory> ++ <OnlyUnallocated/> ++ <Include> ++ <Not> ++ <!-- Don't list non-KDE core applications --> ++ <And> ++ <Category>Core</Category> ++ <Not><Category>KDE</Category></Not> ++ </And> ++ <!-- Don't list SUSE's YaST in here --> ++ <Category>X-SuSE-YaST</Category> ++ </Not> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Development</Name> ++ <Directory>kde-development.directory</Directory> ++ <Menu> ++ <Name>X-KDE-KDevelopIDE</Name> ++ <Directory>kde-development-kdevelop.directory</Directory> ++ <Include> ++ <And> ++ <Category>Development</Category> ++ <Category>X-KDE-KDevelopIDE</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Translation</Name> ++ <Directory>kde-development-translation.directory</Directory> ++ <Include> ++ <And> ++ <Category>Development</Category> ++ <Category>Translation</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Web Development</Name> ++ <Directory>kde-development-webdevelopment.directory</Directory> ++ <Include> ++ <And> ++ <Category>Development</Category> ++ <Category>WebDevelopment</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Include> ++ <And> ++ <Category>Development</Category> ++ <Not><Category>X-KDE-KDevelopIDE</Category></Not> ++ <Not><Category>Translation</Category></Not> ++ <Not><Category>WebDevelopment</Category></Not> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Science</Name> ++ <Directory>kde-science.directory</Directory> ++ <Include> ++ <And><!-- Include /any/ Science app which is not an Education app --> ++ <Or> ++ <Category>Astronomy</Category> ++ <Category>Biology</Category> ++ <Category>Chemistry</Category> ++ <Category>Geology</Category> ++ <Category>MedicalSoftware</Category> ++ <Category>Physics</Category> ++ <Category>Math</Category> ++ <Category>Science</Category> ++ </Or> ++ <Not><Category>Education</Category></Not> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Edutainment</Name> ++ <Directory>kde-edutainment.directory</Directory> ++ <Menu> ++ <Name>Languages</Name> ++ <Directory>kde-edu-languages.directory</Directory> ++ <Include> ++ <And> ++ <Category>Education</Category> ++ <Or> ++ <Category>Languages</Category> ++ <Category>X-KDE-Edu-Language</Category> ++ </Or> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Mathematics</Name> ++ <Directory>kde-edu-mathematics.directory</Directory> ++ <Include> ++ <And> ++ <Category>Education</Category> ++ <Category>Math</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Miscellaneous</Name> ++ <Directory>kde-edu-miscellaneous.directory</Directory> ++ <Include> ++ <And> ++ <Category>Education</Category> ++ <Not> ++ <Category>Languages</Category> ++ <Category>X-KDE-Edu-Language</Category> ++ <Category>Math</Category> ++ <Category>Science</Category> ++ <Category>Teaching</Category> ++ <Category>X-KDE-Edu-Teaching</Category> ++ </Not> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Science</Name> ++ <Directory>kde-edu-science.directory</Directory> ++ <Include> ++ <And> ++ <Category>Education</Category> ++ <Category>Science</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Tools</Name> ++ <Directory>kde-edu-tools.directory</Directory> ++ <Include> ++ <And> ++ <Category>Education</Category> ++ <Or> ++ <Category>Teaching</Category> ++ <Category>X-KDE-Edu-Teaching</Category> ++ </Or> ++ </And> ++ </Include> ++ </Menu> ++ </Menu> ++ <Menu> ++ <Name>Games</Name> ++ <Directory>kde-games.directory</Directory> ++ <Menu> ++ <Name>Arcade</Name> ++ <Directory>kde-games-arcade.directory</Directory> ++ <Include> ++ <And> ++ <Category>Game</Category> ++ <Category>ArcadeGame</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Board</Name> ++ <Directory>kde-games-board.directory</Directory> ++ <Include> ++ <And> ++ <Category>Game</Category> ++ <Category>BoardGame</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Card</Name> ++ <Directory>kde-games-card.directory</Directory> ++ <Include> ++ <And> ++ <Category>Game</Category> ++ <Category>CardGame</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Kidsgames</Name> ++ <Directory>kde-games-kids.directory</Directory> ++ <Include> ++ <And> ++ <Category>Game</Category> ++ <Or> ++ <Category>X-KDE-KidsGame</Category> ++ <Category>KidsGame</Category> ++ </Or> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>TacticStrategy</Name> ++ <Directory>kde-games-strategy.directory</Directory> ++ <Include> ++ <And> ++ <Category>Game</Category> ++ <Category>StrategyGame</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Include> ++ <And> ++ <Category>Game</Category> ++ <Not> ++ <Category>ArcadeGame</Category> ++ <Category>BoardGame</Category> ++ <Category>CardGame</Category> ++ <Category>X-KDE-KidsGame</Category> ++ <Category>KidsGame</Category> ++ <Category>StrategyGame</Category> ++ </Not> ++ </And> ++ </Include> ++ <Menu> ++ <Name>Toys</Name> ++ <Directory>kde-toys.directory</Directory> ++ <Include> ++ <Category>Amusement</Category> ++ </Include> ++ </Menu> ++ </Menu> ++ <Menu> ++ <Name>Graphics</Name> ++ <Directory>kde-graphics.directory</Directory> ++ <Include> ++ <And> ++ <Category>Graphics</Category> ++ <Not><Category>X-KDE-More</Category></Not> ++ </And> ++ </Include> ++ <Menu> ++ <Name>More</Name> ++ <Directory>kde-more.directory</Directory> ++ <Include> ++ <And> ++ <Category>Graphics</Category> ++ <Category>X-KDE-More</Category> ++ </And> ++ </Include> ++ </Menu> ++ </Menu> ++ <Menu> ++ <Name>Internet</Name> ++ <Directory>kde-internet.directory</Directory> ++ <Include> ++ <And> ++ <Category>Network</Category> ++ <Not><Category>X-KDE-More</Category></Not> ++ </And> ++ </Include> ++ <Menu> ++ <Name>Terminal</Name> ++ <Directory>kde-internet-terminal.directory</Directory> ++ </Menu> ++ <Menu> ++ <Name>More</Name> ++ <Directory>kde-more.directory</Directory> ++ <Include> ++ <And> ++ <Category>Network</Category> ++ <Category>X-KDE-More</Category> ++ </And> ++ </Include> ++ </Menu> ++ </Menu> ++ <Menu> ++ <Name>Multimedia</Name> ++ <Directory>kde-multimedia.directory</Directory> ++ <Include> ++ <And> ++ <Category>AudioVideo</Category> ++ <Not><Category>X-KDE-More</Category></Not> ++ </And> ++ </Include> ++ <Menu> ++ <Name>More</Name> ++ <Directory>kde-more.directory</Directory> ++ <Include> ++ <And> ++ <Category>AudioVideo</Category> ++ <Category>X-KDE-More</Category> ++ </And> ++ </Include> ++ </Menu> ++ </Menu> ++ <Menu> ++ <Name>Office</Name> ++ <Directory>kde-office.directory</Directory> ++ <Layout> ++ <Merge type="menus"/> ++ <Filename>kde-koshell.desktop</Filename> ++ <Filename>kde-Kontact.desktop</Filename> ++ <Separator/> ++ <Filename>kde-kword.desktop</Filename> ++ <Filename>kde-kspread.desktop</Filename> ++ <Filename>kde-kpresenter.desktop</Filename> ++ <Merge type="files"/> ++ <Separator/> ++ <Menuname>More</Menuname> ++ </Layout> ++ <Include> ++ <And> ++ <Category>Office</Category> ++ <Not><Category>X-KDE-More</Category></Not> ++ </And> ++ </Include> ++ <Menu> ++ <Name>More</Name> ++ <Directory>kde-more.directory</Directory> ++ <Include> ++ <And> ++ <Category>Office</Category> ++ <Category>X-KDE-More</Category> ++ </And> ++ </Include> ++ </Menu> ++ </Menu> ++ <Menu> ++ <Name>Settingsmenu</Name> ++ <Directory>kde-settingsmenu.directory</Directory> ++ <Include> ++ <Category>Settings</Category> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>System</Name> ++ <Directory>kde-system.directory</Directory> ++ <Include> ++ <And> ++ <Category>System</Category> ++ <Not><Category>X-KDE-More</Category></Not> ++ </And> ++ </Include> ++ <Menu> ++ <Name>More</Name> ++ <Directory>kde-more.directory</Directory> ++ <Include> ++ <And> ++ <Category>System</Category> ++ <Category>X-KDE-More</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>ScreenSavers</Name> ++ <Directory>kde-system-screensavers.directory</Directory> ++ </Menu> ++ <Menu> ++ <Name>Terminal</Name> ++ <Directory>kde-system-terminal.directory</Directory> ++ </Menu> ++ </Menu> ++ <Menu> ++ <Name>Utilities</Name> ++ <Directory>kde-utilities.directory</Directory> ++ <Include> ++ <And> ++ <Category>Utility</Category> ++ <Not><Category>Accessibility</Category></Not> ++ <Not><Category>X-KDE-Utilities-Desktop</Category></Not> ++ <Not><Category>X-KDE-Utilities-File</Category></Not> ++ <Not><Category>X-KDE-Utilities-Peripherals</Category></Not> ++ <Not><Category>X-KDE-Utilities-PIM</Category></Not> ++ <Not><Category>X-KDE-More</Category></Not> ++ </And> ++ </Include> ++ <Menu> ++ <Name>Accessibility</Name> ++ <Directory>kde-utilities-accessibility.directory</Directory> ++ <Include> ++ <And> ++ <Category>Utility</Category> ++ <Category>Accessibility</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Desktop</Name> ++ <Directory>kde-utilities-desktop.directory</Directory> ++ <Include> ++ <And> ++ <Category>Utility</Category> ++ <Category>X-KDE-Utilities-Desktop</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Editors</Name> ++ <Directory>kde-editors.directory</Directory> ++ <Include> ++ <Category>TextEditor</Category> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>File</Name> ++ <Directory>kde-utilities-file.directory</Directory> ++ <Include> ++ <And> ++ <Category>Utility</Category> ++ <Category>X-KDE-Utilities-File</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>Peripherals</Name> ++ <Directory>kde-utilities-peripherals.directory</Directory> ++ <Include> ++ <And> ++ <Category>Utility</Category> ++ <Category>X-KDE-Utilities-Peripherals</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>PIM</Name> ++ <Directory>kde-utilities-pim.directory</Directory> ++ <Include> ++ <And> ++ <Category>Utility</Category> ++ <Category>X-KDE-Utilities-PIM</Category> ++ </And> ++ </Include> ++ </Menu> ++ <Menu> ++ <Name>XUtilities</Name> ++ <Directory>kde-utilities-xutils.directory</Directory> ++ </Menu> ++ <Menu> ++ <Name>More</Name> ++ <Directory>kde-more.directory</Directory> ++ <Include> ++ <And> ++ <Category>Utility</Category> ++ <Category>X-KDE-More</Category> ++ </And> ++ </Include> ++ </Menu> ++ </Menu> ++ <Include> ++ <And> ++ <Category>KDE</Category> ++ <Category>Core</Category> ++ </And> ++ </Include> ++ <DefaultMergeDirs/> ++ <MergeFile>applications-kmenuedit.menu</MergeFile> ++</Menu> diff --git a/staging/kdelibs3/kdelibs3-missing-include.patch b/staging/kdelibs3/kdelibs3-missing-include.patch new file mode 100644 index 000000000..5b84ef746 --- /dev/null +++ b/staging/kdelibs3/kdelibs3-missing-include.patch @@ -0,0 +1,10 @@ +--- kdeprint/cups/cupsdconf2/cups-util.c.old 2012-01-19 01:30:26.000000000 -0500 ++++ kdeprint/cups/cupsdconf2/cups-util.c 2012-01-19 01:31:33.000000000 -0500 +@@ -2,6 +2,7 @@ + #include <cups/http.h> + #include <cups/cups.h> + #include <stdlib.h> ++#include <stdio.h> + #include <fcntl.h> + #include <sys/stat.h> + #include <unistd.h> diff --git a/staging/kdelibs3/kdelibs3.install b/staging/kdelibs3/kdelibs3.install new file mode 100644 index 000000000..7291ac0a2 --- /dev/null +++ b/staging/kdelibs3/kdelibs3.install @@ -0,0 +1,12 @@ +post_install() { + post_remove +} + +post_upgrade() { + post_remove +} + +post_remove() { + # this can be removed in future versions + sed -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf +} diff --git a/staging/kdelibs3/openssl.patch b/staging/kdelibs3/openssl.patch new file mode 100644 index 000000000..a948b884a --- /dev/null +++ b/staging/kdelibs3/openssl.patch @@ -0,0 +1,180 @@ +diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc +--- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x 2009-09-04 23:10:53.000000000 +0200 ++++ kdelibs-3.5.10/kio/kssl/kopenssl.cc 2009-09-04 23:10:53.000000000 +0200 +@@ -96,9 +96,14 @@ static int (*K_BIO_write) (BIO *b, cons + static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *, + const EVP_CIPHER *,unsigned char *,int , + pem_password_cb *, void *) = 0L; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L; ++static ASN1_ITEM *K_NETSCAPE_X509_it = 0L; ++#else + static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L; + static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L; + static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L; ++#endif + static int (*K_X509_print_fp) (FILE *, X509*) = 0L; + static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L; + static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L; +@@ -430,9 +435,14 @@ KConfig *cfg; + K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl"); + K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write"); + K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio"); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp"); ++ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it"); ++#else + K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth"); + K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp"); + K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER"); ++#endif + K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp"); + K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12"); + K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp"); +@@ -594,7 +604,7 @@ KConfig *cfg; + K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session"); + K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION"); + K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION"); +- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); ++ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); + #endif + + +@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI + else return -1; + } + +- ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) { ++ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it) ++ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x); ++ else return -1; ++} ++#else + ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) { + if (K_X509_asn1_meth) return (K_X509_asn1_meth)(); + else return 0L; +@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out + return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x); + else return -1; + } +- ++#endif + + int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) { + if (K_X509_print_fp) return (K_X509_print_fp)(fp, x); +diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h +--- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x 2006-07-22 10:16:39.000000000 +0200 ++++ kdelibs-3.5.10/kio/kssl/kopenssl.h 2009-09-04 23:10:53.000000000 +0200 +@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate; + #include <openssl/stack.h> + #include <openssl/bn.h> + #undef crypt ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#define STACK _STACK ++#endif + #endif + + #include <kstaticdeleter.h> +@@ -446,12 +449,12 @@ public: + */ + int PEM_write_bio_X509(BIO *bp, X509 *x); + +- ++#if OPENSSL_VERSION_NUMBER < 0x10000000L + /* + * X509_asn1_meth - used for netscape output + */ + ASN1_METHOD *X509_asn1_meth(); +- ++#endif + + /* + * ASN1_i2d_fp - used for netscape output +@@ -531,6 +534,9 @@ public: + */ + void sk_free(STACK *s); + ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); } ++#endif + + /* + * Number of elements in the stack +@@ -543,6 +549,9 @@ public: + */ + char *sk_value(STACK *s, int n); + ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); } ++#endif + + /* + * Create a new stack +@@ -555,6 +564,9 @@ public: + */ + int sk_push(STACK *s, char *d); + ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); } ++#endif + + /* + * Duplicate the stack +diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc +--- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x 2005-10-10 17:05:44.000000000 +0200 ++++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc 2009-09-04 23:10:53.000000000 +0200 +@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate + + + STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) { +- STACK_OF(X509) *x509 = sk_new(NULL); ++ STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL)); + KSSLCertificate *cert = certs.first(); + while(cert) { + sk_X509_push(x509, cert->getCert()); +diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc +--- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x 2006-01-19 18:06:12.000000000 +0100 ++++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc 2009-09-04 23:10:53.000000000 +0200 +@@ -1003,17 +1003,31 @@ return qba; + QByteArray KSSLCertificate::toNetscape() { + QByteArray qba; + #ifdef KSSL_HAVE_SSL +-ASN1_HEADER ah; +-ASN1_OCTET_STRING os; +-KTempFile ktf; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ NETSCAPE_X509 nx; ++ ASN1_OCTET_STRING hdr; ++#else ++ ASN1_HEADER ah; ++ ASN1_OCTET_STRING os; ++#endif ++ KTempFile ktf; + +- os.data = (unsigned char *)NETSCAPE_CERT_HDR; +- os.length = strlen(NETSCAPE_CERT_HDR); +- ah.header = &os; +- ah.data = (char *)getCert(); +- ah.meth = d->kossl->X509_asn1_meth(); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR; ++ hdr.length = strlen(NETSCAPE_CERT_HDR); ++ nx.header = &hdr; ++ nx.cert = getCert(); ++ ++ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx); ++#else ++ os.data = (unsigned char *)NETSCAPE_CERT_HDR; ++ os.length = strlen(NETSCAPE_CERT_HDR); ++ ah.header = &os; ++ ah.data = (char *)getCert(); ++ ah.meth = d->kossl->X509_asn1_meth(); + +- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); ++ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); ++#endif + + ktf.close(); + diff --git a/staging/lbreakout2/PKGBUILD b/staging/lbreakout2/PKGBUILD new file mode 100644 index 000000000..814fc5520 --- /dev/null +++ b/staging/lbreakout2/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 146936 2012-01-19 12:08:17Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=lbreakout2 +pkgver=2.6.3 +pkgrel=3 +pkgdesc="A breakout game with nice effects, graphics, and sounds" +arch=('i686' 'x86_64') +url="http://lgames.sourceforge.net" +license=('GPL') +depends=('sdl_mixer' 'libpng') +backup=('var/games/lbreakout2/lbreakout2.hscr') +source=("http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver/_/-}.tar.gz" + 'lbreakout2.desktop' + 'lbreakout2.png') +md5sums=('43900187bc935475cd6489569cd2230a' + '14cd34a72a8f4e3b8f385f9023625241' + '94e2fa393eb2a7d4494641dec580573b') + +build() { + cd ${srcdir}/${pkgname}-${pkgver/_/-} + + ./configure --prefix=/usr \ + --localstatedir=/var/games/lbreakout2 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver/_/-} + + make DESTDIR=${pkgdir}/ doc_dir=/usr/share/doc install + + chmod -R 755 ${pkgdir}/usr + chown root:games ${pkgdir}/var/games + chmod 775 ${pkgdir}/var/games + chown root:games ${pkgdir}/var/games/lbreakout2 + chmod 755 ${pkgdir}/var/games/lbreakout2 + chown root:games ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr + chmod 775 ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr + + install -Dm644 ${srcdir}/lbreakout2.png ${pkgdir}/usr/share/pixmaps/lbreakout2.png + install -Dm644 ${srcdir}/lbreakout2.desktop ${pkgdir}/usr/share/applications/lbreakout2.desktop +} diff --git a/staging/lbreakout2/lbreakout2.desktop b/staging/lbreakout2/lbreakout2.desktop new file mode 100644 index 000000000..c8ef945da --- /dev/null +++ b/staging/lbreakout2/lbreakout2.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=Linux Breakout 2 +Comment=Breakout and Arkanoid style arcade game +Icon=/usr/share/pixmaps/lbreakout2.png +TryExec=lbreakout2 +Exec=lbreakout2 +Terminal=false +Categories=Application;Game; diff --git a/staging/lbreakout2/lbreakout2.png b/staging/lbreakout2/lbreakout2.png Binary files differnew file mode 100644 index 000000000..f9541e184 --- /dev/null +++ b/staging/lbreakout2/lbreakout2.png diff --git a/staging/lcms/PKGBUILD b/staging/lcms/PKGBUILD new file mode 100644 index 000000000..bb67c9e75 --- /dev/null +++ b/staging/lcms/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 146955 2012-01-19 17:30:11Z eric $ +# Maintainer: Tobias Kieslich <neri@archlinux.org> +# Contributor: Ben <contrasutra@myrealbox.com> + +pkgname=lcms +pkgver=1.19 +pkgrel=2 +pkgdesc="Lightweight color management development library/engine" +arch=('i686' 'x86_64') +license=('custom') +depends=('libtiff') +url="http://www.littlecms.com" +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('8af94611baf20d9646c7c2c285859818') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm 644 COPYING \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/libpano13/PKGBUILD b/staging/libpano13/PKGBUILD new file mode 100644 index 000000000..c4d1054e6 --- /dev/null +++ b/staging/libpano13/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 146959 2012-01-19 17:50:13Z eric $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=libpano13 +pkgver=2.9.18 +pkgrel=2 +pkgdesc="Basic library to calculate panoramical pictures - core functions of the panotools" +arch=('i686' 'x86_64') +url="http://panotools.sourceforge.net/" +license=('GPL2') +depends=('libpng' 'libtiff') +makedepends=('openjdk6') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/panotools/${pkgname}-${pkgver}.tar.gz) +md5sums=('9c3a4fce8b6f1d79e395896ce5d8776e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man --with-java=${JAVA_HOME} + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/qt3/PKGBUILD b/staging/qt3/PKGBUILD new file mode 100644 index 000000000..57b052598 --- /dev/null +++ b/staging/qt3/PKGBUILD @@ -0,0 +1,133 @@ +# $Id: PKGBUILD 146911 2012-01-19 05:18:20Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=qt3 +pkgver=3.3.8 +pkgrel=22 +pkgdesc="The QT3 gui toolkit" +arch=('i686' 'x86_64') +url="http://www.trolltech.com/products/qt/index.html" +license=('GPL') +depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft' + 'libxrandr' 'libmng') +makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3') +optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') +options=('!libtool') +install=qt.install +source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.bz2 + qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 + qt-patches.tar.bz2 utf8-bug-qt3.diff qt-font-default-subst.diff + mysql.patch eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) +sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7' + 'd2e257a9011208b2cb81b9cf47915b9a2f9dab83' + '3d19510c46016a1a211d97bf8f82b01498b1b33c' + '9cb2e5bec782069692ee337cfa171539d9d73753' + '116afa0e737bdf27ea27f9b3653aeb56db9ec151' + 'ca5ecb29c7f1c826d48703339a3371038e306bb7' + 'd928ff55adb52c4bab2fb268df022651551cd70c' + 'bb6aad81cce143c23ff7840b1d79f6b2007a0c04' + '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17' + '1346320614f6f86fbeb10b9fbad721dea29f5b61' + 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f') + +# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ +# other qt-patches come from fedora and gentoo + +build() { + unset QMAKESPEC + export QTDIR="${srcdir}"/qt-x11-free-${pkgver} + export PATH=${QTDIR}/bin:${PATH} + export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} + export QMAKESPEC=$QTDIR/mkspecs/linux-g++ + cd "${srcdir}"/qt-x11-free-${pkgver} + # apply qt patches from kde.org + for i in ../qt-copy-kde-patches/*; do + patch -Np0 -i $i + done + # apply other qt patches and one security fix from debian/gentoo + for i in ../qt-patches/*; do + patch -Np1 -i $i + done + # fix utf8 bug + patch -p0 -i "${srcdir}"/utf8-bug-qt3.diff + # fix asia fonts + patch -p0 -i "${srcdir}"/qt-font-default-subst.diff + # fix segfaults on exit when using mysql DB driver + patch -p0 -i "${srcdir}"/mysql.patch + # fix CJK font/chars select error (FS#11245) + patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff + # fix build problem against new unixODBC + patch -p1 -i "${srcdir}"/qt-odbc.patch + # fix build with gcc 4.6.0 + patch -p1 -i "${srcdir}"/gcc-4.6.patch + + patch -p0 -i "${srcdir}"/qt3-png15.patch + # start compiling qt + sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix + rm -rf doc/html examples tutorial + sed -i "s|sub-tutorial sub-examples||" Makefile + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf + sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix + sed -i "s|read acceptance|acceptance=yes|" configure + + # remove unwanted mkspecs + rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} + + if [ "$CARCH" = "x86_64" ]; then + export ARCH="-64" + else unset ARCH + fi + + ./configure -prefix /opt/qt \ + -platform linux-g++$ARCH \ + -system-zlib \ + -qt-gif \ + -release \ + -shared \ + -sm \ + -nis \ + -thread \ + -stl \ + -system-lib{png,jpeg,mng} \ + -no-g++-exceptions \ + -plugin-sql-{mysql,psql,sqlite,odbc} + + # fix /opt/qt/lib path + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile + + cd "${srcdir}"/qt-x11-free-${pkgver} + make -C qmake + cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql + "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro + cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql + "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro + + cd "${srcdir}"/qt-x11-free-${pkgver} + # fix the broken makefiles + #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile + make +} + +package() { + cd "${srcdir}"/qt-x11-free-${pkgver} + make INSTALL_ROOT="${pkgdir}" install + rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations} + sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl + install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake + install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh + ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config + rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH + + # install man pages + install -d -m755 "${pkgdir}"/opt/qt/man + cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/ + + install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ + echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf +} diff --git a/staging/qt3/eastern_asian_languagues.diff b/staging/qt3/eastern_asian_languagues.diff new file mode 100644 index 000000000..7c25eef7d --- /dev/null +++ b/staging/qt3/eastern_asian_languagues.diff @@ -0,0 +1,39 @@ +--- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200 ++++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200 +@@ -966,20 +966,22 @@ + + #ifdef Q_WS_X11 + if (script == QFont::Han) { +- // modify script according to locale +- static QFont::Script defaultHan = QFont::UnknownScript; +- if (defaultHan == QFont::UnknownScript) { +- QCString locale = setlocale(LC_ALL, NULL); +- if (locale.contains("ko")) +- defaultHan = QFont::Han_Korean; +- else if (locale.contains("zh_TW") || locale.contains("zh_HK")) +- defaultHan = QFont::Han_TraditionalChinese; +- else if (locale.contains("zh")) +- defaultHan = QFont::Han_SimplifiedChinese; +- else +- defaultHan = QFont::Han_Japanese; +- } +- script = defaultHan; ++ // modify script according to locale ++ static QFont::Script defaultHan; ++ QCString locale = setlocale(LC_ALL, NULL); ++ ++ if (locale.contains("ko")) ++ defaultHan = QFont::Han_Korean; ++ else if (locale.contains("zh_TW") || locale.contains("zh_HK")) ++ defaultHan = QFont::Han_TraditionalChinese; ++ else if (locale.contains("zh")) ++ defaultHan = QFont::Han_SimplifiedChinese; ++ else if (locale.contains("ja")) ++ defaultHan = QFont::Han_Japanese; ++ else ++ defaultHan = QFont::Han; // don't change ++ ++ script = defaultHan; + } + #endif + diff --git a/staging/qt3/gcc-4.6.patch b/staging/qt3/gcc-4.6.patch new file mode 100644 index 000000000..bcbffcea6 --- /dev/null +++ b/staging/qt3/gcc-4.6.patch @@ -0,0 +1,33 @@ +diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h +--- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600 +@@ -49,6 +49,7 @@ + #include "qvaluelist.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <map> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h +--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600 +@@ -47,6 +47,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <list> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h +--- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600 +@@ -45,6 +45,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <vector> + #endif diff --git a/staging/qt3/mysql.patch b/staging/qt3/mysql.patch new file mode 100644 index 000000000..5f61edc67 --- /dev/null +++ b/staging/qt3/mysql.patch @@ -0,0 +1,47 @@ +--- src/sql/drivers/mysql/qsql_mysql.cpp ++++ src/sql/drivers/mysql/qsql_mysql.cpp +@@ -37,7 +37,6 @@ + #include "qsql_mysql.h" + #include <private/qsqlextension_p.h> + +-#include <qapplication.h> + #include <qdatetime.h> + #include <qvaluevector.h> + #include <qsqlrecord.h> +@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected() + } + + ///////////////////////////////////////////////////////// +-static void qServerEnd() +-{ +-#ifndef Q_NO_MYSQL_EMBEDDED +-# if MYSQL_VERSION_ID >= 40000 +- mysql_server_end(); +-# endif // MYSQL_VERSION_ID +-#endif // Q_NO_MYSQL_EMBEDDED +-} + + static void qServerInit() + { +@@ -366,9 +357,7 @@ static void qServerInit() + qWarning( "QMYSQLDriver::qServerInit: unable to start server." ); + # endif + } +- qAddPostRoutine(qServerEnd); + init = TRUE; +- + # endif // MYSQL_VERSION_ID + #endif // Q_NO_MYSQL_EMBEDDED + } +@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver() + QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); + delete ext; + } ++#ifndef Q_NO_MYSQL_EMBEDDED ++# if MYSQL_VERSION_ID > 40000 ++ mysql_server_end(); ++# endif ++#endif + } + + bool QMYSQLDriver::hasFeature( DriverFeature f ) const diff --git a/staging/qt3/qt-copy-kde-patches.tar.bz2 b/staging/qt3/qt-copy-kde-patches.tar.bz2 Binary files differnew file mode 100644 index 000000000..19d899963 --- /dev/null +++ b/staging/qt3/qt-copy-kde-patches.tar.bz2 diff --git a/staging/qt3/qt-font-default-subst.diff b/staging/qt3/qt-font-default-subst.diff new file mode 100644 index 000000000..3e286f74e --- /dev/null +++ b/staging/qt3/qt-font-default-subst.diff @@ -0,0 +1,77 @@ +--- src/kernel/qfontdatabase_x11.cpp ++++ src/kernel/qfontdatabase_x11.cpp +@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s + if (script == QFont::Latin) + // add Euro character + FcCharSetAddChar(cs, 0x20ac); +- if (script == QFont::Han_SimplifiedChinese) +- FcCharSetAddChar(cs, 0x3400); +- if (script == QFont::Han_TraditionalChinese){ +- FcCharSetAddChar(cs, 0x3435); +- FcCharSetAddChar(cs, 0xE000); +- FcCharSetAddChar(cs, 0xF6B1); +- } +- if (script == QFont::MiscellaneousSymbols) +- FcCharSetAddChar(cs, 0x2714); + FcPatternAddCharSet(pattern, FC_CHARSET, cs); + FcCharSetDestroy(cs); + } +@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c + FcPatternPrint(pattern); + #endif + ++ // XftFontMatch calls the right ConfigSubstitute variants, but as we use ++ // FcFontMatch/Sort here we have to do it manually. + FcConfigSubstitute(0, pattern, FcMatchPattern); ++ XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern); ++ + // qDebug("1: pattern contains:"); + // FcPatternPrint(pattern); + +@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c + value.u.s = (const FcChar8 *)cs.data(); + FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue); + } +-#ifdef FONT_MATCH_DEBUG +- printf("final pattern contains:\n"); +- FcPatternPrint(pattern); +-#endif + } + + if (script != QFont::Unicode) { +@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c + if (script == QFont::Latin) + // add Euro character + FcCharSetAddChar(cs, 0x20ac); +- if (script == QFont::Han_SimplifiedChinese) +- FcCharSetAddChar(cs, 0x3400); +- if (script == QFont::Han_TraditionalChinese) { +- FcCharSetAddChar(cs, 0x3435); +- FcCharSetAddChar(cs, 0xE000); +- FcCharSetAddChar(cs, 0xF6B1); +- } +- if (script == QFont::MiscellaneousSymbols) +- FcCharSetAddChar(cs, 0x2714); + FcPatternAddCharSet(pattern, FC_CHARSET, cs); + FcCharSetDestroy(cs); + } + ++#ifdef FONT_MATCH_DEBUG ++ printf("final pattern contains:\n"); ++ FcPatternPrint(pattern); ++#endif ++ + QFontEngine *fe = 0; + + for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) { +--- src/kernel/qfontdatabase.cpp ++++ src/kernel/qfontdatabase.cpp +@@ -554,7 +554,7 @@ static const unsigned short sample_chars + // GeometricSymbols, + { 0x2500, 0x0 }, + // MiscellaneousSymbols, +- { 0x2640, 0x0 }, ++ { 0x2640, 0x2714, 0x0 }, + // EnclosedAndSquare, + { 0x2460, 0x0 }, + // Braille, diff --git a/staging/qt3/qt-odbc.patch b/staging/qt3/qt-odbc.patch new file mode 100644 index 000000000..6f21e3cf1 --- /dev/null +++ b/staging/qt3/qt-odbc.patch @@ -0,0 +1,19 @@ +diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp +--- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100 ++++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100 +@@ -57,13 +57,13 @@ + #endif + + // newer platform SDKs use SQLLEN instead of SQLINTEGER +-#ifdef SQLLEN ++#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define QSQLLEN SQLLEN + #else + # define QSQLLEN SQLINTEGER + #endif + +-#ifdef SQLULEN ++#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define QSQLULEN SQLULEN + #else + # define QSQLULEN SQLUINTEGER diff --git a/staging/qt3/qt-patches.tar.bz2 b/staging/qt3/qt-patches.tar.bz2 Binary files differnew file mode 100644 index 000000000..3f4aee171 --- /dev/null +++ b/staging/qt3/qt-patches.tar.bz2 diff --git a/staging/qt3/qt.install b/staging/qt3/qt.install new file mode 100644 index 000000000..6d042daae --- /dev/null +++ b/staging/qt3/qt.install @@ -0,0 +1,12 @@ +post_install() { + post_remove +} + +post_upgrade() { + post_remove +} + +post_remove() { + # this can be removed in future versions + sed -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf +} diff --git a/staging/qt3/qt.profile b/staging/qt3/qt.profile new file mode 100644 index 000000000..ed4d232ae --- /dev/null +++ b/staging/qt3/qt.profile @@ -0,0 +1,4 @@ +export QTDIR=/opt/qt +export QT_XFT=true +export PATH=$PATH:$QTDIR/bin +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig diff --git a/staging/qt3/qt3-png15.patch b/staging/qt3/qt3-png15.patch new file mode 100644 index 000000000..e64fea36a --- /dev/null +++ b/staging/qt3/qt3-png15.patch @@ -0,0 +1,212 @@ +$NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $ + +--- src/kernel/qpngio.cpp.orig 2007-02-02 10:01:15.000000000 -0400 ++++ src/kernel/qpngio.cpp +@@ -43,6 +43,7 @@ + #include "qiodevice.h" + + #include <png.h> ++#include <zlib.h> + + + #ifdef Q_OS_TEMP +@@ -123,9 +124,24 @@ void setup_qt( QImage& image, png_struct + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, + 0, 0, 0); + ++ png_colorp info_ptr_palette = NULL; ++ int info_ptr_num_palette = 0; ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) { ++ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette); ++ } ++ ++ png_bytep info_ptr_trans_alpha = NULL; ++ int info_ptr_num_trans = 0; ++ png_color_16p info_ptr_trans_color = NULL; ++ ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { ++ png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color); ++ } ++ ++ + if ( color_type == PNG_COLOR_TYPE_GRAY ) { + // Black & White or 8-bit grayscale +- if ( bit_depth == 1 && info_ptr->channels == 1 ) { ++ if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) { + png_set_invert_mono( png_ptr ); + png_read_update_info( png_ptr, info_ptr ); + if (!image.create( width, height, 1, 2, QImage::BigEndian )) +@@ -159,7 +175,7 @@ void setup_qt( QImage& image, png_struct + image.setColor( i, qRgba(c,c,c,0xff) ); + } + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { +- const int g = info_ptr->trans_values.gray; ++ const int g = info_ptr_trans_color->gray; + if (g < ncols) { + image.setAlphaBuffer(TRUE); + image.setColor(g, image.color(g) & RGB_MASK); +@@ -168,7 +184,7 @@ void setup_qt( QImage& image, png_struct + } + } else if ( color_type == PNG_COLOR_TYPE_PALETTE + && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE) +- && info_ptr->num_palette <= 256 ) ++ && info_ptr_num_palette <= 256 ) + { + // 1-bit and 8-bit color + if ( bit_depth != 1 ) +@@ -176,28 +192,28 @@ void setup_qt( QImage& image, png_struct + png_read_update_info( png_ptr, info_ptr ); + png_get_IHDR(png_ptr, info_ptr, + &width, &height, &bit_depth, &color_type, 0, 0, 0); +- if (!image.create(width, height, bit_depth, info_ptr->num_palette, ++ if (!image.create(width, height, bit_depth, info_ptr_num_palette, + QImage::BigEndian)) + return; + int i = 0; + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { + image.setAlphaBuffer( TRUE ); +- while ( i < info_ptr->num_trans ) { ++ while ( i < info_ptr_num_trans ) { + image.setColor(i, qRgba( +- info_ptr->palette[i].red, +- info_ptr->palette[i].green, +- info_ptr->palette[i].blue, +- info_ptr->trans[i] ++ info_ptr_palette[i].red, ++ info_ptr_palette[i].green, ++ info_ptr_palette[i].blue, ++ info_ptr_trans_alpha[i] + ) + ); + i++; + } + } +- while ( i < info_ptr->num_palette ) { ++ while ( i < info_ptr_num_palette ) { + image.setColor(i, qRgba( +- info_ptr->palette[i].red, +- info_ptr->palette[i].green, +- info_ptr->palette[i].blue, ++ info_ptr_palette[i].red, ++ info_ptr_palette[i].green, ++ info_ptr_palette[i].blue, + 0xff + ) + ); +@@ -284,7 +300,7 @@ void read_png_image(QImageIO* iio) + return; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + iio->setStatus(-4); + return; +@@ -469,7 +485,7 @@ bool QPNGImageWriter::writeImage(const Q + return FALSE; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return FALSE; + } +@@ -491,10 +507,16 @@ bool QPNGImageWriter::writeImage(const Q + + png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn); + ++#warning XXXtnn not too sure about this ++/* ++according to png.h, channels is only used on read, not writes, so we ++should be able to comment this out. ++ + info_ptr->channels = + (image.depth() == 32) + ? (image.hasAlphaBuffer() ? 4 : 3) + : 1; ++*/ + + png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(), + image.depth() == 1 ? 1 : 8 /* per channel */, +@@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q + : PNG_COLOR_TYPE_RGB + : PNG_COLOR_TYPE_PALETTE, 0, 0, 0); + ++ png_color_8 sig_bit; ++ sig_bit.red = 8; ++ sig_bit.green = 8; ++ sig_bit.blue = 8; ++ png_set_sBIT(png_ptr, info_ptr, &sig_bit); + +- //png_set_sBIT(png_ptr, info_ptr, 8); +- info_ptr->sig_bit.red = 8; +- info_ptr->sig_bit.green = 8; +- info_ptr->sig_bit.blue = 8; + + if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian) + png_set_packswap(png_ptr); +@@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q + png_set_PLTE(png_ptr, info_ptr, palette, num_palette); + int* trans = new int[num_palette]; + int num_trans = 0; ++ png_colorp info_ptr_palette = NULL; ++ int tmp; ++ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp); + for (int i=0; i<num_palette; i++) { + QRgb rgb=image.color(i); +- info_ptr->palette[i].red = qRed(rgb); +- info_ptr->palette[i].green = qGreen(rgb); +- info_ptr->palette[i].blue = qBlue(rgb); ++ info_ptr_palette[i].red = qRed(rgb); ++ info_ptr_palette[i].green = qGreen(rgb); ++ info_ptr_palette[i].blue = qBlue(rgb); + if (image.hasAlphaBuffer()) { + trans[i] = rgb >> 24; + if (trans[i] < 255) { +@@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q + } + } + } ++ png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette); + if (num_trans) { + copy_trans = new png_byte[num_trans]; + for (int i=0; i<num_trans; i++) +@@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q + } + + if ( image.hasAlphaBuffer() ) { +- info_ptr->sig_bit.alpha = 8; ++ png_color_8p sig_bit; ++ png_get_sBIT(png_ptr, info_ptr, &sig_bit); ++ sig_bit->alpha = 8; ++ png_set_sBIT(png_ptr, info_ptr, sig_bit); + } + + // Swap ARGB to RGBA (normal PNG format) before saving on +@@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma + return -1; + } + +- if (setjmp((png_ptr)->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + return -1; +@@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma + + if ( !png_ptr ) return 0; + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + state = MovieStart; +@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn + consumer->frameDone(QPoint(offx,offy),r); + consumer->end(); + state = FrameStart; +- unused_data = (int)png->buffer_size; // Since libpng doesn't tell us ++ unused_data = png_process_data_pause(png, 0); + } + + #ifdef PNG_USER_CHUNKS_SUPPORTED diff --git a/staging/qt3/utf8-bug-qt3.diff b/staging/qt3/utf8-bug-qt3.diff new file mode 100644 index 000000000..43e84a99f --- /dev/null +++ b/staging/qt3/utf8-bug-qt3.diff @@ -0,0 +1,101 @@ +--- src/codecs/qutfcodec.cpp ++++ src/codecs/qutfcodec.cpp +@@ -154,6 +154,7 @@ + + class QUtf8Decoder : public QTextDecoder { + uint uc; ++ uint min_uc; + int need; + bool headerDone; + public: +@@ -167,8 +168,9 @@ + result.setLength( len ); // worst case + QChar *qch = (QChar *)result.unicode(); + uchar ch; ++ int error = -1; + for (int i=0; i<len; i++) { +- ch = *chars++; ++ ch = chars[i]; + if (need) { + if ( (ch&0xc0) == 0x80 ) { + uc = (uc << 6) | (ch & 0x3f); +@@ -182,6 +184,8 @@ + *qch++ = QChar(high); + *qch++ = QChar(low); + headerDone = TRUE; ++ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { ++ *qch++ = QChar::replacement; + } else { + if (headerDone || QChar(uc) != QChar::byteOrderMark) + *qch++ = uc; +@@ -190,6 +194,7 @@ + } + } else { + // error ++ i = error; + *qch++ = QChar::replacement; + need = 0; + } +@@ -200,12 +205,21 @@ + } else if ((ch & 0xe0) == 0xc0) { + uc = ch & 0x1f; + need = 1; ++ error = i; ++ min_uc = 0x80; + } else if ((ch & 0xf0) == 0xe0) { + uc = ch & 0x0f; + need = 2; ++ error = i; ++ min_uc = 0x800; + } else if ((ch&0xf8) == 0xf0) { + uc = ch & 0x07; + need = 3; ++ error = i; ++ min_uc = 0x10000; ++ } else { ++ // error ++ *qch++ = QChar::replacement; + } + } + } +--- src/tools/qstring.cpp ++++ src/tools/qstring.cpp +@@ -5805,6 +5805,7 @@ + result.setLength( len ); // worst case + QChar *qch = (QChar *)result.unicode(); + uint uc = 0; ++ uint min_uc = 0; + int need = 0; + int error = -1; + uchar ch; +@@ -5822,6 +5823,12 @@ + unsigned short low = uc%0x400 + 0xdc00; + *qch++ = QChar(high); + *qch++ = QChar(low); ++ } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { ++ // overlong seqence, UTF16 surrogate or BOM ++ i = error; ++ qch = addOne(qch, result); ++ *qch++ = QChar(0xdbff); ++ *qch++ = QChar(0xde00+((uchar)utf8[i])); + } else { + *qch++ = uc; + } +@@ -5844,14 +5851,17 @@ + uc = ch & 0x1f; + need = 1; + error = i; ++ min_uc = 0x80; + } else if ((ch & 0xf0) == 0xe0) { + uc = ch & 0x0f; + need = 2; + error = i; ++ min_uc = 0x800; + } else if ((ch&0xf8) == 0xf0) { + uc = ch & 0x07; + need = 3; + error = i; ++ min_uc = 0x10000; + } else { + // Error + qch = addOne(qch, result); diff --git a/staging/scim-anthy/PKGBUILD b/staging/scim-anthy/PKGBUILD new file mode 100644 index 000000000..f34466307 --- /dev/null +++ b/staging/scim-anthy/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 146909 2012-01-19 05:06:58Z bisson $ +# Contributor: damir <damir@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=scim-anthy +pkgver=1.2.7 +pkgrel=3 +_filecode=37309 +pkgdesc='Japanese input method module for SCIM' +arch=('i686' 'x86_64') +url='http://sourceforge.jp/projects/scim-imengine/' +license=('GPL') +depends=('scim' 'anthy') +options=('!libtool') +source=("http://osdn.dl.sourceforge.jp/scim-imengine/${_filecode}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('1429cf202f5cdcfc4733220acbe27dd9edb75db8') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/staging/scim-chewing/PKGBUILD b/staging/scim-chewing/PKGBUILD new file mode 100644 index 000000000..0d2c298af --- /dev/null +++ b/staging/scim-chewing/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 146907 2012-01-19 05:02:07Z bisson $ +# Contributor: damir <damir@archlinux.org> +# Contributor: whisky <archlinux.cle(at)gmail.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=scim-chewing +pkgver=0.3.4 +pkgrel=2 +pkgdesc='Traditional Chinese input method module for SCIM' +arch=('i686' 'x86_64') +url='http://chewing.csie.net/' +license=('GPL') +depends=('scim' 'libchewing') +makedepends=('intltool') +options=('!libtool') +source=("http://chewing.csie.net/download/scim/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('f6c8d16f19f17449ee169f1ca787350353e93b05') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/tumbler/PKGBUILD b/staging/tumbler/PKGBUILD index f08533acc..01b53bbc8 100644 --- a/staging/tumbler/PKGBUILD +++ b/staging/tumbler/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 146889 2012-01-19 03:45:36Z foutrelis $ +# $Id: PKGBUILD 146989 2012-01-19 22:34:27Z 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 +pkgrel=4 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') +depends=('dbus-glib' 'gdk-pixbuf2') +makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10' 'poppler-glib' + 'libgsf' 'libopenraw' 'freetype2') optdepends=('ffmpegthumbnailer: for video thumbnails' - 'gstreamer0.10: for video thumbnails') + 'gstreamer0.10: for video thumbnails' + 'poppler-glib: for PDF thumbnails' + 'libgsf: for ODF thumbnails' + 'libopenraw: for RAW thumbnails' + 'freetype2: for font thumbnails') options=('!libtool') source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2) sha256sums=('b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb') diff --git a/staging/vice/PKGBUILD b/staging/vice/PKGBUILD new file mode 100644 index 000000000..92a531c26 --- /dev/null +++ b/staging/vice/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 146938 2012-01-19 12:54:40Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=vice +pkgver=2.3 +pkgrel=5 +pkgdesc="A Versatile Commodore Emulator" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.viceteam.org/" +depends=('alsa-lib' 'gcc-libs' 'giflib' 'lame' 'libxrandr' + 'libxv' 'libjpeg' 'libpng' 'libxaw' 'libxxf86vm') +makedepends=('xorg-font-utils') +options=('!makeflags') +source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz" + 'vice-2.3-x11video.patch') +md5sums=('b48d137874daad50c087a0686cbdde34' + '088292ce9efe785edfb2b0c7c670785e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i ${srcdir}/vice-2.3-x11video.patch + ./configure --prefix=/usr \ + --with-alsa \ + --enable-fullscreen + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/staging/vice/vice-2.3-x11video.patch b/staging/vice/vice-2.3-x11video.patch new file mode 100644 index 000000000..d698638c6 --- /dev/null +++ b/staging/vice/vice-2.3-x11video.patch @@ -0,0 +1,11 @@ +--- a/src/arch/unix/x11/xaw/x11video.c 2011-01-18 23:59:00.000000000 +0100 ++++ b/src/arch/unix/x11/xaw/x11video.c 2011-02-27 18:40:52.000000000 +0100 +@@ -60,6 +60,8 @@ + #include <X11/Xutil.h> + #include <X11/Intrinsic.h> + #include <X11/cursorfont.h> ++#include <X11/Xmd.h> ++#include <X11/extensions/shmproto.h> + + #include <stdio.h> + #include <stdlib.h> diff --git a/staging/wv/PKGBUILD b/staging/wv/PKGBUILD new file mode 100644 index 000000000..03e85ef24 --- /dev/null +++ b/staging/wv/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 146944 2012-01-19 13:58:47Z giovanni $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> +pkgname=wv +pkgver=1.2.9 +pkgrel=1 +pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/wvware" +license=('GPL') +depends=('libgsf' 'libpng' 'sh') +makedepends=('pkg-config') +options=('!libtool') +source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +md5sums=('dbccf2e9f747e50c913b7e3d126b73f7') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/staging/wv/fix-soname.patch b/staging/wv/fix-soname.patch new file mode 100644 index 000000000..81dff86e6 --- /dev/null +++ b/staging/wv/fix-soname.patch @@ -0,0 +1,14 @@ +diff -ru wv-1.2.7.orig//configure wv-1.2.7//configure +--- wv-1.2.7.orig//configure 2009-09-21 12:22:46.000000000 +0200 ++++ wv-1.2.7//configure 2010-06-08 12:00:27.948857203 +0200 +@@ -2082,8 +2082,8 @@ + WV_MAJOR_VERSION=1 + WV_MINOR_VERSION=2 + WV_MICRO_VERSION=7 +-WV_INTERFACE_AGE=3 +-WV_BINARY_AGE=3 ++WV_INTERFACE_AGE=4 ++WV_BINARY_AGE=4 + WV_VERSION=$WV_MAJOR_VERSION.$WV_MINOR_VERSION.$WV_MICRO_VERSION + + diff --git a/staging/xine-ui/PKGBUILD b/staging/xine-ui/PKGBUILD new file mode 100644 index 000000000..ac3016952 --- /dev/null +++ b/staging/xine-ui/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 146917 2012-01-19 05:44:29Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=xine-ui +pkgver=0.99.6 +pkgrel=5 +pkgdesc="A free video player for Unix" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.xine-project.org" +depends=('xine-lib' 'curl' 'libpng' 'libxft' 'libxxf86vm' + 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme' + 'desktop-file-utils' 'lirc-utils') +makedepends=('libxt') +options=('!strip') +install=xine-ui.install +source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz + lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch + fix_lirc.diff xine-ui-xdg.diff xine-ui-0.99.6-libpng15.patch) +sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e' + 'b2df43ede3a9d1a34b80139704a4cbbc7295c584' + '8bbd39f61de7b6991385457a4944b8ea104da88b' + '2361df9ddad59c426b0f863414c6d527b463a38a' + '9c70c6543dae6815710b239b4638ffe3843bac86' + 'bc7ec3153e61553dee8c0b6e04d1ca7cfe4a6f14') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" + patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" + patch -p1 < "${srcdir}/fix_lirc.diff" + patch -p1 < "${srcdir}/xine-ui-xdg.diff" + patch -p1 < "${srcdir}/xine-ui-0.99.6-libpng15.patch" + sed -i '/\#include <curl\/types.h>/d' src/xitk/download.c + autoconf + ./configure --prefix=/usr --mandir=/usr/share/man \ + --with-x --enable-lirc --without-aalib --enable-debug + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" desktopdir=/usr/share/applications install +} diff --git a/staging/xine-ui/fix_lirc.diff b/staging/xine-ui/fix_lirc.diff new file mode 100644 index 000000000..93890cb5c --- /dev/null +++ b/staging/xine-ui/fix_lirc.diff @@ -0,0 +1,13 @@ +diff --git a/m4/_xine.m4 b/m4/_xine.m4 +--- a/m4/_xine.m4 ++++ b/m4/_xine.m4 +@@ -46,7 +46,8 @@ AC_DEFUN([AC_CHECK_LIRC], + fi + for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do + AC_CHECK_FILE(["$llirc/liblirc_client.so"], +- [LIRC_LIBS="$llirc/liblirc_client.so"] ++ [LIRC_LIBS="$llirc/liblirc_client.so" ++ found_lirc=yes] + AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]), + AC_CHECK_FILE(["$llirc/liblirc_client.a"], + [LIRC_LIBS="$llirc/liblirc_client.a" diff --git a/staging/xine-ui/lirc-check-a89347673097.patch b/staging/xine-ui/lirc-check-a89347673097.patch new file mode 100644 index 000000000..c1c8d2614 --- /dev/null +++ b/staging/xine-ui/lirc-check-a89347673097.patch @@ -0,0 +1,64 @@ + +# HG changeset patch +# User Darren Salt <linux@youmustbejoking.demon.co.uk> +# Date 1268754560 0 +# Node ID a89347673097053d89675e991ab403cda04d94cd +# Parent ed3079d668ed5291d1daf7096d6b42c90ee06e11 +Resync LIRC check with gxine; no longer fails if liblircclient0.pc is missing. + +--- a/m4/_xine.m4 Sun Mar 14 18:04:46 2010 +0000 ++++ b/m4/_xine.m4 Tue Mar 16 15:49:20 2010 +0000 +@@ -25,14 +25,14 @@ + dnl + AC_DEFUN([AC_CHECK_LIRC], + [AC_ARG_ENABLE(lirc, +- [ --disable-lirc Turn off LIRC support.], +- [], enable_lirc=yes) ++ [AS_HELP_STRING([--disable-lirc], [turn off LIRC support])], ++ [given=Y], [given=N; enable_lirc=yes]) + + found_lirc=no + if test x"$enable_lirc" = xyes; then + have_lirc=yes +- PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], []) +- if test "$LIRC_CFLAGS" != ''; then ++ PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [:]) ++ if test "$found_lirc" = yes; then + LIRC_INCLUDE="$LIRC_CFLAGS" + else + AC_REQUIRE_CPP +@@ -42,15 +42,20 @@ + + if test x"$LIRC_PREFIX" != "x"; then + lirc_libprefix="$LIRC_PREFIX/lib" +- LIRC_INCLUDE="-I$LIRC_PREFIX/include" ++ LIRC_INCLUDE="-I$LIRC_PREFIX/include" + fi + for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do +- AC_CHECK_FILE(["$llirc/liblirc_client.a"], +- [LIRC_LIBS="$llirc/liblirc_client.a" +- found_lirc=yes],,) ++ AC_CHECK_FILE(["$llirc/liblirc_client.so"], ++ [LIRC_LIBS="$llirc/liblirc_client.so"] ++ AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]), ++ AC_CHECK_FILE(["$llirc/liblirc_client.a"], ++ [LIRC_LIBS="$llirc/liblirc_client.a" ++ found_lirc=yes],,) ++ ) + done + else +- AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]); ++ test $given = Y && AC_MSG_ERROR([LIRC client support requested but not available]) ++ AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]) + fi + fi + fi +@@ -59,7 +64,6 @@ + fi + AC_SUBST(LIRC_LIBS) + AC_SUBST(LIRC_INCLUDE) +- AM_CONDITIONAL([HAVE_LIRC], [test "x$have_lirc" = "xyes"]) + ]) + + dnl AC_C_ATTRIBUTE_ALIGNED + diff --git a/staging/xine-ui/lirc-makefile-a68dd15ff7ae.patch b/staging/xine-ui/lirc-makefile-a68dd15ff7ae.patch new file mode 100644 index 000000000..daad4f03a --- /dev/null +++ b/staging/xine-ui/lirc-makefile-a68dd15ff7ae.patch @@ -0,0 +1,19 @@ + +# HG changeset patch +# User Darren Salt <linux@youmustbejoking.demon.co.uk> +# Date 1268758696 0 +# Node ID a68dd15ff7ae4be65c2ace25ef66966d7c272514 +# Parent 882c464d4a650d09da37ade366face74452c1897 +Restore definition of HAVE_LIRC for use in makefiles. + +--- a/m4/_xine.m4 Mon Mar 15 12:03:01 2010 -0700 ++++ b/m4/_xine.m4 Tue Mar 16 16:58:16 2010 +0000 +@@ -62,6 +62,7 @@ + if test "$found_lirc" = yes; then + AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]) + fi ++ AM_CONDITIONAL([HAVE_LIRC], [test "$found_lirc" = yes]) + AC_SUBST(LIRC_LIBS) + AC_SUBST(LIRC_INCLUDE) + ]) + diff --git a/staging/xine-ui/xine-ui-0.99.6-libpng15.patch b/staging/xine-ui/xine-ui-0.99.6-libpng15.patch new file mode 100644 index 000000000..6a5fb5522 --- /dev/null +++ b/staging/xine-ui/xine-ui-0.99.6-libpng15.patch @@ -0,0 +1,13 @@ +Index: xine-ui-0.99.6/src/xitk/Imlib-light/load.c +=================================================================== +--- xine-ui-0.99.6.orig/src/xitk/Imlib-light/load.c ++++ xine-ui-0.99.6/src/xitk/Imlib-light/load.c +@@ -61,7 +61,7 @@ unsigned char *_LoadPNG(ImlibData * id, + png_destroy_read_struct(&png_ptr, NULL, 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/xine-ui/xine-ui-xdg.diff b/staging/xine-ui/xine-ui-xdg.diff new file mode 100644 index 000000000..959d674b2 --- /dev/null +++ b/staging/xine-ui/xine-ui-xdg.diff @@ -0,0 +1,206 @@ +--- xine-ui-0.99.6.orig/src/xitk/common.h ++++ xine-ui-0.99.6/src/xitk/common.h +@@ -331,6 +331,5 @@ typedef struct { + int use_root_window; + + int ssaver_enabled; +- int ssaver_timeout; + + int skip_by_chapter; +--- xine-ui-0.99.6.orig/src/xitk/main.c ++++ xine-ui-0.99.6/src/xitk/main.c +@@ -1383,6 +1383,8 @@ int main(int argc, char *argv[]) { + if (sigprocmask (SIG_BLOCK, &vo_mask, NULL)) + fprintf (stderr, "sigprocmask() failed.\n"); + ++ signal(SIGCHLD, SIG_IGN); ++ + gGui = (gGui_t *) calloc(1, sizeof(gGui_t)); + + gGui->stream = NULL; +--- xine-ui-0.99.6.orig/src/xitk/panel.c ++++ xine-ui-0.99.6/src/xitk/panel.c +@@ -356,7 +356,6 @@ void panel_update_runtime_display(void) + * Update slider thread. + */ + static void *slider_loop(void *dummy) { +- int screensaver_timer = 0; + int status, speed; + int pos, secs; + int i = 0; +@@ -441,20 +440,7 @@ static void *slider_loop(void *dummy) { + else + video_window_set_mrl((char *)gGui->mmk.mrl); + +- if(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)) { +- +- if(gGui->ssaver_timeout) { +- +- if(!(i % 2)) +- screensaver_timer++; +- +- if(screensaver_timer >= gGui->ssaver_timeout) { +- screensaver_timer = 0; +- video_window_reset_ssaver(); +- +- } +- } +- } ++ video_window_suspend_ssaver(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)); + + if(gGui->logo_mode == 0) { + +@@ -494,6 +480,8 @@ static void *slider_loop(void *dummy) { + stream_infos_update_infos(); + + } ++ } else { ++ video_window_suspend_ssaver(0); + } + } + +--- xine-ui-0.99.6.orig/src/xitk/videowin.c ++++ xine-ui-0.99.6/src/xitk/videowin.c +@@ -1087,6 +1087,9 @@ static void video_window_adapt_size (voi + + /* The old window should be destroyed now */ + if(old_video_window != None) { ++ /* Screensaver control is tied to our window id */ ++ video_window_suspend_ssaver(0); ++ + XDestroyWindow(gGui->video_display, old_video_window); + + if(gGui->cursor_grabbed) +@@ -2261,69 +2264,34 @@ static void video_window_handle_event (X + + } + +-void video_window_reset_ssaver(void) { ++void video_window_suspend_ssaver(int do_suspend) { ++ static int was_suspended; + +- if(gGui->ssaver_enabled && (xitk_get_last_keypressed_time() >= (long int) gGui->ssaver_timeout)) { ++ do_suspend = do_suspend && gGui->ssaver_enabled; + +-#ifdef HAVE_XTESTEXTENSION +- if(gVw.have_xtest == True) { +- +- gVw.fake_key_cur++; +- +- if(gVw.fake_key_cur >= 2) +- gVw.fake_key_cur = 0; +- +- XLockDisplay(gGui->video_display); +- XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], True, CurrentTime); +- XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], False, CurrentTime); +- XSync(gGui->video_display, False); +- XUnlockDisplay(gGui->video_display); ++ if(was_suspended != do_suspend) { ++ if(fork() == 0) { ++ char window_id[30]; ++ char *args[] = { "xdg-screensaver", NULL, window_id, NULL }; ++ int fd; ++ ++ for(fd = 3; fd < 256; fd++) ++ close(fd); ++ ++ args[1] = do_suspend ? "suspend" : "resume"; ++ sprintf(window_id, "%lu", (unsigned long)gGui->video_window); ++ execvp(args[0], args); ++ _exit(0); + } +- else +-#endif +- { +- /* Reset the gnome screensaver. Look up the command in PATH only once to save time, */ +- /* assuming its location and permission will not change during run time of xine-ui. */ +- { +- static char *const gssaver_args[] = { "gnome-screensaver-command", "--poke", NULL }; +- static char *gssaver_path = NULL; +- +- if(!gssaver_path) { +- char *path = getenv("PATH"); +- +- if(!path) +- path = "/usr/local/bin:/usr/bin"; +- do { +- char *p, *pbuf; +- int plen; +- +- for(p = path; *path && *path != ':'; path++) +- ; +- if(p == path) +- plen = 1, p = "."; +- else +- plen = path - p; +- asprintf(&pbuf, "%.*s/%s", plen, p, gssaver_args[0]); +- if ( access(pbuf, X_OK) ) { +- free(pbuf); +- gssaver_path = ""; +- } else +- gssaver_path = pbuf; +- } while(!gssaver_path[0] && *path++); +- } +- if(gssaver_path[0] && (fork() == 0)) { +- execv(gssaver_path, gssaver_args); +- exit(0); +- } +- } + +- XLockDisplay(gGui->video_display); +- XResetScreenSaver(gGui->video_display); +- XUnlockDisplay(gGui->video_display); +- } ++ was_suspended = do_suspend; + } + } + ++void video_window_reset_ssaver(void) { ++ video_window_suspend_ssaver(1); ++} ++ + void video_window_get_frame_size(int *w, int *h) { + if(w) + *w = gVw.frame_width; +--- xine-ui-0.99.6.orig/src/xitk/videowin.h ++++ xine-ui-0.99.6/src/xitk/videowin.h +@@ -81,6 +81,7 @@ void video_window_get_mag (float *xmag, + void video_window_update_logo(void); + void video_window_change_skins(int); + ++void video_window_suspend_ssaver(int do_suspend); + void video_window_reset_ssaver(void); + + void video_window_get_frame_size(int *w, int *h); +--- xine-ui-0.99.6.orig/src/xitk/event.c ++++ xine-ui-0.99.6/src/xitk/event.c +@@ -135,9 +135,6 @@ static void skip_by_chapter_cb(void *dat + gGui->skip_by_chapter = cfg->num_value; + panel_update_nextprev_tips(); + } +-static void ssaver_timeout_cb(void *data, xine_cfg_entry_t *cfg) { +- gGui->ssaver_timeout = cfg->num_value; +-} + + static void visual_anim_cb(void *data, xine_cfg_entry_t *cfg) { + +@@ -1614,14 +1611,6 @@ void gui_init (int nfiles, char *filenam + snapshot_loc_cb, + CONFIG_NO_DATA); + +- gGui->ssaver_timeout = +- xine_config_register_num (__xineui_global_xine_instance, "gui.screensaver_timeout", 10, +- _("Screensaver reset interval (s)"), +- _("Time, in seconds, between two faked events to keep a screensaver quiet, 0 to disable."), +- CONFIG_LEVEL_ADV, +- ssaver_timeout_cb, +- CONFIG_NO_DATA); +- + gGui->skip_by_chapter = + xine_config_register_bool (__xineui_global_xine_instance, "gui.skip_by_chapter", 1, + _("Chapter hopping"), + + + + + diff --git a/staging/xine-ui/xine-ui.install b/staging/xine-ui/xine-ui.install new file mode 100644 index 000000000..3b3aff7d9 --- /dev/null +++ b/staging/xine-ui/xine-ui.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/zvbi/PKGBUILD b/staging/zvbi/PKGBUILD new file mode 100644 index 000000000..442df8b76 --- /dev/null +++ b/staging/zvbi/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 146940 2012-01-19 13:11:45Z giovanni $ +# Maintainer: +# Contributor: Alexander Baldeck <alexander@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> + +pkgname=zvbi +pkgver=0.2.33 +pkgrel=4 +pkgdesc="VBI capture and decoding library" +url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome" +arch=('i686' 'x86_64') +depends=('libpng' 'libx11') +license=('GPL') +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2" + 'fix-includes.patch' + 'zvbi-0.2.33-libpng15.patch') +md5sums=('1741a6045c3eedfb611d645f2da69ac8' + '38766bc59e1571133d0399f0102da653' + '4434de7addc438be8c5a33274146bd11') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/fix-includes.patch" + patch -Np0 -i "${srcdir}/zvbi-0.2.33-libpng15.patch" + + ./configure --prefix=/usr \ + --disable-static \ + --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/staging/zvbi/fix-includes.patch b/staging/zvbi/fix-includes.patch new file mode 100644 index 000000000..28252649e --- /dev/null +++ b/staging/zvbi/fix-includes.patch @@ -0,0 +1,36 @@ +Add proper #includes so that we do not get undef errors to S_ISCHR +during linking. + +Signed-off-by: Alex Chiang <achiang@canonical.com> +--- +--- zvbi-0.2.33.orig/src/io-dvb.c ++++ zvbi-0.2.33/src/io-dvb.c +@@ -29,6 +29,8 @@ + #include <errno.h> + #include <sys/select.h> + #include <sys/ioctl.h> ++#include <sys/types.h> ++#include <sys/stat.h> + + #ifndef HAVE_S64_U64 + /* Linux 2.6.x asm/types.h defines __s64 and __u64 only +--- zvbi-0.2.33.orig/src/io-v4l.c ++++ zvbi-0.2.33/src/io-v4l.c +@@ -42,6 +42,7 @@ static const char rcsid [] = + #include <assert.h> + #include <sys/time.h> /* timeval */ + #include <sys/types.h> /* fd_set, uid_t */ ++#include <sys/stat.h> /* S_ISCHR */ + #include <sys/ioctl.h> /* for (_)videodev.h */ + #include <pthread.h> + +--- zvbi-0.2.33.orig/contrib/ntsc-cc.c ++++ zvbi-0.2.33/contrib/ntsc-cc.c +@@ -34,6 +34,7 @@ + #include <locale.h> + #include <sys/ioctl.h> + #include <sys/types.h> ++#include <sys/stat.h> + #include <sys/time.h> + #ifdef HAVE_GETOPT_LONG + # include <getopt.h> diff --git a/staging/zvbi/zvbi-0.2.33-libpng15.patch b/staging/zvbi/zvbi-0.2.33-libpng15.patch new file mode 100644 index 000000000..262677376 --- /dev/null +++ b/staging/zvbi/zvbi-0.2.33-libpng15.patch @@ -0,0 +1,21 @@ +Index: src/exp-gfx.c +=================================================================== +RCS file: /cvsroot/zapping/vbi/src/exp-gfx.c,v +retrieving revision 1.16 +diff -u -B -r1.16 exp-gfx.c +--- src/exp-gfx.c 24 Feb 2008 14:17:47 -0000 1.16 ++++ src/exp-gfx.c 15 Feb 2011 20:03:58 -0000 +@@ -1672,11 +1672,11 @@ + char title[80]; + unsigned int i; + +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_ptr))) + return FALSE; + + png_set_write_fn (png_ptr, +- (voidp) gfx, ++ (png_voidp) gfx, + write_data, + flush_data); + diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD new file mode 100644 index 000000000..d7e723b01 --- /dev/null +++ b/testing/nilfs-utils/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 146948 2012-01-19 15:15:14Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + +pkgname=nilfs-utils +pkgver=2.1.1 +pkgrel=1 +pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" +arch=('i686' 'x86_64') +url="http://www.nilfs.org/" +license=('GPL2' 'LGPL2.1') +backup=('etc/nilfs_cleanerd.conf') +depends=('util-linux') +options=(!libtool) +source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) +md5sums=('caa7d8b7121311bd978120e2f0c45d81') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --libdir=/lib --enable-libmount + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install LDCONFIG=/bin/true +} |
