diff options
| author | root <root@rshg054.dnsready.net> | 2012-02-06 23:14:50 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-02-06 23:14:50 +0000 |
| commit | 1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 (patch) | |
| tree | 8d7ccc2dc9d08a4c3cde26aa01c887e9a0fc2fa1 | |
| parent | bdb5b3e66f6afa586ea147f69af5e4ba388f7615 (diff) | |
Mon Feb 6 23:14:50 UTC 2012
483 files changed, 9682 insertions, 2243 deletions
diff --git a/community-staging/mtpaint/PKGBUILD b/community-staging/mtpaint/PKGBUILD new file mode 100644 index 000000000..7f984ae4b --- /dev/null +++ b/community-staging/mtpaint/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 63821 2012-02-05 19:42:59Z 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/setconf/PKGBUILD b/community-staging/setconf/PKGBUILD new file mode 100644 index 000000000..26b898bf9 --- /dev/null +++ b/community-staging/setconf/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 63823 2012-02-05 20:27:23Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +pkgname=setconf +pkgver=0.3.2 +pkgrel=3 +pkgdesc="Utility to easily change settings in Makefiles and configuration files" +arch=('x86_64' 'i686') +url="http://setconf.roboticoverlords.org/" +license=('GPL') +depends=('pcre' 'gc') +makedepends=('shedskin>=0.9.1') +source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2") +sha256sums=('8b18e11da7adf78f2e21c39cfa949b178fa1b2f85e691b85be123023b7303f03') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + shedskin "$pkgname.py" + make CPPFLAGS="-march=native -fomit-frame-pointer" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" + install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/amsn/PKGBUILD b/community/amsn/PKGBUILD index c96ccf33c..0faa75753 100644 --- a/community/amsn/PKGBUILD +++ b/community/amsn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 34944 2010-12-13 21:56:56Z jlichtblau $ +# $Id: PKGBUILD 63498 2012-02-05 11:51:24Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <j@codemac.net> pkgname=amsn pkgver=0.98.4 -pkgrel=1 +pkgrel=2 pkgdesc="MSN client written in Tcl/Tk" arch=('i686' 'x86_64') url="http://amsn.sourceforge.net/" @@ -14,13 +14,20 @@ depends=('tk' 'tls') makedepends=('libjpeg' 'libpng' 'farsight2' 'libv4l') optdepends=('farsight2: for video conferencing') changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2) -md5sums=('96fd20e8709ced4443432d125a5e0a5a') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2 amsn-0.98.4-libpng15.patch amsn-0.98.4-v4l2.patch) +md5sums=('96fd20e8709ced4443432d125a5e0a5a' + '182eef321e78632499c24b3009c085ad' + '02d4ec8faed521387d6e44481f43c91a') build() { cd ${srcdir}/${pkgname}-${pkgver} -# python2 fix + # patch for libpng15 + patch -Np0 -i $srcdir/amsn-0.98.4-libpng15.patch + + # patch for linux kernel header changes + patch -Np0 -i $srcdir/amsn-0.98.4-v4l2.patch + # python2 fix for file in lang/missing.py plugins/music/infosongbird; do sed -i 's_/usr/bin/env python_/usr/bin/env python2_' ${file} done diff --git a/community/amsn/amsn-0.98.4-libpng15.patch b/community/amsn/amsn-0.98.4-libpng15.patch new file mode 100644 index 000000000..24f875d02 --- /dev/null +++ b/community/amsn/amsn-0.98.4-libpng15.patch @@ -0,0 +1,471 @@ +--- utils/TkCximage/src/CxImage/ximapng.cpp ++++ utils/TkCximage/src/CxImage/ximapng.cpp +@@ -15,7 +15,7 @@ + void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message) + { + strcpy(info.szLastError,message); +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + //////////////////////////////////////////////////////////////////////////////// + #if CXIMAGE_SUPPORT_DECODE +@@ -62,7 +62,7 @@ + /* Set error handling if you are using the setjmp/longjmp method (this is + * 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 */ + delete [] row_pointers; + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); +@@ -77,15 +77,15 @@ + png_read_info(png_ptr, info_ptr); + + if (info.nEscape == -1){ +- head.biWidth = info_ptr->width; +- head.biHeight= info_ptr->height; ++ head.biWidth = png_get_image_width(png_ptr, info_ptr); ++ head.biHeight= png_get_image_height(png_ptr, info_ptr); + info.dwType = CXIMAGE_FORMAT_PNG; +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + /* calculate new number of channels */ + int channels=0; +- switch(info_ptr->color_type){ ++ switch(png_get_color_type(png_ptr, info_ptr)){ + case PNG_COLOR_TYPE_GRAY: + case PNG_COLOR_TYPE_PALETTE: + channels = 1; +@@ -101,71 +101,76 @@ + break; + default: + strcpy(info.szLastError,"unknown PNG color type"); +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + //find the right pixel depth used for cximage +- int pixel_depth = info_ptr->pixel_depth; ++#if MIGHT_BE_BUGGY ++ int pixel_depth = png_get_pixel_depth(png_ptr, info_ptr); + if (channels == 1 && pixel_depth>8) pixel_depth=8; ++#endif ++ int pixel_depth; ++ if (channels == 1) pixel_depth=8; + if (channels == 2) pixel_depth=8; + if (channels >= 3) pixel_depth=24; + +- if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){ +- longjmp(png_ptr->jmpbuf, 1); ++ if (!Create(png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr), pixel_depth, CXIMAGE_FORMAT_PNG)){ ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + /* get metrics */ +- switch (info_ptr->phys_unit_type) ++ png_uint_32 res_x, res_y; ++ int unit_type; ++ png_get_pHYs_dpi(png_ptr, info_ptr, &res_x, &res_y, &unit_type); ++ switch (unit_type) + { + case PNG_RESOLUTION_UNKNOWN: +- SetXDPI(info_ptr->x_pixels_per_unit); +- SetYDPI(info_ptr->y_pixels_per_unit); ++ SetXDPI(res_x); ++ SetYDPI(res_y); + break; + case PNG_RESOLUTION_METER: +- SetXDPI((long)floor(info_ptr->x_pixels_per_unit * 254.0 / 10000.0 + 0.5)); +- SetYDPI((long)floor(info_ptr->y_pixels_per_unit * 254.0 / 10000.0 + 0.5)); ++ SetXDPI((long)floor(res_x * 254.0 / 10000.0 + 0.5)); ++ SetYDPI((long)floor(res_y * 254.0 / 10000.0 + 0.5)); + break; + } + +- if (info_ptr->num_palette>0){ +- SetPalette((rgb_color*)info_ptr->palette,info_ptr->num_palette); +- SetClrImportant(info_ptr->num_palette); +- } else if (info_ptr->bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs ++ png_colorp palette; ++ int num_palette; ++ png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette); ++ if (num_palette>0){ ++ SetPalette((rgb_color*)palette,num_palette); ++ SetClrImportant(num_palette); ++ } else if (png_get_bit_depth(png_ptr, info_ptr) ==2) { //<DP> needed for 2 bpp grayscale PNGs + SetPaletteColor(0,0,0,0); + SetPaletteColor(1,85,85,85); + SetPaletteColor(2,170,170,170); + SetPaletteColor(3,255,255,255); + } else SetGrayPalette(); //<DP> needed for grayscale PNGs + +- int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3; ++ int nshift = max(0,(png_get_bit_depth(png_ptr, info_ptr)>>3)-1)<<3; + +- if (info_ptr->num_trans!=0){ //palette transparency +- if (info_ptr->num_trans==1){ +- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){ +-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 +- info.nBkgndIndex = info_ptr->trans_color.index; +-#else +- info.nBkgndIndex = info_ptr->trans_values.index; +-#endif ++png_uint_32 png_get_tRNS (png_const_structp png_ptr, png_infop ++info_ptr, png_bytep *trans_alpha, int *num_trans, png_color_16p ++*trans_color); ++ png_bytep trans_alpha; ++ int num_trans; ++ png_color_16p trans_color; ++ png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color); ++ if (num_trans!=0){ //palette transparency ++ if (num_trans==1){ ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE){ ++ info.nBkgndIndex = trans_color->index; + } else{ +-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 +- info.nBkgndIndex = info_ptr->trans_color.gray>>nshift; +-#else +- info.nBkgndIndex = info_ptr->trans_values.gray>>nshift; +-#endif ++ info.nBkgndIndex = trans_color->gray>>nshift; + } + } +- if (info_ptr->num_trans>1){ ++ if (num_trans>1){ + RGBQUAD* pal=GetPalette(); + if (pal){ + DWORD ip; +- for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++) +-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 +- pal[ip].rgbReserved=info_ptr->trans_alpha[ip]; +-#else +- pal[ip].rgbReserved=info_ptr->trans[ip]; +-#endif +- for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){ ++ for (ip=0;ip<min(head.biClrUsed,(unsigned long)num_trans);ip++) ++ pal[ip].rgbReserved=trans_alpha[ip]; ++ for (ip=num_trans;ip<head.biClrUsed;ip++){ + pal[ip].rgbReserved=255; + } + info.bAlphaPaletteEnabled=true; +@@ -178,15 +183,9 @@ + int num_trans; + png_color_16 *image_background; + if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){ +-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 +- info.nBkgndColor.rgbRed = (BYTE)(info_ptr->trans_color.red>>nshift); +- info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift); +- info.nBkgndColor.rgbBlue = (BYTE)(info_ptr->trans_color.blue>>nshift); +-#else +- info.nBkgndColor.rgbRed = (BYTE)(info_ptr->trans_values.red>>nshift); +- info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift); +- info.nBkgndColor.rgbBlue = (BYTE)(info_ptr->trans_values.blue>>nshift); +-#endif ++ info.nBkgndColor.rgbRed = (BYTE)(trans_color->red>>nshift); ++ info.nBkgndColor.rgbGreen = (BYTE)(trans_color->green>>nshift); ++ info.nBkgndColor.rgbBlue = (BYTE)(trans_color->blue>>nshift); + info.nBkgndColor.rgbReserved = 0; + info.nBkgndIndex = 0; + } +@@ -202,15 +201,15 @@ + } + + // <vho> - flip the RGB pixels to BGR (or RGBA to BGRA) +- if (info_ptr->color_type & PNG_COLOR_MASK_COLOR){ ++ if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR){ + png_set_bgr(png_ptr); + } + + // <vho> - handle cancel +- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1); ++ if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1); + + // row_bytes is the width x number of channels x (bit-depth / 8) +- row_pointers = new BYTE[info_ptr->rowbytes + 8]; ++ row_pointers = new BYTE[png_get_rowbytes(png_ptr, info_ptr) + 8]; + + // turn on interlace handling + int number_passes = png_set_interlace_handling(png_ptr); +@@ -221,8 +220,10 @@ + SetCodecOption(0); + } + +- int chan_offset = info_ptr->bit_depth >> 3; +- int pixel_offset = info_ptr->pixel_depth >> 3; ++ int bit_depth = png_get_bit_depth(png_ptr, info_ptr); ++ int chan_offset = bit_depth >> 3; ++ //int pixel_offset = info_ptr->pixel_depth >> 3; ++ int pixel_offset = (bit_depth * channels) >> 3; + + for (int pass=0; pass < number_passes; pass++) { + iter.Upset(); +@@ -230,7 +231,7 @@ + do { + + // <vho> - handle cancel +- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1); ++ if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1); + + #if CXIMAGE_SUPPORT_ALPHA // <vho> + if (AlphaIsValid()) { +@@ -241,7 +242,7 @@ + BYTE* prow= iter.GetRow(ay); + + //recover data from previous scan +- if (info_ptr->interlace_type && pass>0 && pass!=7){ ++ if (png_get_interlace_type(png_ptr, info_ptr) && pass>0 && pass!=7){ + for(ax=0;ax<head.biWidth;ax++){ + long px = ax * pixel_offset; + if (channels == 2){ +@@ -278,10 +279,10 @@ + #endif // CXIMAGE_SUPPORT_ALPHA // vho + { + //recover data from previous scan +- if (info_ptr->interlace_type && pass>0){ +- iter.GetRow(row_pointers, info_ptr->rowbytes); ++ if (png_get_interlace_type(png_ptr, info_ptr) && pass>0){ ++ iter.GetRow(row_pointers, png_get_rowbytes(png_ptr, info_ptr)); + //re-expand buffer for images with bit depth > 8 +- if (info_ptr->bit_depth > 8){ ++ if (png_get_bit_depth(png_ptr, info_ptr) > 8){ + for(long ax=(head.biWidth*channels-1);ax>=0;ax--) + row_pointers[ax*chan_offset] = row_pointers[ax]; + } +@@ -291,15 +292,15 @@ + png_read_row(png_ptr, row_pointers, NULL); + + //shrink 16 bit depth images down to 8 bits +- if (info_ptr->bit_depth > 8){ ++ if (png_get_bit_depth(png_ptr, info_ptr) > 8){ + for(long ax=0;ax<(head.biWidth*channels);ax++) + row_pointers[ax] = row_pointers[ax*chan_offset]; + } + + //copy the pixels +- iter.SetRow(row_pointers, info_ptr->rowbytes); ++ iter.SetRow(row_pointers, png_get_rowbytes(png_ptr, info_ptr)); + //<DP> expand 2 bpp images only in the last pass +- if (info_ptr->bit_depth==2 && pass==(number_passes-1)) ++ if (png_get_bit_depth(png_ptr, info_ptr)==2 && pass==(number_passes-1)) + expand2to4bpp(iter.GetRow()); + + //go on +@@ -340,6 +341,11 @@ + BYTE trans[256]; //for transparency (don't move) + png_struct *png_ptr; + png_info *info_ptr; ++ png_uint_32 width, height; ++ png_byte bit_depth; ++ png_byte color_type; ++ png_byte interlace_type; ++ BYTE channels; + + cx_try + { +@@ -362,9 +368,8 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)){ ++ if (setjmp(png_jmpbuf(png_ptr))){ + /* If we get here, we had a problem reading the file */ +- if (info_ptr->palette) free(info_ptr->palette); + png_destroy_write_struct(&png_ptr, (png_infopp)&info_ptr); + cx_throw("Error saving PNG file"); + } +@@ -376,20 +381,18 @@ + png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data); + + /* set the file information here */ +- info_ptr->width = GetWidth(); +- info_ptr->height = GetHeight(); +- info_ptr->pixel_depth = (BYTE)GetBpp(); +- info_ptr->channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1; +- info_ptr->bit_depth = (BYTE)(GetBpp()/info_ptr->channels); +- info_ptr->compression_type = info_ptr->filter_type = 0; +- info_ptr->valid = 0; ++ width = GetWidth(); ++ height = GetHeight(); ++ //pixel_depth = (BYTE)GetBpp(); ++ channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1; ++ bit_depth = (BYTE)(GetBpp()/channels); + + switch(GetCodecOption(CXIMAGE_FORMAT_PNG)){ + case 1: +- info_ptr->interlace_type = PNG_INTERLACE_ADAM7; ++ interlace_type = PNG_INTERLACE_ADAM7; + break; + default: +- info_ptr->interlace_type = PNG_INTERLACE_NONE; ++ interlace_type = PNG_INTERLACE_NONE; + } + + /* set compression level */ +@@ -399,19 +402,19 @@ + + if (GetNumColors()){ + if (bGrayScale){ +- info_ptr->color_type = PNG_COLOR_TYPE_GRAY; ++ color_type = PNG_COLOR_TYPE_GRAY; + } else { +- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; ++ color_type = PNG_COLOR_TYPE_PALETTE; + } + } else { +- info_ptr->color_type = PNG_COLOR_TYPE_RGB; ++ color_type = PNG_COLOR_TYPE_RGB; + } + #if CXIMAGE_SUPPORT_ALPHA + if (AlphaIsValid()){ +- info_ptr->color_type |= PNG_COLOR_MASK_ALPHA; +- info_ptr->channels++; +- info_ptr->bit_depth = 8; +- info_ptr->pixel_depth += 8; ++ color_type |= PNG_COLOR_MASK_ALPHA; ++ channels++; ++ bit_depth = 8; ++ //pixel_depth += 8; + } + #endif + +@@ -428,29 +431,21 @@ + /* set metrics */ + png_set_pHYs(png_ptr, info_ptr, head.biXPelsPerMeter, head.biYPelsPerMeter, PNG_RESOLUTION_METER); + +- png_set_IHDR(png_ptr, info_ptr, info_ptr->width, info_ptr->height, info_ptr->bit_depth, +- info_ptr->color_type, info_ptr->interlace_type, ++ png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, ++ color_type, interlace_type, + PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); + + //<DP> simple transparency + if (info.nBkgndIndex >= 0){ +- info_ptr->num_trans = 1; +- info_ptr->valid |= PNG_INFO_tRNS; +-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 +- info_ptr->trans_alpha = trans; +- info_ptr->trans_color.index = (BYTE)info.nBkgndIndex; +- info_ptr->trans_color.red = tc.rgbRed; +- info_ptr->trans_color.green = tc.rgbGreen; +- info_ptr->trans_color.blue = tc.rgbBlue; +- info_ptr->trans_color.gray = info_ptr->trans_color.index; +-#else +- info_ptr->trans = trans; +- info_ptr->trans_values.index = (BYTE)info.nBkgndIndex; +- info_ptr->trans_values.red = tc.rgbRed; +- info_ptr->trans_values.green = tc.rgbGreen; +- info_ptr->trans_values.blue = tc.rgbBlue; +- info_ptr->trans_values.gray = info_ptr->trans_values.index; +-#endif ++ png_color_16 trans_color; ++ ++ trans_color.index = (BYTE)info.nBkgndIndex; ++ trans_color.red = tc.rgbRed; ++ trans_color.green = tc.rgbGreen; ++ trans_color.blue = tc.rgbBlue; ++ trans_color.gray = (BYTE)info.nBkgndIndex; ++ ++ png_set_tRNS(png_ptr, info_ptr, trans, 1, &trans_color); + + // the transparency indexes start from 0 for non grayscale palette + if (!bGrayScale && head.biClrUsed && info.nBkgndIndex) +@@ -459,30 +454,27 @@ + + /* set the palette if there is one */ + if (GetPalette()){ +- if (!bGrayScale){ +- info_ptr->valid |= PNG_INFO_PLTE; +- } +- + int nc = GetClrImportant(); + if (nc==0) nc = GetNumColors(); + + if (info.bAlphaPaletteEnabled){ + for(WORD ip=0; ip<nc;ip++) + trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved; +- info_ptr->num_trans = (WORD)nc; +- info_ptr->valid |= PNG_INFO_tRNS; +-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 +- info_ptr->trans_alpha = trans; +-#else +- info_ptr->trans = trans; +-#endif ++ png_set_tRNS(png_ptr, info_ptr, trans, (WORD)nc, NULL); + } + + // copy the palette colors +- info_ptr->palette = new png_color[nc]; +- info_ptr->num_palette = (png_uint_16) nc; +- for (int i=0; i<nc; i++) +- GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue); ++ if (!bGrayScale) { ++ png_color *palette; ++ ++ palette = (png_color *)png_malloc(png_ptr, nc*sizeof(palette[0])); ++ for (int i=0; i<nc; i++) ++ GetPaletteColor(i, &palette[i].red, &palette[i].green, &palette[i].blue); ++ png_set_PLTE(png_ptr, info_ptr, palette, nc); ++ png_data_freer(png_ptr, info_ptr, ++ PNG_DESTROY_WILL_FREE_DATA, ++ PNG_FREE_PLTE); ++ } + } + + #if CXIMAGE_SUPPORT_ALPHA // <vho> +@@ -496,8 +488,8 @@ + } } } + #endif // CXIMAGE_SUPPORT_ALPHA // <vho> + +- int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8)); +- info_ptr->rowbytes = row_size; ++ int row_size = max(info.dwEffWidth, png_get_rowbytes(png_ptr, info_ptr)); ++ //info_ptr->rowbytes = row_size; + BYTE *row_pointers = new BYTE[row_size]; + + /* write the file information */ +@@ -515,7 +507,7 @@ + if (AlphaIsValid()){ + for (long ax=head.biWidth-1; ax>=0;ax--){ + c = BlindGetPixelColor(ax,ay); +- int px = ax * info_ptr->channels; ++ int px = ax * png_get_channels(png_ptr, info_ptr); + if (!bGrayScale){ + row_pointers[px++]=c.rgbRed; + row_pointers[px++]=c.rgbGreen; +@@ -530,7 +522,7 @@ + #endif //CXIMAGE_SUPPORT_ALPHA // <vho> + { + iter.GetRow(row_pointers, row_size); +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB) //HACK BY OP + RGBtoBGR(row_pointers, row_size); + png_write_row(png_ptr, row_pointers); + } +@@ -547,12 +539,6 @@ + /* It is REQUIRED to call this to finish writing the rest of the file */ + png_write_end(png_ptr, info_ptr); + +- /* if you malloced the palette, free it here */ +- if (info_ptr->palette){ +- delete [] (info_ptr->palette); +- info_ptr->palette = NULL; +- } +- + /* clean up after the write, and free any memory allocated */ + png_destroy_write_struct(&png_ptr, (png_infopp)&info_ptr); + +--- utils/TkCximage/src/CxImage/ximapng.h ++++ utils/TkCximage/src/CxImage/ximapng.h +@@ -64,8 +64,8 @@ + + static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg) + { +- strncpy((char*)png_ptr->error_ptr,error_msg,255); +- longjmp(png_ptr->jmpbuf, 1); ++ strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + }; + diff --git a/community/amsn/amsn-0.98.4-v4l2.patch b/community/amsn/amsn-0.98.4-v4l2.patch new file mode 100644 index 000000000..815a6ad19 --- /dev/null +++ b/community/amsn/amsn-0.98.4-v4l2.patch @@ -0,0 +1,33 @@ +Add support for v4l2 on Linux so it can compile against modern +kernel headers. #363201 + +Patch by Kevin McCarthy <signals@gentoo.org> + +--- configure.ac ++++ configure.ac +@@ -382,6 +382,10 @@ + AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux) + fi + ++if test "$FOUND_OS" = "linux"; then ++ AC_CHECK_HEADERS(linux/videodev2.h) ++fi ++ + #--------------------------------------------------------------------------------------------- + + dnl --------------------------------------------------------------------- +--- utils/linux/capture/capture.h ++++ utils/linux/capture/capture.h +@@ -33,7 +33,11 @@ + #ifdef HAVE_SYS_VIDEODEV2_H + # include <sys/videodev2.h> + #else +-# include <linux/videodev.h> ++ #ifdef HAVE_LINUX_VIDEODEV2_H ++ #include <linux/videodev2.h> ++ #else ++ #include <linux/videodev.h> ++ #endif + #endif + + #include "grab-ng.h" diff --git a/community/ario/PKGBUILD b/community/ario/PKGBUILD index cc59a56fd..03a344b4c 100644 --- a/community/ario/PKGBUILD +++ b/community/ario/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 52022 2011-07-19 19:38:14Z jlichtblau $ +# $Id: PKGBUILD 63500 2012-02-05 11:51:34Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=ario pkgver=1.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK client for MPD (Music player daemon) inspired by Rhythmbox but much lighter and faster" arch=('i686' 'x86_64') url="http://ario-player.sourceforge.net/" license=('GPL') depends=('avahi' 'curl' 'dbus-glib' 'gnutls' 'hicolor-icon-theme' 'libglade' 'libmpdclient' 'libnotify' 'libsoup' 'libunique' 'taglib' 'xdg-utils') -makedepends=('intltool' 'perlxml') +makedepends=('intltool' 'perl-xml-parser') options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog @@ -17,14 +17,14 @@ source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$p sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc make } package () { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/ario/ario.changelog b/community/ario/ario.changelog index d2839893f..baca8a7b1 100644 --- a/community/ario/ario.changelog +++ b/community/ario/ario.changelog @@ -1,3 +1,6 @@ +2012-01-26 Eric Belanger <eric@archlinux.org> + * Rebuild against libpng 1.5 and libtiff 4.0 + 2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Update to major release 1.5.1 diff --git a/community/armagetronad/PKGBUILD b/community/armagetronad/PKGBUILD index c3606bde1..c4deac487 100644 --- a/community/armagetronad/PKGBUILD +++ b/community/armagetronad/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 26100 2010-09-13 15:56:15Z schuay $ +# $Id: PKGBUILD 63502 2012-02-05 11:51:43Z ibiru $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Filippo 'JoeyrS' Civiletti <joeyrs@gmail.com> pkgname=armagetronad pkgver=0.2.8.3.1 -pkgrel=2 +pkgrel=3 pkgdesc='A Tron Clone in 3D.' arch=('i686' 'x86_64') url='http://armagetronad.net/' diff --git a/community/avr-binutils/PKGBUILD b/community/avr-binutils/PKGBUILD new file mode 100644 index 000000000..ebd67da97 --- /dev/null +++ b/community/avr-binutils/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 63813 2012-02-05 15:45:13Z bpiotrowski $ +# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> +# Contributor: danst0 <danst0@west.de> + +pkgname=avr-binutils +pkgver=2.22 +pkgrel=2 +pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/binutils/" +license=('GPL') +depends=('glibc>=2.12-5' 'zlib') +provides=("binutils-avr=$pkgver") +replaces=('binutils-avr') +options=('!libtool' '!distcc' '!ccache') +source=(http://ftp.gnu.org/gnu/${pkgname/avr-}/${pkgname/avr-}-${pkgver}.tar.bz2{,.sig}) +md5sums=('ee0f10756c84979622b992a4a61ea3f5' + '6aea2485019497583e5c3f5fc4a39cd5') + +build() { + cd "${srcdir}"/${pkgname/avr-}-${pkgver} + + mkdir build + cd build + + CC="gcc -L$(pwd)/bfd/.libs/" + if [ "${CARCH}" = "x86_64" ]; then + ../configure --build=$(../config.guess) \ + --disable-multilib \ + --disable-nls \ + --enable-64-bit-bfd \ + --enable-install-libbfd \ + --includedir=/usr/$(../config.guess)/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --mandir=/usr/share/man \ + --prefix=/usr \ + --target=avr + else + ../configure --build=$(../config.guess) \ + --disable-nls \ + --enable-install-libbfd \ + --includedir=/usr/$(../config.guess)/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --mandir=/usr/share/man \ + --prefix=/usr \ + --target=avr + fi + + # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. + make configure-host + + make tooldir=/usr +} + +package() { + cd "${srcdir}"/${pkgname/avr-}-${pkgver} + + cd build + make DESTDIR="${pkgdir}" tooldir=/usr install + + rm -f ${pkgdir}/usr/lib/libiberty.a + + for bin in addr2line ar as c++filt gprof ld nm objcopy objdump ranlib readelf size strings strip ; do + rm -f ${pkgdir}/usr/bin/${bin} || return 1 + done + + for info in as bfd binutils configure gprof ld standards; do + mv ${pkgdir}/usr/share/info/${info}.info ${pkgdir}/usr/share/info/avr-${info}.info + done +} + diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD new file mode 100644 index 000000000..ced9b0eb5 --- /dev/null +++ b/community/avr-gcc/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 63817 2012-02-05 16:15:02Z bpiotrowski $ +# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> +# Contributor: danst0 <danst0@west.de> + +pkgname=avr-gcc +pkgver=4.6.2 +pkgrel=1 +pkgdesc="The GNU avr Compiler Collection" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'custom') +url="http://gcc.gnu.org/" +depends=('binutils-avr>=2.21' 'cloog' 'ppl' 'gcc-libs>=4.6.0' 'libmpc') +provides=("gcc-avr=$pkgver") +replaces=('gcc-avr') +options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip') +source=(http://ftp.gnu.org/gnu/gcc/${pkgname/avr-}-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2) +md5sums=('0c0e7e35d2215e19de9c97efba507553' + '0d75ca7ca35b1e7f252223f9d23a6ad1') + +build() { + export CFLAGS="-O2 -pipe" + export CXXFLAGS="-O2 -pipe" + + cd "${srcdir}/${pkgname/avr-}-${pkgver}" + + mkdir build + cd build + ../configure --disable-libssp \ + --disable-nls \ + --enable-languages=c,c++ \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --mandir=/usr/share/man \ + --prefix=/usr \ + --target=avr \ + --with-gnu-as \ + --with-gnu-ld \ + --with-as=/usr/bin/avr-as \ + --with-ld=/usr/bin/avr-ld + + make +} + +package() { + cd "${srcdir}/${pkgname/avr-}-${pkgver}" + + cd build + make -j1 DESTDIR=${pkgdir} install + + install -Dm644 "${srcdir}/${pkgname/avr-}-${pkgver}/COPYING.RUNTIME" \ + "${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION" + + rm -f ${pkgdir}/usr/lib/libiberty.a + rm -rf ${pkgdir}/usr/share/man/man7 + rm -rf ${pkgdir}/usr/share/info +} + +md5sums=('780f614ab18c7a9066dec6387d7490b2' + '87ecd60431e41096419dd8a10f76e46b') diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD index 516791c85..0f23b4ae5 100644 --- a/community/blender/PKGBUILD +++ b/community/blender/PKGBUILD @@ -14,7 +14,7 @@ _svn=false pkgname=blender pkgver=2.61 -pkgrel=3 +pkgrel=4 epoch=3 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64') diff --git a/community/bwbar/PKGBUILD b/community/bwbar/PKGBUILD index 72b3810c2..8f2620965 100644 --- a/community/bwbar/PKGBUILD +++ b/community/bwbar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59215 2011-11-21 15:20:03Z spupykin $ +# $Id: PKGBUILD 63506 2012-02-05 11:52:02Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Rosenstand <mark@borkware.net> pkgname=bwbar pkgver=1.2.3 -pkgrel=2 +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/" @@ -16,6 +16,8 @@ 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/calibre/PKGBUILD b/community/calibre/PKGBUILD index a8f4c645b..4c828e7f3 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63441 2012-02-03 13:48:06Z giovanni $ +# $Id: PKGBUILD 63508 2012-02-05 11:52:12Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre pkgver=0.8.38 -pkgrel=1 +pkgrel=2 pkgdesc="Ebook management application" arch=('i686' 'x86_64') url="http://calibre-ebook.com/" diff --git a/community/caph/PKGBUILD b/community/caph/PKGBUILD index 99c4e4366..04307c8e5 100644 --- a/community/caph/PKGBUILD +++ b/community/caph/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 33204 2010-11-22 23:40:32Z svenstaro $ +# $Id: PKGBUILD 63510 2012-02-05 11:52:20Z ibiru $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: jose <jose1711 [at] gmail (dot) com> pkgname=caph arch=('i686' 'x86_64') pkgver=1.1 -pkgrel=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/" diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index c4b90317a..df5913ecf 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60147 2011-12-06 05:24:01Z svenstaro $ +# $Id: PKGBUILD 63514 2012-02-05 11:52:35Z ibiru $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=clanlib pkgver=2.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64') url="http://clanlib.org/" diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD index eb4a0c1fb..0d049ce7c 100644 --- a/community/compiz/PKGBUILD +++ b/community/compiz/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('compiz-core' 'compiz-decorator-kde' 'compiz-decorator-gtk') pkgver=0.8.8 -pkgrel=2 +pkgrel=3 pkgdesc="Composite manager for Aiglx and Xgl" url="http://www.compiz.org/" license=('GPL' 'LGPL' 'MIT') @@ -20,13 +20,14 @@ makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace' options=(!libtool !emptydirs) conflicts=('compiz' 'compiz-core-git' 'compiz-git') replaces=('compiz') -source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz) -sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e') +source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz compiz-build.patch) +sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e' + '148656352f8a20b3781ee185025c5c8d4b7d720f') build() { - cd $srcdir/compiz-$pkgver - + cd "$srcdir/compiz-$pkgver" + patch -p1 -i ../compiz-build.patch ./configure --prefix=/usr \ --enable-gnome \ --enable-gtk \ @@ -48,18 +49,18 @@ package_compiz-core() depends=('startup-notification' 'librsvg' \ 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse') - cd $srcdir/compiz-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir/compiz-$pkgver" + make DESTDIR="$pkgdir" install # remove stuff which is in one of the decorations - rm -rf $pkgdir/usr/bin/{gtk-window-decorator,kde4-window-decorator} - rm -rf ${pkgdir}/usr/share/{applications,gnome,gnome-control-center} - rm -rf ${pkgdir}/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*} - rm -rf ${pkgdir}/etc + rm -rf "$pkgdir"/usr/bin/{gtk-window-decorator,kde4-window-decorator} + rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center} + rm -rf "${pkgdir}"/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*} + rm -rf "${pkgdir}"/etc # install MIT license - install -Dm644 $srcdir/compiz-$pkgver/COPYING.MIT \ - $pkgdir/usr/share/licenses/compiz-core/COPYING.MIT + install -Dm644 "$srcdir/compiz-$pkgver/COPYING.MIT" \ + "$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT" } package_compiz-decorator-gtk() @@ -68,39 +69,39 @@ package_compiz-decorator-gtk() depends=('gnome-control-center' 'libwnck' 'compiz-core' 'metacity') install=compiz-decorator-gtk.install - cd $srcdir/compiz-$pkgver + cd "$srcdir/compiz-$pkgver" pushd gtk - make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir" install install -Dm644 window-decorator/gwd.schemas \ - $pkgdir/usr/share/gconf/schemas/gwd.schemas + "$pkgdir/usr/share/gconf/schemas/gwd.schemas" popd for i in dbus gconf ini inotify png regex svg glib kconfig do - rm $srcdir/compiz-$pkgver/metadata/compiz-$i.schemas + rm "$srcdir"/compiz-$pkgver/metadata/compiz-$i.schemas done gconf-merge-schema \ - ${pkgdir}/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \ - ${srcdir}/compiz-$pkgver/metadata/*.schemas + "${pkgdir}"/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \ + "${srcdir}"/compiz-$pkgver/metadata/*.schemas - make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir" install # remove stuff which is in one of the other packages - rm -rf ${pkgdir}/etc - rm -rf $pkgdir/usr/bin/{compiz,kde4-window-decorator} - rm -rf $pkgdir/usr/include - cd $pkgdir/usr/lib + rm -rf "${pkgdir}"/etc + rm -rf "$pkgdir"/usr/bin/{compiz,kde4-window-decorator} + rm -rf "$pkgdir"/usr/include + cd "$pkgdir"/usr/lib rm libdecoration* rm pkgconfig/{compiz-cube.pc,compiz-scale.pc,compiz.pc,libdecoration.pc} - cd ${pkgdir}/usr/lib/compiz - rm `ls --hide=*gconf*` - rm -rf ${pkgdir}/usr/share/{compiz,locale} + cd "${pkgdir}"/usr/lib/compiz + rm $(ls --hide=*gconf*) + rm -rf "${pkgdir}"/usr/share/{compiz,locale} # install MIT license - install -Dm644 $srcdir/compiz-$pkgver/COPYING.MIT \ - $pkgdir/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT + install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \ + "$pkgdir"/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT } package_compiz-decorator-kde() @@ -108,17 +109,17 @@ package_compiz-decorator-kde() pkgdesc="Compiz decorator for KDE" depends=('kdebase-workspace' 'compiz-core') - cd $srcdir/compiz-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir"/compiz-$pkgver + make DESTDIR="$pkgdir" install # Let's remove stuff that are in compiz-core package or gtk decorator - rm -rf $pkgdir/usr/{include,lib} - rm -rf $pkgdir/usr/bin/{compiz,gtk-window-decorator} - rm -rf ${pkgdir}/etc - rm -rf ${pkgdir}/usr/share/{applications,gnome,gnome-control-center,locale,compiz} + rm -rf "$pkgdir"/usr/{include,lib} + rm -rf "$pkgdir"/usr/bin/{compiz,gtk-window-decorator} + rm -rf "${pkgdir}"/etc + rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center,locale,compiz} # install MIT license - install -Dm644 $srcdir/compiz-$pkgver/COPYING.MIT \ - $pkgdir/usr/share/licenses/compiz-decorator-kde/COPYING.MIT + install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \ + "$pkgdir"/usr/share/licenses/compiz-decorator-kde/COPYING.MIT } diff --git a/community/compiz/compiz-build.patch b/community/compiz/compiz-build.patch new file mode 100644 index 000000000..f22a3fa21 --- /dev/null +++ b/community/compiz/compiz-build.patch @@ -0,0 +1,18 @@ +diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp +--- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp 2012-01-29 22:05:54.000000000 -0500 ++++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp 2012-01-29 22:10:38.000000000 -0500 +@@ -986,10 +986,10 @@ + { + Atom atom = Atoms::compizWindowBlurDecor; + QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; +- Region topRegion = NULL; +- Region bottomRegion = NULL; +- Region leftRegion = NULL; +- Region rightRegion = NULL; ++ ::Region topRegion = NULL; ++ ::Region bottomRegion = NULL; ++ ::Region leftRegion = NULL; ++ ::Region rightRegion = NULL; + int size = 0; + int w, h; + diff --git a/community/coq/PKGBUILD b/community/coq/PKGBUILD index 2f2750606..15223d9d4 100644 --- a/community/coq/PKGBUILD +++ b/community/coq/PKGBUILD @@ -3,7 +3,7 @@ pkgname=coq pkgver=8.3pl3 -pkgrel=1 +pkgrel=2 pkgdesc='Formal proof management system.' arch=('i686' 'x86_64') url='http://coq.inria.fr/' @@ -11,11 +11,11 @@ license=('GPL') options=('!emptydirs') depends=('gtk2' 'lablgtk2' 'ocaml') makedepends=('camlp5-transitional' 'netpbm' 'hevea') -source=("http://coq.inria.fr/distrib/V${pkgver}/files/${pkgname}-${pkgver}.tar.gz") +source=("http://coq.inria.fr/distrib/V${pkgver}/files/coq-${pkgver}.tar.gz") md5sums=('37e9a52110a025128667c03fed75f9c2') build() { - cd ${pkgname}-${pkgver} + cd coq-${pkgver} ./configure \ -prefix '/usr' \ @@ -29,7 +29,7 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd coq-${pkgver} make COQINSTALLPREFIX=${pkgdir} install diff --git a/community/critter/PKGBUILD b/community/critter/PKGBUILD index 56769ac4f..1c01a5742 100644 --- a/community/critter/PKGBUILD +++ b/community/critter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57886 2011-11-04 08:24:44Z lcarlier $ +# $Id: PKGBUILD 63520 2012-02-05 11:53:03Z ibiru $ # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us> pkgname=critter _origname=CriticalMass pkgver=1.0.2 -pkgrel=5 +pkgrel=6 pkgdesc="Critical Mass (aka Critter) is an SDL/OpenGL space shoot'em up game" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/criticalmass" @@ -13,16 +13,19 @@ license=('GPL') depends=('sdl_image' 'sdl_mixer' 'mesa') source=(http://downloads.sourceforge.net/sourceforge/criticalmass/$_origname-${pkgver}.tar.bz2 critter-gcc43.patch + criticalmass-1.0.2-libpng15.patch critter.desktop) md5sums=('e2aff114bffa717fb79c82e1dc473ebe' 'e936920acce56bfa3b0123ca8b1193a6' + '76448ba5b7a42aec8fd2a5d1bc31b8e2' '98c17809aed964c445adad09827035df') build() { cd ${srcdir}/$_origname-${pkgver} patch -Np1 -i ../critter-gcc43.patch - sed -i 's|-lpng12|-lpng|g' configure + patch -Np0 -i ../criticalmass-1.0.2-libpng15.patch + sed -i 's|-lpng12|-lpng15|g' configure ./configure --prefix=/usr --mandir=/usr/share/man make diff --git a/community/critter/criticalmass-1.0.2-libpng15.patch b/community/critter/criticalmass-1.0.2-libpng15.patch new file mode 100644 index 000000000..ac1b8c0c6 --- /dev/null +++ b/community/critter/criticalmass-1.0.2-libpng15.patch @@ -0,0 +1,31 @@ +--- game/main.cpp ++++ game/main.cpp +@@ -28,6 +28,8 @@ + #include <sys/stat.h> + #include <sys/types.h> + ++#include <zlib.h> ++ + void migrateConfig( void) + { + //if onlineCheck is not set, default it to true +--- utilssdl/PNG.cpp ++++ utilssdl/PNG.cpp +@@ -45,7 +45,7 @@ + { + png_size_t check; + +- check = fwrite( data, 1, length, (FILE *)(png->io_ptr)); ++ check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png))); + if( check != length) + { + png_error( png, "Write Error"); +@@ -72,7 +72,7 @@ + return false; + } + +- if( setjmp(_png->jmpbuf)) ++ if( setjmp(png_jmpbuf(_png))) + { + fclose( fp); + png_destroy_write_struct(&_png, (png_infopp)NULL); diff --git a/community/cwiid/PKGBUILD b/community/cwiid/PKGBUILD index 8f928328a..ec59807bb 100644 --- a/community/cwiid/PKGBUILD +++ b/community/cwiid/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 53971 2011-08-10 19:27:06Z schiv $ +# $Id: PKGBUILD 63522 2012-02-05 11:53:14Z ibiru $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Wieland Hoffmann <the_mineo@web.de> # Contributor: Birger Moellering <bmoellering@googlemail.com> pkgname=cwiid pkgver=0.6.00 -pkgrel=9 +pkgrel=10 pkgdesc="Linux Nintendo Wiimote interface" arch=('i686' 'x86_64') url="http://abstrakraft.org/cwiid" diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 04e856aa9..d296ddfca 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61213 2011-12-24 17:41:33Z spupykin $ +# $Id: PKGBUILD 63524 2012-02-05 11:53:20Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> @@ -6,7 +6,7 @@ pkgname=darktable pkgver=0.9.3 _pkgver=0.9 -pkgrel=4 +pkgrel=5 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD index 4cf31e845..06eed72cd 100644 --- a/community/devil/PKGBUILD +++ b/community/devil/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 60209 2011-12-07 16:29:05Z svenstaro $ +# $Id: PKGBUILD 63526 2012-02-05 11:53:30Z ibiru $ # Maintainer: Laurent Carlier <lordheavym@gmail.org> # Contributor: damir <damir@archlinux.org> # Contributor: TheHoff <forums> pkgname=devil pkgver=1.7.8 -pkgrel=9 +pkgrel=10 pkgdesc="Library for reading several different image formats" arch=('i686' 'x86_64') url="http://openil.sourceforge.net/" diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD index 4663a3987..732145cef 100644 --- a/community/dia/PKGBUILD +++ b/community/dia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61137 2011-12-22 11:13:11Z spupykin $ +# $Id: PKGBUILD 63528 2012-02-05 11:53:40Z ibiru $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,7 +6,7 @@ pkgname=dia pkgver=0.97.2 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK+ based diagram creation program" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/dillo/PKGBUILD b/community/dillo/PKGBUILD index 111906348..13600444a 100644 --- a/community/dillo/PKGBUILD +++ b/community/dillo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60152 2011-12-06 08:54:11Z spupykin $ +# $Id: PKGBUILD 63530 2012-02-05 11:53:50Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=dillo pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="A small, fast graphical web browser built on FLTK" arch=(i686 x86_64) url="http://www.dillo.org" diff --git a/community/directfb/DirectFB-1.4.9-libpng-1.5.patch b/community/directfb/DirectFB-1.4.9-libpng-1.5.patch new file mode 100644 index 000000000..e428afbaf --- /dev/null +++ b/community/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/directfb/PKGBUILD b/community/directfb/PKGBUILD index 322155d9f..3a34cb6d3 100644 --- a/community/directfb/PKGBUILD +++ b/community/directfb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53472 2011-08-03 20:58:54Z ebelanger $ +# $Id: PKGBUILD 63532 2012-02-05 11:54:02Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=directfb pkgver=1.4.14 -pkgrel=1 +pkgrel=3 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" @@ -12,14 +12,16 @@ 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) -md5sums=('de0745d25a6ac9e337d4d5572df85471') +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}" - ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-zlib \ - --enable-x11 --enable-sdl --disable-vnc --disable-osx \ - --enable-video4linux2 --enable-voodoo + patch -p1 -i ../DirectFB-1.4.9-libpng-1.5.patch + ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-debug \ + --enable-zlib --enable-x11 --enable-sdl --disable-vnc --disable-osx \ + --enable-video4linux2 --enable-voodoo make } diff --git a/community/djview4/PKGBUILD b/community/djview4/PKGBUILD index 3923d1b2d..4cb58fc29 100644 --- a/community/djview4/PKGBUILD +++ b/community/djview4/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 54964 2011-08-29 08:34:07Z bisson $ -# Contributor: Paulo Matias <matiasΘarchlinux-br·org> -# Contributor: Leslie P. Polzer <polzerΘgnu·org> -# Contributor: erm67 <erm67Θyahoo·it> +# $Id: PKGBUILD 63534 2012-02-05 11:54:12Z ibiru $ +# 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=1 +pkgrel=2 pkgdesc='Portable DjVu viewer and browser plugin' url='http://djvu.sourceforge.net/djview4.html' license=('GPL') @@ -22,6 +22,7 @@ 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 } diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD index 1f88ecec8..6ddcaeb2d 100644 --- a/community/dosbox/PKGBUILD +++ b/community/dosbox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49481 2011-06-17 21:30:52Z jelle $ +# $Id: PKGBUILD 63536 2012-02-05 11:54:23Z ibiru $ # Maintainer : # Contribute : Jelle van der Waa <jelle@vdwaa.nl> # Contributor: James Rayner <james@archlinux.org> @@ -6,7 +6,7 @@ pkgname=dosbox pkgver=0.74 -pkgrel=2 +pkgrel=3 pkgdesc="An emulator with builtin DOS for running DOS Games" arch=('i686' 'x86_64') url="http://dosbox.sourceforge.net/" @@ -17,8 +17,8 @@ source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" 'dosbox.png' 'dosbox.desktop' 'gcc46.patch') build(){ - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i $srcdir/gcc46.patch + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "$srcdir/gcc46.patch" sed -i 's/png_check_sig/png_sig_cmp/' configure ./configure --prefix=/usr \ --sysconfdir=/etc/dosbox @@ -26,19 +26,18 @@ build(){ } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install # install docs, make does not install them - install -d $pkgdir/usr/share/doc/$pkgname - install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README - install -Dm644 $srcdir/$pkgname-$pkgver/docs/README.video $pkgdir/usr/share/doc/$pkgname/README.video + install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README + install -Dm644 docs/README.video "$pkgdir"/usr/share/doc/$pkgname/README.video - install -Dm644 ${srcdir}/${pkgname}.png \ - ${pkgdir}/usr/share/pixmaps/${pkgname}.png - install -Dm644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -Dm644 "${srcdir}/${pkgname}.png" \ + "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + install -Dm644 "${srcdir}/${pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" } md5sums=('b9b240fa87104421962d14eee71351e8' '2aac25fc06979e375953fcc36824dc5e' diff --git a/community/efax-gtk/PKGBUILD b/community/efax-gtk/PKGBUILD index 98fa4a965..c9363d1a5 100644 --- a/community/efax-gtk/PKGBUILD +++ b/community/efax-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61996 2012-01-13 21:14:06Z giovanni $ +# $Id: PKGBUILD 63538 2012-02-05 11:54:36Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=efax-gtk pkgver=3.2.9 -pkgrel=1 +pkgrel=2 pkgdesc="A GUI front end for the 'efax' fax program" arch=('i686' 'x86_64') url="http://efax-gtk.sourceforge.net/" diff --git a/community/emerald/PKGBUILD b/community/emerald/PKGBUILD index bbed29dc5..c7b2bf8f4 100644 --- a/community/emerald/PKGBUILD +++ b/community/emerald/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 52293 2011-07-23 10:43:05Z rvanharen $ +# $Id: PKGBUILD 63540 2012-02-05 11:54:48Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> # Contributor: nesl247 <nesl247@gmail.com> pkgname=emerald pkgver=0.8.8 -pkgrel=1 +pkgrel=2 pkgdesc="Emerald window decorator" arch=('i686' 'x86_64') url="http://www.compiz.org" license=('GPL') -depends=('compiz-core' 'libwnck' 'gtk2' 'libxres' 'shared-mime-info' 'xdg-utils') -makedepends=('intltool' 'pkgconfig' 'gettext') +depends=('compiz-core' 'libwnck' 'gtk2' 'libxres' 'shared-mime-info' 'xdg-utils' \ + 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'pkg-config' 'gettext') groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk') options=(!libtool) conflicts=('emerald-git') @@ -20,14 +21,14 @@ source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2 sha1sums=('a5deb2ae135d1c4dac7b57b2a0415f320ae7c0aa') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + LIBS+="-lm -ldl" ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/emerald/emerald.install b/community/emerald/emerald.install index 6ed258dd4..c2fa624ae 100644 --- a/community/emerald/emerald.install +++ b/community/emerald/emerald.install @@ -1,14 +1,13 @@ post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true - update-mime-database usr/share/mime + xdg-icon-resource forceupdate + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true - update-mime-database usr/share/mime + post_install } post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true - update-mime-database usr/share/mime + post_install } diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index 6bb6364d1..a81745658 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61697 2012-01-06 21:59:30Z rvanharen $ +# $Id: PKGBUILD 63542 2012-02-05 11:54:54Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas-svn pkgver=66901 -pkgrel=1 +pkgrel=2 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64') groups=('e17-libs-svn' 'e17-svn') @@ -22,7 +22,7 @@ _svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas" _svnmod="evas" build() { - cd $srcdir + cd "$srcdir" msg "Connecting to $_svntrunk SVN server...." if [ -d $_svnmod/.svn ]; then @@ -44,13 +44,13 @@ msg "Connecting to $_svntrunk SVN server...." } package() { - cd $srcdir/$_svnmod-build - make DESTDIR=$pkgdir install + cd "$srcdir/$_svnmod-build" + make DESTDIR="$pkgdir" install # install license files - install -Dm644 $srcdir/$_svnmod-build/COPYING \ - $pkgdir/usr/share/licenses/$pkgname/COPYING + install -Dm644 "$srcdir/$_svnmod-build/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" - rm -r $srcdir/$_svnmod-build + rm -r "$srcdir/$_svnmod-build" } diff --git a/community/exfat-utils/PKGBUILD b/community/exfat-utils/PKGBUILD new file mode 100644 index 000000000..95bf5fd88 --- /dev/null +++ b/community/exfat-utils/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 63825 2012-02-05 21:05:12Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Alex <mail.avatar@gmail.com> + +pkgname=exfat-utils +pkgver=0.9.6 +pkgrel=2 +pkgdesc="Utilities for exFAT file system" +arch=('i686' 'x86_64') +url="http://code.google.com/p/exfat/" +license=('GPL3') +depends=('glibc') +makedepends=('scons') +source=("http://exfat.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +md5sums=('6722b7a919b4924bc64f86bccfedb0a6') + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" install DESTDIR="${pkgdir}/sbin" + + # Install man pages + install -Dm444 dump/dumpexfat.8 "${pkgdir}/usr/share/man/man8/dumpexfat.8" + install -m444 fsck/exfatfsck.8 "${pkgdir}/usr/share/man/man8" + install -m444 mkfs/mkexfatfs.8 "${pkgdir}/usr/share/man/man8" + install -m444 label/exfatlabel.8 "${pkgdir}/usr/share/man/man8" +} diff --git a/community/extremetuxracer/PKGBUILD b/community/extremetuxracer/PKGBUILD index 7206154f9..3f00c689d 100644 --- a/community/extremetuxracer/PKGBUILD +++ b/community/extremetuxracer/PKGBUILD @@ -1,39 +1,45 @@ -# $Id: PKGBUILD 9321 2010-01-25 01:55:48Z ibiru $ +# $Id: PKGBUILD 63544 2012-02-05 11:55:05Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Eric Belanger <eric.archlinux.org> # Contributor: Fabio Scotoni <CCuleX.gmail.com> - +# Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=extremetuxracer pkgver=0.4 -pkgrel=2 +pkgrel=3 pkgdesc="Downhill racing game starring Tux" -arch=('i686' 'x86_64') +arch=('x86_64' 'i686') url="http://www.extremetuxracer.com" license=('GPL') depends=('sdl_mixer' 'tcl>=8.5.0' 'mesa' 'libpng>=1.4.0' 'freetype2' 'libxi' 'libxmu') conflicts=('ppracer' 'etracer') replaces=('ppracer' 'etracer') -source=(http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz \ - $pkgname.png $pkgname.desktop libpng14.patch) -md5sums=('6830eb4e1ca7c5a541f286ded3853f9f' - 'a188e4ce61d0376fa42059e13157c5d1' - '429974a3d7f4640073e8fbfb4f0f45d2' - '0c16eb309df6413397cd886f63361fcc') +source=("http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz" + "$pkgname.png" + "$pkgname.desktop" + "libpng15.patch") +sha256sums=('5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d' + 'ec1426171fc80b07b702e373bf9528244a3b224e887ab24b52f90740691e92fb' + '349448e8be522bbbe9fd896e875a4add7e02c35d0fafa46c5b10582562da3ca8' + '2b693eaf421d56887615fc02d40f742e9b8bf817ae36be1f1f9e33a52719eea8') build() { - cd ${srcdir}/extremetuxracer-$pkgver - - patch -Np1 -i ${srcdir}/libpng14.patch || return 1 - - sed -i -e 's/libpng12/libpng14/g' configure || return 1 + cd "$srcdir/extremetuxracer-$pkgver" + patch -Np1 -i ${srcdir}/libpng15.patch + sed -i -e 's/libpng12/libpng15/g' configure ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + make +} + +package() { + cd "$srcdir/extremetuxracer-$pkgver" + make DESTDIR="$pkgdir" install # Install icon and desktop file - install -D -m644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1 - install -D -m644 ${srcdir}/${pkgname}.png \ - ${pkgdir}/usr/share/pixmaps/${pkgname}.png || return 1 + install -Dm644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "$srcdir/$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" } + +# vim:set ts=2 sw=2 et: diff --git a/community/extremetuxracer/libpng15.patch b/community/extremetuxracer/libpng15.patch new file mode 100644 index 000000000..5c9999857 --- /dev/null +++ b/community/extremetuxracer/libpng15.patch @@ -0,0 +1,57 @@ +diff -Nur extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp +--- extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp 2007-09-01 19:38:12.000000000 +0300 ++++ extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp 2010-01-25 03:47:21.000000000 +0200 +@@ -53,7 +53,7 @@ + if (!info_ptr) + { + png_destroy_read_struct(&png_ptr, +- (png_infopp)NULL, (png_infopp)NULL); ++ NULL, NULL); + fclose(fp); + return; + } +@@ -62,7 +62,7 @@ + if (!end_info) + { + png_destroy_read_struct(&png_ptr, &info_ptr, +- (png_infopp)NULL); ++ NULL); + fclose(fp); + return; + } +@@ -77,7 +77,7 @@ + + + png_get_IHDR(png_ptr, info_ptr, &width, &height, +- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); ++ &bit_depth, &color_type, &interlace_type, NULL, NULL); + + if(bit_depth == 16) + png_set_strip_16(png_ptr); +@@ -88,7 +88,7 @@ + png_set_expand(png_ptr); + png_read_update_info(png_ptr, info_ptr); + png_get_IHDR(png_ptr, info_ptr, &width, &height, +- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); ++ &bit_depth, &color_type, &interlace_type, NULL, NULL); + } + + if( color_type == PNG_COLOR_TYPE_GRAY || +@@ -96,7 +96,7 @@ + png_set_gray_to_rgb(png_ptr); + png_read_update_info(png_ptr, info_ptr); + png_get_IHDR(png_ptr, info_ptr, &width, &height, +- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); ++ &bit_depth, &color_type, &interlace_type, NULL, NULL); + } + + this->width=width; +@@ -114,7 +114,7 @@ + } + + png_read_end(png_ptr, info_ptr); +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(fp); + } + diff --git a/community/fbgrab/PKGBUILD b/community/fbgrab/PKGBUILD index 6ea2b333c..14c947599 100644 --- a/community/fbgrab/PKGBUILD +++ b/community/fbgrab/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 8867 2010-01-22 03:05:07Z dgriffiths $ +# $Id: PKGBUILD 63546 2012-02-05 11:55:12Z ibiru $ # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org + pkgname=fbgrab pkgver=1.0 -pkgrel=5 +pkgrel=6 pkgdesc="A framebuffer screenshot grabber" arch=(i686 x86_64) url="http://hem.bredband.net/gmogmo/fbgrab/" @@ -14,9 +15,9 @@ 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 } -# vim:syntax=sh diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD index 29ac34a54..3cdb3e1e3 100644 --- a/community/fbreader/PKGBUILD +++ b/community/fbreader/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58784 2011-11-18 14:18:00Z spupykin $ +# $Id: PKGBUILD 63548 2012-02-05 11:55:20Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fbreader pkgver=0.12.10 -pkgrel=2 +pkgrel=3 pkgdesc="An e-book reader for Linux" arch=('i686' 'x86_64') url="http://www.fbreader.org/" diff --git a/community/fbshot/PKGBUILD b/community/fbshot/PKGBUILD index 752c53faa..489f897f8 100644 --- a/community/fbshot/PKGBUILD +++ b/community/fbshot/PKGBUILD @@ -1,8 +1,10 @@ +# $Id: PKGBUILD 63550 2012-02-05 11:55:26Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: sp42b <sp42b|a_t|gmx.net> pkgname=fbshot pkgver=0.3 -pkgrel=3 +pkgrel=4 pkgdesc="Takes screenshots (PNG) from your framebuffer device (e.g. console)." arch=('i686' 'x86_64') url="http://www.sfires.net/fbshot/" @@ -13,7 +15,8 @@ md5sums=('2cc6cc25cdc4cd447a8b0a9662907635') build() { cd "$srcdir/$pkgname-$pkgver" - make || return 1 + 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/fbv/PKGBUILD b/community/fbv/PKGBUILD index e1cc13f69..a5043eaad 100644 --- a/community/fbv/PKGBUILD +++ b/community/fbv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 11511 2010-02-12 23:37:12Z spupykin $ +# $Id: PKGBUILD 63552 2012-02-05 11:55:32Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aectann <aectann@infoline.su> pkgname=fbv pkgver=1.0b -pkgrel=4 +pkgrel=5 pkgdesc="FrameBuffer image viewer" arch=('i686' 'x86_64') url="http://s-tech.elsat.net.pl/fbv/" @@ -17,9 +17,9 @@ build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lungif -lgif|' Make.conf - make || return 1 + 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/fityk/PKGBUILD b/community/fityk/PKGBUILD index ffd72b248..9c95247c7 100644 --- a/community/fityk/PKGBUILD +++ b/community/fityk/PKGBUILD @@ -4,12 +4,12 @@ pkgname=fityk pkgver=1.1.1 -pkgrel=3 +pkgrel=4 pkgdesc='A program for nonlinear fitting of analytical functions to data.' arch=('i686' 'x86_64') url='http://www.unipress.waw.pl/fityk/' license=('GPL') -depends=('xylib' 'shared-mime-info' 'lua' 'gnuplot') # wxgtk supplied by statically linked wxWidgets +depends=('xylib' 'shared-mime-info' 'lua' 'gnuplot' 'desktop-file-utils') # wxgtk supplied by statically linked wxWidgets makedepends=('boost' 'git' 'python-sphinx' 'swig' 'subversion') options=('!libtool') install='fityk.install' diff --git a/community/fityk/fityk.install b/community/fityk/fityk.install index 6b399fa54..df476d572 100644 --- a/community/fityk/fityk.install +++ b/community/fityk/fityk.install @@ -1,11 +1,14 @@ post_install() { update-mime-database /usr/share/mime + update-desktop-database -q } post_upgrade() { - post_install + update-mime-database /usr/share/mime + update-desktop-database -q } post_remove() { - post_install + update-mime-database /usr/share/mime + update-desktop-database -q } diff --git a/community/flam3/PKGBUILD b/community/flam3/PKGBUILD index 08759b92d..663f0f332 100644 --- a/community/flam3/PKGBUILD +++ b/community/flam3/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 59890 2011-12-02 04:26:05Z ebelanger $ +# $Id: PKGBUILD 63556 2012-02-05 11:55:49Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=flam3 pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Tools to create/display fractal flames: algorithmically generated images and animations" arch=('i686' 'x86_64') url="http://flam3.com/" license=('GPL3') depends=('libjpeg' 'libpng' 'libxml2') options=('!libtool') -source=(http://flam3.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('8814515f2e49e034e47cf97e9d2c0e932844abb9') +source=(http://flam3.googlecode.com/files/${pkgname}-${pkgver}.tar.gz flam3-3.0.1-libpng15.patch) +sha1sums=('8814515f2e49e034e47cf97e9d2c0e932844abb9' + '17ece6cc00899e5135dad2bc79f97dfbd73107a6') build() { cd "${srcdir}/${pkgname}-${pkgver}/src" + patch -p1 -i ../../flam3-3.0.1-libpng15.patch ./configure --prefix=/usr --enable-shared make } diff --git a/community/flam3/flam3-3.0.1-libpng15.patch b/community/flam3/flam3-3.0.1-libpng15.patch new file mode 100644 index 000000000..61f905589 --- /dev/null +++ b/community/flam3/flam3-3.0.1-libpng15.patch @@ -0,0 +1,76 @@ +http://code.google.com/p/flam3/issues/detail?id=8 + +--- src/png.c ++++ src/png.c +@@ -142,7 +142,7 @@ + } + if (setjmp(png_jmpbuf(png_ptr))) { + if (png_image) { +- for (y = 0 ; y < info_ptr->height ; y++) ++ for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) + free (png_image[y]); + free (png_image); + } +@@ -161,19 +161,19 @@ + png_set_sig_bytes (png_ptr, SIG_CHECK_SIZE); + png_read_info (png_ptr, info_ptr); + +- if (8 != info_ptr->bit_depth) { ++ if (8 != png_get_bit_depth(png_ptr, info_ptr)) { + fprintf(stderr, "bit depth type must be 8, not %d.\n", +- info_ptr->bit_depth); ++ png_get_bit_depth(png_ptr, info_ptr)); + return 0; + } + +- *width = info_ptr->width; +- *height = info_ptr->height; ++ *width = png_get_image_width(png_ptr, info_ptr); ++ *height = png_get_image_height(png_ptr, info_ptr); + p = q = malloc(4 * *width * *height); +- png_image = (png_byte **)malloc (info_ptr->height * sizeof (png_byte*)); ++ png_image = (png_byte **)malloc (png_get_image_height(png_ptr, info_ptr) * sizeof (png_byte*)); + +- linesize = info_ptr->width; +- switch (info_ptr->color_type) { ++ linesize = png_get_image_width(png_ptr, info_ptr); ++ switch (png_get_color_type(png_ptr, info_ptr)) { + case PNG_COLOR_TYPE_RGB: + linesize *= 3; + break; +@@ -182,21 +182,21 @@ + break; + default: + fprintf(stderr, "color type must be RGB or RGBA not %d.\n", +- info_ptr->color_type); ++ png_get_color_type(png_ptr, info_ptr)); + return 0; + } + +- for (y = 0 ; y < info_ptr->height ; y++) { ++ for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) { + png_image[y] = malloc (linesize); + } + png_read_image (png_ptr, png_image); + png_read_end (png_ptr, info_ptr); + +- for (y = 0 ; y < info_ptr->height ; y++) { ++ for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) { + unsigned char *s = png_image[y]; +- for (x = 0 ; x < info_ptr->width ; x++) { ++ for (x = 0 ; x < png_get_image_width(png_ptr, info_ptr) ; x++) { + +- switch (info_ptr->color_type) { ++ switch (png_get_color_type(png_ptr, info_ptr)) { + case PNG_COLOR_TYPE_RGB: + p[0] = s[0]; + p[1] = s[1]; +@@ -217,7 +217,7 @@ + } + } + +- for (y = 0 ; y < info_ptr->height ; y++) ++ for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) + free (png_image[y]); + free (png_image); + png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL); diff --git a/community/flowcanvas/PKGBUILD b/community/flowcanvas/PKGBUILD index ce145f515..39dee6da0 100644 --- a/community/flowcanvas/PKGBUILD +++ b/community/flowcanvas/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48184 2011-05-29 16:00:31Z schiv $ +# $Id: PKGBUILD 63558 2012-02-05 11:55:57Z ibiru $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Max a.k.a. Synthead <synthead@gmail.com> # Contributor: christhemonkey <christhemonkey at gmail dot com> pkgname=flowcanvas pkgver=0.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="Gtkmm/Gnomecanvasmm widget for boxes-and-lines style environments" arch=('i686' 'x86_64') url="http://drobilla.net/software/flowcanvas/" diff --git a/community/fltk2/PKGBUILD b/community/fltk2/PKGBUILD index d3da63100..7600f7322 100644 --- a/community/fltk2/PKGBUILD +++ b/community/fltk2/PKGBUILD @@ -1,33 +1,28 @@ -# $Id: PKGBUILD 58766 2011-11-18 13:49:19Z spupykin $ +# $Id: PKGBUILD 63560 2012-02-05 11:56:02Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=fltk2 pkgver=2.0 _pkgver=2.0.x-alpha-r9166 -pkgrel=7 +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 - libpng14.patch) -md5sums=('d5e7cd859d2aeb9bb6e13ee298e8b2aa' - '93955f17f56ad8b419ca1f8ea8c24a7f') +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 - -# patch -Np1 -i "$srcdir/libpng14.patch" make make DESTDIR=$pkgdir install } diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD index 76f92966a..41a7c1cbb 100644 --- a/community/fox/PKGBUILD +++ b/community/fox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58793 2011-11-18 14:31:12Z spupykin $ +# $Id: PKGBUILD 63562 2012-02-05 11:56:09Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Ben <ben@benmazer.net> pkgname=fox pkgver=1.6.44 -pkgrel=1 +pkgrel=2 pkgdesc="Free Objects for X: GUI Toolkit for C++" arch=('i686' 'x86_64') url="http://www.fox-toolkit.org/" diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD index 2f3a97380..2921e4396 100644 --- a/community/freedroidrpg/PKGBUILD +++ b/community/freedroidrpg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61165 2011-12-23 11:47:47Z spupykin $ +# $Id: PKGBUILD 63564 2012-02-05 11:56:19Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: nut543 <kfs1@online.no> @@ -6,7 +6,7 @@ #pkgname=('freedroidrpg' 'freedroidrpg-data') pkgname='freedroidrpg' pkgver=0.15 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') # depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data') depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa') diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index 56ec0047c..4ff18322b 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58829 2011-11-18 16:55:57Z spupykin $ +# $Id: PKGBUILD 63566 2012-02-05 11:56:27Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl pkgver=1.22.10 -pkgrel=7 +pkgrel=8 pkgdesc="VRML viewer" arch=('i686' 'x86_64') url="http://freewrl.sourceforge.net/" diff --git a/community/fuse-exfat/PKGBUILD b/community/fuse-exfat/PKGBUILD new file mode 100644 index 000000000..1bb0daf0b --- /dev/null +++ b/community/fuse-exfat/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 63829 2012-02-05 21:18:47Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: GaoShichao <xgdgsc@gmail.com> + +pkgname=fuse-exfat +pkgver=0.9.6 +pkgrel=2 +pkgdesc="Free exFAT file system implementation" +arch=('i686' 'x86_64') +url="http://code.google.com/p/exfat/" +license=('GPL3') +depends=('fuse') +makedepends=('scons') +optdepends=('exfat-utils: utilities for exFAT file system' + 'util-linux-ng: to mount exFAT volumes automatically') +source=("http://exfat.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +md5sums=('809be0bc49c3b2be3f2d0fd115d36709') + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" install DESTDIR="${pkgdir}/sbin" + + # Install man page + install -Dm444 fuse/mount.exfat-fuse.8 "${pkgdir}/usr/share/man/man8/mount.exfat-fuse.8" +} diff --git a/community/fxdesktop/PKGBUILD b/community/fxdesktop/PKGBUILD index a4414397b..98eacc23b 100644 --- a/community/fxdesktop/PKGBUILD +++ b/community/fxdesktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 8608 2010-01-21 02:59:29Z dgriffiths $ +# $Id: PKGBUILD 63570 2012-02-05 11:56:40Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sander Jansen <sander@knology.net> pkgname=fxdesktop pkgver=0.1.12 -pkgrel=3 +pkgrel=5 pkgdesc="Lightweight Desktop Environment" arch=('i686' 'x86_64') url="http://code.google.com/p/fxdesktop/" @@ -14,14 +14,12 @@ source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.bz2) md5sums=('9489e7369b5e052e0b6836a3b0670832') build() { - cd $startdir/src/$pkgname-$pkgver - + 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 || return 1) - + [ "$CARCH" = "x86_64" ] && (sed -i -e 's|lib64|lib|g' build/config.linux_x86_64) # Compile - ./gb --prefix=/usr || return 1 - ./gb --package-root=$startdir/pkg/usr install || return 1 + ./gb --prefix=/usr + ./gb --package-root=$pkgdir/usr install } diff --git a/community/fxprocessview/PKGBUILD b/community/fxprocessview/PKGBUILD index 4ef1d3f0f..4596b5e26 100644 --- a/community/fxprocessview/PKGBUILD +++ b/community/fxprocessview/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 8603 2010-01-21 02:55:46Z dgriffiths $ +# $Id: PKGBUILD 63572 2012-02-05 11:56:52Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sander Jansen <sander@knology.net> pkgname=fxprocessview pkgver=0.5.0 -pkgrel=3 +pkgrel=4 pkgdesc="Process Viewer" arch=('i686' 'x86_64') license=('GPL') @@ -16,22 +16,17 @@ md5sums=('5d3cc8d7aec770997c281a743ddfda5a' '2d2c3d54dcd2404149955f12cccb21a5') build() { - cd $startdir/src/$pkgname-$pkgver - + cd $srcdir/$pkgname-$pkgver # Override default flags export CFLAGS="-Wall -O2 -pipe" export CXXFLAGS="-Wall -O2 -pipe" - # Compile - patch -Np1 <../build-fix.patch || return 1 - ./gb - + patch -Np1 <../build-fix.patch + ./gb # gb does not return valid error code - [ -f src/fxprocessview ] || return 1 - - # make sure destination exists - mkdir -p $startdir/pkg/usr/bin - + [ -f src/fxprocessview ] + # make sure destination exists + mkdir -p $pkgdir/usr/bin # Install - ./gb install --package-root=$startdir/pkg/usr + ./gb install --package-root=$pkgdir/usr } diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index 946e8a1af..b4fb28737 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61109 2011-12-21 20:57:20Z andrea $ +# $Id: PKGBUILD 63574 2012-02-05 11:57:16Z ibiru $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.23.1 -pkgrel=6 +pkgrel=7 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 427a2caed..04eee157c 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61783 2012-01-07 19:54:03Z lcarlier $ +# $Id: PKGBUILD 63576 2012-02-05 11:57:26Z ibiru $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -13,7 +13,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD index 9bf40aea8..2a6babd3b 100644 --- a/community/gdal/PKGBUILD +++ b/community/gdal/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 51471 2011-07-09 22:30:40Z rvanharen $ +# $Id: PKGBUILD 63578 2012-02-05 11:57:36Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gdal -pkgver=1.8.0 -pkgrel=6 +pkgver=1.9.0 +pkgrel=1 pkgdesc="A translator library for raster geospatial data formats" arch=('i686' 'x86_64') url="http://www.gdal.org/" @@ -16,13 +16,12 @@ optdepends=('postgresql: postgresql database support' 'mysql: mysql database support' 'perl: perl binding support' 'swig: perl binding support') -options=('!libtool' '!makeflags') +options=('!libtool') changelog=$pkgname.changelog -source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.gz \ - gdal-1.5.1-python-install.patch) - -md5sums=('c762cdab0f7e51a677ba49278a8a263d' '81afc1c26d29cee84aadb6924fe33861') - +source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.gz + gdal-1.5.1-python-install.patch) +md5sums=('1853f3d8eb5232ae030abe007840cade' + '81afc1c26d29cee84aadb6924fe33861') build() { export CFLAGS="$CFLAGS -fno-strict-aliasing" diff --git a/community/gdk-pixbuf/PKGBUILD b/community/gdk-pixbuf/PKGBUILD index ada0fc41c..286f0ef52 100644 --- a/community/gdk-pixbuf/PKGBUILD +++ b/community/gdk-pixbuf/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63580 2010-01-17 23:27:59Z andrea $ -# Maintainer: +# $Id: PKGBUILD 63580 2012-02-05 11:57:50Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=gdk-pixbuf pkgver=0.22.0 -pkgrel=7 +pkgrel=9 pkgdesc="Image loading and manipulation library" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -13,28 +13,31 @@ license=('GPL' 'LGPL') depends=('gtk' 'libtiff' 'libpng') makedepends=('libxt') options=('!libtool') -source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.22/${pkgname}-${pkgver}.tar.bz2 +source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.24/${pkgname}-${pkgver}.tar.bz2 gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch gdk-pixbuf-0.22.0-bmp_secure.patch gdk-pixbuf-0.22.0-loaders.patch - gdk-pixbuf-0.22.0.patch) + gdk-pixbuf-0.22.0.patch + libpng15.patch) md5sums=('05fcb68ceaa338614ab650c775efc2f2' - 'd1fb93f1ae994875158a7e0c108c36f8' - '5f59d5772b1482d885a180dbc581cf84' - '3cf31ae0509747f72ac27a9fd96109c2' - 'e0f5f301ce958b7cea0be631ed7b8e56') + 'd1fb93f1ae994875158a7e0c108c36f8' + '5f59d5772b1482d885a180dbc581cf84' + '3cf31ae0509747f72ac27a9fd96109c2' + 'e0f5f301ce958b7cea0be631ed7b8e56' + '16db4dc83d507ebcf15d1beb753a77bc') build() { cd ${srcdir}/${pkgname}-${pkgver} export SED=/bin/sed - patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch || return 1 - patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_secure.patch || return 1 - patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch || return 1 - patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch || return 1 - libtoolize --force --copy --automake || return 1 - autoreconf --force --install || return 1 - ./configure --prefix=/usr --disable-gtk-doc || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch + patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_secure.patch + patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch + patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch + patch -Np1 -i ${srcdir}/libpng15.patch + libtoolize --force --copy --automake + autoreconf --force --install + ./configure --prefix=/usr --disable-gtk-doc + make + make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/usr/share/gnome } diff --git a/community/gdk-pixbuf/libpng15.patch b/community/gdk-pixbuf/libpng15.patch new file mode 100644 index 000000000..e667288f8 --- /dev/null +++ b/community/gdk-pixbuf/libpng15.patch @@ -0,0 +1,30 @@ +diff -wbBur gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c +--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c 2001-01-24 23:59:23.000000000 +0300 ++++ gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c 2012-01-23 13:33:08.000000000 +0400 +@@ -175,7 +175,7 @@ + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); + return NULL; + } +@@ -311,7 +311,7 @@ + return NULL; + } + +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + if (lc->png_info_ptr) + png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); + g_free(lc); +@@ -366,7 +366,7 @@ + lc->max_row_seen_in_chunk = -1; + + /* Invokes our callbacks as needed */ +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + return FALSE; + } else { + png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size); diff --git a/community/geda-gaf/ChangeLog b/community/geda-gaf/ChangeLog index 3433c3f92..c8b902cc5 100644 --- a/community/geda-gaf/ChangeLog +++ b/community/geda-gaf/ChangeLog @@ -1,3 +1,7 @@ +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] diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD index 95408aeea..b3e6278b9 100644 --- a/community/geda-gaf/PKGBUILD +++ b/community/geda-gaf/PKGBUILD @@ -1,9 +1,10 @@ +# Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Jared Casper <jaredcasper@gmail.com> -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=geda-gaf pkgver=1.6.2 -pkgrel=1 +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" @@ -19,18 +20,19 @@ md5sums=('35ae86aebc174ec1fc03863fde4c843c') build () { - cd $srcdir/$pkgname-$pkgver/ + cd "$srcdir/$pkgname-$pkgver/" ./configure --prefix=/usr --disable-update-xdg-database make } + package() { - cd $srcdir/$pkgname-$pkgver/ - make DESTDIR=$pkgdir/ install + cd "$srcdir/$pkgname-$pkgver/" + make DESTDIR="$pkgdir/" install sed -i 's+/usr/bin/env python+/usr/bin/env python2+' \ - $pkgdir/usr/bin/garchive + "$pkgdir/usr/bin/garchive" sed -i 's+/usr/bin/python+/usr/bin/python2+' \ - $pkgdir/usr/bin/tragesym + "$pkgdir/usr/bin/tragesym" sed -i 's+/usr/bin/python+/usr/bin/python2+' \ - $pkgdir/usr/share/doc/$pkgname/examples/lightning_detector/bom + "$pkgdir/usr/share/doc/$pkgname/examples/lightning_detector/bom" } diff --git a/community/gimp-plugin-mathmap/PKGBUILD b/community/gimp-plugin-mathmap/PKGBUILD index cc78ce075..e1dc19fd4 100644 --- a/community/gimp-plugin-mathmap/PKGBUILD +++ b/community/gimp-plugin-mathmap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 32207 2010-11-11 16:38:32Z stativ $ +# $Id: PKGBUILD 63584 2012-02-05 11:58:06Z ibiru $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Serge Gielkens <gielkens.serge@mumeli.org> pkgname=gimp-plugin-mathmap pkgver=1.3.5 -pkgrel=1 +pkgrel=2 pkgdesc="A GIMP plug-in which allows distortion of images specified by mathematical formulae" arch=('i686' 'x86_64') url="http://www.complang.tuwien.ac.at/schani/mathmap/" @@ -14,15 +14,18 @@ makedepends=('doxygen' 'unzip') provides=('gimp-mathmap') replaces=('gimp-mathmap') source=(http://www.complang.tuwien.ac.at/schani/mathmap/files/mathmap-${pkgver}.tar.gz \ - fix_libnoise_build.patch) + fix_libnoise_build.patch libpng15.patch) md5sums=('6ff66d070ea410dee1a27283d05b8beb' - 'eca40de0ba0e6b8d34b7d1f904bc3d18') + 'eca40de0ba0e6b8d34b7d1f904bc3d18' + '9780d6354b7380b772c4616253ecee54') build() { cd "$srcdir/mathmap-$pkgver" # fix problem with building libnoise patch -Np1 < "$srcdir"/fix_libnoise_build.patch + # fix for libpng 1.5 + patch -Np1 < "$srcdir"/libpng15.patch make } diff --git a/community/gimp-plugin-mathmap/libpng15.patch b/community/gimp-plugin-mathmap/libpng15.patch new file mode 100644 index 000000000..3cf95387c --- /dev/null +++ b/community/gimp-plugin-mathmap/libpng15.patch @@ -0,0 +1,170 @@ +diff -rup mathmap-1.3.5/rwimg/rwpng.c mathmap-1.3.5.new/rwimg/rwpng.c +--- mathmap-1.3.5/rwimg/rwpng.c 2009-08-23 13:56:14.000000000 +0200 ++++ mathmap-1.3.5.new/rwimg/rwpng.c 2012-01-27 13:02:29.708023734 +0100 +@@ -58,34 +58,34 @@ open_png_file_reading (const char *filen + data->end_info = png_create_info_struct(data->png_ptr); + assert(data->end_info != 0); + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + png_init_io(data->png_ptr, data->file); + + png_read_info(data->png_ptr, data->info_ptr); + +- *width = data->info_ptr->width; +- *height = data->info_ptr->height; ++ *width = png_get_image_width(data->png_ptr, data->info_ptr); ++ *height = png_get_image_height(data->png_ptr, data->info_ptr); + +- if (data->info_ptr->bit_depth != 8 && data->info_ptr->bit_depth != 16) ++ if (png_get_bit_depth(data->png_ptr, data->info_ptr) != 8 && png_get_bit_depth(data->png_ptr, data->info_ptr) != 16) + { + fprintf(stderr, "PNG files are only supported with bit depths 8 and 16.\n"); + /* FIXME: free stuff */ + return 0; + } + +- if (data->info_ptr->color_type != PNG_COLOR_TYPE_RGB +- && data->info_ptr->color_type != PNG_COLOR_TYPE_RGB_ALPHA +- && data->info_ptr->color_type != PNG_COLOR_TYPE_GRAY +- && data->info_ptr->color_type != PNG_COLOR_TYPE_GRAY_ALPHA) ++ if (png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_RGB ++ && png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_RGB_ALPHA ++ && png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_GRAY ++ && png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_GRAY_ALPHA) + { + fprintf(stderr, "PNG files are only supported in RGB and Gray, with or without alpha.\n"); + /* FIXME: free stuff */ + return 0; + } + +- if (data->info_ptr->interlace_type != PNG_INTERLACE_NONE) ++ if (png_get_interlace_type(data->png_ptr, data->info_ptr) != PNG_INTERLACE_NONE) + { + fprintf(stderr, "Interlaced PNG files are not supported.\n"); + /* FIXME: free stuff */ +@@ -105,24 +105,24 @@ png_read_lines (void *_data, unsigned ch + int bps, spp; + unsigned char *row; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + +- if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY) ++ if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_GRAY) + spp = 1; +- else if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ++ else if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) + spp = 2; +- else if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB) ++ else if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB) + spp = 3; + else + spp = 4; + +- if (data->info_ptr->bit_depth == 16) ++ if (png_get_bit_depth(data->png_ptr, data->info_ptr) == 16) + bps = 2; + else + bps = 1; + +- row = (unsigned char*)malloc(data->info_ptr->width * spp * bps); ++ row = (unsigned char*)malloc(png_get_image_width(data->png_ptr, data->info_ptr) * spp * bps); + + for (i = 0; i < num_lines; ++i) + { +@@ -131,13 +131,13 @@ png_read_lines (void *_data, unsigned ch + png_read_row(data->png_ptr, (png_bytep)row, 0); + + if (spp <= 2) +- for (j = 0; j < data->info_ptr->width; ++j) ++ for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j) + for (channel = 0; channel < 3; ++channel) +- lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps]; ++ lines[i * png_get_image_width(data->png_ptr, data->info_ptr) * 3 + j * 3 + channel] = row[j * spp * bps]; + else +- for (j = 0; j < data->info_ptr->width; ++j) ++ for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j) + for (channel = 0; channel < 3; ++channel) +- lines[i * data->info_ptr->width * 3 + j * 3 + channel] ++ lines[i * png_get_image_width(data->png_ptr, data->info_ptr) * 3 + j * 3 + channel] + = row[j * spp * bps + channel * bps]; + } + +@@ -151,7 +151,7 @@ png_free_reader_data (void *_data) + { + png_data_t *data = (png_data_t*)_data; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + if (data->have_read) +@@ -180,7 +180,7 @@ open_png_file_writing (const char *filen + data->info_ptr = png_create_info_struct(data->png_ptr); + assert(data->info_ptr != 0); + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + if (pixel_stride == 4) +@@ -188,18 +188,9 @@ open_png_file_writing (const char *filen + + png_init_io(data->png_ptr, data->file); + +- data->info_ptr->width = width; +- data->info_ptr->height = height; +- data->info_ptr->valid = 0; +- data->info_ptr->rowbytes = width * 3; +- data->info_ptr->palette = 0; +- data->info_ptr->num_palette = 0; +- data->info_ptr->num_trans = 0; +- data->info_ptr->bit_depth = 8; +- data->info_ptr->color_type = PNG_COLOR_TYPE_RGB; +- data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT; +- data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT; +- data->info_ptr->interlace_type = PNG_INTERLACE_NONE; ++ png_set_IHDR(data->png_ptr, data->info_ptr, width, height, ++ 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, ++ PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + + png_write_info(data->png_ptr, data->info_ptr); + +@@ -216,12 +207,12 @@ png_write_lines (void *_data, unsigned c + unsigned char *packed_line; + int i; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + if (data->pixel_stride != 3) + { +- packed_line = (unsigned char*)malloc(data->info_ptr->width * 3); ++ packed_line = (unsigned char*)malloc(png_get_image_width(data->png_ptr, data->info_ptr) * 3); + assert(packed_line != 0); + } + else +@@ -235,7 +226,7 @@ png_write_lines (void *_data, unsigned c + { + int j; + +- for (j = 0; j < data->info_ptr->width; ++j) ++ for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j) + { + packed_line[j * 3 + 0] = p[j * data->pixel_stride + 0]; + packed_line[j * 3 + 1] = p[j * data->pixel_stride + 1]; +@@ -257,7 +248,7 @@ png_free_writer_data (void *_data) + { + png_data_t *data = (png_data_t*)_data; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + png_write_end(data->png_ptr, data->info_ptr); +Only in mathmap-1.3.5.new/rwimg: rwpng.c.orig diff --git a/community/gimp-plugin-wavelet-decompose/PKGBUILD b/community/gimp-plugin-wavelet-decompose/PKGBUILD index 15fdf6542..02c20524d 100644 --- a/community/gimp-plugin-wavelet-decompose/PKGBUILD +++ b/community/gimp-plugin-wavelet-decompose/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 38078 2011-01-21 15:50:47Z spupykin $ +# $Id: PKGBUILD 63586 2012-02-05 11:58:12Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Denis Kvist <denvist@ya.ru> pkgname=gimp-plugin-wavelet-decompose pkgver=0.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Wavelet decompose plugin for Gimp" arch=('i686' 'x86_64') url="http://registry.gimp.org/node/11742" @@ -16,11 +16,11 @@ md5sums=('e0cb8670a1c5506d08f57f2300caac24' '4de9e41a535f200c2502f0dd8458c43e') build() { - cd "$srcdir/wavelet-decompose-$pkgver" - patch -Np1 < ../po_install.diff - make - install -Dvm755 src/wavelet-decompose \ + cd "$srcdir/wavelet-decompose-$pkgver" + patch -Np1 < ../po_install.diff + make + install -Dvm755 src/wavelet-decompose \ "$pkgdir"/usr/lib/gimp/2.0/plug-ins/wavelet-decompose - cd po - make LOCALEDIR="$pkgdir"/usr/share/locale install + cd po + make LOCALEDIR="$pkgdir"/usr/share/locale install } diff --git a/community/gliv/PKGBUILD b/community/gliv/PKGBUILD index 9875b6eb0..157adabfb 100644 --- a/community/gliv/PKGBUILD +++ b/community/gliv/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gliv pkgver=1.9.7 -pkgrel=1 +pkgrel=2 pkgdesc="OpenGL image viewer" arch=('i686' 'x86_64') url="http://guichaz.free.fr/gliv/" diff --git a/community/glpng/PKGBUILD b/community/glpng/PKGBUILD index 0c57c67ae..0c604e544 100644 --- a/community/glpng/PKGBUILD +++ b/community/glpng/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55485 2011-09-13 02:26:22Z ebelanger $ +# $Id: PKGBUILD 63590 2012-02-05 11:58:33Z ibiru $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=glpng pkgver=1.45 -pkgrel=4 +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" @@ -12,19 +12,13 @@ depends=('libpng' 'libgl') makedepends=('mesa') source=(http://ftp.de.debian.org/debian/pool/main/libg/libglpng/libglpng_${pkgver}.orig.tar.gz Makefile - libglpng-1.45-debian.patch - libpng14.patch + libpng15.patch license) -md5sums=('9e0daad8e39fbf3179c73c0d3f74f104' - '0b24e9cb527d4ed1c43dd743d49d2b54' - '51ee01e61a70d91977b791a03e579b0f' - '50e00b9de0b376d7fb5fd812dc7beac9' - 'cd066652a6e5dbd7c1fc303b8e03417a') - build() { cd "$srcdir/libglpng-1.45.orig" - patch -Np1 -i "$srcdir/libglpng-1.45-debian.patch" - patch -Np1 -i "$srcdir/libpng14.patch" + + patch -Np1 -i "$srcdir/libpng15.patch" + cp "$srcdir/Makefile" . make libglpng.so.1.45 } @@ -35,3 +29,7 @@ package() { install -Dm644 "$srcdir/license" \ "$pkgdir/usr/share/licenses/glpng/license" } +md5sums=('9e0daad8e39fbf3179c73c0d3f74f104' + '0b24e9cb527d4ed1c43dd743d49d2b54' + 'f3f0c0a3f867c5856d922c18677ef2a2' + 'cd066652a6e5dbd7c1fc303b8e03417a') diff --git a/community/glpng/libpng15.patch b/community/glpng/libpng15.patch new file mode 100644 index 000000000..89e9bf67e --- /dev/null +++ b/community/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/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD index dbdc62f80..c915337bf 100644 --- a/community/gmerlin-avdecoder/PKGBUILD +++ b/community/gmerlin-avdecoder/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61443 2011-12-31 13:20:56Z ibiru $ +# $Id: PKGBUILD 63594 2012-02-05 11:58:46Z ibiru $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin-avdecoder pkgver=1.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="Media decoding library" arch=('i686' 'x86_64') url="http://gmerlin.sourceforge.net/avdec_frame.html" diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index adb56b50c..ef8b7aa08 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 58153 2011-11-07 10:55:45Z spupykin $ +# $Id: PKGBUILD 63592 2012-02-05 11:58:41Z ibiru $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin pkgver=1.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64') url="http://openmovieeditor.sourceforge.net/HomePage" license=('GPL') -depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'mesa' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools') -makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils') +depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl') +makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils' 'mesa') optdepends=('alsa-lib: for ALSA support' 'jack: for JACK support' 'libquicktime: for movie encoding' 'pulseaudio: for PulseAudio support' 'v4l-utils: for video conversion') -options=('!libtool') +options=('!libtool' '!makeflags') +install=gmerlin.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz libpng.patch) md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6' @@ -26,8 +27,10 @@ build() { rm -rf cpuinfo.sh - patch -p1 <$srcdir/libpng.patch + patch -p1 -i "$srcdir/libpng.patch" ./configure --prefix=/usr --without-doxygen + sed -i 's|LIBS = -lgavl|LIBS = -lgavl -ldl -lpthread -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lX11|' {lib,tests,apps/*}/Makefile + sed -i 's|ln -sf $(DESTDIR)$(pkgdatadir)|ln -sf $(pkgdatadir)|' icons/Makefile make } @@ -35,5 +38,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - rm -rf "$pkgdir/usr/share/info/dir" } diff --git a/community/gmerlin/gmerlin.install b/community/gmerlin/gmerlin.install new file mode 100644 index 000000000..c7625c2f1 --- /dev/null +++ b/community/gmerlin/gmerlin.install @@ -0,0 +1,25 @@ +infodir=usr/share/info +filelist=(gmerlin.info) + +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + [[ -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 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index ccfbf4d53..049f0fe11 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61559 2012-01-02 22:44:42Z spupykin $ +# $Id: PKGBUILD 63596 2012-02-05 11:58:54Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -7,7 +7,7 @@ pkgbase=gmic pkgname=('gmic' 'gimp-plugin-gmic') pkgver=1.5.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="image procession framework" arch=('i686' 'x86_64') license=('custom:CeCILL') @@ -29,6 +29,7 @@ build() { sed -i 's|OPENCV_CFLAGS = .*|OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv `pkg-config --cflags opencv`|' src/Makefile sed -i 's|OPENCV_LDFLAGS = .*|OPENCV_LDFLAGS = `pkg-config --libs opencv`|' src/Makefile sed -i 's|cp -f gmic_gimp.*||' src/Makefile + sed -i 's|ln -s $(DESTDIR)$(USR)|ln -s $(USR)|' src/Makefile patch -p1 <$srcdir/opencv-buildfix.patch make -C src all } diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index df42c396b..348db3561 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.9 -pkgrel=8 +pkgrel=9 arch=(i686 x86_64) url="http://www.gnu.org/software/gnash/" license=(GPL3) @@ -45,6 +45,8 @@ build() { --enable-media=gst,ffmpeg \ --enable-hwaccel=vaapi + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make } diff --git a/community/gnubiff-gtk/PKGBUILD b/community/gnubiff-gtk/PKGBUILD index 2ebd79695..a632caace 100644 --- a/community/gnubiff-gtk/PKGBUILD +++ b/community/gnubiff-gtk/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 53956 2011-08-10 14:39:02Z spupykin $ +# $Id: PKGBUILD 63602 2012-02-05 11:59:50Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> # Contributor: Todd Musall <tmusall@gmail.com> pkgname=gnubiff-gtk -pkgver=2.2.13 -pkgrel=3 +pkgver=2.2.14 +pkgrel=1 pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived. GTK version." arch=('i686' 'x86_64') url="http://gnubiff.sourceforge.net/" license=("GPL") -depends=('libglade' 'openssl' 'popt') +depends=('libglade' 'gtk3' 'openssl' 'popt') makedepends=('intltool') -conflicts=(gnubiff) +conflicts=('gnubiff') source=(http://downloads.sourceforge.net/sourceforge/gnubiff/gnubiff-$pkgver.tar.gz build.patch) -md5sums=('65423957eb027b94c9e661611c0e4271' +md5sums=('f2a2c3485d2f3f0adff1b7665c2f3b24' '96fde605eb69e300f6014546d4339beb') build() { cd $srcdir/gnubiff-$pkgver - patch -p1 <../build.patch +# patch -p1 <../build.patch export LDFLAGS=-lX11 ./configure --prefix=/usr --disable-gnome --disable-fam --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" make diff --git a/community/gnubiff/PKGBUILD b/community/gnubiff/PKGBUILD index 5dd567d8a..03485f1f1 100644 --- a/community/gnubiff/PKGBUILD +++ b/community/gnubiff/PKGBUILD @@ -1,55 +1,29 @@ -# $Id: PKGBUILD 53951 2011-08-10 14:38:08Z spupykin $ +# $Id: PKGBUILD 63600 2012-02-05 11:59:28Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> # Contributor: Todd Musall <tmusall@gmail.com> pkgname=gnubiff -pkgver=2.2.13 -pkgrel=2 +pkgver=2.2.14 +pkgrel=1 pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived" arch=('i686' 'x86_64') url="http://gnubiff.sourceforge.net/" license=("GPL") -depends=('libglade' 'gtk2' 'popt') +depends=('libglade' 'gtk3' 'popt') makedepends=('perlxml' 'intltool') conflicts=(gnubiff-gtk) source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz) -md5sums=('65423957eb027b94c9e661611c0e4271') +md5sums=('f2a2c3485d2f3f0adff1b7665c2f3b24') build() { [ "$GNOMEDIR" = "" ] && GNOMEDIR=/usr - cd $startdir/src/gnubiff-$pkgver - - patch -p2 src/support.h <<EOF -diff -wbBur gnubiff-2.2.10/src/support.h gnubiff-2.2.10.my/src/support.h ---- gnubiff-2.2.10/src/support.h 2008-03-22 05:08:51.000000000 +0300 -+++ gnubiff-2.2.10.my/src/support.h 2008-04-22 14:21:58.000000000 +0400 -@@ -35,6 +35,9 @@ - #endif - #include "nls.h" - -+#include <stdlib.h> -+#define EXIT_SUCCESS 0 -+#define EXIT_FAILURE 1 - - #include <glib.h> - #include <sstream> -@@ -131,6 +134,9 @@ - if ((pos == end) && (last < num)) - result << sep << num; - -+ if ((pos == end) && (last != num)) -+ result << sep << num; -+ - // Save new number - inf_bound = last = num; - } -EOF + cd $srcdir/gnubiff-$pkgver ./configure --prefix=/usr --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" \ --disable-fam --disable-gnome make - make DESTDIR=$startdir/pkg install + make DESTDIR=$pkgdir install rm -rf ${pkgdir}/usr/share/info/dir } diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD index 624656ee9..39b928cba 100644 --- a/community/gnustep-gui/PKGBUILD +++ b/community/gnustep-gui/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58379 2011-11-12 16:02:38Z spupykin $ +# $Id: PKGBUILD 63604 2012-02-05 11:59:59Z ibiru $ # 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=2 +pkgrel=3 pkgdesc="The GNUstep GUI class library" arch=('i686' 'x86_64') url="http://www.gnustep.org/" diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index ff5f9784e..a654aac4e 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61715 2012-01-06 22:18:07Z ebelanger $ +# $Id: PKGBUILD 63606 2012-02-05 12:00:04Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpac pkgver=3824 -pkgrel=1 +pkgrel=2 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64') url="http://gpac.sourceforge.net" diff --git a/community/gpsim/PKGBUILD b/community/gpsim/PKGBUILD index 809a2b973..311a70a32 100644 --- a/community/gpsim/PKGBUILD +++ b/community/gpsim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53898 2011-08-09 13:35:24Z spupykin $ +# $Id: PKGBUILD 63608 2012-02-05 12:00:08Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: mickael9 <mickael9 at gmail dot com> pkgname=gpsim pkgver=0.26.1 -pkgrel=1 +pkgrel=2 pkgdesc="A full-featured software simulator for Microchip PIC microcontrollers" arch=(i686 x86_64) url="http://gpsim.sourceforge.net/" diff --git a/community/grace/PKGBUILD b/community/grace/PKGBUILD index 3a74d0fb0..0c0296724 100644 --- a/community/grace/PKGBUILD +++ b/community/grace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 46737 2011-05-11 10:00:50Z spupykin $ +# $Id: PKGBUILD 63610 2012-02-05 12:00:16Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: damir <damir@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=grace pkgver=5.1.22 -pkgrel=5 +pkgrel=6 pkgdesc="2D plotting tool" arch=(i686 x86_64) url="http://plasma-gate.weizmann.ac.il/Grace/" @@ -17,6 +17,8 @@ md5sums=('672356466f18fe59ed21a8fb44f9851d') build() { cd $srcdir/$pkgname-$pkgver + sed -i '1,1i#include <zlib.h>' src/rstdrv.c + sed -i 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|g' src/rstdrv.c ./configure --prefix=/usr --exec-prefix=/usr \ --enable-grace-home=/usr/share/grace \ --includedir=/usr/include --libdir=/usr/lib \ diff --git a/community/grafx2/PKGBUILD b/community/grafx2/PKGBUILD index 43da08b43..d7756ee14 100644 --- a/community/grafx2/PKGBUILD +++ b/community/grafx2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 57828 2011-11-03 10:14:39Z arodseth $ +# $Id: PKGBUILD 63612 2012-02-05 12:00:25Z ibiru $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Simon Parzer <simon.parzer@gmail.com> pkgname=grafx2 pkgver=2.3 -pkgrel=2 +pkgrel=3 pkgdesc="Pixelart-oriented painting program" arch=('x86_64' 'i686') url="http://code.google.com/p/grafx2/" @@ -23,7 +23,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}/src" + cd "$srcdir/$pkgname/src" msg2 "Packaging files..." make prefix="/usr" DESTDIR="$pkgdir" install diff --git a/community/gsql/PKGBUILD b/community/gsql/PKGBUILD index 88d05ff87..be3937b83 100644 --- a/community/gsql/PKGBUILD +++ b/community/gsql/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 58755 2011-11-18 13:09:30Z spupykin $ +# $Id: PKGBUILD 63614 2012-02-05 12:00:35Z ibiru $ # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=gsql pkgver=0.2.2 -pkgrel=3 +pkgrel=4 pkgdesc="Integrated database development tool for GNOME" url="http://gsql.org/" license=('GPL') diff --git a/community/gtk-chtheme/PKGBUILD b/community/gtk-chtheme/PKGBUILD index 5621dce39..fbce248ad 100644 --- a/community/gtk-chtheme/PKGBUILD +++ b/community/gtk-chtheme/PKGBUILD @@ -1,27 +1,29 @@ +# $Id: PKGBUILD 63616 2012-02-05 12:00:48Z ibiru $ # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gtk-chtheme pkgver=0.3.1 -pkgrel=6 +pkgrel=7 pkgdesc="This little program lets you change your Gtk+ 2.0 theme. A better alternative to switch2" arch=('i686' 'x86_64') license=('GPL') url="http://plasmasturm.org/programs/gtk-chtheme/" depends=('gtk2') -source=(http://plasmasturm.org/programs/gtk-chtheme/${pkgname}-${pkgver}.tar.bz2) +source=("http://plasmasturm.org/programs/gtk-chtheme/${pkgname}-${pkgver}.tar.bz2") md5sums=('f688053bf26dd6c4f1cd0bf2ee33de2a') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} - # Fix xdg compliancy - sed -i 's|-DGTK.*||' Makefile - sed -i 's|theme_list(g_.*|&\n\tread_theme_list(g_strconcat(g_get_user_data_dir(), "/themes", NULL));|' main.c - make || return 1 + # Fix xdg compliancy + sed -i 's|-DGTK.*||' Makefile + sed -i 's|theme_list(g_.*|&\n\tread_theme_list(g_strconcat(g_get_user_data_dir(), "/themes", NULL));|' main.c + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -Dm755 gtk-chtheme ${pkgdir}/usr/bin/gtk-chtheme || return 1 + cd ${srcdir}/${pkgname}-${pkgver} + + install -Dm755 gtk-chtheme ${pkgdir}/usr/bin/gtk-chtheme } diff --git a/community/gtk-engine-murrine/PKGBUILD b/community/gtk-engine-murrine/PKGBUILD index b14fa5f7f..c8cf2b616 100644 --- a/community/gtk-engine-murrine/PKGBUILD +++ b/community/gtk-engine-murrine/PKGBUILD @@ -1,4 +1,5 @@ -# $Id: PKGBUILD 34751 2010-12-12 15:03:53Z tdziedzic $ +# $Id: PKGBUILD 63618 2012-02-05 12:00:53Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: detto <detto-brumm@freenet.de> @@ -6,7 +7,7 @@ pkgname=gtk-engine-murrine pkgver=0.98.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="GTK2 engine to make your desktop look like a 'murrina', an italian word meaning the art glass works done by Venicians glass blowers." arch=('i686' 'x86_64') url="http://cimitan.com/murrine/project/murrine" @@ -19,17 +20,14 @@ sha256sums=('e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912') build() { cd murrine-${pkgver} - ./configure \ --prefix=/usr \ --enable-animation \ --enable-animationrtl - make } package() { cd murrine-${pkgver} - make DESTDIR=${pkgdir} install } diff --git a/community/guake/0001-Retrieve-port-as-int.2.patch b/community/guake/0001-Retrieve-port-as-int.2.patch new file mode 100644 index 000000000..3fde26dc2 --- /dev/null +++ b/community/guake/0001-Retrieve-port-as-int.2.patch @@ -0,0 +1,25 @@ +From efcd1d8d3cdc354f46bc2485e7e3394f8578b7ba Mon Sep 17 00:00:00 2001 +From: pingou <pingou@pingoured.fr> +Date: Mon, 23 Aug 2010 09:54:35 +0200 +Subject: [PATCH] Retrieve port as int + +--- + src/guake.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/guake.py b/src/guake.py +index 6214fb2..40e688f 100644 +--- a/src/guake.py ++++ b/src/guake.py +@@ -1099,7 +1099,7 @@ class Guake(SimpleGladeApp): + ssl_port = port + else: + ssl_host = self.client.get_string('/system/proxy/secure_host') +- ssl_port = self.client.get_string('/system/proxy/secure_port') ++ ssl_port = self.client.get_int('/system/proxy/secure_port') + + if self.client.get_bool(proxy + 'use_authentication'): + auth_user = self.client.get_string( +-- +1.7.2.1 + diff --git a/community/guake/PKGBUILD b/community/guake/PKGBUILD index 96bc8f472..cd40f51be 100644 --- a/community/guake/PKGBUILD +++ b/community/guake/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 33304 2010-11-23 20:21:25Z angvp $ -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# $Id: PKGBUILD 63620 2012-02-05 12:01:07Z ibiru $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org> pkgname=guake pkgver=0.4.2 -pkgrel=4 +pkgrel=5 pkgdesc='is a drop-down terminal for Gnome Desktop Environment' arch=('i686' 'x86_64') -url='http://guake-terminal.org' +url='http://guake.org' license=('GPL') depends=('python-notify' 'vte' 'gconf' 'python2-gconf' 'dbus-python' 'notification-daemon') makedepends=('libx11' 'pkgconfig' 'perlxml' 'intltool') install=guake.install -source=(http://trac.guake-terminal.org/files/guake-$pkgver.tar.gz +source=(http://guake.org/files/guake-$pkgver.tar.gz http://guake.org/raw-attachment/ticket/246/0001-Retrieve-port-as-int.2.patch) md5sums=('1f0feff3bfc15c998147dbf07d9d8a8e' '9aca6ba8e46ae1b69958cda0e03320ff') @@ -27,5 +27,9 @@ build() { ./configure --sysconfdir=/usr/share --prefix=/usr --disable-static make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/hatari/PKGBUILD b/community/hatari/PKGBUILD index d0250b55b..750c9bf10 100644 --- a/community/hatari/PKGBUILD +++ b/community/hatari/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55846 2011-09-23 18:34:08Z lcarlier $ +# $Id: PKGBUILD 63626 2012-02-05 12:01:45Z ibiru $ # Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=hatari pkgver=1.5.0 -pkgrel=1 +pkgrel=2 pkgdesc='An Atari ST and STE emulator' arch=('i686' 'x86_64') url='http://hatari.sourceforge.net/' diff --git a/community/htmldoc/PKGBUILD b/community/htmldoc/PKGBUILD index ded19e284..b498e00f1 100644 --- a/community/htmldoc/PKGBUILD +++ b/community/htmldoc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52181 2011-07-21 12:03:40Z spupykin $ +# $Id: PKGBUILD 63628 2012-02-05 12:01:52Z ibiru $ # 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=6 +pkgrel=7 pkgdesc="Produce PDF or Postscript from HTML documents including TOCs and Indices" arch=(i686 x86_64) url="http://www.htmldoc.org" @@ -16,7 +16,7 @@ md5sums=('35589e7b8fe9c54e11be87cd5aec4dcc') build() { cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr --mandir=${pkgdir}/usr/share/man + ./configure --prefix=/usr make } diff --git a/community/icoutils/PKGBUILD b/community/icoutils/PKGBUILD index d9c24c298..8f8813cbd 100644 --- a/community/icoutils/PKGBUILD +++ b/community/icoutils/PKGBUILD @@ -4,7 +4,7 @@ pkgname=icoutils pkgver=0.29.1 -pkgrel=1 +pkgrel=2 pkgdesc='Extracts and converts images in MS Windows(R) icon and cursor files.' arch=('i686' 'x86_64') license=('GPL') @@ -15,16 +15,13 @@ 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/irrlicht/PKGBUILD b/community/irrlicht/PKGBUILD index 8dd14decd..c4b0ceccd 100644 --- a/community/irrlicht/PKGBUILD +++ b/community/irrlicht/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56796 2011-10-12 23:30:10Z svenstaro $ +# $Id: PKGBUILD 63632 2012-02-05 12:02:14Z ibiru $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Hilton Medeiros <medeiros.hilton AT gmail DOT com> # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com> @@ -7,19 +7,26 @@ pkgname=irrlicht pkgver=1.7.2 -pkgrel=3 +pkgrel=4 pkgdesc="An open source high performance realtime 3D graphics engine." arch=('i686' 'x86_64') url="http://irrlicht.sourceforge.net/" license=('ZLIB') depends=('libgl' 'libjpeg' 'bzip2' 'libpng') -makedepends=('mesa') -source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip") -md5sums=('eb627d4c432bf73f12bc6d9ddc700b07') +makedepends=('mesa' 'unzip') +source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip" + "irrlicht-1.7.2-libpng15.patch") +md5sums=('eb627d4c432bf73f12bc6d9ddc700b07' + 'a7f8d4aa1bc2880bbeaf3449e09f69a5') +noextract=($pkgname-$pkgver.zip) build() { + unzip $pkgname-$pkgver.zip + cd $srcdir/$pkgname-$pkgver + patch -Np0 < $srcdir/irrlicht-1.7.2-libpng15.patch + sed -i -e '/^#.*NON_SYSTEM_ZLIB/d' \ -e '/^#.*NON_SYSTEM_JPEG/d' \ -e '/^#.*NON_SYSTEM_LIB_PNG/d' \ diff --git a/community/irrlicht/irrlicht-1.7.2-libpng15.patch b/community/irrlicht/irrlicht-1.7.2-libpng15.patch new file mode 100644 index 000000000..a1426bf29 --- /dev/null +++ b/community/irrlicht/irrlicht-1.7.2-libpng15.patch @@ -0,0 +1,40 @@ +--- source/Irrlicht/CImageLoaderPNG.cpp ++++ source/Irrlicht/CImageLoaderPNG.cpp +@@ -28,7 +28,7 @@ + static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
+ {
+ os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ // PNG function for file reading
+@@ -37,7 +37,7 @@ + png_size_t check;
+
+ // changed by zola {
+- io::IReadFile* file=(io::IReadFile*)png_ptr->io_ptr;
++ io::IReadFile* file=(io::IReadFile*)png_get_io_ptr(png_ptr);
+ check=(png_size_t) file->read((void*)data,(u32)length);
+ // }
+
+--- source/Irrlicht/CImageWriterPNG.cpp ++++ source/Irrlicht/CImageWriterPNG.cpp +@@ -35,7 +35,7 @@ + static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
+ {
+ os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ // PNG function for file writing
+@@ -43,7 +43,7 @@ + {
+ png_size_t check;
+
+- io::IWriteFile* file=(io::IWriteFile*)png_ptr->io_ptr;
++ io::IWriteFile* file=(io::IWriteFile*)png_get_io_ptr(png_ptr);
+ check=(png_size_t) file->write((const void*)data,(u32)length);
+
+ if (check != length)
diff --git a/community/jwm/PKGBUILD b/community/jwm/PKGBUILD index 6fe9358d5..2caf2a506 100644 --- a/community/jwm/PKGBUILD +++ b/community/jwm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56063 2011-09-30 07:00:29Z kkeen $ +# $Id: PKGBUILD 63634 2012-02-05 12:02:20Z ibiru $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=jwm pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight window manager for the X11 Window System" arch=('i686' 'x86_64') url="http://joewing.net/programs/jwm/" diff --git a/community/kovpn/PKGBUILD b/community/kovpn/PKGBUILD index 13b780799..20b76bfc4 100644 --- a/community/kovpn/PKGBUILD +++ b/community/kovpn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58772 2011-11-18 14:01:32Z spupykin $ +# $Id: PKGBUILD 63636 2012-02-05 12:02:32Z ibiru $ # 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=5 +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" diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD index d5e3fec82..9aaa55a76 100644 --- a/community/leptonica/PKGBUILD +++ b/community/leptonica/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57411 2011-10-27 08:39:19Z spupykin $ +# $Id: PKGBUILD 63638 2012-02-05 12:02:42Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christoph Drexler <chrdr at gmx dot at> pkgname=leptonica pkgver=1.68 -pkgrel=2 +pkgrel=3 pkgdesc="Software that is broadly useful for image processing and image analysis applications" arch=('i686' 'x86_64') url="http://www.leptonica.com/" @@ -24,6 +24,7 @@ md5sums=('5cd7092f9ff2ca7e3f3e73bfcd556403') build() { cd ${srcdir}/leptonica-${pkgver} + sed -i '1,1i#include <zlib.h>' src/pngio.c ./configure --prefix=/usr make } diff --git a/community/libgeotiff/PKGBUILD b/community/libgeotiff/PKGBUILD index a7e2823f6..f8c13285c 100644 --- a/community/libgeotiff/PKGBUILD +++ b/community/libgeotiff/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 27066 2010-09-17 00:46:59Z bfanella $ +# $Id: PKGBUILD 63640 2012-02-05 12:02:48Z ibiru $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=libgeotiff pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="A TIFF based interchange format for georeferenced raster imagery" arch=('i686' 'x86_64') license=('custom') url="http://www.remotesensing.org/geotiff" depends=('libtiff' 'proj' 'libjpeg>=7') -options=('!makeflags') +options=('!makeflags' '!libtool') source=(ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/$pkgname-$pkgver.tar.gz) md5sums=('6ac3c22e44711e9a3add9044e40b9527') diff --git a/community/libgtksourceviewmm2/PKGBUILD b/community/libgtksourceviewmm2/PKGBUILD index 1542c58e1..a9c611216 100644 --- a/community/libgtksourceviewmm2/PKGBUILD +++ b/community/libgtksourceviewmm2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 33294 2010-11-23 19:37:10Z heftig $ +# $Id: PKGBUILD 63642 2012-02-05 12:02:56Z ibiru $ # Maintainer: Roman Kyrylych <roman@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=libgtksourceviewmm2 pkgver=2.10.1 -pkgrel=1 +pkgrel=2 pkgdesc='A C++ API for gtksourceview2' arch=('i686' 'x86_64') url='http://projects.gnome.org/gtksourceviewmm/' diff --git a/community/libharu/PKGBUILD b/community/libharu/PKGBUILD index 160373489..ecbd647ad 100644 --- a/community/libharu/PKGBUILD +++ b/community/libharu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51967 2011-07-18 20:03:48Z spupykin $ +# $Id: PKGBUILD 63644 2012-02-05 12:03:04Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : SpepS <dreamspepser at yahoo dot it> # Contributor: Auguste <auguste@gmail.com> @@ -6,18 +6,21 @@ pkgname=libharu pkgver=2.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="C/C++ library for generating PDF documents" url="http://libharu.org/wiki/Main_Page" arch=('i686' 'x86_64') license=('custom:ZLIB') depends=('libpng' 'gcc-libs') options=(!libtool) -source=("http://libharu.org/files/$pkgname-$pkgver.tar.gz") -md5sums=('63da8e087744f1d6cf16f9501b1cb766') +source=("http://libharu.org/files/$pkgname-$pkgver.tar.gz" + libpng15.patch) +md5sums=('63da8e087744f1d6cf16f9501b1cb766' + '3793dd30017474bcd277af3b419bc0f6') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 <$srcdir/libpng15.patch ./configure --prefix=/usr make } diff --git a/community/libharu/libpng15.patch b/community/libharu/libpng15.patch new file mode 100644 index 000000000..05a8d39fc --- /dev/null +++ b/community/libharu/libpng15.patch @@ -0,0 +1,302 @@ +diff -wbBur libharu-2.2.1/src/hpdf_image_png.c libharu-2.2.1.my/src/hpdf_image_png.c +--- libharu-2.2.1/src/hpdf_image_png.c 2010-02-08 12:27:51.000000000 +0300 ++++ libharu-2.2.1.my/src/hpdf_image_png.c 2012-01-23 12:53:05.000000000 +0400 +@@ -110,13 +110,13 @@ + { + png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr); + png_bytep* row_pointers = HPDF_GetMem (image->mmgr, +- info_ptr->height * sizeof (png_bytep)); ++ png_image_height(png_ptr, info_ptr) * sizeof (png_bytep)); + + if (row_pointers) { + HPDF_UINT i; + +- HPDF_MemSet (row_pointers, 0, info_ptr->height * sizeof (png_bytep)); +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ HPDF_MemSet (row_pointers, 0, png_image_height(png_ptr, info_ptr) * sizeof (png_bytep)); ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + row_pointers[i] = HPDF_GetMem (image->mmgr, len); + + if (image->error->error_no != HPDF_OK) +@@ -126,7 +126,7 @@ + if (image->error->error_no == HPDF_OK) { + png_read_image(png_ptr, row_pointers); + if (image->error->error_no == HPDF_OK) { /* add this line */ +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + if (HPDF_Stream_Write (image->stream, row_pointers[i], len) != + HPDF_OK) + break; +@@ -135,7 +135,7 @@ + } + + /* clean up */ +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + HPDF_FreeMem (image->mmgr, row_pointers[i]); + } + +@@ -156,7 +156,7 @@ + if (buf_ptr) { + HPDF_UINT i; + +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + png_read_rows(png_ptr, (png_byte**)&buf_ptr, NULL, 1); + if (image->error->error_no != HPDF_OK) + break; +@@ -183,13 +183,13 @@ + HPDF_UINT i, j; + png_bytep *row_ptr; + +- row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep)); ++ row_ptr = HPDF_GetMem (image->mmgr, png_image_height(png_ptr, info_ptr) * sizeof(png_bytep)); + if (!row_ptr) { + return HPDF_FAILD_TO_ALLOC_MEM; + } else { + png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr); + +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + row_ptr[i] = HPDF_GetMem(image->mmgr, len); + if (!row_ptr[i]) { + for (; i >= 0; i--) { +@@ -207,19 +207,19 @@ + goto Error; + } + +- for (j = 0; j < info_ptr->height; j++) { +- for (i = 0; i < info_ptr->width; i++) { +- smask_data[info_ptr->width * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF; ++ for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) { ++ for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) { ++ smask_data[png_image_width(png_ptr, info_ptr) * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF; + } + +- if (HPDF_Stream_Write (image->stream, row_ptr[j], info_ptr->width) != HPDF_OK) { ++ if (HPDF_Stream_Write (image->stream, row_ptr[j], png_image_width(png_ptr, info_ptr)) != HPDF_OK) { + ret = HPDF_FILE_IO_ERROR; + goto Error; + } + } + + Error: +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + HPDF_FreeMem (image->mmgr, row_ptr[i]); + } + +@@ -245,13 +245,13 @@ + return HPDF_INVALID_PNG_IMAGE; + } + +- row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep)); ++ row_ptr = HPDF_GetMem (image->mmgr, png_image_height(png_ptr, info_ptr) * sizeof(png_bytep)); + if (!row_ptr) { + return HPDF_FAILD_TO_ALLOC_MEM; + } else { + png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr); + +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + row_ptr[i] = HPDF_GetMem(image->mmgr, len); + if (!row_ptr[i]) { + for (; i >= 0; i--) { +@@ -271,12 +271,12 @@ + + switch (color_type) { + case PNG_COLOR_TYPE_RGB_ALPHA: +- row_len = 3 * info_ptr->width * sizeof(png_byte); +- for (j = 0; j < info_ptr->height; j++) { +- for (i = 0; i < info_ptr->width; i++) { ++ row_len = 3 * png_image_width(png_ptr, info_ptr) * sizeof(png_byte); ++ for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) { ++ for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) { + row = row_ptr[j]; + memmove(row + (3 * i), row + (4*i), 3); +- smask_data[info_ptr->width * j + i] = row[4 * i + 3]; ++ smask_data[png_image_width(png_ptr, info_ptr) * j + i] = row[4 * i + 3]; + } + + if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) { +@@ -286,12 +286,12 @@ + } + break; + case PNG_COLOR_TYPE_GRAY_ALPHA: +- row_len = info_ptr->width * sizeof(png_byte); +- for (j = 0; j < info_ptr->height; j++) { +- for (i = 0; i < info_ptr->width; i++) { ++ row_len = png_image_width(png_ptr, info_ptr) * sizeof(png_byte); ++ for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) { ++ for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) { + row = row_ptr[j]; + row[i] = row[2 * i]; +- smask_data[info_ptr->width * j + i] = row[2 * i + 1]; ++ smask_data[png_image_width(png_ptr, info_ptr) * j + i] = row[2 * i + 1]; + } + + if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) { +@@ -306,7 +306,7 @@ + } + + Error: +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + HPDF_FreeMem (image->mmgr, row_ptr[i]); + } + +@@ -448,7 +448,7 @@ + } + + /* 16bit images are not supported. */ +- if (info_ptr->bit_depth == 16) { ++ if (png_get_bit_depth(png_ptr, info_ptr) == 16) { + png_set_strip_16(png_ptr); + } + +@@ -458,7 +458,7 @@ + } + + /* check palette-based images for transparent areas and load them immediately if found */ +- if (xref && PNG_COLOR_TYPE_PALETTE & info_ptr->color_type) { ++ if (xref && PNG_COLOR_TYPE_PALETTE & png_get_color_type(png_ptr, info_ptr)) { + png_bytep trans; + int num_trans; + HPDF_Dict smask; +@@ -478,10 +478,10 @@ + smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT; + ret = HPDF_Dict_AddName (smask, "Type", "XObject"); + ret += HPDF_Dict_AddName (smask, "Subtype", "Image"); +- ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width); +- ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height); ++ ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr)); ++ ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr)); + ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray"); +- ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth); ++ ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)); + + if (ret != HPDF_OK) { + HPDF_Dict_Free(smask); +@@ -489,7 +489,7 @@ + goto Exit; + } + +- smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height); ++ smask_data = HPDF_GetMem(image->mmgr, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)); + if (!smask_data) { + HPDF_Dict_Free(smask); + ret = HPDF_FAILD_TO_ALLOC_MEM; +@@ -503,7 +503,7 @@ + goto Exit; + } + +- if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) { ++ if (HPDF_Stream_Write(smask->stream, smask_data, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)) != HPDF_OK) { + HPDF_FreeMem(image->mmgr, smask_data); + HPDF_Dict_Free(smask); + ret = HPDF_FILE_IO_ERROR; +@@ -513,9 +513,9 @@ + + + ret += CreatePallet(image, png_ptr, info_ptr); +- ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width); +- ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height); +- ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth); ++ ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr)); ++ ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr)); ++ ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)); + ret += HPDF_Dict_Add (image, "SMask", smask); + + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); +@@ -526,7 +526,7 @@ + + /* read images with alpha channel right away + we have to do this because image transparent mask must be added to the Xref */ +- if (xref && PNG_COLOR_MASK_ALPHA & info_ptr->color_type) { ++ if (xref && PNG_COLOR_MASK_ALPHA & png_get_color_type(png_ptr, info_ptr)) { + HPDF_Dict smask; + png_bytep smask_data; + +@@ -539,10 +539,10 @@ + smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT; + ret = HPDF_Dict_AddName (smask, "Type", "XObject"); + ret += HPDF_Dict_AddName (smask, "Subtype", "Image"); +- ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width); +- ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height); ++ ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr)); ++ ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr)); + ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray"); +- ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth); ++ ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)); + + if (ret != HPDF_OK) { + HPDF_Dict_Free(smask); +@@ -550,7 +550,7 @@ + goto Exit; + } + +- smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height); ++ smask_data = HPDF_GetMem(image->mmgr, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)); + if (!smask_data) { + HPDF_Dict_Free(smask); + ret = HPDF_FAILD_TO_ALLOC_MEM; +@@ -564,7 +564,7 @@ + goto Exit; + } + +- if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) { ++ if (HPDF_Stream_Write(smask->stream, smask_data, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)) != HPDF_OK) { + HPDF_FreeMem(image->mmgr, smask_data); + HPDF_Dict_Free(smask); + ret = HPDF_FILE_IO_ERROR; +@@ -572,14 +572,14 @@ + } + HPDF_FreeMem(image->mmgr, smask_data); + +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) { + ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray"); + } else { + ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB"); + } +- ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width); +- ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height); +- ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth); ++ ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr)); ++ ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr)); ++ ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)); + ret += HPDF_Dict_Add (image, "SMask", smask); + + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); +@@ -589,9 +589,9 @@ + /* if the image has color palette, copy the pallet of the image to + * create color map. + */ +- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) + ret = CreatePallet(image, png_ptr, info_ptr); +- else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) ++ else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) + ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray"); + else + ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB"); +@@ -617,16 +617,16 @@ + } + + /* setting the info of the image. */ +- if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width) ++ if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr)) + != HPDF_OK) + goto Exit; + +- if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height) ++ if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr)) + != HPDF_OK) + goto Exit; + + if (HPDF_Dict_AddNumber (image, "BitsPerComponent", +- (HPDF_UINT)info_ptr->bit_depth) != HPDF_OK) ++ (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)) != HPDF_OK) + goto Exit; + + /* clean up */ diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD index 4dc307ca4..817166b0f 100644 --- a/community/libinfinity/PKGBUILD +++ b/community/libinfinity/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54465 2011-08-18 15:07:27Z bluewind $ +# $Id: PKGBUILD 63646 2012-02-05 12:03:09Z ibiru $ # 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=2 +pkgrel=3 pkgdesc="An implementation of the Infininote protocol written in GObject-based C" arch=('i686' 'x86_64') url="http://gobby.0x539.de" diff --git a/community/libmatchbox/PKGBUILD b/community/libmatchbox/PKGBUILD index 63eb2cb29..7024885ce 100644 --- a/community/libmatchbox/PKGBUILD +++ b/community/libmatchbox/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 58821 2011-11-18 16:44:16Z spupykin $ +# $Id: PKGBUILD 63648 2012-02-05 12:03:24Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> pkgname=libmatchbox pkgver=1.9 -pkgrel=4 +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) -md5sums=('9f73e7515cc4679171a5db180dc1343b') +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 - ./configure --prefix=/usr --enable-pango --enable-jpeg --enable-xsettings + 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/libmatchbox/libpng15.patch b/community/libmatchbox/libpng15.patch new file mode 100644 index 000000000..6c4ddef4d --- /dev/null +++ b/community/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/luakit/PKGBUILD b/community/luakit/PKGBUILD index af16ee713..e92f5a99f 100644 --- a/community/luakit/PKGBUILD +++ b/community/luakit/PKGBUILD @@ -3,7 +3,7 @@ pkgname=luakit pkgver=2011.07.22 -pkgrel=4 +pkgrel=3 pkgdesc='Highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit. "Stable" release.' arch=('i686' 'x86_64') url='http://www.luakit.org/projects/luakit' diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index f29d49477..d37734038 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61083 2011-12-21 20:51:24Z andrea $ +# $Id: PKGBUILD 63654 2012-02-05 12:03:48Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=luminancehdr pkgver=2.1.0 -pkgrel=6 +pkgrel=7 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64') url='http://qtpfsgui.sourceforge.net/' diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog index 378053ef5..807541292 100644 --- a/community/luminancehdr/luminancehdr.changelog +++ b/community/luminancehdr/luminancehdr.changelog @@ -1,3 +1,6 @@ +2012-01-27 Eric Belanger <eric@archlinux.org> + * Rebuild against libpng 1.5 and libtiff 4.0 + 2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * luminancehdr 2.1.0-1 diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index 3cb9ad56e..c611ffdc6 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61377 2011-12-29 13:55:18Z stativ $ +# $Id: PKGBUILD 63656 2012-02-05 12:03:53Z ibiru $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Initial contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> pkgname=luxrender pkgver=0.8 _pkgver=45d3e13eb94c -pkgrel=11 +pkgrel=12 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64') url="http://www.luxrender.net/" diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 98af0c4d7..4034a978d 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59948 2011-12-02 20:59:31Z ibiru $ +# $Id: PKGBUILD 63658 2012-02-05 12:04:01Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=0.7.1 -pkgrel=12 +pkgrel=13 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." arch=('i686' 'x86_64') url="http://mapnik.org/" @@ -34,7 +34,7 @@ build() { #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64 sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct - + sed -i 's|png_ptr->io_ptr|png_get_io_ptr(png_ptr)|g' src/png_reader.cpp sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct scons configure \ @@ -46,7 +46,6 @@ build() { package(){ cd "$srcdir/$pkgname-$pkgver" scons install - # fix permissions on SCons-autogenerated files chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py" } diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 6df58d747..592833c16 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62705 2012-01-24 21:51:26Z svenstaro $ +# $Id: PKGBUILD 63660 2012-02-05 12:04:09Z ibiru $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest -pkgver=3.6.0.3 -pkgrel=1 +pkgver=3.6.0.2 +pkgrel=2 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64') url="http://sourceforge.net/projects/megaglest/" @@ -13,7 +13,7 @@ depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' ' 'libircclient' 'miniupnpc' 'wxgtk') makedepends=('ftjam' 'cmake' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz") -md5sums=('e939cbbb85c35e66c67ec2aa6f6b7f0b') +md5sums=('9d840a04b41aef2cba503de7bf433b8d') build() { cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ diff --git a/community/megaglest/megaglest.sh b/community/megaglest/megaglest.sh new file mode 100644 index 000000000..571a01be7 --- /dev/null +++ b/community/megaglest/megaglest.sh @@ -0,0 +1,26 @@ +#!/bin/sh + # Wrapper script for Megaglest. + + MAINDIR=/usr/share/megaglest + BASEDIR="$HOME/.config" + DIR="$BASEDIR/megaglest" + if [ ! -d "$DIR" ]; then + mkdir -p $DIR + fi + cd $DIR + [ -f glest.ini ] || cp /usr/share/megaglest/glest.ini . + [ -h megaglest ] || ln -s /usr/share/megaglest/megaglest . + [ -f servers.ini ] || cp $MAINDIR/servers.ini . + [ -f glestkeys.ini ] || cp $MAINDIR/glestkeys.ini . + for i in data scenarios techs tilesets tutorials; do + [ -h $i ] || ln -s $MAINDIR/$i . + done + [ -d maps ] || mkdir maps + [ -d screens ] || mkdir screens + cd maps + for i in $MAINDIR/maps/*; do + [ -h `basename $i` ] || ln -s $i . + done + cd .. + + exec ./megaglest
\ No newline at end of file diff --git a/community/metapixel/PKGBUILD b/community/metapixel/PKGBUILD index 056f40d52..1e5300fca 100644 --- a/community/metapixel/PKGBUILD +++ b/community/metapixel/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 53817 2011-08-08 13:44:50Z lfleischer $ +# $Id: PKGBUILD 63662 2012-02-05 12:04:18Z ibiru $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de> pkgname=metapixel pkgver=1.0.2 -pkgrel=2 +pkgrel=3 pkgdesc='A program for generating photomosaics.' arch=('i686' 'x86_64') url='http://www.complang.tuwien.ac.at/schani/metapixel/' license=('GPL') -depends=('libungif' 'libjpeg' 'libpng' 'perl') +depends=('giflib' 'libjpeg' 'libpng' 'perl') source=("http://www.complang.tuwien.ac.at/schani/metapixel/files/${pkgname}-${pkgver}.tar.gz" 'metapixel-1.0.2-libpng-1.5.patch') md5sums=('af5d77d38826756af213a08e3ada9941' @@ -18,9 +18,6 @@ md5sums=('af5d77d38826756af213a08e3ada9941' build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's/lgif/lungif/g' Makefile - sed -ie '58,58d' Makefile - patch -p1 -i ../metapixel-1.0.2-libpng-1.5.patch make @@ -28,5 +25,8 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" + + install -dm0755 "${pkgdir}/usr/share/man/man1" + make PREFIX="${pkgdir}/usr" install } diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD index 4d7b7ffb8..ea5a0f175 100644 --- a/community/mldonkey/PKGBUILD +++ b/community/mldonkey/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54810 2011-08-26 12:19:01Z cbrannon $ +# $Id: PKGBUILD 63664 2012-02-05 12:04:35Z ibiru $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=mldonkey pkgver=3.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-network P2P client" arch=('i686' 'x86_64') url="http://mldonkey.sourceforge.net/" diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index 2aacb7fff..839f4bf6d 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61499 2012-01-02 02:35:06Z arodseth $ +# $Id: PKGBUILD 63668 2012-02-05 12:04:57Z ibiru $ # 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=1 +pkgrel=2 pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork" arch=('x86_64' 'i686') url="http://mtpaint.sourceforge.net/" @@ -12,14 +12,14 @@ license=('GPL3') depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2') install=mtpaint.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" - "libpng14.patch") + "libpng15.patch") sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890' 'be51d45d1146d6c61d1c2c12d1712134da5048dd7314e2741ff336cac6838de3') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/libpng14.patch" + 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 diff --git a/community/mtpaint/libpng15.patch b/community/mtpaint/libpng15.patch new file mode 100644 index 000000000..7df3b2127 --- /dev/null +++ b/community/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/mypaint/PKGBUILD b/community/mypaint/PKGBUILD index bdb479906..5117a9227 100644 --- a/community/mypaint/PKGBUILD +++ b/community/mypaint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59299 2011-11-22 22:00:51Z spupykin $ +# $Id: PKGBUILD 63672 2012-02-05 12:05:19Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=mypaint pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A fast and easy painting application for digital painters, with brush dynamics" arch=('i686' 'x86_64') url="http://mypaint.intilinux.com/" diff --git a/community/naev/PKGBUILD b/community/naev/PKGBUILD index d6464d992..4c6138156 100644 --- a/community/naev/PKGBUILD +++ b/community/naev/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48678 2011-06-04 13:28:51Z svenstaro $ +# $Id: PKGBUILD 63674 2012-02-05 12:05:32Z ibiru $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Johan Rehnberg <cleanrock@gmail.com> pkgname=naev pkgver=0.5.0 -pkgrel=1 +pkgrel=2 pkgdesc='2D action/rpg space game' arch=('i686' 'x86_64') url="http://code.google.com/p/naev/" @@ -17,6 +17,8 @@ md5sums=('f7d754a17ace87aac540d0d6d48313d6') build() { cd "$srcdir/$pkgname-$pkgver" + sed -i "41 i #include <zlib.h>" src/opengl.c + ./configure --prefix=/usr --disable-debug --disable-shave --with-ndata-path=/usr/share/naev/ndata-${pkgver} make } diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD index 0cff030f3..c73ddbce7 100644 --- a/community/nestopia/PKGBUILD +++ b/community/nestopia/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 53185 2011-07-31 19:02:49Z spupykin $ +# $Id: PKGBUILD 63676 2012-02-05 12:05:46Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com> # Contributor: robb_force <robb_force@holybuffalo.net> pkgname=nestopia pkgver=1.40h -pkgrel=4 +pkgrel=5 pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' url='http://rbelmont.mameworld.info/?page_id=200' license=('GPL') diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD index beddbb372..618c5a76b 100644 --- a/community/netsurf/PKGBUILD +++ b/community/netsurf/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59684 2011-11-29 11:46:42Z arodseth $ +# $Id: PKGBUILD 63678 2012-02-05 12:05:59Z ibiru $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Georgij Kondratjev <smpuj@bk.ru> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=netsurf pkgver=2.8 -pkgrel=2 +pkgrel=3 pkgdesc="Lightweight and fast web browser" arch=('x86_64' 'i686') url="http://www.netsurf-browser.org/" @@ -25,6 +25,8 @@ md5sums=('4f28912e5df4b826b819e175265bcc9c' build() { cd "$srcdir/$pkgname" + sed 's:libpng:libpng15:' -i gtk/Makefile.target + sed 's:libpng:libpng15:' -i monkey/Makefile.target make PREFIX=/usr TARGET=gtk } diff --git a/community/netsurf/PKGBUILD.wip b/community/netsurf/PKGBUILD.wip new file mode 100644 index 000000000..592ca0268 --- /dev/null +++ b/community/netsurf/PKGBUILD.wip @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 62434 2012-01-20 02:23:51Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Paulo Matias <matiasΘarchlinux-br·org> +# Contributor: Georgij Kondratjev <smpuj@bk.ru> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +pkgname=netsurf +pkgver=2.8 +pkgrel=3 +pkgdesc="Lightweight and fast web browser" +arch=('x86_64' 'i686') +url="http://www.netsurf-browser.org/" +license=('GPL') +depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub' 'libpng') +makedepends=('re2c' 'lcms' 'setconf') +provides=('netsurf') +conflicts=('netsurf') +install=netsurf.install +source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" + "http://www.netsurf-browser.org/downloads/releases/$pkgname-$pkgver-src.tar.gz" + "$pkgname.desktop") +md5sums=('4f28912e5df4b826b819e175265bcc9c' + '49c41f281f3e9ca28a24da505fad2e3a' + '85e0af265e77607596fd90db9ac707ad') + +build() { + cd "$srcdir/$pkgname" + + #sed 's:libpng:libpng15:' -i gtk/Makefile.target + #setconf Makefile.defaults NETSURF_USE_PNG NO + #setconf Makefile.defaults NETSURF_USE_RSVG NO + #setconf Makefile.defaults NETSURF_USE_MNG NO + #setconf Makefile.defaults NETSURF_USE_BMP NO + #setconf Makefile.defaults NETSURF_USE_GIF NO + #setconf Makefile.defaults NETSURF_USE_JPEG NO + + #setconf gtk/Makefile.target NETSURF_FEATURE_RSVG_CFLAGS "-DWITH_RSVG -pthread -lrsvg-2 -lgio-2.0 -lgdk_pixbuf-2.0 -lcairo -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -pthread -I/usr/include/librsvg-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/cairo -I/usr/include/libpng -I/usr/include/pixman-1 -I/usr/include/freetype2" + #sed 's:$(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG)):#:' -i gtk/Makefile.target + + setconf Makefile.defaults CFLAGS "-lm" + + #sed 's:$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS):echo $(LDFLAGS)\n\t$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS):' -i Makefile + + #LDFLAGS="-lm" make PREFIX=/usr TARGET=gtk + LDFLAGS="-lm" make PREFIX=/usr TARGET=gtk +} + +package() { + cd "$srcdir/$pkgname" + + make install PREFIX=/usr DESTDIR="$pkgdir" + install -Dm644 "../$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "../$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/nvclock/PKGBUILD b/community/nvclock/PKGBUILD index 4eda3735f..ac863cc81 100644 --- a/community/nvclock/PKGBUILD +++ b/community/nvclock/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 37680 2011-01-16 14:37:03Z lfleischer $ +# $Id: PKGBUILD 63680 2012-02-05 12:06:13Z ibiru $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Markus Meissner <markus@meissna.de> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=nvclock pkgver=0.8b4 -pkgrel=2 +pkgrel=3 pkgdesc='A small utility which allows users to overclock NVIDIA based video cards.' arch=('i686' 'x86_64') url='http://www.linuxhardware.org/nvclock/' @@ -16,16 +16,19 @@ install='nvclock.install' options=('!makeflags') source=("http://www.linuxhardware.org/${pkgname}/${pkgname}${pkgver}.tar.gz" 'nvclock-0.8b4-buildfix.patch' + 'nvclock-0.8b4-linkfix.patch' 'nvclock.desktop-use-gksu.patch') md5sums=('23f1b3ebf40f35d76d5fdac50f66ab11' '1da24b50dd6a8c4704fa550a3e1a8b53' + 'b812646787ea44e693fd2288612f25ad' '98fc1995721d0b0e8ff6d448869eee6d') build(){ cd "${srcdir}/${pkgname}${pkgver}" - # build fix from Fedora + # build and link fixes from Fedora patch -Np1 -i "${srcdir}/nvclock-0.8b4-buildfix.patch" + patch -Np1 -i "${srcdir}/nvclock-0.8b4-linkfix.patch" # Make ".desktop" file use gksu(1). patch -Np0 -i "${srcdir}/nvclock.desktop-use-gksu.patch" diff --git a/community/nvclock/nvclock-0.8b4-linkfix.patch b/community/nvclock/nvclock-0.8b4-linkfix.patch new file mode 100644 index 000000000..0029d1c74 --- /dev/null +++ b/community/nvclock/nvclock-0.8b4-linkfix.patch @@ -0,0 +1,18 @@ +diff -upNr nvclock0.8b4.orign/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in +--- nvclock0.8b4.orign/src/gtk/Makefile.in 2008-05-11 12:25:46.000000000 +0200 ++++ nvclock0.8b4/src/gtk/Makefile.in 2010-02-13 19:56:24.204078277 +0100 +@@ -20,12 +20,12 @@ endif + ifeq ($(HAVE_NVCONTROL), yes) + DEPS=$(libbackend) $(libnvcontrol) + INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I.. -I../.. +- LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol ++ LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol -lX11 -lXext -ldl + OBJECTS=banner.o gl.o hw.o main.o settings.o + else + DEPS=$(libbackend) + INCLUDES=-I./backend -I./nvcontrol -I.. -I../.. +- LIBS=@GTK_LIBS@ -L../backend -lbackend ++ LIBS=@GTK_LIBS@ -L../backend -lbackend -lX11 -lXext -ldl + OBJECTS=banner.o hw.o main.o settings.o + endif + diff --git a/community/ogmrip/PKGBUILD b/community/ogmrip/PKGBUILD index 8d157decc..6d616a9cd 100644 --- a/community/ogmrip/PKGBUILD +++ b/community/ogmrip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56646 2011-10-09 12:12:21Z jlichtblau $ +# $Id: PKGBUILD 63682 2012-02-05 12:06:35Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Daenyth # Contributor: Allan McRae <allan@archlinux.org> @@ -6,12 +6,12 @@ pkgname=ogmrip pkgver=0.13.7 -pkgrel=2 +pkgrel=3 pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder" arch=('i686' 'x86_64') url="http://ogmrip.sourceforge.net/" license=('GPL') -depends=('libdvdread>=4.1.3' 'mplayer' 'mencoder' 'enca' 'pkgconfig' 'gconf' 'libglade' 'libnotify' 'enchant') +depends=('libdvdread>=4.1.3' 'mplayer' 'mencoder' 'enca' 'pkg-config' 'gconf' 'libglade' 'libnotify' 'enchant') makedepends=('patch' 'intltool' 'perl-xml-parser' 'faac' 'lame' 'mkvtoolnix' 'libtheora' 'ogmtools' 'gpac' 'vorbis-tools' 'tesseract') optdepends=('faac: support for the AAC audio codec' 'lame: support for the MP3 audio codec' @@ -25,18 +25,19 @@ optdepends=('faac: support for the AAC audio codec' 'tesseract: support for the SRT subtitle format') options=('!libtool' '!makeflags') changelog=$pkgname.changelog +install=ogmrip.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) sha256sums=('362060e4c1944f020f9a491d9a8af53cd3bf4f94d4f5beb8d3d855ebf17d9c2a') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/usr/share make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/ogmrip/ogmrip.changelog b/community/ogmrip/ogmrip.changelog index 922355602..1bd5c70ae 100644 --- a/community/ogmrip/ogmrip.changelog +++ b/community/ogmrip/ogmrip.changelog @@ -1,3 +1,7 @@ +2012-01-26 Eric Belanger <eric@archlinux.org> + * Rebuild against libpng 1.5 and libtiff 4.0 + * Add .install file + 2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * ogmrip O.13.7-1 diff --git a/community/ogmrip/ogmrip.install b/community/ogmrip/ogmrip.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/community/ogmrip/ogmrip.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index b6cdcd8c1..dd91ef261 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -4,7 +4,7 @@ _pkg=OpenImageIO pkgname=openimageio pkgver=0.10.4 -pkgrel=3 +pkgrel=5 pkgdesc="A library for reading and writing images, including classes, utilities, and applications." arch=(i686 x86_64) url="http://www.openimageio.org/" @@ -13,8 +13,10 @@ depends=('openexr' 'boost-libs' 'jasper' 'glew') makedepends=('cmake' 'qt' 'python2' 'boost') optdepends=('qt: iv image viewer' 'python2: bindings support') options=(!buildflags) -source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}") -md5sums=('08a1bc2b82862ad5547bba569f4f633f') +source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}" + "openimageio-0.10.2-libpng15.patch") +md5sums=('08a1bc2b82862ad5547bba569f4f633f' + 'd12829808610a54b6bc3350dc5419db3') build() { cd "$srcdir"/$_pkg* @@ -22,7 +24,10 @@ build() { # remove insecure rpath sed -i "/RPATH/d" src/CMakeLists.txt - make debug + patch -d src/ -Np0 < $srcdir/openimageio-0.10.2-libpng15.patch + + # strange bug on i686, see https://github.com/OpenImageIO/oiio/issues/204 + [[ $CARCH == "i686" ]] && make debug || make } package() { diff --git a/community/openimageio/openimageio-0.10.2-libpng15.patch b/community/openimageio/openimageio-0.10.2-libpng15.patch new file mode 100644 index 000000000..97375d5fb --- /dev/null +++ b/community/openimageio/openimageio-0.10.2-libpng15.patch @@ -0,0 +1,11 @@ +--- ico.imageio/icooutput.cpp ++++ ico.imageio/icooutput.cpp +@@ -32,6 +32,8 @@ + #include <cstdlib> + #include <cmath> + ++#include <zlib.h> /* Z_BEST_COMPRESSION */ ++ + #include "ico.h" + #include "../png.imageio/png_pvt.h" + diff --git a/community/openmotif/PKGBUILD b/community/openmotif/PKGBUILD index de442f87d..26f37cc92 100644 --- a/community/openmotif/PKGBUILD +++ b/community/openmotif/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 59163 2011-11-21 12:54:58Z spupykin $ +# $Id: PKGBUILD 63686 2012-02-05 12:06:47Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Enrico Morelli <morelli@cerm.unifi.it> - pkgname=openmotif pkgver=2.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="Open Motif" arch=('i686' 'x86_64') url="http://www.motifzone.org/" @@ -18,25 +17,12 @@ source=(http://www.motifzone.org/files/public_downloads/openmotif/2.3/$pkgver/op md5sums=('fd27cd3369d6c7d5ef79eccba524f7be') build() { -_automakever=`pacman -Q automake | cut -f 2 -d \ | cut -f 1 -d -` + _automakever=1.11 cd $srcdir/openmotif-$pkgver - [ $NOEXTRACT -eq 1 ] || patch -p0 Makefile.in <<EOF ---- Makefile.in.org 2007-06-11 09:32:01.000000000 +0400 -+++ Makefile.in 2007-06-19 19:13:04.000000000 +0400 -@@ -249,8 +249,7 @@ - include \\ - tools \\ - clients \\ -- doc \\ -- demos -+ doc - - AUTOMAKE_OPTIONS = 1.4 - all: all-recursive -EOF - + sed -i 's|.*demos.*||g' Makefile.in Makefile.am + sed -i 's|doc \\|doc|g' Makefile.in Makefile.am sed -i 's#if (!png_check_sig(sig, 8))#if (png_sig_cmp(sig, 0, 8))#' lib/Xm/Png.c ln -s -f /usr/share/automake-${_automakever}/compile compile @@ -48,10 +34,8 @@ EOF ln -s -f /usr/share/libtool/config/ltmain.sh ltmain.sh touch NEWS AUTHORS - [ $NOEXTRACT -eq 1 ] || autoreconf -i; - + [ $NOEXTRACT -eq 1 ] || autoreconf -i [ $CARCH == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" - [ $NOEXTRACT -eq 1 ] || ./configure --with-x --prefix=/usr make -j1 diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 7b5cce6c0..0366a02f5 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61921 2012-01-10 23:41:50Z ebelanger $ +# $Id: PKGBUILD 63688 2012-02-05 12:06:54Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> @@ -6,7 +6,7 @@ pkgname=openscenegraph pkgver=3.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64') license=('custom:OSGPL') diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index a17e7c43d..2848f7af2 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 60078 2011-12-04 22:02:23Z lcarlier $ +# $Id: PKGBUILD 63690 2012-02-05 12:07:04Z ibiru $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=openttd -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") -md5sums=('d1c48ddf616bd0d269c4cd35ef8a8a39') +md5sums=('aea731c9f87c53955269446d580ee19e') build() { cd ${pkgname}-${pkgver} diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index cf71d6d81..32fce25f2 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -4,12 +4,12 @@ pkgname=paraview pkgver=3.12.0 -pkgrel=2 +pkgrel=3 pkgdesc='Parallel Visualization Application using VTK' arch=('i686' 'x86_64') url='http://www.paraview.org' license=('custom') -depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns2' 'libtiff') +depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns2' 'libtiff' 'libtheora') makedepends=('cmake' 'desktop-file-utils' 'boost') source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" 'paraview.png' @@ -37,7 +37,7 @@ build() { # flags to enable using system libs local cmake_system_flags="" - for lib in HDF5 FREETYPE JPEG PNG TIFF ZLIB EXPAT LIBXML2; do + for lib in HDF5 FREETYPE JPEG PNG TIFF ZLIB EXPAT LIBXML2 OGGTHEORA; do cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON " done diff --git a/community/patchage/PKGBUILD b/community/patchage/PKGBUILD index e7c6516a0..0a9e2b4c3 100644 --- a/community/patchage/PKGBUILD +++ b/community/patchage/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 56003 2011-09-28 17:57:04Z schiv $ +# $Id: PKGBUILD 63694 2012-02-05 12:07:28Z ibiru $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Max Pray a.k.a. Synthead <synthead@gmail.com> # Contributor: clarence <catchfire at gmail dot com> - pkgname=patchage pkgver=0.5.0 -pkgrel=2 +pkgrel=3 pkgdesc="A modular patch bay for audio and MIDI systems" arch=('i686' 'x86_64') url="http://drobilla.net/software/patchage" @@ -14,8 +13,8 @@ depends=('dbus-glib' 'libglademm' 'hicolor-icon-theme' 'raul' 'flowcanvas<1.0.0' 'jack') makedepends=('boost' 'python2') install=$pkgname.install -source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2) -md5sums=('3f1c297c8c6b998563d1a2fbc215cf85') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +sha256sums=('9bb9d1ba0205c0ad95c6dbecba56c513ff706f1057348d33ff7567bc9cbd89d2') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index 20c5f045c..b58f512a7 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 61967 2012-01-11 17:03:39Z giovanni $ +# $Id: PKGBUILD 63833 2012-02-06 00:38:50Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite -pkgver=1.8.1 -pkgrel=3 +pkgver=1.8.2 +pkgrel=1 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64') url="https://alioth.debian.org/projects/pcsclite/" license=('BSD') depends=('udev') -makedepends=('pkgconfig') +makedepends=('pkg-config') options=('!libtool' '!docs') -source=("https://alioth.debian.org/frs/download.php/3687/pcsc-lite-${pkgver}.tar.bz2" +source=("https://alioth.debian.org/frs/download.php/3695/pcsc-lite-${pkgver}.tar.bz2" 'pcscd') -md5sums=('fd035e4f610eba6fa545159e60d0d780' +md5sums=('cb7156346e9478c19085c918b605ed43' 'c97b6bce695222efb0f003d8e8369010') build() { diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index ba8c7a3db..71d46daae 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59954 2011-12-02 20:59:56Z ibiru $ +# $Id: PKGBUILD 63696 2012-02-05 12:07:40Z ibiru $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=11 +pkgrel=12 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" @@ -16,10 +16,12 @@ makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.48') optdepends=('performous-freesongs: free songs for performous') source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2 boost-filesystem-v3.patch - ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a") + ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a" + png15.patch) md5sums=('451a759de77984b5a699e91107fe52e2' '42a8c825d80b0de16bd5752d2a80e585' - 'ff0ffa681dfaa09c4f42133a65309bf0') + 'ff0ffa681dfaa09c4f42133a65309bf0' + '89157d5e21b0efd09fcbeee299d23c7e') build() { cd ${srcdir}/Performous-${pkgver}-Source @@ -28,6 +30,8 @@ build() { patch -Np1 -i ../boost-filesystem-v3.patch # fix with ffmpeg-0.8 patch -Np1 -i ../ffmpeg-0.8.patch + # fix for libpng 1.5 + patch -Np1 -i ../png15.patch mkdir -p build cd build diff --git a/community/performous/png15.patch b/community/performous/png15.patch new file mode 100644 index 000000000..b6fb8fb14 --- /dev/null +++ b/community/performous/png15.patch @@ -0,0 +1,33 @@ +diff -ur Performous-0.6.1-Source/cmake/Modules/FindPng.cmake Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake +--- Performous-0.6.1-Source/cmake/Modules/FindPng.cmake 2010-10-31 17:05:44.000000000 +0100 ++++ Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake 2012-01-29 01:07:56.339648832 +0100 +@@ -10,7 +10,7 @@ + + include(LibFindMacros) + +-libfind_pkg_check_modules(Png_PKGCONF Png) ++libfind_pkg_check_modules(Png_PKGCONF libpng) + + find_path(Png_INCLUDE_DIR + NAMES pngconf.h +@@ -18,7 +18,7 @@ + ) + + find_library(Png_LIBRARY +- NAMES png png12 png14 ++ NAMES png png12 png14 png15 + PATHS ${Png_PKGCONF_LIBRARY_DIRS} + ) + +diff -ur Performous-0.6.1-Source/game/image.hh Performous-0.6.1a-Source/game/image.hh +--- Performous-0.6.1-Source/game/image.hh 2010-10-31 17:05:43.000000000 +0100 ++++ Performous-0.6.1a-Source/game/image.hh 2012-01-29 01:44:16.050575186 +0100 +@@ -26,7 +26,7 @@ + } + void loadPNG_internal(png_structp pngPtr, png_infop infoPtr, std::ifstream& file, std::vector<unsigned char>& image, std::vector<png_bytep>& rows, unsigned& w, unsigned& h) { + if (setjmp(png_jmpbuf(pngPtr))) throw std::runtime_error("Reading PNG failed"); +- png_set_read_fn(pngPtr,(voidp)&file, readPngHelper); ++ png_set_read_fn(pngPtr, &file, readPngHelper); + png_read_info(pngPtr, infoPtr); + png_set_expand(pngPtr); // Expand everything to RGB(A) + png_set_strip_16(pngPtr); // Strip everything down to 8 bit/component diff --git a/community/perl-gnome2-wnck/PKGBUILD b/community/perl-gnome2-wnck/PKGBUILD index 25e0df822..0f4c28d26 100644 --- a/community/perl-gnome2-wnck/PKGBUILD +++ b/community/perl-gnome2-wnck/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47727 2011-05-25 02:44:57Z tdziedzic $ +# $Id: PKGBUILD 63698 2012-02-05 12:07:47Z ibiru $ # Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=perl-gnome2-wnck pkgver=0.16 -pkgrel=4 +pkgrel=5 pkgdesc="Perl interface to the Window Navigator Construction Kit" arch=('i686' 'x86_64') license=("GPL" "Artistic") @@ -16,17 +16,13 @@ md5sums=('439f4569ffd7af96ef1d3feaab23760e') build() { cd Gnome2-Wnck-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make } package() { cd Gnome2-Wnck-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-gtk2-sexy/PKGBUILD b/community/perl-gtk2-sexy/PKGBUILD index 6b4789bd2..44f110e1f 100644 --- a/community/perl-gtk2-sexy/PKGBUILD +++ b/community/perl-gtk2-sexy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 47716 2011-05-25 02:28:38Z tdziedzic $ +# $Id: PKGBUILD 63700 2012-02-05 12:07:55Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Charles Mauch <cmauch@gmail.com> # Creator: Florian Ragwitz <http://search.cpan.org/~/> pkgname=perl-gtk2-sexy pkgver=0.05 -pkgrel=5 +pkgrel=6 pkgdesc="Perl/CPAN Module Gtk2::Sexy" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Gtk2-Sexy" @@ -18,17 +18,13 @@ md5sums=('3e291808250d7b956ba8443013a1b461') build() { cd Gtk2-Sexy-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make } package() { cd Gtk2-Sexy-${pkgver} - - make install DESTDIR=${pkgdir} - + make install DESTDIR=${pkgdir} find ${pkgdir} -name '.packlist' -delete find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-gtk2-trayicon/PKGBUILD b/community/perl-gtk2-trayicon/PKGBUILD index a4cdb9e76..531aa6fe0 100644 --- a/community/perl-gtk2-trayicon/PKGBUILD +++ b/community/perl-gtk2-trayicon/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47733 2011-05-25 02:54:41Z tdziedzic $ +# $Id: PKGBUILD 63702 2012-02-05 12:08:02Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-gtk2-trayicon pkgver=0.06 -pkgrel=7 +pkgrel=8 pkgdesc="Perl interface to the EggTrayIcon library" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Gtk2-TrayIcon/" @@ -17,17 +17,13 @@ md5sums=('522c328f14681a25d76eeaf317e05049') build() { cd Gtk2-TrayIcon-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make } package() { cd Gtk2-TrayIcon-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-gtk2-webkit/PKGBUILD b/community/perl-gtk2-webkit/PKGBUILD index 269e6080a..190a668f2 100644 --- a/community/perl-gtk2-webkit/PKGBUILD +++ b/community/perl-gtk2-webkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47720 2011-05-25 02:33:54Z tdziedzic $ +# $Id: PKGBUILD 63704 2012-02-05 12:08:14Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gtk2-webkit pkgver=0.09 -pkgrel=1 +pkgrel=2 pkgdesc="Gtk2::WebKit" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Gtk2-WebKit" @@ -16,17 +16,13 @@ md5sums=('e696fc2b15d6189370e19bce9a9e56f3') build() { cd Gtk2-WebKit-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make } package() { cd Gtk2-WebKit-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete find ${pkgdir} -name '*.pod' -delete } diff --git a/community/pidgin-libnotify/PKGBUILD b/community/pidgin-libnotify/PKGBUILD index cf9378755..500f5d532 100644 --- a/community/pidgin-libnotify/PKGBUILD +++ b/community/pidgin-libnotify/PKGBUILD @@ -4,7 +4,7 @@ pkgname=pidgin-libnotify pkgver=0.14 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') pkgdesc="pidgin plugin that enables popups when someone logs in or messages you." url="http://gaim-libnotify.sourceforge.net/" diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index 63c876fb9..52d8a8b06 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 61223 2011-12-24 23:23:29Z lcarlier $ +# $Id: PKGBUILD 63708 2012-02-05 12:08:32Z ibiru $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus pkgver=0.7.6 -pkgrel=1 +pkgrel=2 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64') url="http://pingus.seul.org" license=('GPL') depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.48') makedepends=('scons' 'boost>=1.48' 'mesa') -source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop) +source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 + pingus.desktop) md5sums=('561798686f34d3fa4e69135d655f47ac' '9eec34047bdcff49e08f41e81764e20c') sha1sums=('b5f5a25d71beb197c9466fb8928018a377f56487' diff --git a/community/png2ico/PKGBUILD b/community/png2ico/PKGBUILD index 8a5f7a330..ef13d303d 100644 --- a/community/png2ico/PKGBUILD +++ b/community/png2ico/PKGBUILD @@ -1,8 +1,11 @@ -# $Id: PKGBUILD 8479 2010-01-20 08:15:47Z dgriffiths $ +# $Id: PKGBUILD 63710 2012-02-05 12:08:36Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + pkgname=png2ico pkgver=20021208 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') pkgdesc="Converts PNG files to Windows icon resource files" url="http://www.winterdrache.de/freeware/png2ico/" @@ -12,8 +15,12 @@ source=(http://www.winterdrache.de/freeware/png2ico/data/$pkgname-src-2002-12-08 md5sums=('9b663df81c826cd564638cba2e6bc75b') build() { - cd $srcdir/$pkgname - make || return 1 - install -D -m755 png2ico $pkgdir/usr/bin/png2ico - install -D -m644 doc/png2ico.1 $pkgdir/usr/share/man/man1/png2ico.1 + cd ${srcdir}/${pkgname} + make +} + +package() { + cd ${srcdir}/${pkgname} + install -D -m755 png2ico ${pkgdir}/usr/bin/png2ico + install -D -m644 doc/png2ico.1 ${pkgdir}/usr/share/man/man1/png2ico.1 } diff --git a/community/podofo/PKGBUILD b/community/podofo/PKGBUILD index f154e016f..a4527f47e 100644 --- a/community/podofo/PKGBUILD +++ b/community/podofo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59830 2011-11-30 22:21:17Z giovanni $ +# $Id: PKGBUILD 63712 2012-02-05 12:08:41Z ibiru $ # 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=2 +pkgrel=3 pkgdesc="A C++ library to work with the PDF file format" arch=('i686' 'x86_64') url="http://podofo.sourceforge.net" diff --git a/community/prboom/PKGBUILD b/community/prboom/PKGBUILD index f33cec1fe..a7af51cb7 100644 --- a/community/prboom/PKGBUILD +++ b/community/prboom/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57863 2011-11-03 19:29:22Z lfleischer $ +# $Id: PKGBUILD 63714 2012-02-05 12:08:47Z ibiru $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: dale <dale@archlinux.org> pkgname=prboom pkgver=2.5.0 -pkgrel=5 +pkgrel=6 pkgdesc='A game engine which provides a program to play Doom levels.' url='http://prboom.sourceforge.net/' license=('GPL2') diff --git a/community/pyqt3/PKGBUILD b/community/pyqt3/PKGBUILD index 862ea062e..990cec25f 100644 --- a/community/pyqt3/PKGBUILD +++ b/community/pyqt3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 37900 2011-01-18 23:30:00Z andrea $ -# Maintainer: +# $Id: PKGBUILD 63716 2012-02-05 12:08:52Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgname=pyqt3 pkgver=3.18.1 -pkgrel=9 +pkgrel=10 pkgdesc="A set of Python bindings for the Qt3 toolkit" arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/pyqt/intro" @@ -16,13 +16,10 @@ md5sums=('f1d120495d1aaf393819e988c0a7bb7e') build() { cd ${srcdir}/PyQt-x11-gpl-${pkgver} - . /etc/profile.d/qt3.sh - echo yes | python2 configure.py -b /usr/bin \ -d /usr/lib/python2.7/site-packages \ -v /usr/share/sip - make } diff --git a/community/python-galago-gtk/PKGBUILD b/community/python-galago-gtk/PKGBUILD index 1589d3e41..c05c783a6 100644 --- a/community/python-galago-gtk/PKGBUILD +++ b/community/python-galago-gtk/PKGBUILD @@ -1,8 +1,10 @@ -# $Id: PKGBUILD 29291 2010-10-12 16:29:20Z foutrelis $ +# $Id: PKGBUILD 63720 2012-02-05 12:09:04Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> + pkgname=python-galago-gtk pkgver=0.5.0 -pkgrel=5 +pkgrel=6 pkgdesc="A library of simple functions that are optimized for various CPUs" arch=('i686' 'x86_64') url="http://galago-project.org" diff --git a/community/python2-matplotlib/PKGBUILD b/community/python2-matplotlib/PKGBUILD index 102421f30..f269b7659 100644 --- a/community/python2-matplotlib/PKGBUILD +++ b/community/python2-matplotlib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56824 2011-10-13 21:31:09Z stephane $ +# $Id: PKGBUILD 63718 2012-02-05 12:08:58Z ibiru $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -6,7 +6,7 @@ pkgname=python2-matplotlib pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A python plotting library, making publication quality plots" arch=('i686' 'x86_64') url="http://matplotlib.sourceforge.net/" diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 50853b837..28cacf696 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,10 +1,12 @@ +# $Id: PKGBUILD 63722 2012-02-05 12:09:17Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=qcad pkgver=2.0.5.0 -pkgrel=8 +pkgrel=9 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64') url="http://www.ribbonsoft.com/qcad.html" @@ -12,19 +14,18 @@ license=('GPL2') depends=('qt3') options=(libtool) source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz - qcad.xpm - QCad.desktop - qcad-intptr.patch + qcad.xpm + QCad.desktop + qcad-intptr.patch qcad.patch) # http://ghost1227.com/files/misc/qm.tar.gz) -md5sums=('96b6a56027782aec953c9c4e64c5998c' \ - 'da32fec0d2fb85d96126bf28bb0ab9ff' \ - 'b4d1eb6724b4b41f191f1ab6fd859c39' \ - '92f900fe1fd3a8f841232b587b49c7da' \ - '7e6779b1e3b10da1eb4daf36d93f8479' \ - '89f78319babd39a14679af8112f9e12c') +md5sums=('96b6a56027782aec953c9c4e64c5998c' + 'da32fec0d2fb85d96126bf28bb0ab9ff' + 'b4d1eb6724b4b41f191f1ab6fd859c39' + '92f900fe1fd3a8f841232b587b49c7da' + '7e6779b1e3b10da1eb4daf36d93f8479') -build () { +build() { export PATH="/opt/qt/bin:$PATH" export QTDIR=/opt/qt @@ -32,26 +33,21 @@ build () { #Arch64 fix - gentoo patch [ "$CARCH" = "x86_64" ] && patch -p1 < ../qcad-intptr.patch - patch -p1 < ../qcad.patch || return 1 - sed -i "s:"-pedantic"::g" mkspecs/defs.pro || return 1 + patch -p1 < ../qcad.patch + sed -i "s:"-pedantic"::g" mkspecs/defs.pro cd scripts - ./build_qcad.sh notrans || return 1 + ./build_qcad.sh notrans } package() { cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad - install -D -m755 qcad ${pkgdir}/usr/bin/qcad || return 1 - install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications} || return 1 - install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm || return 1 + install -D -m755 qcad ${pkgdir}/usr/bin/qcad + install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications} + install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm install -m644 ../../QCad.desktop \ - ${pkgdir}/usr/share/applications/QCad.desktop || return 1 - cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad || return 1 + ${pkgdir}/usr/share/applications/QCad.desktop + cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/ } -md5sums=('96b6a56027782aec953c9c4e64c5998c' - 'da32fec0d2fb85d96126bf28bb0ab9ff' - 'b4d1eb6724b4b41f191f1ab6fd859c39' - '92f900fe1fd3a8f841232b587b49c7da' - '7e6779b1e3b10da1eb4daf36d93f8479') diff --git a/community/qpxtool/PKGBUILD b/community/qpxtool/PKGBUILD index 9d8987cb2..9147bc92d 100644 --- a/community/qpxtool/PKGBUILD +++ b/community/qpxtool/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 15647 2010-04-13 11:41:23Z spupykin $ +# $Id: PKGBUILD 63724 2012-02-05 12:09:25Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com> pkgname=qpxtool pkgver=0.7.1_002 -pkgrel=1 +pkgrel=3 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings." arch=('i686' 'x86_64') url="http://qpxtool.sourceforge.net/" license=('GPL') depends=('qt') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('755321a0196b16d06857550aac74ff50') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + libpng15.patch) +md5sums=('755321a0196b16d06857550aac74ff50' + 'ab9af7610277652c77c6d114422b2266') build() { cd $srcdir/$pkgname-$pkgver - # Fix strict aliasing warnings export CFLAGS="$CFLAGS -fno-strict-aliasing" sed -i 's|lib64|lib|' configure + patch -p1 <$srcdir/libpng15.patch ./configure --prefix=/usr - make || return 1 + make mkdir -p $pkgdir/usr/bin make DESTDIR=$pkgdir install } diff --git a/community/qpxtool/libpng15.patch b/community/qpxtool/libpng15.patch new file mode 100644 index 000000000..05e6f49d2 --- /dev/null +++ b/community/qpxtool/libpng15.patch @@ -0,0 +1,127 @@ +diff -wbBur qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp +--- qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp 2009-11-25 10:55:44.000000000 +0300 ++++ qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp 2012-01-23 13:53:37.000000000 +0400 +@@ -129,28 +129,28 @@ + + png_read_info(png_ptr, info_ptr); + +- printf("Image size: %ld x %ld\n", info_ptr->width, info_ptr->height); ++ printf("Image size: %u x %u\n", png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr)); + +- if (info_ptr->width != 3744U || info_ptr->height != rows ) { ++ if (png_get_image_width(png_ptr, info_ptr) != 3744U || png_get_image_height(png_ptr, info_ptr) != rows ) { + printf("Image should be 3744 x %d", rows); + return 1; + } + +-// width = info_ptr->width; +-// height = info_ptr->height; +-// bit_depth = info_ptr->bit_depth; ++// width = png_get_image_width(png_ptr, info_ptr); ++// height = png_get_image_height(png_ptr, info_ptr); ++// bit_depth = png_get_bit_depth(png_ptr, info_ptr); + + number_of_passes = png_set_interlace_handling(png_ptr); + png_read_update_info(png_ptr, info_ptr); + +- printf("Color type: [%d] ", info_ptr->color_type); +- switch (info_ptr->color_type) { ++ printf("Color type: [%d] ", png_get_color_type(png_ptr, info_ptr)); ++ switch (png_get_color_type(png_ptr, info_ptr)) { + case PNG_COLOR_TYPE_GRAY: + printf("PNG_COLOR_TYPE_GRAY\n"); + break; + case PNG_COLOR_TYPE_PALETTE: + printf("PNG_COLOR_TYPE_PALETTE\n"); +- if (!(info_ptr->valid & PNG_INFO_PLTE)) { ++ if (!(png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE))) { + printf("PNG color type is indexed, but no palette found!"); + goto err_read_png; + } +@@ -168,49 +168,53 @@ + printf("unlnown PNG color type!\n"); + goto err_read_png; + } +- printf("Bit depth : %d\n", info_ptr->bit_depth); +- if (info_ptr->bit_depth != 8) { ++ printf("Bit depth : %d\n", png_get_bit_depth(png_ptr, info_ptr)); ++ if (png_get_bit_depth(png_ptr, info_ptr) != 8) { + printf("Unsupported bit depth!\n"); + goto err_read_png; + } +- if (info_ptr->valid & PNG_INFO_PLTE) { +- printf("Palette : %d colors\n", info_ptr->num_palette); ++ ++ int num_palette; ++ png_colorp plte; ++ png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette); ++ ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) { ++ printf("Palette : %d colors\n", num_palette); + } else { + printf("Palette : NO\n"); + } +- printf("ROW bytes : %ld\n", info_ptr->rowbytes); +- ++ printf("ROW bytes : %d\n", png_get_rowbytes(png_ptr, info_ptr)); + + raw_row_pointer = buf; +- png_row_pointer = (png_byte*) malloc(info_ptr->rowbytes); ++ png_row_pointer = (png_byte*) malloc(png_get_rowbytes(png_ptr, info_ptr)); + for (row=0; row<rows; row++) { + if (setjmp(png_jmpbuf(png_ptr))) { + printf("png_jmpbuf failed!\n"); + goto err_read_png; + } + png_read_row(png_ptr, png_row_pointer, NULL); +- if (info_ptr->width < 3744U) ++ if (png_get_image_width(png_ptr, info_ptr) < 3744U) + memset(raw_row_pointer, 0, 3744); + +- switch (info_ptr->color_type) { ++ switch (png_get_color_type(png_ptr, info_ptr)) { + case PNG_COLOR_TYPE_GRAY: +- for (col=0; col<info_ptr->width; col++) { ++ for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) { + raw_row_pointer[col] = png_row_pointer[col] ^ 0xFF; + // memcpy(raw_row_pointer, png_row_pointer, 3744); + } + break; + case PNG_COLOR_TYPE_PALETTE: +- for (col=0; col<info_ptr->width; col++) { ++ for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) { + c = png_row_pointer[col]; +- r = info_ptr->palette[c].red; +- g = info_ptr->palette[c].green; +- b = info_ptr->palette[c].blue; ++ r = plte[c].red; ++ g = plte[c].green; ++ b = plte[c].blue; + c = (r*11 + g*16 + b*5) / 32; + raw_row_pointer[col] = c ^ 0xFF; + } + break; + case PNG_COLOR_TYPE_RGB: +- for (col=0; col<info_ptr->width; col++) { ++ for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) { + r = png_row_pointer[col*3]; + g = png_row_pointer[col*3+1]; + b = png_row_pointer[col*3+2]; +@@ -219,7 +223,7 @@ + } + break; + case PNG_COLOR_TYPE_RGB_ALPHA: +- for (col=0; col<info_ptr->width; col++) { ++ for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) { + r = png_row_pointer[col*4]; + g = png_row_pointer[col*4+1]; + b = png_row_pointer[col*4+2]; +@@ -228,7 +232,7 @@ + } + break; + case PNG_COLOR_TYPE_GRAY_ALPHA: +- for (col=0; col<info_ptr->width; col++) { ++ for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) { + raw_row_pointer[col] = png_row_pointer[col*2] ^ 0xFF; + } + break; diff --git a/community/quilt/PKGBUILD b/community/quilt/PKGBUILD index 637179fe1..f872009d6 100644 --- a/community/quilt/PKGBUILD +++ b/community/quilt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 60696 2011-12-17 00:36:28Z seblu $ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# $Id: PKGBUILD 63831 2012-02-06 00:30:28Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Peter Richard Lewis <plewis@aur.archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> pkgname=quilt -pkgver=0.50 +pkgver=0.51 pkgrel=1 pkgdesc='Manage a series of patches by keeping track of the changes each patch makes' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url='http://savannah.nongnu.org/projects/quilt' license=('GPL2') depends=('diffstat' 'gawk' 'patch' 'diffutils' 'gettext') source=("http://savannah.nongnu.org/download/quilt/${pkgname}-${pkgver}.tar.gz") -md5sums=('ff5e1e041363c3af3c8fda4b968c9d1d') +md5sums=('d56d23d5212297d5777502e84dc0ee80') build() { cd ${pkgname}-${pkgver} diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD index 337f08e7a..eabd7858c 100644 --- a/community/rawstudio/PKGBUILD +++ b/community/rawstudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56347 2011-10-05 19:08:35Z andrea $ +# $Id: PKGBUILD 63726 2012-02-05 12:09:34Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ pkgname=rawstudio pkgver=2.0 -pkgrel=3 +pkgrel=5 pkgdesc="An open source raw-image converter written in GTK+" arch=('i686' 'x86_64') license=('GPL') @@ -15,11 +15,14 @@ depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun' 'raptor1' 'lcms' 'gtk2') install=${pkgname}.install options=('!libtool') -source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz) -md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b') +source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz + libpng15.patch) +md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' + '2f8b7acbe10d8096ce613cbea7986fd3') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 <$srcdir/libpng15.patch ./configure --prefix=/usr make } diff --git a/community/rawstudio/libpng15.patch b/community/rawstudio/libpng15.patch new file mode 100644 index 000000000..6d3b85968 --- /dev/null +++ b/community/rawstudio/libpng15.patch @@ -0,0 +1,40 @@ +diff -wbBur rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp +--- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp 2011-02-24 01:35:18.000000000 +0300 ++++ rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp 2012-01-23 15:03:22.000000000 +0400 +@@ -102,8 +102,8 @@ + { + *linear_guess = FALSE; + RSColorSpace* profile = NULL; +- const gchar *icc_profile_title; +- const gchar *icc_profile; ++ png_charp icc_profile_title; ++ png_bytep icc_profile; + guint icc_profile_size; + png_structp png_ptr = png_create_read_struct( + PNG_LIBPNG_VER_STRING, +@@ -125,11 +125,11 @@ + + int compression_type; + /* Extract embedded ICC profile */ +- if (info_ptr->valid & PNG_INFO_iCCP) ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) + { + png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr, +- (png_charpp) &icc_profile_title, &compression_type, +- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); ++ &icc_profile_title, &compression_type, ++ &icc_profile, (png_uint_32*) &icc_profile_size); + if (retval != 0) + { + RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE); +diff -wbBur rawstudio-2.0/plugins/output-pngfile/output-pngfile.c rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c +--- rawstudio-2.0/plugins/output-pngfile/output-pngfile.c 2011-03-26 04:52:29.000000000 +0300 ++++ rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c 2012-01-23 15:04:59.000000000 +0400 +@@ -23,6 +23,7 @@ + #include <gettext.h> + #include "config.h" + #include <png.h> ++#include <zlib.h> + + #define RS_TYPE_PNGFILE (rs_pngfile_type) + #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile)) diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index cc4126ef1..cb30236db 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 61903 2012-01-10 14:41:19Z stativ $ +# $Id: PKGBUILD 63728 2012-02-05 12:09:41Z ibiru $ # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com> # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com> # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz> # Contributor: Archie <mymaud@gmail.com> pkgname=rawtherapee -pkgver=4.0.6 +pkgver=4.0.7 pkgrel=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64') url="http://www.rawtherapee.com/" -license=('GPL') -depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme') +license=('GPL3') +depends=('gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('mercurial' 'cmake') install=rawtherapee.install source=() diff --git a/community/remmina-plugins/PKGBUILD b/community/remmina-plugins/PKGBUILD index 7b6007a69..e80c927c3 100644 --- a/community/remmina-plugins/PKGBUILD +++ b/community/remmina-plugins/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54479 2011-08-18 15:08:28Z bluewind $ +# $Id: PKGBUILD 63730 2012-02-05 12:09:50Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stijn Segers <francesco dot borromini at gmail dot com> pkgname=remmina-plugins pkgver=0.9.2 -pkgrel=2 +pkgrel=3 pkgdesc="Remina plugins" #"Remmina supports multiple network protocols in an integrated and consistant user interface. # Currently RDP, VNC, XDMCP and SSH are supported." diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index 729d3377f..d277db4ec 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -3,7 +3,7 @@ pkgname=root pkgver=5.32.00 -pkgrel=2 +pkgrel=3 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64') url='http://root.cern.ch' @@ -16,25 +16,31 @@ options=('!emptydirs') source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'root.sh' 'rootd' - 'root.xml') + 'root.xml' + 'fix-mathcore-generation-r42566.diff') md5sums=('1c30e4e6eeae62ff1ad5118cd1309679' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' - 'e2cf69b204192b5889ceb5b4dedc66f7') + 'e2cf69b204192b5889ceb5b4dedc66f7' + '12877cabd620284f50ea16ef97a54aac') build() { cd root + # temporary workaround: remove on next patch release after 5.32.00 + # bug reported at: https://savannah.cern.ch/bugs/?90906 + patch -Np0 -i ${srcdir}/fix-mathcore-generation-r42566.diff + if [ ${CARCH} == 'i686' ]; then TARGET=linux; else TARGET=linuxx8664gcc; fi - # python2 switch - find . -type f -exec sed -i -e 's_#!/usr/bin/env python_&2_' \ - -e 's/python -O/python2 -O/g' \ - -e 's/python -c/python2 -c/g' {} \; + msg 'python2 switch' + find . -type f -exec sed -e 's_#!/usr/bin/env python_&2_' \ + -e 's/python -O/python2 -O/g' \ + -e 's/python -c/python2 -c/g' -i {} \; sed \ -e 's/python 2/python2 2/g' \ -i configure @@ -45,15 +51,16 @@ build() { -e 's/python /python2 /' \ -i config/genreflex.in config/genreflex-rootcint.in + local sys_libs="" + for sys_lib in ftgl freetype glew pcre zlib lzma; do + sys_libs+="--disable-builtin-${sys_lib} " + done + # move from aur if possible + #--disable-builtin-afterimage \ + ./configure \ ${TARGET} \ --prefix=/usr \ - --disable-builtin-ftgl \ - --disable-builtin-freetype \ - --disable-builtin-glew \ - --disable-builtin-pcre \ - --disable-builtin-zlib \ - --disable-builtin-lzma \ --enable-gdml \ --enable-gsl-shared \ --enable-minuit2 \ @@ -61,10 +68,8 @@ build() { --enable-roofit \ --enable-python \ --with-python-incdir=/usr/include/python2.7 \ - --with-python-libdir=/usr/lib - - # move from aur - #--disable-builtin-afterimage \ + --with-python-libdir=/usr/lib \ + ${sys_libs} make } diff --git a/community/root/fix-mathcore-generation-r42566.diff b/community/root/fix-mathcore-generation-r42566.diff new file mode 100644 index 000000000..ae22c23c0 --- /dev/null +++ b/community/root/fix-mathcore-generation-r42566.diff @@ -0,0 +1,40 @@ +Index: cint/cint/src/typedef.cxx +=================================================================== +--- cint/cint/src/typedef.cxx (revision 42564) ++++ cint/cint/src/typedef.cxx (revision 42566) +@@ -297,18 +297,27 @@ + } + c = G__fgetname_template(type1, 0, "{"); + } +- if (!strcmp(type1, "::")) { // FIXME: This makes no sense, there cannot be typedef ::{...}; ++ if (!strcmp(type1, "::")) { + // skip a :: without a namespace in front of it (i.e. global namespace!) + c = G__fgetspace(); // skip the next ':' + c = G__fgetname_template(type1, 0, "{"); + } +- if (!strncmp(type1, "::", 2)) { // Strip a leading :: (global namespace operator) +- // A leading '::' causes other typename matching functions to fail so +- // we remove it. This is not the ideal solution (neither was the one +- // above since it does not allow for distinction between global +- // namespace and local namespace) ... but at least it is an improvement +- // over the current behavior. +- strcpy((char*)type1, type1 + 2); // Okay since we reduce the size ... ++ if (!strncmp(type1, "::", 2)) { ++ // Strip a leading :: (global namespace operator). ++ // A leading '::' causes other typename matching ++ // functions to fail so we remove it. This is not ++ // the ideal solution (neither is the one above) ++ // since it does not allow for decriminating between ++ // global namespace and local namespace, but at ++ // least it is an improvement over the current ++ // behavior. ++ // ++ // Note: We must use memmove because the source ++ // and destination strings overlap! ++ // ++ int t1len = strlen(type1); ++ memmove(type1, type1 + 2, t1len - 2); ++ type1.Set(t1len - 2, '\0'); + } + while (isspace(c)) { + len = strlen(type1); diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 0db9d7688..3d71aeb10 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61675 2012-01-06 12:11:34Z arodseth $ +# $Id: PKGBUILD 63819 2012-02-05 18:41:40Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -6,14 +6,14 @@ # Contributor: kritoke <kritoke@nospam.gmail.com> pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=1.0.3 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 arch=('x86_64' 'i686') url="http://ruby-gnome2.sourceforge.jp/" license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('e4fab8f2778c29b4c814109741d886c6f0725cfbb85b851aaf42d8f635ff515c') +sha256sums=('a16da4335c3e65ccab22e38caa55843fe2df18d55987c7be3f9dfc70866e2aaf') build() { cd "$srcdir/ruby-gtk2-$pkgver" diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index d240ce248..4b4dff9ad 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -5,7 +5,7 @@ pkgname=sage-mathematics pkgver=4.7.2 -pkgrel=2 +pkgrel=3 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' arch=('i686' 'x86_64') diff --git a/community/scantailor/PKGBUILD b/community/scantailor/PKGBUILD index 96c166249..b69f026c3 100644 --- a/community/scantailor/PKGBUILD +++ b/community/scantailor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53336 2011-08-03 00:10:13Z spupykin $ +# $Id: PKGBUILD 63736 2012-02-05 12:10:28Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Denis Terskov aka neurosurgeon <terskov.den@gmail.com> pkgname=scantailor pkgver=0.9.10 -pkgrel=1 +pkgrel=2 pkgdesc="Interactive post-processing tool for scanned pages" arch=(i686 x86_64) url="http://scantailor.sourceforge.net" diff --git a/community/scorched3d/PKGBUILD b/community/scorched3d/PKGBUILD index 42e9f414d..8a481c910 100644 --- a/community/scorched3d/PKGBUILD +++ b/community/scorched3d/PKGBUILD @@ -3,7 +3,7 @@ pkgname=scorched3d pkgver=43.2a -pkgrel=1 +pkgrel=2 pkgdesc="A 3d artillery combat game" arch=('i686' 'x86_64') url="http://www.scorched3d.co.uk/" @@ -16,12 +16,14 @@ source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${pkgver}-src.ta 'scorched3d.png.uu' 'scorched3d-42.1-gcc43.patch' 'scorched3d-42.1-fixups.patch' + 'scorched3d-libpng1.5.patch' 'libpng14.patch') md5sums=('876de173218fd83a2b0a30255ba694fa' 'b951f2150004e10fdff3e6226f1a3939' '178a281333006c6a5a92919865c1d7af' '053769f77a38c252eef1d967b18e93e6' 'dfde556559d95bca07c4a390c60790b4' + 'ec6958191751b5a2c44aa15abfc75269' 'c8c03855fd3693122fd39427fa3638c1') build() { @@ -29,6 +31,7 @@ build() { # patch -Np1 -i ${srcdir}/scorched3d-42.1-gcc43.patch patch -Np1 -i ${srcdir}/scorched3d-42.1-fixups.patch + patch -Np1 -i ${srcdir}/scorched3d-libpng1.5.patch # patch -Np0 -i ${srcdir}/libpng14.patch WANT_WXGTK=gtk2 diff --git a/community/scorched3d/scorched3d-libpng1.5.patch b/community/scorched3d/scorched3d-libpng1.5.patch new file mode 100644 index 000000000..4e8f003b8 --- /dev/null +++ b/community/scorched3d/scorched3d-libpng1.5.patch @@ -0,0 +1,74 @@ +--- ./src/common/image/ImagePngFactory.cpp.old 2011-09-12 12:34:30.114461019 +0200 ++++ ./src/common/image/ImagePngFactory.cpp 2011-09-12 12:39:28.566425593 +0200 +@@ -104,7 +104,7 @@ +
+ static void user_png_error(png_structp png_ptr, png_const_charp msg)
+ {
+- longjmp(png_ptr->jmpbuf,1);
++ longjmp(png_jmpbuf(png_ptr),1);
+ }
+
+ static void user_png_warning(png_structp png_ptr, png_const_charp msg)
+--- ./src/client/client/LoadPNG.cpp.old 2011-09-12 12:45:49.167380419 +0200 ++++ ./src/client/client/LoadPNG.cpp 2011-09-12 14:11:14.961772024 +0200 +@@ -28,6 +28,8 @@ + int row, i; + volatile int ckey = -1; + png_color_16 *transv; ++ png_colorp png_palette; ++ int num_palette; + + if ( !src ) { + /* The error message has been set in SDL_RWFromFile */ +@@ -58,7 +60,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)) ) { + error = "Error reading the PNG file."; + goto done; + } +@@ -127,9 +129,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; +@@ -137,7 +139,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 ) { + error = "Out of memory"; + goto done; +@@ -185,12 +187,15 @@ + 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 { ++ png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette); ++ if (num_palette > 0 ) { ++ palette->ncolors = num_palette; ++ for( i=0; i<num_palette; ++i ) { ++ palette->colors[i].b = png_palette[i].blue; ++ palette->colors[i].g = png_palette[i].green; ++ palette->colors[i].r = png_palette[i].red; ++ } + } + } + } diff --git a/community/scummvm-tools/PKGBUILD b/community/scummvm-tools/PKGBUILD index 1dba7faf0..e58621d12 100644 --- a/community/scummvm-tools/PKGBUILD +++ b/community/scummvm-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58732 2011-11-18 08:41:40Z svenstaro $ +# $Id: PKGBUILD 63740 2012-02-05 12:10:55Z ibiru $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jérémie Dimino <jeremie@dimino.org> # Contributor: Sebastian Hase <sebastian_hase@gmx.de> # Contributor: Joe Davison <joe@thosedamnpeanuts.com> pkgname=scummvm-tools pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="A set of tools that enable you to convert, compress and decode game datafiles for ScummVM" url="http://www.scummvm.org/" license=('GPL') diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index c3d982595..5b3e1f11f 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62685 2012-01-24 13:11:44Z giovanni $ +# $Id: PKGBUILD 63837 2012-02-06 01:19:19Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="A WYSIWYG ebook editor" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('cmake') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip" "${pkgname}.desktop") -md5sums=('8deb8ae451d485698ab9330dccfe46e5' +md5sums=('82a2a764e38eb1372dbe43597055957d' 'fef6aa492af487ccccd6b133635cee5a') build() { diff --git a/community/silly/PKGBUILD b/community/silly/PKGBUILD index 390c82194..12ac8800a 100644 --- a/community/silly/PKGBUILD +++ b/community/silly/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 63954 2010-01-19 05:25:26Z eric $ +# $Id: PKGBUILD 63742 2012-02-05 12:11:01Z ibiru $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> pkgname=silly pkgver=0.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="Simple Image Loading LibrarY, a part of the CEGUI project" arch=('i686' 'x86_64') url="http://www.cegui.org.uk/wiki/index.php/SILLY" license=('MIT') depends=('libjpeg' 'libpng' 'gcc-libs') options=('!libtool') -source=(http://downloads.sourceforge.net/crayzedsgui/SILLY-${pkgver}.tar.gz) -md5sums=('c3721547fced7792a36ffc9ce6ec23fd') -sha1sums=('ef5c8ed6c5c57d7d792dbb9e02006c3770334869') +source=(http://downloads.sourceforge.net/crayzedsgui/SILLY-${pkgver}.tar.gz + silly-libpng1.5.patch) +md5sums=('c3721547fced7792a36ffc9ce6ec23fd' + '530551c2942aea6fa20f10d06f1e604f') build() { cd "${srcdir}/SILLY-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1 + patch -Np1 < $srcdir/silly-libpng1.5.patch + ./configure --prefix=/usr + make + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/community/silly/silly-libpng1.5.patch b/community/silly/silly-libpng1.5.patch new file mode 100644 index 000000000..0b2d27252 --- /dev/null +++ b/community/silly/silly-libpng1.5.patch @@ -0,0 +1,14 @@ +ILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp~ SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp +--- SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp~ 2006-06-19 00:42:12.000000000 +0200 ++++ SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp 2011-12-06 14:38:31.738251526 +0100 +@@ -64,10 +64,7 @@ void PNG_error_function(png_structp png_ + png_const_charp error) + { + // printf("PNG Error: %s\n", error); +- // copied from libpng's pngerror.cpp +- jmp_buf buf; +- memcpy(buf, png_ptr->jmpbuf, sizeof(jmp_buf)); +- longjmp(buf, 1); ++ png_longjmp(png_ptr, 1); + } + diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD index b93398345..cd69b6236 100644 --- a/community/smc/PKGBUILD +++ b/community/smc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59966 2011-12-02 21:00:57Z ibiru $ +# $Id: PKGBUILD 63744 2012-02-05 12:11:13Z ibiru $ # Maintainer: # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=smc pkgver=1.9 -pkgrel=13 +pkgrel=14 pkgdesc="Secret Maryo Chronicles" arch=('i686' 'x86_64') url="http://www.secretmaryo.org/" @@ -22,24 +22,25 @@ md5sums=('75ab7826303c49aec25b052a8b90287f' 'efca7580e28748625eb676c9d24ee122') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" # to remove when smc will be compatible with cegui-0.7.x - patch -Np1 -i ${srcdir}/smc-for-cegui-v0-7.diff + patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff" # fix for boost-1.46 export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" ./autogen.sh - ./configure --prefix=/usr + LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr + make } package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" - make install DESTDIR=$pkgdir + make install DESTDIR="$pkgdir" # install some freedesktop.org compatibility - install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop - install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png + install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" - rm -rf $pkgdir/usr/share/smc/ + rm -rf "$pkgdir/usr/share/smc/" } diff --git a/community/speed-dreams/PKGBUILD b/community/speed-dreams/PKGBUILD index 990763d56..39a6dec8a 100644 --- a/community/speed-dreams/PKGBUILD +++ b/community/speed-dreams/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 56288 2011-10-04 20:51:38Z svenstaro $ +# $Id: PKGBUILD 63748 2012-02-05 12:11:31Z ibiru $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Adrián Chaves Fernández, aka Gallaecio <adriyetichaves@gmail.com> # Contributor: Shahar Weiss <sweiss4@gmx.net> (build() code from his TORCS' PKGBUILD) pkgname=speed-dreams pkgver=2.0.0b1 _pkgver=2.0.0-b1-r3937 -pkgrel=1 +pkgrel=2 pkgdesc="A racing simulator with rich graphics and physics" arch=('i686' 'x86_64') url="http://speed-dreams.sourceforge.net/" license=('GPL2') depends=('sdl' 'freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib>=1.8.3' 'libjpeg' 'zlib' 'enet' 'speed-dreams-data') makedepends=('cmake' 'p7zip') +noextract=(${pkgname}-${_pkgver}-src.tar.7z) source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_pkgver}-src.tar.7z" "${pkgname}.desktop") md5sums=('5299fe23aec3641827039ae3c69de460' diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD index e23adadc2..eb02f0ce2 100644 --- a/community/synergy/PKGBUILD +++ b/community/synergy/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Dale Blount <dale@archlinux.org> pkgname=synergy -pkgver=1.3.8 +pkgver=1.4.6 pkgrel=1 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org" @@ -36,5 +36,5 @@ package() { install -Dm644 $srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example "${pkgdir}/etc" install -Dm755 $srcdir/${pkgname}s.rc "${pkgdir}/etc/rc.d/${pkgname}s" } -md5sums=('3534c65ecfa6e47d7899c57975442f03' +md5sums=('3e1ecc4fcbfe6b130ac0c86c674f6db3' '8f8c01add9bf6e3ae9f37a36ca6345b6') diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 53671e957..7f6eb2c40 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60363 2011-12-12 09:57:03Z spupykin $ +# $Id: PKGBUILD 63750 2012-02-05 12:11:41Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig pkgver=0.63.03 -pkgrel=1 +pkgrel=2 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64) url="http://synfig.org" diff --git a/community/ted/PKGBUILD b/community/ted/PKGBUILD index 0a62bc597..3695c15dc 100644 --- a/community/ted/PKGBUILD +++ b/community/ted/PKGBUILD @@ -1,31 +1,36 @@ -# $Id: PKGBUILD 9087 2010-01-23 13:12:23Z foutrelis $ +# $Id: PKGBUILD 63752 2012-02-05 12:11:51Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ted pkgver=2.21 -pkgrel=2 +pkgrel=4 pkgdesc="An easy rich text processor (with footnote support)" arch=('i686' 'x86_64') url="http://www.nllgg.nl/Ted/" depends=('bash' 'libtiff' 'libxmu' 'libxpm' 'libpng' 'gtk2') license=('GPL') -source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz) -md5sums=('34ae855938a3b364eb587cca504ba356') +source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz + ted-2.21-libpng15.patch) +md5sums=('34ae855938a3b364eb587cca504ba356' + '0c339b0fa7aec6b150e07e9027cd360c') build() { - cd $srcdir/Ted-$pkgver - sed -i "s|--with-GTK|--with-GTK --prefix=/usr/share|g" Makefile || return 1 - # libpng 1.4 - sed -i "s|png_info_init|png_create_info_struct|g" bitmap/bmpng.c || return 1 - make compile.shared || return 1 - make package.shared || return 1 - mkdir -p $pkgdir/usr/share/ - cd $pkgdir/usr/share/ - tar -zxvf $srcdir/Ted-$pkgver/tedPackage/ted-$pkgver-linux-$CARCH.tar.gz || return 1 + cd "$srcdir/Ted-$pkgver" + sed -i "s|--with-GTK|--with-GTK --prefix=/usr/share|g" Makefile + patch -p0 -i ../ted-2.21-libpng15.patch + make compile.shared + make package.shared +} + +package() { + cd "$srcdir/Ted-$pkgver" + mkdir -p "$pkgdir/usr/share/" + cd "$pkgdir/usr/share/" + tar -zxvf "$srcdir/Ted-$pkgver/tedPackage/ted-$pkgver-linux-$CARCH.tar.gz" mv bin ../ - mkdir -p $pkgdir/usr/share/man/man1 - cd $pkgdir/usr/share/Ted/ - mv Ted.1 rtf2pdf.1 rtf2ps.1 ../../share/man/man1/ || return 1 + mkdir -p "$pkgdir/usr/share/man/man1" + cd "$pkgdir/usr/share/Ted/" + mv Ted.1 rtf2pdf.1 rtf2ps.1 ../../share/man/man1/ sed -i "s|usr/local/afm|usr/share/Ted/afm|g" gsafm.sh - mv *.sh $pkgdir/usr/bin/ || return 1 + mv *.sh "$pkgdir/usr/bin/" } diff --git a/community/ted/ted-2.21-libpng15.patch b/community/ted/ted-2.21-libpng15.patch new file mode 100644 index 000000000..afd30f9a4 --- /dev/null +++ b/community/ted/ted-2.21-libpng15.patch @@ -0,0 +1,423 @@ +This patch is from netbsd pkgsrc + +ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/editors/ted/patches/ + +--- bitmap/bmpng.c ++++ bitmap/bmpng.c +@@ -20,23 +20,32 @@ + /* */ + /************************************************************************/ + +-static int bpPngiToBitmap( const png_info * pngi, ++static int bpPngiToBitmap( const png_structp pngp, ++ png_info * pngi, + BitmapDescription * bd ) + { + unsigned int col; ++ png_uint_32 res_x, res_y; ++ int unit_type= 0; + +- bd->bdPixelsWide= pngi->width; +- bd->bdPixelsHigh= pngi->height; ++ bd->bdPixelsWide= png_get_image_width( pngp, pngi ); ++ bd->bdPixelsHigh= png_get_image_height( pngp, pngi ); + bd->bdHasAlpha= 0; + +- switch( pngi->color_type ) ++ switch( png_get_color_type( pngp, pngi ) ) + { + case PNG_COLOR_TYPE_PALETTE: ++ { ++ int num_palette; ++ png_colorp palette; ++ ++ png_get_PLTE( pngp, pngi, &palette, &num_palette ); ++ + bd->bdColorEncoding= BMcoRGB8PALETTE; +- bd->bdColorCount= pngi->num_palette; ++ bd->bdColorCount= num_palette; + bd->bdBitsPerSample= 8; + bd->bdSamplesPerPixel= 3; +- bd->bdBitsPerPixel= pngi->bit_depth; ++ bd->bdBitsPerPixel= png_get_bit_depth( pngp, pngi ); + + bd->bdRGB8Palette= (RGB8Color *) + malloc( bd->bdColorCount* sizeof(RGB8Color) ); +@@ -46,47 +55,51 @@ static int bpPngiToBitmap( const png_inf + + for ( col= 0; col < bd->bdColorCount; col++ ) + { +- bd->bdRGB8Palette[col].rgb8Red= pngi->palette[col].red; +- bd->bdRGB8Palette[col].rgb8Green= pngi->palette[col].green; +- bd->bdRGB8Palette[col].rgb8Blue= pngi->palette[col].blue; ++ bd->bdRGB8Palette[col].rgb8Red= palette[col].red; ++ bd->bdRGB8Palette[col].rgb8Green= palette[col].green; ++ bd->bdRGB8Palette[col].rgb8Blue= palette[col].blue; + bd->bdRGB8Palette[col].rgb8Alpha= 0; + } ++ } + break; + + case PNG_COLOR_TYPE_RGB: + bd->bdColorEncoding= BMcoRGB; +- bd->bdBitsPerSample= pngi->bit_depth; +- bd->bdSamplesPerPixel= pngi->channels; +- bd->bdBitsPerPixel= pngi->pixel_depth; ++ bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi ); ++ bd->bdSamplesPerPixel= png_get_channels( pngp, pngi ); ++ bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample; + break; + + case PNG_COLOR_TYPE_GRAY: + bd->bdColorEncoding= BMcoWHITEBLACK; +- bd->bdBitsPerSample= pngi->bit_depth; +- bd->bdSamplesPerPixel= pngi->channels; +- bd->bdBitsPerPixel= pngi->pixel_depth; ++ bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi ); ++ bd->bdSamplesPerPixel= png_get_channels( pngp, pngi ); ++ bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample; + break; + + case PNG_COLOR_TYPE_RGB_ALPHA: + bd->bdHasAlpha= 1; + bd->bdColorEncoding= BMcoRGB; +- bd->bdBitsPerSample= pngi->bit_depth; +- bd->bdSamplesPerPixel= pngi->channels; +- bd->bdBitsPerPixel= pngi->pixel_depth; ++ bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi ); ++ bd->bdSamplesPerPixel= png_get_channels( pngp, pngi ); ++ bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample; + break; + + case PNG_COLOR_TYPE_GRAY_ALPHA: + bd->bdHasAlpha= 1; +- LDEB(pngi->color_type); return -1; ++ LDEB(png_get_color_type( pngp, pngi )); return -1; + + default: +- LDEB(pngi->color_type); return -1; ++ LDEB(png_get_color_type( pngp, pngi )); return -1; + } + +- bd->bdBytesPerRow= pngi->rowbytes; ++ bd->bdBytesPerRow= png_get_rowbytes( pngp, pngi ); + bd->bdBufferLength= bd->bdBytesPerRow* bd->bdPixelsHigh; + +- switch( pngi->phys_unit_type ) ++ if ( ! png_get_pHYs( pngp, pngi, &res_x, &res_y, &unit_type ) ) ++ { unit_type= PNG_RESOLUTION_UNKNOWN; } ++ ++ switch( unit_type ) + { + case PNG_RESOLUTION_UNKNOWN: + bd->bdUnit= BMunPIXEL; +@@ -96,12 +109,12 @@ static int bpPngiToBitmap( const png_inf + + case PNG_RESOLUTION_METER: + bd->bdUnit= BMunM; +- bd->bdXResolution= pngi->x_pixels_per_unit; +- bd->bdYResolution= pngi->y_pixels_per_unit; ++ bd->bdXResolution= res_x; ++ bd->bdYResolution= res_y; + break; + + default: +- LDEB(pngi->phys_unit_type); ++ LDEB(unit_type); + return -1; + } + +@@ -119,11 +132,11 @@ static int bmPngReadContents( png_info * + unsigned char * buffer; + + numberOfPasses= 1; +- if ( pngi->interlace_type ) ++ if ( png_get_interlace_type( png, pngi ) ) + { numberOfPasses= png_set_interlace_handling( png ); } + +- if ( pngi->color_type == PNG_COLOR_TYPE_RGB && +- pngi->bit_depth == 16 ) ++ if ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB && ++ png_get_bit_depth( png, pngi ) == 16 ) + { + const unsigned short one= 1; + const unsigned char * testEndian= (const unsigned char *)&one; +@@ -133,9 +146,6 @@ static int bmPngReadContents( png_info * + } + + png_start_read_image( png ); +- /* +- png_read_update_info( png, pngi ); +- */ + + buffer= (unsigned char *)malloc( bd->bdBufferLength ); + if ( ! buffer ) +@@ -236,9 +246,9 @@ int bmPngReadPng( BitmapDescription * bd + + png_read_info( pngp, pngip ); + +- if ( bpPngiToBitmap( pngip, bd ) ) ++ if ( bpPngiToBitmap( pngp, pngip, bd ) ) + { +- LLLDEB(pngip->color_type,bd->bdColorCount,bd->bdRGB8Palette); ++ LLDEB(bd->bdColorCount,bd->bdRGB8Palette); + png_destroy_read_struct( &pngp, &pngip, (png_infop *)0 ); + return -1; + } +@@ -282,44 +292,43 @@ int bmCanWritePngFile( const BitmapDescr + + static int bpPngiFromBitmap( png_structp png, + png_info * pngi, ++ png_colorp * pPalette, + const BitmapDescription * bd ) + { +- png_info_init( pngi ); +- pngi->width= bd->bdPixelsWide; +- pngi->height= bd->bdPixelsHigh; ++ int bit_depth; ++ int color_type; ++ png_color_8 sig_bit; + + switch( bd->bdUnit ) + { + case BMunM: +- pngi->phys_unit_type= PNG_RESOLUTION_METER; +- pngi->x_pixels_per_unit= bd->bdXResolution; +- pngi->y_pixels_per_unit= bd->bdYResolution; +- pngi->valid |= PNG_INFO_pHYs; ++ png_set_pHYs( png, pngi, ++ bd->bdXResolution, ++ bd->bdYResolution, ++ PNG_RESOLUTION_METER); + break; + + case BMunINCH: +- pngi->phys_unit_type= PNG_RESOLUTION_METER; +- pngi->x_pixels_per_unit= (int)( 39.37* bd->bdXResolution ); +- pngi->y_pixels_per_unit= (int)( 39.37* bd->bdYResolution ); +- pngi->valid |= PNG_INFO_pHYs; ++ png_set_pHYs( png, pngi, ++ (int)( 39.37* bd->bdXResolution ), ++ (int)( 39.37* bd->bdYResolution ), ++ PNG_RESOLUTION_METER); + break; + + case BMunPOINT: +- pngi->phys_unit_type= PNG_RESOLUTION_METER; +- pngi->x_pixels_per_unit= POINTS_PER_M* bd->bdXResolution; +- pngi->y_pixels_per_unit= POINTS_PER_M* bd->bdYResolution; +- pngi->valid |= PNG_INFO_pHYs; ++ png_set_pHYs( png, pngi, ++ POINTS_PER_M* bd->bdXResolution, ++ POINTS_PER_M* bd->bdYResolution, ++ PNG_RESOLUTION_METER); + break; + + case BMunPIXEL: +- pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN; +- pngi->x_pixels_per_unit= 1; +- pngi->y_pixels_per_unit= 1; ++ png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN); + break; + + default: + LDEB(bd->bdUnit); +- pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN; ++ png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN); + break; + } + +@@ -329,41 +338,48 @@ static int bpPngiFromBitmap( png_structp + + case BMcoBLACKWHITE: + case BMcoWHITEBLACK: +- pngi->bit_depth= bd->bdBitsPerPixel; ++ bit_depth= bd->bdBitsPerPixel; + if ( bd->bdHasAlpha ) +- { pngi->color_type= PNG_COLOR_TYPE_GRAY_ALPHA; } +- else{ pngi->color_type= PNG_COLOR_TYPE_GRAY; } +- pngi->sig_bit.gray= bd->bdBitsPerSample; ++ { color_type= PNG_COLOR_TYPE_GRAY_ALPHA; } ++ else{ color_type= PNG_COLOR_TYPE_GRAY; } ++ sig_bit.gray= bd->bdBitsPerSample; + break; + + case BMcoRGB: +- pngi->bit_depth= bd->bdBitsPerSample; ++ bit_depth= bd->bdBitsPerSample; + if ( bd->bdHasAlpha ) +- { pngi->color_type= PNG_COLOR_TYPE_RGB_ALPHA; } +- else{ pngi->color_type= PNG_COLOR_TYPE_RGB; } +- pngi->sig_bit.red= bd->bdBitsPerSample; +- pngi->sig_bit.green= bd->bdBitsPerSample; +- pngi->sig_bit.blue= bd->bdBitsPerSample; ++ { color_type= PNG_COLOR_TYPE_RGB_ALPHA; } ++ else{ color_type= PNG_COLOR_TYPE_RGB; } ++ sig_bit.red= bd->bdBitsPerSample; ++ sig_bit.green= bd->bdBitsPerSample; ++ sig_bit.blue= bd->bdBitsPerSample; + break; + + case BMcoRGB8PALETTE: +- pngi->bit_depth= bd->bdBitsPerPixel; +- pngi->color_type= PNG_COLOR_TYPE_PALETTE; ++ bit_depth= bd->bdBitsPerPixel; ++ color_type= PNG_COLOR_TYPE_PALETTE; + +- pngi->valid |= PNG_INFO_PLTE; +- pngi->palette= (png_color *)malloc( 256* sizeof( png_color ) ); +- if ( ! pngi->palette ) +- { XDEB(pngi->palette); return -1; } +- pngi->num_palette= bd->bdColorCount; +- pngi->sig_bit.red= bd->bdBitsPerSample; +- pngi->sig_bit.green= bd->bdBitsPerSample; +- pngi->sig_bit.blue= bd->bdBitsPerSample; +- for ( i= 0; i < pngi->num_palette; i++ ) ++ if ( bd->bdColorCount > PNG_MAX_PALETTE_LENGTH ) + { +- pngi->palette[i].red= bd->bdRGB8Palette[i].rgb8Red; +- pngi->palette[i].green= bd->bdRGB8Palette[i].rgb8Green; +- pngi->palette[i].blue= bd->bdRGB8Palette[i].rgb8Blue; ++ LLDEB(bd->bdColorCount,PNG_MAX_PALETTE_LENGTH); ++ return -1; + } ++ ++ *pPalette= (png_color *)malloc( PNG_MAX_PALETTE_LENGTH* ++ sizeof( png_color ) ); ++ if ( ! *pPalette ) ++ { XDEB(*pPalette); return -1; } ++ sig_bit.red= bd->bdBitsPerSample; ++ sig_bit.green= bd->bdBitsPerSample; ++ sig_bit.blue= bd->bdBitsPerSample; ++ for ( i= 0; i < bd->bdColorCount; i++ ) ++ { ++ (*pPalette)[i].red= bd->bdRGB8Palette[i].rgb8Red; ++ (*pPalette)[i].green= bd->bdRGB8Palette[i].rgb8Green; ++ (*pPalette)[i].blue= bd->bdRGB8Palette[i].rgb8Blue; ++ } ++ ++ png_set_PLTE( png, pngi, (*pPalette), bd->bdColorCount ); + break; + + default: +@@ -371,7 +387,13 @@ static int bpPngiFromBitmap( png_structp + return -1; + } + +- pngi->interlace_type= 0; ++ png_set_sBIT( png, pngi, &sig_bit ); ++ png_set_IHDR( png, pngi, ++ bd->bdPixelsWide, bd->bdPixelsHigh, ++ bit_depth, color_type, ++ PNG_INTERLACE_NONE, ++ PNG_COMPRESSION_TYPE_BASE, ++ PNG_FILTER_TYPE_BASE ); + + return 0; + } +@@ -395,8 +417,8 @@ static void bmPngWriteContents( png_stru + } + } + +- if ( pngi->color_type == PNG_COLOR_TYPE_RGB && +- bd->bdBitsPerSample == 16 ) ++ if ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB && ++ bd->bdBitsPerSample == 16 ) + { + const unsigned short one= 1; + const unsigned char * testEndian= (const unsigned char *)&one; +@@ -431,9 +453,9 @@ static void bmPngWriteContents( png_stru + from= scratch; + } + +- if ( pngi->color_type == PNG_COLOR_TYPE_RGB && +- bd->bdBitsPerSample == 16 && +- scratch ) ++ if ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB && ++ bd->bdBitsPerSample == 16 && ++ scratch ) + { + int col; + const BmUint16 * fr= (const BmUint16 *)from; +@@ -453,10 +475,6 @@ static void bmPngWriteContents( png_stru + + png_write_end( png, pngi ); + +- if ( bd->bdColorEncoding == BMcoRGB8PALETTE && +- pngi->palette ) +- { free( pngi->palette ); } +- + if ( scratch ) + { free( scratch ); } + +@@ -510,50 +528,43 @@ int bmPngWritePng( const BitmapDescript + const unsigned char * buffer, + SimpleOutputStream * sos ) + { ++ int rval= 0; + png_structp pngp= (png_structp)0; + png_infop pngip= (png_infop)0; ++ png_colorp palette= (png_colorp)0; + + pngp = png_create_write_struct( PNG_LIBPNG_VER_STRING, (void *)0, + (png_error_ptr)0, (png_error_ptr)0 ); + if ( ! pngp ) +- { LDEB(1); return -1; } ++ { XDEB(pngp); rval= -1; goto ready; } + + pngip = png_create_info_struct( pngp ); + if ( ! pngip ) +- { +- LDEB(1); +- png_destroy_write_struct( &pngp, (png_infop *)0 ); +- return -1; +- } ++ { XDEB(pngip); rval= -1; goto ready; } ++ ++ /* ++ As the info struct is built by libpng this is not needed: ++ (The call will disappear from libpng in version 1.4) ++ png_info_init( pngi ); ++ */ + + if ( setjmp( png_jmpbuf( pngp ) ) ) +- { +- LDEB(1); +- png_destroy_write_struct( &pngp, &pngip ); +- /* Crashes: +- if ( bd->bdColorEncoding == BMcoRGB8PALETTE && +- pngip->palette ) +- { free( pngip->palette ); } +- */ +- return -1; +- } ++ { LDEB(1); rval= -1; goto ready; } + + png_init_io( pngp, (FILE *)0 ); + png_set_write_fn( pngp, (void *)sos, bmPngWriteBytes, bmPngFlushBytes ); + +- if ( bpPngiFromBitmap( pngp, pngip, bd ) ) +- { +- LDEB(bd->bdColorEncoding); +- png_destroy_write_struct( &pngp, &pngip ); +- return -1; +- } +- +- /* +- png_write_info( pngp, pngip ); +- */ ++ if ( bpPngiFromBitmap( pngp, pngip, &palette, bd ) ) ++ { LDEB(bd->bdColorEncoding); rval= -1; goto ready; } + + bmPngWriteContents( pngp, pngip, buffer, bd ); + ++ ready: ++ ++ if ( palette ) ++ { free( palette ); } ++ + png_destroy_write_struct( &pngp, &pngip ); +- return 0; ++ ++ return rval; + } diff --git a/community/tmw/PKGBUILD b/community/tmw/PKGBUILD index 53de9a0a3..66ee80a3a 100644 --- a/community/tmw/PKGBUILD +++ b/community/tmw/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46816 2011-05-12 17:56:23Z mherych $ +# $Id: PKGBUILD 63754 2012-02-05 12:11:59Z ibiru $ # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=tmw pkgver=0.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG." arch=('i686' 'x86_64') url="http://themanaworld.org" @@ -16,12 +16,12 @@ source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgv md5sums=('c843ef420aced82db1e51fa14e80174a') build() { - cd $srcdir + cd "$srcdir" cmake . -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd $srcdir - make DESTDIR=$pkgdir install + cd "$srcdir" + make DESTDIR="$pkgdir" install } diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD index 1d6c27f91..f6a4e9380 100644 --- a/community/torcs/PKGBUILD +++ b/community/torcs/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 61835 2012-01-08 19:53:39Z spupykin $ +# $Id: PKGBUILD 63756 2012-02-05 12:12:13Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Shahar Weiss <sweiss4@gmx.net> pkgname=torcs -pkgver=1.3.2_test2 +pkgver=1.3.2 pkgrel=1 pkgdesc="A 3D racing cars simulator using OpenGL" url="http://torcs.sourceforge.net" license=("GPL") arch=('i686' 'x86_64') -depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'torcs-data' - 'libvorbis') +depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis') makedepends=('plib') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 torcs.desktop torcs-gcc.patch) -md5sums=('7851c1149587451bd64a6a55d785af40' +md5sums=('254b8f4c14d067dd63da8d54d3cfdba8' '328e419e9f985c3e7b69924fe299330d' '5ae7e903df37300d3b8744328c756bff') @@ -28,6 +27,7 @@ build() { } package() { + depends=(${depends[@]} "torcs-data=$pkgver") cd $srcdir/$pkgname-${pkgver/_/-} make DESTDIR=${pkgdir} install install -D -m644 Ticon.png ${pkgdir}/usr/share/pixmaps/torcs.png diff --git a/community/tuxpaint/PKGBUILD b/community/tuxpaint/PKGBUILD index 782eb0534..d0b06469d 100644 --- a/community/tuxpaint/PKGBUILD +++ b/community/tuxpaint/PKGBUILD @@ -1,38 +1,39 @@ -# $Id: PKGBUILD 26451 2010-09-15 18:28:06Z schuay $ +# $Id: PKGBUILD 63759 2012-02-05 12:12:25Z ibiru $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Sergio Jovani Guzman <moret.sjg@gmail.com> # Adopted: royrocks <royrocks13@gmail.com> pkgname=tuxpaint pkgver=0.9.21 -pkgrel=4 +pkgrel=5 pkgdesc="Tux Paint is a free drawing program designed for young children." arch=('i686' 'x86_64') url="http://www.tuxpaint.org" license=('GPL') backup=('etc/tuxpaint/tuxpaint.conf') depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango' 'libpaper' 'librsvg') -source=(http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz) -md5sums=('a88401d1860648098eeed819cff038fa') -sha1sums=('082a179a3cb44ee17af47421bc92125a890846e4') +source=(http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz tuxpaint-0.9.21-libpng1.5.patch) +md5sums=('a88401d1860648098eeed819cff038fa' + '11d11119b3316c13f7b7a77048317bce') +sha1sums=('082a179a3cb44ee17af47421bc92125a890846e4' + '5595a65ebabc46bebd2d0670589effc8dbdd4e0c') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" # python2 fix for file in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file done + patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch + sed -i 's/$(ARCH_LINKS)/$(ARCH_LINKS) -lpng/' Makefile echo "Categories=Game;KidsGame;Graphics;RasterGraphics;" >> src/tuxpaint.desktop make PREFIX=/usr } package() { - cd $srcdir/$pkgname-$pkgver - make PREFIX=/usr DESTDIR=$startdir/pkg CONFDIR=$pkgdir/etc MAN_PREFIX=$pkgdir/usr/share/man X11_ICON_PREFIX=$pkgdir/usr/share/pixmaps KDE_PREFIX="" KDE_ICON_PREFIX="" install - install -D -m 644 $srcdir/$pkgname-$pkgver/src/tuxpaint.desktop $pkgdir/usr/share/applications/tuxpaint.desktop - chmod -R 644 $pkgdir/usr/share/doc/tuxpaint-dev/* - chmod 755 $pkgdir/usr/share/doc/tuxpaint-dev/html - mkdir -p $pkgdir/etc/tuxpaint - mv $pkgdir/etc/tuxpaint.conf $pkgdir/etc/tuxpaint/ + cd "$srcdir/$pkgname-$pkgver" + make PREFIX=/usr DESTDIR="$pkgdir" GNOME_PREFIX=/usr X11_ICON_PREFIX="$pkgdir/usr/share/pixmaps" install + chmod -R 644 "$pkgdir"/usr/share/doc/tuxpaint-dev/* + chmod 755 "$pkgdir/usr/share/doc/tuxpaint-dev/html" } diff --git a/community/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch b/community/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch new file mode 100644 index 000000000..25e80cd2a --- /dev/null +++ b/community/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch @@ -0,0 +1,19 @@ +http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829 +No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433) + +--- src/tuxpaint.c 2011/07/29 21:27:39 1.828 ++++ src/tuxpaint.c 2011/08/08 17:59:12 1.829 +@@ -13425,12 +13425,7 @@ + { + png_init_io(png_ptr, fi); + +- info_ptr->width = surf->w; +- info_ptr->height = surf->h; +- info_ptr->bit_depth = 8; +- info_ptr->color_type = PNG_COLOR_TYPE_RGB; +- info_ptr->interlace_type = 1; +- info_ptr->valid = 0; /* will be updated by various png_set_FOO() functions */ ++ png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); + + png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, + PNG_sRGB_INTENT_PERCEPTUAL); diff --git a/community/tvtime/PKGBUILD b/community/tvtime/PKGBUILD index 59a5792c6..00442105e 100644 --- a/community/tvtime/PKGBUILD +++ b/community/tvtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59091 2011-11-21 09:46:20Z spupykin $ +# $Id: PKGBUILD 63761 2012-02-05 12:12:36Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:thefatprecious <marty@loomar.com> pkgname=tvtime pkgver=1.0.2 -pkgrel=2 +pkgrel=3 pkgdesc="A high quality television application for use with video capture cards" arch=('i686' 'x86_64') url='http://tvtime.sourceforge.net/' @@ -26,6 +26,7 @@ build() { patch -p1 < ../tvtime-1.0.2+linux-headers-2.6.18.patch patch -p1 < ../tvtime-1.0.2-gcc41.patch patch -p1 < ../tvtime-1.0.2-locale_t.patch + sed -i '1,1i#include <zlib.h>' src/pngoutput.c [ -f Makefile ] || ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var --sysconfdir=/etc make make DESTDIR=$pkgdir install diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 7339633aa..f28badfda 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60899 2011-12-19 18:08:37Z ibiru $ +# $Id: PKGBUILD 63763 2012-02-05 12:13:00Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source') pkgver=4.1.8 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -16,7 +16,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild change_default_driver_dir.patch vbox-service.conf vbox-service.rc) -_extramodules=extramodules-3.1-ARCH +_extramodules=extramodules-3.2-ARCH _kernver="$(cat /lib/modules/${_extramodules}/version)" build() { @@ -40,7 +40,7 @@ build() { package_virtualbox() { pkgdesc="Powerful x86 virtualization for enterprise as well as home use" - depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng') + depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng') optdepends=('qt: for VirtualBox GUI' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-sdk: developer kit' @@ -149,7 +149,7 @@ package_virtualbox-sdk() { package_virtualbox-archlinux-additions(){ pkgdesc="Additions only for Arch Linux guests (userspace tools)" - depends=("virtualbox-archlinux-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr') + depends=("virtualbox-archlinux-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') replaces=('virtualbox-guest-additions') conflicts=('virtualbox-guest-additions') diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD index 6abbad324..1798634b9 100644 --- a/community/virtviewer/PKGBUILD +++ b/community/virtviewer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54218 2011-08-14 19:34:13Z spupykin $ +# $Id: PKGBUILD 63765 2012-02-05 12:13:04Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <archaur at jonw dot org> pkgname=virtviewer pkgver=0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS." depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt') makedepends=('intltool') diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 78af11f86..c1984cfb6 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61185 2011-12-23 22:04:01Z tdziedzic $ +# $Id: PKGBUILD 63769 2012-02-05 12:13:32Z ibiru $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> # Contributor: leepesjee <lpeschier at xs4all dot nl> @@ -9,12 +9,12 @@ pkgname=vtk pkgver=5.8.0 -pkgrel=7 +pkgrel=8 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' arch=('i686' 'x86_64') url='http://www.vtk.org' license=('BSD') -depends=('libpng' 'libtiff' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql') +depends=('libpng' 'libtiff' 'libjpeg-turbo' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql' 'hdf5' 'expat' 'libtheora') makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk') optdepends=('python2: python bindings' 'java-runtime: java bindings' @@ -53,6 +53,15 @@ build() { mkdir build cd build + # flags to enable using system libs + local cmake_system_flags="" + for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA; do # LIBPROJ4 + cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON " + done + + # flags to use python2 instead of python which is 3.x.x on archlinux + local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so" + cmake \ -Wno-dev \ -DBUILD_SHARED_LIBS:BOOL=ON \ @@ -65,13 +74,6 @@ build() { -DVTK_USE_HYBRID:BOOL=ON \ -DVTK_USE_PARALLEL:BOOL=ON \ -DVTK_USE_PATENTED:BOOL=ON \ - -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ - -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ - -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ - -DVTK_USE_SYSTEM_PNG:BOOL=ON \ - -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ - -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ - -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \ -DVTK_USE_BOOST:BOOL=ON \ -DVTK_USE_INFOVIS:BOOL=ON \ -DVTK_USE_GL2PS:BOOL=ON \ @@ -86,9 +88,8 @@ build() { -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \ -DVTK_USE_GUISUPPORT:BOOL=ON \ -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ - -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + ${cmake_system_flags} \ + ${cmake_system_python_flags} \ ${srcdir}/VTK make diff --git a/community/w3cam/PKGBUILD b/community/w3cam/PKGBUILD index 5d85e2d99..d0e0dcc6d 100644 --- a/community/w3cam/PKGBUILD +++ b/community/w3cam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59116 2011-11-21 11:03:42Z spupykin $ +# $Id: PKGBUILD 63771 2012-02-05 12:13:37Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Christian Schmidt <mucknert@gmx.net> pkgname=w3cam pkgver=0.7.2 -pkgrel=9 +pkgrel=10 pkgdesc="a small and fast CGI program to retrieve images from a video4linux device." arch=('i686' 'x86_64') url="http://mpx.freeshell.net/" diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD index 473e98ef7..dcf0fecad 100644 --- a/community/warmux/PKGBUILD +++ b/community/warmux/PKGBUILD @@ -1,25 +1,31 @@ -# $Id: PKGBUILD 47366 2011-05-22 06:58:10Z lcarlier $ +# $Id: PKGBUILD 63773 2012-02-05 12:13:45Z ibiru $ # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: pukyxd # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> pkgname=warmux pkgver=11.04.1 -pkgrel=3 +pkgrel=4 pkgdesc="A clone of the worms game" arch=('i686' 'x86_64') url="http://www.wormux.org/" license=('GPL') makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') replaces=('wormux') -source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('26ff65c43a9bb61a3f0529c98b943e35') +source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + include-zlib.patch + gcc-fix.patch) +md5sums=('26ff65c43a9bb61a3f0529c98b943e35' + 'c8285955e880f80e3c68312715a3061c' + '693176b72c9568c0c223be76ea7dd0d2') build() { cd "${srcdir}/${pkgname}-${pkgver/.1/}" - #gcc 4.6.0 fix - #sed -i '27i#include <stddef.h>' lib/warmux/include/WARMUX_action.h + # libpng 1.5 fix + patch -Np1 -i ../include-zlib.patch + # gcc fix + patch -Np1 -i ../gcc-fix.patch ./configure --prefix=/usr make diff --git a/community/warmux/gcc-fix.patch b/community/warmux/gcc-fix.patch new file mode 100644 index 000000000..d4ceb0746 --- /dev/null +++ b/community/warmux/gcc-fix.patch @@ -0,0 +1,25 @@ +## i-love-you-lordheavy.patch [diff] +diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp +--- warmux-11.04/lib/warmux/action/action.cpp 2011-04-28 21:03:14.000000000 +0200 ++++ warmux-11.04-new/lib/warmux/action/action.cpp 2012-01-29 09:51:16.680251815 +0100 +@@ -81,7 +81,7 @@ + } + + // Build an action from a network packet +-Action::Action(const char *buffer, DistantComputer* _creator) ++Action::Action(char *buffer, DistantComputer* _creator) + { + m_creator = _creator; + +diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h +--- warmux-11.04/lib/warmux/include/WARMUX_action.h 2011-04-28 21:03:13.000000000 +0200 ++++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h 2012-01-29 09:52:14.246921833 +0100 +@@ -168,7 +168,7 @@ + Action(Action_t type, Double value1, Double value2); + + // Build an action from a network packet +- Action(const char* buffer, DistantComputer* _creator); ++ Action(char* buffer, DistantComputer* _creator); + + ~Action(); + diff --git a/community/warmux/include-zlib.patch b/community/warmux/include-zlib.patch new file mode 100644 index 000000000..c7e77aba1 --- /dev/null +++ b/community/warmux/include-zlib.patch @@ -0,0 +1,11 @@ +diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp +--- warmux-11.04.orig/src/graphic/surface.cpp 2011-09-19 09:26:52.392650465 +0200 ++++ warmux-11.04/src/graphic/surface.cpp 2011-09-19 09:26:19.417648189 +0200 +@@ -25,6 +25,7 @@ + #include <SDL_image.h> + #include <SDL_rotozoom.h> + #include <png.h> ++#include <zlib.h> + + #include "graphic/surface.h" + #include "tool/math_tools.h" diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index 334c92f3e..c3acd0b53 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 57212 2011-10-24 14:41:07Z lcarlier $ +# $Id: PKGBUILD 63775 2012-02-05 12:13:50Z ibiru $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=warzone2100 pkgver=2.3.9 -pkgrel=1 +pkgrel=2 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" arch=('i686' 'x86_64') license=('GPL') -depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu') -makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'mesa') +depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'mesa' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu') +makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip') source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz") md5sums=('7185090a089c9c0e0eca7535a8f25dca') diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index 4d207a5a6..6f540efaa 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57518 2011-10-29 21:39:24Z lcarlier $ +# $Id: PKGBUILD 63777 2012-02-05 12:14:08Z ibiru $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> @@ -6,17 +6,19 @@ pkgname=widelands pkgver=16 _realver=build16 -pkgrel=4 +pkgrel=5 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64') url="http://widelands.org/" license=('GPL') makedepends=('cmake' 'boost' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2') source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2 + widelands-0.16-libpng15.patch $pkgname.desktop $pkgname.png $pkgname.sh) md5sums=('3d8c28e145b73c64d8ed1625319d25a2' + 'e492620b071cbd1db04280173653a67c' '15820bf099fd6f16251fe70a75c534bb' '3dfda7e9ca76ca00dd98d745d0ceb328' '7cae50aba5ed0cd2cfeea79124637b46') @@ -24,6 +26,8 @@ md5sums=('3d8c28e145b73c64d8ed1625319d25a2' build() { cd $srcdir/$pkgname-$_realver-src + patch -Np0 < $srcdir/widelands-0.16-libpng15.patch + mkdir -p build/compile && cd build/compile cmake ../.. -DCMAKE_BUILD_TYPE=Release \ diff --git a/community/widelands/widelands-0.16-libpng15.patch b/community/widelands/widelands-0.16-libpng15.patch new file mode 100644 index 000000000..9f733e7b9 --- /dev/null +++ b/community/widelands/widelands-0.16-libpng15.patch @@ -0,0 +1,61 @@ +--- src/graphic/SDL_mng.cc ++++ src/graphic/SDL_mng.cc +@@ -276,7 +276,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))) { + SDL_SetError("Error reading the PNG file."); + goto done; + } +@@ -356,9 +356,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 const s = (info_ptr->channels == 4) ? 0 : 8; ++ int const s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; + Rmask = 0xFF000000 >> s; + Gmask = 0x00FF0000 >> s; + Bmask = 0x0000FF00 >> s; +@@ -369,7 +369,7 @@ + SDL_AllocSurface + (SDL_SWSURFACE, + width, height, +- bit_depth * info_ptr->channels, ++ bit_depth * png_get_channels(png_ptr, info_ptr), + Rmask, Gmask, Bmask, Amask); + if (not surface) { + SDL_SetError("Out of memory"); +@@ -407,6 +407,9 @@ + /* read rest of file, get additional chunks in info_ptr - REQUIRED */ + png_read_end(png_ptr, info_ptr); + ++ png_colorp png_palette; ++ int png_num_palette; ++ + /* Load the palette, if any */ + if ((palette = surface->format->palette)) { + if (color_type == PNG_COLOR_TYPE_GRAY) { +@@ -416,12 +419,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 (uint32_t 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 (png_num_palette > 0) { ++ palette->ncolors = png_num_palette; ++ for (uint32_t i = 0; i < png_num_palette; ++i) { ++ palette->colors[i].b = png_palette[i].blue; ++ palette->colors[i].g = png_palette[i].green; ++ palette->colors[i].r = png_palette[i].red; + } + } + } diff --git a/community/xautomation/PKGBUILD b/community/xautomation/PKGBUILD index 1fc7aff75..39472db42 100644 --- a/community/xautomation/PKGBUILD +++ b/community/xautomation/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 57187 2011-10-23 16:31:38Z lfleischer $ +# $Id: PKGBUILD 63780 2012-02-05 12:14:20Z ibiru $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: raubkopierer <mail[dot]sensenmann[at]gmail[dot]com> pkgname=xautomation pkgver=1.05 -pkgrel=1 +pkgrel=2 pkgdesc='Controls X from the command line and does "visual scraping".' url='http://hoopajoo.net/projects/xautomation.html' arch=('i686' 'x86_64') license=('GPL') depends=('libpng' 'libxtst') -source=("http://hoopajoo.net/static/projects/${pkgname}-${pkgver}.tar.gz") -md5sums=('4526ea5085a680a3ae8629af1731e5fa') +source=("http://hoopajoo.net/static/projects/${pkgname}-${pkgver}.tar.gz" + 'xautomation-1.05-fix-libs.patch') +md5sums=('4526ea5085a680a3ae8629af1731e5fa' + 'a8d8b12ed180ce9693f706d0f75d97fe') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../xautomation-1.05-fix-libs.patch + ./configure --prefix=/usr make } diff --git a/community/xautomation/xautomation-1.05-fix-libs.patch b/community/xautomation/xautomation-1.05-fix-libs.patch new file mode 100644 index 000000000..ee3f9247a --- /dev/null +++ b/community/xautomation/xautomation-1.05-fix-libs.patch @@ -0,0 +1,24 @@ +diff -rup xautomation-1.05.orig/Makefile.am xautomation-1.05/Makefile.am +--- xautomation-1.05.orig/Makefile.am 2009-04-14 18:06:23.000000000 +0200 ++++ xautomation-1.05/Makefile.am 2012-01-27 02:06:44.016492587 +0100 +@@ -1,7 +1,7 @@ + bin_PROGRAMS = xte rgb2pat png2pat visgrep pat2ppm patextract xmousepos + man_MANS = pat2ppm.1 patextract.1 png2pat.1 rgb2pat.1 visgrep.1 xautomation.7 xmousepos.1 xte.1 + xte_SOURCES = xte.c debug.c kbd.h keysym_map.h multikey_map.h +-xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst ++xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst -lX11 + rgb2pat_SOURCES = rgb2pat.c image.c image.h debug.c debug.h + rgb2pat_LDADD = -lpng + png2pat_SOURCES = png2pat.c image.c image.h debug.c debug.h +diff -rup xautomation-1.05.orig/Makefile.in xautomation-1.05/Makefile.in +--- xautomation-1.05.orig/Makefile.in 2011-09-07 00:48:19.000000000 +0200 ++++ xautomation-1.05/Makefile.in 2012-01-27 02:14:02.010831581 +0100 +@@ -220,7 +220,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + man_MANS = pat2ppm.1 patextract.1 png2pat.1 rgb2pat.1 visgrep.1 xautomation.7 xmousepos.1 xte.1 + xte_SOURCES = xte.c debug.c kbd.h keysym_map.h multikey_map.h +-xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst ++xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst -lX11 + rgb2pat_SOURCES = rgb2pat.c image.c image.h debug.c debug.h + rgb2pat_LDADD = -lpng + png2pat_SOURCES = png2pat.c image.c image.h debug.c debug.h diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD index 4b9728fc0..3a649abc1 100644 --- a/community/xemacs/PKGBUILD +++ b/community/xemacs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61961 2012-01-11 15:22:47Z stephane $ +# $Id: PKGBUILD 63784 2012-02-05 12:14:51Z ibiru $ # Maintainer: juergen <juergen@archlinux.org> # Contributor : Stéphane Gaudreault <stephane@archlinux.org> pkgname=xemacs pkgver=21.5.31 -pkgrel=4 +pkgrel=5 pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs" arch=('i686' 'x86_64') url="http://www.xemacs.org/" diff --git a/community/xloadimage/PKGBUILD b/community/xloadimage/PKGBUILD index edff1665e..077f71eff 100644 --- a/community/xloadimage/PKGBUILD +++ b/community/xloadimage/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59105 2011-11-21 10:35:15Z spupykin $ +# $Id: PKGBUILD 63786 2012-02-05 12:15:07Z ibiru $ # 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=11 +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" @@ -15,15 +15,18 @@ 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) + enable-image-types.patch + png15-tiff4.patch) md5sums=('86b42b1b628a9c00008b7deec21e1175' 'cc16a51aeb5083b8ff07939dfe244130' - '3a2703925011276fd2d2bd139b676487') + '3a2703925011276fd2d2bd139b676487' + 'c797cfc3f4588b96275d82c2c9cc7025') build() { cd $srcdir/$pkgname.$pkgver patch -p1 <$srcdir/enable-image-types.patch + patch -p1 <$srcdir/png15-tiff4.patch xmkmf make diff --git a/community/xloadimage/png15-tiff4.patch b/community/xloadimage/png15-tiff4.patch new file mode 100644 index 000000000..8536e36f3 --- /dev/null +++ b/community/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/xmoto/PKGBUILD b/community/xmoto/PKGBUILD index 64a776beb..0a865690d 100644 --- a/community/xmoto/PKGBUILD +++ b/community/xmoto/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64796 2010-01-22 08:19:26Z eric $ +# $Id: $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Denis (dtonator@gmail.com) pkgname=xmoto -pkgver=0.5.8 +pkgver=0.5.9 pkgrel=1 pkgdesc="A challenging 2D motocross platform game, where physics play an important role." arch=('i686' 'x86_64') @@ -13,12 +13,16 @@ 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") -sha1sums=('a5197e10f0c37cfefbab55723c8d0760234fb4ce') +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 diff --git a/community/xmoto/xmoto-0.5.9-libpng15.patch b/community/xmoto/xmoto-0.5.9-libpng15.patch new file mode 100644 index 000000000..0410c81c5 --- /dev/null +++ b/community/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/xnc/PKGBUILD b/community/xnc/PKGBUILD index b26a556c6..bba6b27df 100644 --- a/community/xnc/PKGBUILD +++ b/community/xnc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 58678 2011-11-17 15:02:45Z spupykin $ +# $Id: PKGBUILD 63790 2012-02-05 12:15:33Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xnc pkgver=5.0.4 -pkgrel=4 +pkgrel=6 pkgdesc="X nortern captain file manager" arch=(i686 x86_64) url="http://xnc.jinr.ru/" @@ -11,13 +11,18 @@ 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=(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') + '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/xnc/libpng15.patch b/community/xnc/libpng15.patch new file mode 100644 index 000000000..53b941b81 --- /dev/null +++ b/community/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/xplanet/PKGBUILD b/community/xplanet/PKGBUILD index be1d39f2e..08fb15229 100644 --- a/community/xplanet/PKGBUILD +++ b/community/xplanet/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52172 2011-07-21 07:16:17Z spupykin $ +# $Id: PKGBUILD 63792 2012-02-05 12:15:38Z ibiru $ # 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=1 +pkgrel=2 pkgdesc="An Xearth wannabe" arch=(i686 x86_64) url="http://xplanet.sourceforge.net/" diff --git a/community/xvkbd/PKGBUILD b/community/xvkbd/PKGBUILD index c06e2583a..f468d6f48 100644 --- a/community/xvkbd/PKGBUILD +++ b/community/xvkbd/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 58680 2011-11-17 15:09:35Z spupykin $ +# $Id: PKGBUILD 63496 2012-02-05 11:51:10Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Benjamin Andresen <benny@klapmuetz.org> # Contributor: Mikko Seppдlд <t-r-a-y@mbnet.fi> pkgname=xvkbd pkgver=3.2 -pkgrel=2 +pkgrel=3 pkgdesc="virtual (graphical) keyboard program for X Window System" arch=('i686' 'x86_64') url="http://homepage3.nifty.com/tsato/xvkbd/" license=('GPL') -depends=('libxmu' 'xaw3d' 'glibc' 'libxt' 'libxtst' 'libxp') +depends=('libxmu' 'xaw3d' 'glibc' 'libxt' 'libxtst' 'libxp' 'libxpm') makedepends=('imake') source=(http://homepage3.nifty.com/tsato/xvkbd/xvkbd-$pkgver.tar.gz) md5sums=('1bce8d6c27e6e7df92ec09b414f82dad') diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index f678f304e..b6419c832 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146739 2012-01-16 22:52:44Z dreisner $ +# $Id: PKGBUILD 148992 2012-02-05 12:21:23Z andyrtr $ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=gnupg -pkgver=1.4.11 -pkgrel=3 +pkgver=1.4.12 +pkgrel=1 pkgdesc="GNU Privacy Guard - a PGP replacement tool" arch=('i686' 'x86_64') license=('GPL3') @@ -11,7 +11,7 @@ depends=('zlib' 'bzip2' 'libldap>=2.4.18' 'libusb-compat' 'curl>=7.16.2' 'readli source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2) install=gnupg.install url="http://www.gnupg.org/" -md5sums=('411744e1ef8ce90b87938c4203f001f1') +md5sums=('ce3742e5c7912559cab7894ad8ba7f6b') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD index 5e76655a5..1193ed3b0 100644 --- a/core/links/PKGBUILD +++ b/core/links/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 143535 2011-11-26 00:22:27Z eric $ +# $Id: PKGBUILD 148998 2012-02-05 12:58:31Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=links -pkgver=2.4 +pkgver=2.5 pkgrel=1 pkgdesc="A text WWW browser, similar to Lynx" arch=('i686' 'x86_64') url="http://links.twibright.com/" license=('GPL') -depends=('bzip2' 'zlib' 'openssl' 'gpm') +depends=('bzip2' 'xz' 'zlib' 'openssl' 'gpm') makedepends=('libtiff' 'libpng' 'libxt') optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks') provides=('links-g') conflicts=('links-g') replaces=('links-g') source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop) -sha1sums=('c09fcb03874b1d0586f582f73833bb2f4c9ed7ac' +sha1sums=('fe4bc37be8aebd9196c35ffef724435cea94349c' 'f600e27c2a71184444f7dd07a10230aa44463a02') build() { diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD index 2bb71bb52..b02d1bc68 100644 --- a/extra/abiword/PKGBUILD +++ b/extra/abiword/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 139550 2011-10-03 12:22:58Z jgc $ +# $Id: PKGBUILD 148668 2012-02-05 11:46:18Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Maël Lavault <moimael@neuf.fr> pkgbase=abiword pkgname=('abiword' 'abiword-plugins') pkgver=2.8.6 -pkgrel=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') +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) -sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df' - 'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea' - '159b1cd0b9354868ab86f851b64a03dae7d254dc') + '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}" @@ -24,10 +27,23 @@ build() { 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 + ./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 } @@ -54,7 +70,8 @@ package_abiword() { package_abiword-plugins() { pkgdesc="Additional plugins for Abiword" - depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf') + 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 diff --git a/extra/abiword/abiword-2.8.6-libpng15.patch b/extra/abiword/abiword-2.8.6-libpng15.patch new file mode 100644 index 000000000..7eded4c83 --- /dev/null +++ b/extra/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/extra/abook/PKGBUILD b/extra/abook/PKGBUILD index 33832c165..45add6b74 100644 --- a/extra/abook/PKGBUILD +++ b/extra/abook/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110746 2011-02-22 00:31:00Z bisson $ +# $Id: PKGBUILD 149024 2012-02-05 14:23:12Z bisson $ # Contributor: damir <damir@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,7 +6,7 @@ pkgname=abook pkgver=0.6.0pre2 -pkgrel=3 +pkgrel=4 pkgdesc='Text-based addressbook designed for use with Mutt' arch=('i686' 'x86_64') url='http://abook.sourceforge.net/' diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD index 9903edb53..ed8cbd042 100644 --- a/extra/allegro/PKGBUILD +++ b/extra/allegro/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142269 2011-11-07 18:27:05Z eric $ +# $Id: PKGBUILD 148670 2012-02-05 11:46:21Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: arjan <arjan@archlinux.org> pkgname=allegro pkgver=5.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="Portable library mainly aimed at video game and multimedia programming" arch=('i686' 'x86_64') url="http://alleg.sourceforge.net/" diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD index ed5a8b546..b403b8d80 100644 --- a/extra/alsaplayer/PKGBUILD +++ b/extra/alsaplayer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134328 2011-08-02 22:50:41Z eric $ +# $Id: PKGBUILD 148672 2012-02-05 11:46:26Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=alsaplayer pkgver=0.99.81 -pkgrel=2 +pkgrel=3 pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit" arch=('i686' 'x86_64') url="http://www.alsaplayer.org/" @@ -23,7 +23,6 @@ optdepends=('gtk2: for the gtk2 GUI interface' \ options=('!libtool') install=alsaplayer.install source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2) -md5sums=('845c53975791ba342e316ceac8aa1527') sha1sums=('25817ebd1e5c36da31a88363315a1bf7a945ddfd') build() { diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 3eba571f9..28da6c0db 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146505 2012-01-12 07:55:40Z giovanni $ +# $Id: PKGBUILD 148674 2012-02-05 11:46:28Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> @@ -6,7 +6,7 @@ pkgname=amule pkgver=10708 -pkgrel=1 +pkgrel=2 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') url="http://www.amule.org" diff --git a/extra/anthy/PKGBUILD b/extra/anthy/PKGBUILD index c38e8ba48..62e0ba805 100644 --- a/extra/anthy/PKGBUILD +++ b/extra/anthy/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 111076 2011-02-23 21:51:47Z bisson $ +# $Id: PKGBUILD 149031 2012-02-05 15:01:58Z bisson $ # Contributor: damir <damir@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: Gaetan Bisson <bisson@archlinux.org> @@ -6,7 +6,7 @@ pkgname=anthy pkgver=9100h _filecode=37536 -pkgrel=2 +pkgrel=3 pkgdesc='Hiragana text to Kana Kanji mixed text Japanese input method' arch=('i686' 'x86_64') url='http://sourceforge.jp/projects/anthy/' diff --git a/extra/at-spi/PKGBUILD b/extra/at-spi/PKGBUILD index 0970c90f4..c42990c8f 100644 --- a/extra/at-spi/PKGBUILD +++ b/extra/at-spi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120762 2011-04-26 14:25:06Z ibiru $ +# $Id: PKGBUILD 148676 2012-02-05 11:46:33Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=at-spi pkgver=1.32.0 -pkgrel=4 +pkgrel=5 pkgdesc="Assistive Technology Service Provider Interface" arch=('i686' 'x86_64') license=('GPL') @@ -15,6 +15,8 @@ install=at-spi.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.32/${pkgname}-${pkgver}.tar.bz2) sha256sums=('cc841dea746413eebadf0710dabec741450b37a06821c34526f505fe9d027039') +# !! make sure you 'pacman -Rsc python' from your chroot before building the package or it would use python3 instead of the wanted python2 !! + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ diff --git a/extra/automoc4/PKGBUILD b/extra/automoc4/PKGBUILD index a6f7bc58d..4e1309042 100644 --- a/extra/automoc4/PKGBUILD +++ b/extra/automoc4/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 122082 2011-05-02 06:05:33Z andrea $ +# $Id: PKGBUILD 149006 2012-02-05 13:49:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=automoc4 pkgver=0.9.88 -pkgrel=2 +pkgrel=3 pkgdesc="Automatic moc for Qt4" arch=('i686' 'x86_64') -url='http://www.kde.org' +url='http://www.kde.org/' license=('custom') depends=('qt') makedepends=('pkgconfig' 'cmake') diff --git a/extra/autopano-sift-c/PKGBUILD b/extra/autopano-sift-c/PKGBUILD index 35a5d7fdc..f3708cb4a 100644 --- a/extra/autopano-sift-c/PKGBUILD +++ b/extra/autopano-sift-c/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 96768 2010-10-24 16:49:43Z ibiru $ +# $Id: PKGBUILD 148678 2012-02-05 11:46:36Z ibiru $ # 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=2 +pkgrel=3 pkgdesc="Identify key feature points within arbitrary images" arch=('i686' 'x86_64') url="http://hugin.sourceforge.net/" license=('GPL2') -depends=('libxml2' 'libpano13>=2.9.17' 'gcc-libs') +depends=('libxml2' 'libpano13' 'gcc-libs') makedepends=('cmake') provides=('autopano-sift') conflicts=('autopano-sift') @@ -20,8 +20,12 @@ 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 - make DESTDIR=${pkgdir} install +} + +package() { + cd "${srcdir}/autopano-sift-C-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 1d5f9ccc9..4b3221af6 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143808 2011-11-29 13:33:28Z stephane $ +# $Id: PKGBUILD 148680 2012-02-05 11:46:41Z ibiru $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.30 -pkgrel=6 +pkgrel=7 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64') url='http://www.avahi.org/' diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD index 50bbb6257..0cf018e71 100644 --- a/extra/bmp/PKGBUILD +++ b/extra/bmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135355 2011-08-13 06:32:50Z eric $ +# $Id: PKGBUILD 148682 2012-02-05 11:46:44Z ibiru $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Ben <contrasutra@myrealbox.com> pkgname=bmp pkgver=0.9.7.1 -pkgrel=8 +pkgrel=9 pkgdesc="gtk2 port of xmms" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/beepmp/" @@ -23,7 +23,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p0 -i ../${pkgver}-visualization.patch patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch - ./configure --prefix=/usr --mandir=/usr/share/man + LIBS+="-lm" ./configure --prefix=/usr --mandir=/usr/share/man make } diff --git a/extra/cagibi/PKGBUILD b/extra/cagibi/PKGBUILD index ac8f2a431..949f42453 100644 --- a/extra/cagibi/PKGBUILD +++ b/extra/cagibi/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 123124 2011-05-08 20:39:38Z andrea $ +# $Id: PKGBUILD 149009 2012-02-05 13:59:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=cagibi pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc='A cache/proxy daemon for SSDP (the discovery part of UPnP)' arch=('i686' 'x86_64') -url='http://www.kde.org' +url='http://www.kde.org/' license=('LGPL') depends=('qt') makedepends=('cmake' 'automoc4') diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index 9c80110a0..218ab470a 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 114393 2011-03-13 08:22:31Z andyrtr $ +# $Id: PKGBUILD 148684 2012-02-05 11:46:48Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo pkgver=1.10.2 -pkgrel=2 +pkgrel=3 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') url="http://cairographics.org/" -depends=('libpng>=1.4.0' 'libxrender' 'fontconfig>=2.8.0' 'pixman>=0.18.4' 'glib2>=2.24.0' 'sh') -makedepends=('pkgconfig') +depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh') options=('!libtool') -source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz +source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.gz cairo-1.10.0-buggy_gradients.patch) sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e' '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -26,10 +25,14 @@ build() { --disable-static \ --enable-tee make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 Skipped } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/cairomm/PKGBUILD b/extra/cairomm/PKGBUILD index 8bd23555e..be012872e 100644 --- a/extra/cairomm/PKGBUILD +++ b/extra/cairomm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124057 2011-05-16 10:35:03Z jgc $ +# $Id: PKGBUILD 148686 2012-02-05 11:46:52Z ibiru $ # Maintainer: Kevin <kevin@archlinux.org> # Contributor: criminy <criminy@gmail.com> pkgname=cairomm pkgver=1.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="C++ bindings to Cairo vector graphics library" arch=('i686' 'x86_64') url="http://www.cairographics.org" diff --git a/extra/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD index 039ea496d..88ac314e4 100644 --- a/extra/capi4hylafax/PKGBUILD +++ b/extra/capi4hylafax/PKGBUILD @@ -1,49 +1,55 @@ -# $Id: PKGBUILD 84286 2010-06-28 14:07:57Z tpowa $ +# $Id: PKGBUILD 148688 2012-02-05 11:46:56Z ibiru $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=capi4hylafax pkgver=010300 -pkgrel=4 +pkgrel=5 pkgdesc="capi plugin for hylafax to enable isdn faxing" arch=(i686 x86_64) url="ftp://ftp.avm.de/tools" license=('GPL') -depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff') +depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog') source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz config.faxCAPI capi4hylafax.rc) +md5sums=('d37dc652ac80d1525ef8693be55ee67f' + '653b60695d21c128f020a86274ca9192' + '1fe40c58289fa3ba625ce6fe2fdb3d07') install=capi4hylafax.install backup=(var/spool/hylafax/etc/config.faxCAPI) + build() { - cd $srcdir/$pkgname-01.03.00 + cd "$srcdir"/$pkgname-01.03.00 # fix config file - sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in || return 1 - ./configure || return 1 - make || return 1 - install -m755 -D src/faxsend/c2faxsend $pkgdir/usr/bin/c2faxsend - install -m755 -D src/faxrecv/c2faxrecv $pkgdir/usr/bin/c2faxrecv - install -m755 -D setupconffile $pkgdir/usr/bin/c2faxaddmodem - install -m644 -D $srcdir/config.faxCAPI $pkgdir/var/spool/hylafax/etc/config.faxCAPI - install -m755 -D $srcdir/capi4hylafax.rc $pkgdir/etc/rc.d/capi4hylafax + sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in + autoreconf --force --install + ./configure + make +} + +package() { + cd "$srcdir"/$pkgname-01.03.00 + install -m755 -D src/faxsend/c2faxsend "$pkgdir"/usr/bin/c2faxsend + install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv + install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem + install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI + install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax # adding FIFO - mkfifo $pkgdir/var/spool/hylafax/FIFO.faxCAPI - chown 10 $pkgdir/var/spool/hylafax/FIFO.faxCAPI - chgrp 14 $pkgdir/var/spool/hylafax/FIFO.faxCAPI - chmod 0600 $pkgdir/var/spool/hylafax/FIFO.faxCAPI + mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI + chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI + chgrp 14 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI + chmod 0600 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI # fix /var/spool/hylafax permission - chown 10 $pkgdir/var/spool/hylafax - chgrp 14 $pkgdir/var/spool/hylafax + chown 10 "$pkgdir"/var/spool/hylafax + chgrp 14 "$pkgdir"/var/spool/hylafax # adding udev rule - mkdir -p $pkgdir/lib/udev/rules.d -cat << EOF >> $pkgdir/lib/udev/rules.d/53-capi4hylafax.rules + mkdir -p "$pkgdir"/lib/udev/rules.d +cat << EOF >> "$pkgdir"/lib/udev/rules.d/53-capi4hylafax.rules # CAPI devices SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp" SUBSYSTEM=="tty" KERNEL=="capi[0-9]*", NAME="capi/%n", GROUP="uucp" EOF # fix c2faxadd - sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' $pkgdir/usr/bin/c2faxaddmodem || return 1 - echo "main_config_dialog" >> $pkgdir/usr/bin/c2faxaddmodem + sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' "$pkgdir"/usr/bin/c2faxaddmodem + echo "main_config_dialog" >> "$pkgdir"/usr/bin/c2faxaddmodem } -md5sums=('d37dc652ac80d1525ef8693be55ee67f' - '653b60695d21c128f020a86274ca9192' - '1fe40c58289fa3ba625ce6fe2fdb3d07') diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD index 702e3e05f..47608a909 100644 --- a/extra/celestia/PKGBUILD +++ b/extra/celestia/PKGBUILD @@ -1,38 +1,50 @@ -# $Id: PKGBUILD 127269 2011-06-12 08:43:30Z ronald $ +# $Id: PKGBUILD 148690 2012-02-05 11:47:02Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : Damir Perisa <damir.perisa@bluewin.ch> pkgname=celestia pkgver=1.6.1 -pkgrel=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.5.1-gcc44.patch celestia-1.6.1-gentoo.patch) +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' - '5ab2769e239a89468bb8ffb5740cbeec6018143c' - 'aebf894630fdba4c4d429622f5e2b8da56d8b61e') + '7c08ca391603806d788cb8f3342acedafc924eef' + '46ecc4e10b24191384bc848c206652498843adf0' + '534c8eee18d13a868c91f0b870ebecc05f3e7ae1') build() { cd ${srcdir}/${pkgname}-${pkgver} # build patch - patch -Np0 < ${srcdir}/celestia-1.5.1-gcc44.patch - patch -Np0 -i ${srcdir}/celestia-1.6.1-gentoo.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 + --with-gtk \ + --disable-rpath \ + --with-lua make } package() { cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } diff --git a/extra/celestia/celestia-1.6.1-gcc46.patch b/extra/celestia/celestia-1.6.1-gcc46.patch new file mode 100644 index 000000000..ddf4036f2 --- /dev/null +++ b/extra/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/extra/celestia/celestia-1.6.1-libpng15.patch b/extra/celestia/celestia-1.6.1-libpng15.patch new file mode 100644 index 000000000..5dffbab24 --- /dev/null +++ b/extra/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/extra/celestia/celestia-1.6.1-linking.patch b/extra/celestia/celestia-1.6.1-linking.patch new file mode 100644 index 000000000..d610d5243 --- /dev/null +++ b/extra/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/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD index 419c6a1cd..3b9e8e03d 100644 --- a/extra/cinepaint/PKGBUILD +++ b/extra/cinepaint/PKGBUILD @@ -1,32 +1,36 @@ -# $Id: PKGBUILD 143847 2011-11-30 06:23:25Z eric $ +# $Id: PKGBUILD 148694 2012-02-05 11:47:14Z ibiru $ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] pkgname=cinepaint pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" arch=('i686' 'x86_64') license=('LGPL' 'GPL' 'MIT') url="http://www.cinepaint.org" depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm') makedepends=('python2' 'gutenprint') -optdepends=('python2: for python plug-ins' 'gutenprint: for print plug-ins') +optdepends=('python2: for python plug-ins' + 'gutenprint: for print plug-ins' + 'ghostscript: for pdf plug-ins') options=('!libtool') install=cinepaint.install source=(http://sourceforge.net/projects/cinepaint/files/CinePaint/${pkgname}-${pkgver}.tgz - LICENSE) + LICENSE cinepaint-libpng15.patch) md5sums=('7dfdb005d246578392ac9bd500534804' - '169085743f667c250ea2e4022efecf5f') + '169085743f667c250ea2e4022efecf5f' + '682de65ad358512d00a8b76730453664') build() { cd "${srcdir}/${pkgname}" + patch -p1 -i ../cinepaint-libpng15.patch find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in aclocal -I aclocal autoconf - ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \ + LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \ --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2 sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \ plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile @@ -38,5 +42,6 @@ package() { make DESTDIR="${pkgdir}" install sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \ -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool" + sed -i "s/cinepaint.png/cinepaint/" "${pkgdir}/usr/share/applications/cinepaint.desktop" install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/cinepaint/cinepaint-libpng15.patch b/extra/cinepaint/cinepaint-libpng15.patch new file mode 100644 index 000000000..e22edafae --- /dev/null +++ b/extra/cinepaint/cinepaint-libpng15.patch @@ -0,0 +1,452 @@ +diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c +--- cinepaint.old/plug-ins/png/png.c 2012-01-23 12:39:42.000000000 -0500 ++++ cinepaint/plug-ins/png/png.c 2012-01-23 12:39:50.000000000 -0500 +@@ -390,6 +390,16 @@ + gchar *progress; /* Title for progress display... */ + guchar alpha[256], /* Index -> Alpha */ + *alpha_ptr; /* Temporary pointer */ ++ png_byte color_type; ++ png_byte bit_depth; ++ png_colorp palette; ++ int num_palette; ++ png_charpp iccp_name; ++ int compression_type; ++ png_bytepp iccp_profile; ++ png_uint_32 iccp_proflen; ++ png_uint_32 width, height; ++ png_byte channels; + + /* + * PNG 0.89 and newer have a sane, forwards compatible constructor. +@@ -405,7 +415,7 @@ + info = (png_infop)calloc(sizeof(png_info), 1); + #endif /* PNG_LIBPNG_VER > 88 */ + +- if (setjmp (pp->jmpbuf)) ++ if (setjmp (png_jmpbuf(pp))) + { + g_message ("%s\nPNG error. File corrupted?", filename); + return image; +@@ -442,21 +452,26 @@ + */ + + png_read_info(pp, info); ++ color_type = png_get_color_type(pp, info); ++ width=png_get_image_width(pp, info); ++ height=png_get_image_height(pp, info); + + /* + * Latest attempt, this should be my best yet :) + */ + ++ bit_depth = png_get_bit_depth(pp, info); ++ + #ifndef WORDS_BIGENDIAN +- if(info->bit_depth == 16) ++ if(bit_depth == 16) + png_set_swap(pp); + #endif + +- if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) { ++ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { + png_set_expand(pp); + } + +- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) { ++ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) { + png_set_packing(pp); + } + +@@ -464,8 +479,8 @@ + * Expand G+tRNS to GA, RGB+tRNS to RGBA + */ + +- if (info->color_type != PNG_COLOR_TYPE_PALETTE && +- (info->valid & PNG_INFO_tRNS)) { ++ if (color_type != PNG_COLOR_TYPE_PALETTE && ++ (png_get_valid(pp, info, PNG_INFO_tRNS))) { + png_set_expand(pp); + } + +@@ -482,7 +497,7 @@ + + #if PNG_LIBPNG_VER > 99 + if (png_get_valid(pp, info, PNG_INFO_tRNS) && +- info->color_type == PNG_COLOR_TYPE_PALETTE) ++ color_type == PNG_COLOR_TYPE_PALETTE) + { + png_get_tRNS(pp, info, &alpha_ptr, &num, NULL); + /* Copy the existing alpha values from the tRNS chunk */ +@@ -505,9 +520,9 @@ + + png_read_update_info(pp, info); + +- if(info->bit_depth==16) ++ if(bit_depth==16) + { +- switch (info->color_type) ++ switch (color_type) + { + case PNG_COLOR_TYPE_RGB : /* RGB */ + bpp = 6; +@@ -545,7 +560,7 @@ + } + else + { +- switch (info->color_type) ++ switch (color_type) + { + case PNG_COLOR_TYPE_RGB : /* RGB */ + bpp = 3; +@@ -582,7 +597,7 @@ + }; + } + +- image = gimp_image_new(info->width, info->height, image_type); ++ image = gimp_image_new(width, height, image_type); + if (image == -1) + { + g_message("Can't allocate new image\n%s", filename); +@@ -595,7 +610,7 @@ + * Create the "background" layer to hold the image... + */ + +- layer = gimp_layer_new(image, _("Background"), info->width, info->height, ++ layer = gimp_layer_new(image, _("Background"), width, height, + layer_type, 100, NORMAL_MODE); + gimp_image_add_layer(image, layer, 0); + +@@ -627,20 +642,21 @@ + + empty= 0; /* by default assume no full transparent palette entries */ + +- if (info->color_type & PNG_COLOR_MASK_PALETTE) { ++ if (color_type & PNG_COLOR_MASK_PALETTE) { + + #if PNG_LIBPNG_VER > 99 ++ png_get_PLTE(pp, info, &palette, &num_palette); + if (png_get_valid(pp, info, PNG_INFO_tRNS)) { + for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty); + /* Calculates number of fully transparent "empty" entries */ + +- gimp_image_set_cmap(image, (guchar *) (info->palette + empty), +- info->num_palette - empty); ++ gimp_image_set_cmap(image, (guchar *) (palette + empty), ++ num_palette - empty); + } else { +- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); ++ gimp_image_set_cmap(image, (guchar *)palette, num_palette); + } + #else +- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); ++ gimp_image_set_cmap(image, (guchar *)palette, num_palette); + #endif /* PNG_LIBPNG_VER > 99 */ + + } +@@ -659,18 +675,19 @@ + */ + + tile_height = gimp_tile_height (); +- pixel = g_new(guchar, tile_height * info->width * bpp); ++ pixel = g_new(guchar, tile_height * width * bpp); + pixels = g_new(guchar *, tile_height); ++ channels=png_get_channels(pp, info); + +- if(info->bit_depth==16) ++ if(bit_depth==16) + { + for (i = 0; i < tile_height; i ++) +- pixels[i] = pixel + info->width * info->channels * i * 2; ++ pixels[i] = pixel + width * channels * i * 2; + } + else + { + for (i = 0; i < tile_height; i ++) +- pixels[i] = pixel + info->width * info->channels * i; ++ pixels[i] = pixel + width * channels * i; + } + + for (pass = 0; pass < num_passes; pass ++) +@@ -680,11 +697,11 @@ + */ + + for (begin = 0, end = tile_height; +- begin < info->height; ++ begin < height; + begin += tile_height, end += tile_height) + { +- if (end > info->height) +- end = info->height; ++ if (end > height) ++ end = height; + + num = end - begin; + +@@ -697,20 +714,21 @@ + gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin, + drawable->width, num); + +- gimp_progress_update(((double)pass + (double)end / (double)info->height) / ++ gimp_progress_update(((double)pass + (double)end / (double)height) / + (double)num_passes); + }; + }; + + #if defined(PNG_iCCP_SUPPORTED) + /* set icc profile */ +- if (info->iccp_proflen > 0) { +- gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen, +- info->iccp_profile, +- ICC_IMAGE_PROFILE); ++ png_get_iCCP(pp, info, (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen); ++ if (iccp_proflen > 0) { ++ gimp_image_set_icc_profile_by_mem (image, iccp_proflen, ++ (gchar *)iccp_profile, ++ ICC_IMAGE_PROFILE); + printf ("%s:%d %s() set embedded profile \"%s\"\n", + __FILE__,__LINE__,__func__, +- info->iccp_name); ++ (char *)iccp_name); + } + #endif + +@@ -808,6 +826,14 @@ + blue; /* Used for palette background */ + time_t cutime; /* Time since epoch */ + struct tm *gmt; /* GMT broken down */ ++ png_byte color_type; ++ png_byte bit_depth; ++ int filter_method=0; ++ png_colorp palette; ++ int num_palette; ++ png_charpp iccp_name; ++ png_uint_32 height; ++ int compression_type; + + /* + * PNG 0.89 and newer have a sane, forwards compatible constructor. +@@ -824,7 +849,7 @@ + info = (png_infop)calloc(sizeof(png_info), 1); + #endif /* PNG_LIBPNG_VER > 88 */ + +- if (setjmp (pp->jmpbuf)) ++ if (setjmp (png_jmpbuf(pp))) + { + g_message ("%s\nPNG error. Couldn't save image", filename); + return 0; +@@ -857,15 +882,6 @@ + drawable = gimp_drawable_get (drawable_ID); + type = gimp_drawable_type (drawable_ID); + +- /* +- * Set the image dimensions, bit depth, interlacing and compression +- */ +- +- png_set_compression_level (pp, pngvals.compression_level); +- +- info->width = drawable->width; +- info->height = drawable->height; +- info->interlace_type = pngvals.interlaced; + + /* + * Set color type and remember bytes per pixel count +@@ -874,71 +890,69 @@ + switch (type) + { + case RGB_IMAGE : +- info->color_type = PNG_COLOR_TYPE_RGB; +- info->bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_RGB; ++ bit_depth = 8; + bpp = 3; + break; + case RGBA_IMAGE : +- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; +- info->bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_RGB_ALPHA; ++ bit_depth = 8; + bpp = 4; + break; + case GRAY_IMAGE : +- info->color_type = PNG_COLOR_TYPE_GRAY; +- info->bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_GRAY; ++ bit_depth = 8; + bpp = 1; + break; + case GRAYA_IMAGE : +- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; +- info->bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; ++ bit_depth = 8; + bpp = 2; + break; + case INDEXED_IMAGE : + bpp = 1; +- info->bit_depth = 8; +- info->color_type = PNG_COLOR_TYPE_PALETTE; +- info->valid |= PNG_INFO_PLTE; +- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); +- info->num_palette= num_colors; ++ bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_PALETTE; ++ png_get_valid(pp, info, PNG_INFO_PLTE); ++ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); + break; + case INDEXEDA_IMAGE : + bpp = 2; +- info->bit_depth = 8; +- info->color_type = PNG_COLOR_TYPE_PALETTE; ++ bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_PALETTE; + respin_cmap (pp, info, image_ID); /* fix up transparency */ + break; + case U16_RGB_IMAGE : +- info->color_type = PNG_COLOR_TYPE_RGB; +- info->bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_RGB; ++ bit_depth = 16; + bpp = 6; + break; + case U16_RGBA_IMAGE : +- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; +- info->bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_RGB_ALPHA; ++ bit_depth = 16; + bpp = 8; + break; + case U16_GRAY_IMAGE : +- info->color_type = PNG_COLOR_TYPE_GRAY; +- info->bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_GRAY; ++ bit_depth = 16; + bpp = 2; + break; + case U16_GRAYA_IMAGE : +- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; +- info->bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; ++ bit_depth = 16; + bpp = 4; + break; + case U16_INDEXED_IMAGE : + bpp = 2; +- info->bit_depth = 16; +- info->color_type = PNG_COLOR_TYPE_PALETTE; +- info->valid |= PNG_INFO_PLTE; +- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); +- info->num_palette= num_colors; ++ bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_PALETTE; ++ png_get_valid(pp, info, PNG_INFO_PLTE); ++ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); + break; + case U16_INDEXEDA_IMAGE : + bpp = 4; +- info->bit_depth = 16; +- info->color_type = PNG_COLOR_TYPE_PALETTE; ++ bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_PALETTE; + respin_cmap (pp, info, image_ID); /* fix up transparency */ + break; + default: +@@ -950,30 +964,36 @@ + * Fix bit depths for (possibly) smaller colormap images + */ + +- if (info->valid & PNG_INFO_PLTE) { +- if (info->num_palette <= 2) +- info->bit_depth= 1; +- else if (info->num_palette <= 4) +- info->bit_depth= 2; +- else if (info->num_palette <= 16) +- info->bit_depth= 4; ++ if (png_get_valid(pp, info, PNG_INFO_PLTE)) { ++ png_get_PLTE(pp, info, &palette, &num_palette); ++ if (num_palette <= 2) ++ bit_depth= 1; ++ else if (num_palette <= 4) ++ bit_depth= 2; ++ else if (num_palette <= 16) ++ bit_depth= 4; + /* otherwise the default is fine */ + } + ++ png_set_compression_level (pp, pngvals.compression_level); ++ png_set_IHDR(pp, info, drawable->width, drawable->height, ++ bit_depth, color_type, pngvals.interlaced, compression_type, filter_method); ++ ++ + // write icc profile + #if defined(PNG_iCCP_SUPPORTED) + if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) { +- int size; ++ int size; + char *buffer; + + buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size, + ICC_IMAGE_PROFILE); + png_set_iCCP (pp, info, + gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE), +- 0, buffer, size); ++ 0, (png_const_bytep)buffer, size); + printf ("%s:%d %s() embedd icc profile \"%s\"\n", + __FILE__,__LINE__,__func__, +- info->iccp_name); ++ (char *)iccp_name); + } + #endif + +@@ -1039,13 +1059,13 @@ + * Convert unpacked pixels to packed if necessary + */ + +- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) ++ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) + png_set_packing(pp); + + /* Set swapping for 16 bit per sample images */ + + #ifndef WORDS_BIGENDIAN +- if (info->bit_depth == 16) ++ if (bit_depth == 16) + png_set_swap(pp); + #endif + +@@ -1063,6 +1083,7 @@ + + gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width, + drawable->height, FALSE, FALSE); ++ height=png_get_image_height(pp, info); + + for (pass = 0; pass < num_passes; pass ++) + { +@@ -1077,7 +1098,7 @@ + num = end - begin; + + gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num); +- if (info->valid & PNG_INFO_tRNS) { ++ if (png_get_valid(pp, info, PNG_INFO_tRNS)) { + for (i = 0; i < num; ++i) { + fixed= pixels[i]; + for (k = 0; k < drawable->width; ++k) { +@@ -1085,7 +1106,7 @@ + } + } + /* Forgot this case before, what if there are too many colors? */ +- } else if (info->valid & PNG_INFO_PLTE && bpp == 2) { ++ } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) { + for (i = 0; i < num; ++i) { + fixed= pixels[i]; + for (k = 0; k < drawable->width; ++k) { +@@ -1095,9 +1116,8 @@ + } + + png_write_rows (pp, pixels, num); +- + gimp_progress_update (((double)pass + (double)end / +- (double)info->height) / (double)num_passes); ++ (double)height) / (double)num_passes); + }; + }; + diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 06738f0f8..8f9780a19 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147965 2012-01-29 09:32:13Z ronald $ +# $Id: PKGBUILD 147976 2012-01-29 10:54:04Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') pkgver=2.5.0 -pkgrel=4 +pkgrel=5 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/djvulibre/PKGBUILD b/extra/djvulibre/PKGBUILD index 6544542f1..75cd92aef 100644 --- a/extra/djvulibre/PKGBUILD +++ b/extra/djvulibre/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 143707 2011-11-28 13:56:50Z jgc $ +# $Id: PKGBUILD 148700 2012-02-05 11:47:29Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: mgushee pkgname=djvulibre pkgver=3.5.24 -pkgrel=2 +pkgrel=3 pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents" arch=("i686" "x86_64") license=('GPL') url="http://djvu.sourceforge.net/" -depends=('gcc-libs' 'libtiff' 'bash' 'hicolor-icon-theme') +depends=('gcc-libs' 'libtiff>=4.0.0' 'bash' 'hicolor-icon-theme') makedepends=('pkg-config') provides=("libdjvu=${pkgver}") replaces=('libdjvu') diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD index edb8134bb..6eda716a9 100644 --- a/extra/dvdauthor/PKGBUILD +++ b/extra/dvdauthor/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143729 2011-11-28 17:32:58Z giovanni $ +# $Id: PKGBUILD 148702 2012-02-05 11:47:33Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> @@ -6,19 +6,23 @@ pkgname=dvdauthor pkgver=0.7.0 -pkgrel=3 +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") -md5sums=('33a447fb98ab3293ac40f869eedc17ff') +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 diff --git a/extra/dvdauthor/dvdauthor-0.7.0-libpng15.patch b/extra/dvdauthor/dvdauthor-0.7.0-libpng15.patch new file mode 100644 index 000000000..2bb636380 --- /dev/null +++ b/extra/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/extra/ecasound/PKGBUILD b/extra/ecasound/PKGBUILD index 185581224..079175e12 100644 --- a/extra/ecasound/PKGBUILD +++ b/extra/ecasound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 124853 2011-05-24 19:44:26Z schiv $ +# $Id: PKGBUILD 149067 2012-02-05 16:13:46Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ecasound pkgver=2.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="A software package designed for multitrack audio processing" arch=('i686' 'x86_64') url="http://www.eca.cx/ecasound/" @@ -23,7 +23,6 @@ optdepends=('python2: ecamonitor, ECI API' 'timidity++: MIDI file input' 'libmikmod: tracker module') options=('!libtool') -changelog=$pkgname.changelog source=(http://ecasound.seul.org/download/$pkgname-$pkgver.tar.gz) md5sums=('d9ded0074a8eeb59dd507c248220d010') diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index b47ca87b9..9d567c69d 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,14 +1,9 @@ -# $Id: PKGBUILD 146181 2012-01-05 13:48:00Z juergen $ +# $Id: PKGBUILD 148704 2012-02-05 11:47:36Z ibiru $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs -_majorver=23.3 -_minorver=b -# We want something like "23.3.a" so pacman version comparison works, but -# upstream uses "23.3a", which is a bit silly and interpreted as alpha. -pkgver=$_majorver.$_minorver -_realver=$_majorver$_minorver +pkgver=23.4 pkgrel=1 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') @@ -16,18 +11,21 @@ url="http://www.gnu.org/software/emacs/emacs.html" license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz) -md5sums=('f2bfd8eab7e3b34a0f7f09acc0667e71') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig} emacs-subversion17.patch) +md5sums=('070c68ad8e3c31fb3cb2414feaf5e6f0' + '55eb16eb48b44987693c0e3ea5ab8075' + '12e2e7a66df5cc5ded54e1d30083a1fb') build() { - cd "$srcdir"/$pkgname-$_majorver + cd "$srcdir"/$pkgname-$pkgver + patch -p1 -i ../emacs-subversion17.patch ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk --with-xft make } package() { - cd "$srcdir"/$pkgname-$_majorver + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install # remove conflict with ctags package diff --git a/extra/emacs/emacs-subversion17.patch b/extra/emacs/emacs-subversion17.patch new file mode 100644 index 000000000..e7969de81 --- /dev/null +++ b/extra/emacs/emacs-subversion17.patch @@ -0,0 +1,83 @@ +From d7afd9288e22c466b63c27e7e11783589b07aeff Mon Sep 17 00:00:00 2001 +From: Karl Pflästerer <k@rl.pflaesterer.de> +Date: Sat, 12 Feb 2011 01:12:53 +0000 +Subject: Adapt to Subversion change, with no .svn directory in each sub directory. + +http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00357.html + +* vc/vc-svn.el (vc-svn-registered): Use vc-svn-root. +(vc-svn-root): New function. Make vc-svn-responsible-p an alias. +(vc-svn-repository-hostname): Use "svn info". +--- +(limited to 'lisp/vc/vc-svn.el') + +diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el +index aefef50..20c7689 100644 +--- a/lisp/vc-svn.el ++++ b/lisp/vc-svn.el +@@ -117,17 +117,13 @@ If you want to force an empty list of arguments, use t." + ;;;###autoload (getenv "SVN_ASP_DOT_NET_HACK")) + ;;;###autoload "_svn") + ;;;###autoload (t ".svn")))) +-;;;###autoload (when (file-readable-p (expand-file-name +-;;;###autoload (concat admin-dir "/entries") +-;;;###autoload (file-name-directory f))) ++;;;###autoload (when (vc-find-root f admin-dir) + ;;;###autoload (load "vc-svn") + ;;;###autoload (vc-svn-registered f)))) + + (defun vc-svn-registered (file) + "Check if FILE is SVN registered." +- (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory +- "/entries") +- (file-name-directory file))) ++ (when (vc-svn-root file) + (with-temp-buffer + (cd (file-name-directory file)) + (let* (process-file-side-effects +@@ -275,14 +271,12 @@ Passes either `vc-svn-register-switches' or `vc-register-switches' + to the SVN command." + (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register))) + +-(defun vc-svn-responsible-p (file) +- "Return non-nil if SVN thinks it is responsible for FILE." +- (file-directory-p (expand-file-name vc-svn-admin-directory +- (if (file-directory-p file) +- file +- (file-name-directory file))))) ++(defun vc-svn-root (file) ++ (vc-find-root file vc-svn-admin-directory)) + +-(defalias 'vc-svn-could-register 'vc-svn-responsible-p ++(defalias 'vc-svn-responsible-p 'vc-svn-root) ++ ++(defalias 'vc-svn-could-register 'vc-svn-root + "Return non-nil if FILE could be registered in SVN. + This is only possible if SVN is responsible for FILE's directory.") + +@@ -594,20 +588,10 @@ and that it passes `vc-svn-global-switches' to it before FLAGS." + + (defun vc-svn-repository-hostname (dirname) + (with-temp-buffer +- (let ((coding-system-for-read +- (or file-name-coding-system +- default-file-name-coding-system))) +- (vc-insert-file (expand-file-name (concat vc-svn-admin-directory +- "/entries") +- dirname))) ++ (let (process-file-side-effects) ++ (vc-svn-command t t dirname "info" "--xml")) + (goto-char (point-min)) +- (when (re-search-forward +- ;; Old `svn' used name="svn:this_dir", newer use just name="". +- (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*" +- "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?" +- "url=\"\\(?1:[^\"]+\\)\"" +- ;; Yet newer ones don't use XML any more. +- "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t) ++ (when (re-search-forward "<url>\\(.*\\)</url>" nil t) + ;; This is not a hostname but a URL. This may actually be considered + ;; as a feature since it allows vc-svn-stay-local to specify different + ;; behavior for different modules on the same server. +-- +cgit v0.9.0.2 diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index b46dbd724..eca14a2fb 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143541 2011-11-26 04:58:43Z eric $ +# $Id: PKGBUILD 148706 2012-02-05 11:47:41Z ibiru $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=enblend-enfuse pkgver=4.0 -pkgrel=4 +pkgrel=5 pkgdesc="Intelligent blend tool for overlapping picture" arch=("i686" "x86_64") license=('GPL') @@ -15,15 +15,18 @@ 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) +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') + '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 -Np1 -i ../libpng-1.4.patch + patch -p1 -i ../libpng-1.4.patch + patch -p0 -i ../enblend-4.0-libpng15.patch ./configure --prefix=/usr make } diff --git a/extra/enblend-enfuse/enblend-4.0-libpng15.patch b/extra/enblend-enfuse/enblend-4.0-libpng15.patch new file mode 100644 index 000000000..d4465ccad --- /dev/null +++ b/extra/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/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD index e4a3597a9..ff784f835 100644 --- a/extra/enlightenment/PKGBUILD +++ b/extra/enlightenment/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140259 2011-10-11 03:24:04Z eric $ +# $Id: PKGBUILD 149104 2012-02-05 18:10:13Z schiv $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=enlightenment pkgver=1.0.10 _themever=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A fast, flexible, and very extensible Window Manager" arch=('i686' 'x86_64') url="http://www.enlightenment.org" @@ -19,7 +19,7 @@ sha1sums=('20e56c851aeb5279479eb43570b5d58bcc1d6ef9' build() { cd "${srcdir}/e16-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --enable-sound-pulse + ./configure --prefix=/usr --sysconfdir=/etc --enable-sound-pulse make cd "${srcdir}/e16-themes-${_themever}" diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 242d7472b..1cca0cead 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142650 2011-11-12 17:18:26Z ibiru $ +# $Id: PKGBUILD 148708 2012-02-05 11:47:44Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince pkgver=3.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64') diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD index b6081ed88..bab0074f8 100644 --- a/extra/fbida/PKGBUILD +++ b/extra/fbida/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 127739 2011-06-18 00:11:19Z eric $ +# $Id: PKGBUILD 148710 2012-02-05 11:47:47Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fbida pkgver=2.08 -pkgrel=1 +pkgrel=2 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran" arch=('i686' 'x86_64') url="http://www.kraxel.org/blog/linux/fbida/" license=('GPL2') -depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig') +depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl') makedepends=('libxpm') optdepends=('ghostscript: to use fbgs') source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index b16f64c3d..229ab4761 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148518 2012-02-03 01:12:43Z bisson $ +# $Id: PKGBUILD 148712 2012-02-05 11:47:50Z ibiru $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -6,7 +6,7 @@ pkgname=feh pkgver=2.3 -pkgrel=1 +pkgrel=2 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' license=('MIT') diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD index 3fed7aae2..7cc1baea4 100644 --- a/extra/ffmpegthumbnailer/PKGBUILD +++ b/extra/ffmpegthumbnailer/PKGBUILD @@ -4,7 +4,7 @@ pkgname=ffmpegthumbnailer pkgver=2.0.7 -pkgrel=2 +pkgrel=3 pkgdesc="Lightweight video thumbnailer that can be used by file managers." url="http://code.google.com/p/ffmpegthumbnailer/" license=('GPL2') @@ -29,6 +29,6 @@ package() { make DESTDIR="${pkgdir}" install # FS#24105: Generate thumbnails in nautilus - install -Dm644 ${srcdir}/ffmpegthumbnailer.desktop \ - ${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop + install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \ + "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop" } diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD index 5c63fd095..d93e624fe 100644 --- a/extra/fltk/PKGBUILD +++ b/extra/fltk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142179 2011-11-05 20:03:57Z eric $ +# $Id: PKGBUILD 148718 2012-02-05 11:48:05Z ibiru $ # Maintainer: pkgbase=fltk pkgname=('fltk' 'fltk-docs' 'fltk-games') pkgver=1.3.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('custom:LGPL') url="http://www.fltk.org/" diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD index 6319df46f..e483fd487 100644 --- a/extra/fontforge/PKGBUILD +++ b/extra/fontforge/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 146693 2012-01-16 13:56:18Z bisson $ +# $Id: PKGBUILD 148720 2012-02-05 11:48:07Z ibiru $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fontforge -pkgver=20111214 -pkgrel=3 +pkgver=20120119 +pkgrel=1 pkgdesc='Outline and bitmap font editor' arch=('i686' 'x86_64') url='http://fontforge.sourceforge.net/' @@ -13,7 +13,7 @@ license=('BSD') depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro') options=('!libtool' '!makeflags') source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha1sums=('55c3f00c0b486492ba071fc479e1feb426562e2b') +sha1sums=('2c363af075e77bf35d21ee1939e3d6ab39a9f80c') # git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz diff --git a/extra/foobillard++/PKGBUILD b/extra/foobillard++/PKGBUILD index f5d664ee7..5cedf397f 100644 --- a/extra/foobillard++/PKGBUILD +++ b/extra/foobillard++/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146196 2012-01-05 21:53:59Z eric $ +# $Id: PKGBUILD 148666 2012-02-05 11:46:13Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=foobillard++ pkgver=3.42beta -pkgrel=2 +pkgrel=3 pkgdesc="An OpenGL billiard game" arch=('i686' 'x86_64') url="http://foobillardplus.sourceforge.net/" diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD index 867680ccb..fdc24191a 100644 --- a/extra/fvwm/PKGBUILD +++ b/extra/fvwm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140040 2011-10-06 00:22:58Z eric $ +# $Id: PKGBUILD 149155 2012-02-06 01:09:56Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fvwm -pkgver=2.6.3 +pkgver=2.6.4 pkgrel=1 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ 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' +sha1sums=('635b803de5af8677c7f5b91a82b450799cfe3ce2' '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb') build() { diff --git a/extra/gd/PKGBUILD b/extra/gd/PKGBUILD index 29eeed43a..2d89e7bd2 100644 --- a/extra/gd/PKGBUILD +++ b/extra/gd/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 137764 2011-09-10 16:29:02Z pierre $ +# $Id: PKGBUILD 148724 2012-02-05 11:48:15Z ibiru $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=gd pkgver=2.0.36RC1 -pkgrel=4 +pkgrel=5 pkgdesc="Library for the dynamic creation of images by programmers" arch=('i686' 'x86_64') url="http://www.libgd.org/" license=('custom') -depends=('perl' 'libpng' 'fontconfig' 'libjpeg') +depends=('libpng' 'fontconfig' 'libjpeg') +optdepends=('perl: bdftogd script') options=('!libtool') source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'libpng14.patch') @@ -26,5 +27,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index 633a78da7..ab0aad374 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 145133 2011-12-17 10:30:04Z ibiru $ +# $Id: PKGBUILD 148726 2012-02-05 11:48:20Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gdk-pixbuf2 pkgver=2.24.1 -pkgrel=1 +pkgrel=3 pkgdesc="An image loading library" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('GPL2') -depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11') +depends=('glib2' 'libpng>=1.5.7' 'libtiff' 'libjpeg' 'libx11') makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') install=gdk-pixbuf2.install diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 701e9d5f5..48cafffe6 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144902 2011-12-09 12:21:40Z eric $ +# $Id: PKGBUILD 148728 2012-02-05 11:48:24Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gegl pkgver=0.1.8 -pkgrel=1 +pkgrel=2 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64') url="http://www.gegl.org/" diff --git a/extra/gif2png/PKGBUILD b/extra/gif2png/PKGBUILD index 3c96df76f..fcc3b3dde 100644 --- a/extra/gif2png/PKGBUILD +++ b/extra/gif2png/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 143743 2011-11-28 19:26:51Z giovanni $ +# $Id: PKGBUILD 149145 2012-02-05 23:59:19Z 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=2 +pkgver=2.5.5 +pkgrel=1 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") -md5sums=('d63ea3fc6b6119589e8d4d6fead30df9') +source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gif2png-2.5.5-libpng15.patch') +md5sums=('cfb4c003966866b6069d3707bfb12435' + '5b3467b97157f9a7978a230b934bc488') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's#env python#env python2#' web2png + patch -Np1 -i ${srcdir}/gif2png-2.5.5-libpng15.patch + ./configure --prefix=/usr \ --mandir=/usr/share/man make diff --git a/extra/gif2png/gif2png-2.5.5-libpng15.patch b/extra/gif2png/gif2png-2.5.5-libpng15.patch new file mode 100644 index 000000000..58ca43186 --- /dev/null +++ b/extra/gif2png/gif2png-2.5.5-libpng15.patch @@ -0,0 +1,41 @@ +--- a/gif2png.c 2012-01-29 00:02:06.000000000 +0100 ++++ b/gif2png.c 2012-02-06 00:49:14.000000000 +0100 +@@ -12,6 +12,7 @@ + #include <unistd.h> /* for isatty() */ + #include <sys/stat.h> + #include <utime.h> ++#include <zlib.h> + + #if !defined(TRUE) + #define FALSE 0 +@@ -122,8 +123,8 @@ + 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; +@@ -138,6 +139,19 @@ + 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/extra/gimp-dbp/PKGBUILD b/extra/gimp-dbp/PKGBUILD index f09db2f20..9ebff69c5 100644 --- a/extra/gimp-dbp/PKGBUILD +++ b/extra/gimp-dbp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 128499 2011-06-24 05:56:11Z eric $ +# $Id: PKGBUILD 148736 2012-02-05 11:48:41Z ibiru $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gimp-dbp pkgver=1.1.9 -pkgrel=2 +pkgrel=3 pkgdesc="David's batch processor for the GIMP" arch=('i686' 'x86_64') url="http://members.ozemail.com.au/~hodsond/dbp.html" diff --git a/extra/gimp-devel/PKGBUILD b/extra/gimp-devel/PKGBUILD index e0b5eaca2..4583941cd 100644 --- a/extra/gimp-devel/PKGBUILD +++ b/extra/gimp-devel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145035 2011-12-15 15:03:12Z eric $ +# $Id: PKGBUILD 148738 2012-02-05 11:48:46Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gimp-devel pkgver=2.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Image Manipulation Program (Development Version)" arch=('i686' 'x86_64') url="http://www.gimp.org/" diff --git a/extra/gimp-ufraw/PKGBUILD b/extra/gimp-ufraw/PKGBUILD index b360605a7..7273ffd47 100644 --- a/extra/gimp-ufraw/PKGBUILD +++ b/extra/gimp-ufraw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143849 2011-11-30 06:25:30Z eric $ +# $Id: PKGBUILD 148740 2012-02-05 11:48:50Z ibiru $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> pkgname=gimp-ufraw pkgver=0.18 -pkgrel=3 +pkgrel=4 pkgdesc="Standalone or gimp plugin converter for raw files" url="http://ufraw.sourceforge.net/" arch=('i686' 'x86_64') @@ -14,7 +14,6 @@ optdepends=('gimp: to use the gimp import plugin for raw images' 'cinepaint: to use the cinepaint import plugin for raw images') install=gimp-ufraw.install source=(http://downloads.sourceforge.net/ufraw/ufraw-${pkgver}.tar.gz) -md5sums=('454f40a402928998a82e2645d9265d96') sha1sums=('41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2') build() { diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD index c083eb449..6522c6c5c 100644 --- a/extra/gimp/PKGBUILD +++ b/extra/gimp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140569 2011-10-17 08:14:42Z jgc $ +# $Id: PKGBUILD 148734 2012-02-05 11:48:37Z ibiru $ # Maintainer: tobias <tobias@archlinux.org> pkgname=gimp -pkgver=2.6.11 -pkgrel=7 +pkgver=2.6.12 +pkgrel=1 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64') url="http://www.gimp.org/" @@ -19,22 +19,15 @@ optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cu options=('!libtool' '!makeflags') conflicts=('gimp-devel') install=gimp.install -#source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl -source=(http://mirror.umoss.org/gimp/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl - uri-backend-libcurl.patch gimp-poppler-0.18.patch) -md5sums=('bb2939fe13e54fc7255cef5d097bb5dd' - 'bb27bc214261d36484093e857f015f38' - 'e894f4b2ffa92c71448fdd350e9b78c6' - 'bfc73f80e911ed7a7d500d80973469f1') -sha1sums=('2f9d596e727bdbf304fa78257c1731d9faf3934c' +source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl + uri-backend-libcurl.patch) +sha1sums=('82964e3d4eb003239f3443a1bccac53f5d780e15' '110ce9798173b19a662d086ed7b882b4729f06cf' - 'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4' - '1479a6d80be7adf74f66a3b88057a5029fe892e8') + 'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 < ../uri-backend-libcurl.patch - patch -p1 < ../gimp-poppler-0.18.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --enable-mp --enable-gimp-console --enable-gimp-remote \ --enable-python --with-gif-compression=lzw --with-libcurl \ diff --git a/extra/glade-perl/PKGBUILD b/extra/glade-perl/PKGBUILD index 96d77bced..0e2b13098 100644 --- a/extra/glade-perl/PKGBUILD +++ b/extra/glade-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125153 2011-05-25 19:04:01Z foutrelis $ +# $Id: PKGBUILD 148742 2012-02-05 11:48:53Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glade-perl _realname=Gtk2-GladeXML pkgver=1.007 -pkgrel=4 +pkgrel=5 pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x" arch=(i686 x86_64) license=('LGPL') @@ -19,5 +19,9 @@ build() { cd "${srcdir}/${_realname}-${pkgver}" perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/glhack/PKGBUILD b/extra/glhack/PKGBUILD index 5c073c3b0..dbf68735b 100644 --- a/extra/glhack/PKGBUILD +++ b/extra/glhack/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137858 2011-09-12 05:04:42Z eric $ +# $Id: PKGBUILD 148744 2012-02-05 11:48:58Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glhack pkgver=1.2 -pkgrel=5 +pkgrel=6 pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D" arch=('i686' 'x86_64') url="http://glhack.sourceforge.net/" @@ -12,13 +12,13 @@ depends=('sdl' 'libpng' 'libgl') makedepends=('mesa') options=('!makeflags') install=glhack.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('b4c68e3ab689610ca638b7660c1b05bd') -sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae') +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 diff --git a/extra/glhack/glhack-libpng15.patch b/extra/glhack/glhack-libpng15.patch new file mode 100644 index 000000000..d8e644d1c --- /dev/null +++ b/extra/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/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index c436dc1f5..a13062ece 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146319 2012-01-09 17:51:25Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 148748 2012-02-05 11:49:06Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-color-manager pkgver=3.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64) url="http://projects.gnome.org/gnome-color-manager/" @@ -25,6 +25,8 @@ build(){ --libexecdir=/usr/lib/gnome-color-manager \ --disable-static --disable-man-pages + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make } diff --git a/extra/gnome-desktop2/PKGBUILD b/extra/gnome-desktop2/PKGBUILD index 3829d54f7..e84bd7f64 100644 --- a/extra/gnome-desktop2/PKGBUILD +++ b/extra/gnome-desktop2/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 121039 2011-04-28 07:31:32Z heftig $ +# $Id: PKGBUILD 148750 2012-02-05 11:49:09Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Jan de Groot <jan@archlinux.org> _pkgname=gnome-desktop pkgname=${_pkgname}2 pkgver=2.32.1 -pkgrel=1 -pkgdesc="The GNOME Desktop" +pkgrel=2 +pkgdesc="Library with common API for various GNOME modules (legacy version)" arch=(i686 x86_64) license=(GPL LGPL) depends=(gconf gtk2 startup-notification) @@ -23,6 +23,9 @@ build() { --with-gnome-distributor="Archlinux" \ --disable-scrollkeeper \ --disable-gnome-about --disable-desktop-docs + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make } diff --git a/extra/gnome-perl/PKGBUILD b/extra/gnome-perl/PKGBUILD index 81f68ee25..9936311d7 100644 --- a/extra/gnome-perl/PKGBUILD +++ b/extra/gnome-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125159 2011-05-25 19:04:51Z foutrelis $ +# $Id: PKGBUILD 148752 2012-02-05 11:49:12Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-perl _realname=Gnome2 pkgver=1.042 -pkgrel=6 +pkgrel=7 pkgdesc="Perl bindings for libgnome" arch=('i686' 'x86_64') license=('LGPL') @@ -19,5 +19,9 @@ build() { cd "${srcdir}/${_realname}-${pkgver}" perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/gnome-python/PKGBUILD b/extra/gnome-python/PKGBUILD index b7a0e897f..26fabe51f 100644 --- a/extra/gnome-python/PKGBUILD +++ b/extra/gnome-python/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 107445 2011-01-25 10:20:52Z jgc $ +# $Id: PKGBUILD 148754 2012-02-05 11:49:16Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgbase=gnome-python pkgname=('gnome-python' 'python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs') pkgver=2.28.1 -pkgrel=7 +pkgrel=8 arch=(i686 x86_64) license=('LGPL') makedepends=('pygtk' 'pyorbit' 'libgnomeui') diff --git a/extra/gnome-sharp/PKGBUILD b/extra/gnome-sharp/PKGBUILD index 276b77a73..33518bbfe 100644 --- a/extra/gnome-sharp/PKGBUILD +++ b/extra/gnome-sharp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119246 2011-04-11 14:46:11Z jgc $ +# $Id: PKGBUILD 148756 2012-02-05 11:49:19Z ibiru $ # Maintainer: tobias <tobias@archlinux.org> pkgbase=gnome-sharp pkgname=('gnome-sharp' 'art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp') pkgver=2.24.2 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) license=(LGPL) url="http://gtk-sharp.sourceforge.net" diff --git a/extra/gnomecanvas-perl/PKGBUILD b/extra/gnomecanvas-perl/PKGBUILD index 2563caae4..81dc19907 100644 --- a/extra/gnomecanvas-perl/PKGBUILD +++ b/extra/gnomecanvas-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125156 2011-05-25 19:04:24Z foutrelis $ +# $Id: PKGBUILD 148746 2012-02-05 11:49:02Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnomecanvas-perl _realname=Gnome2-Canvas pkgver=1.002 -pkgrel=8 +pkgrel=9 pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas" arch=('i686' 'x86_64') license=('LGPL') @@ -19,5 +19,9 @@ build() { cd "${srcdir}/${_realname}-${pkgver}" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" make install DESTDIR="${pkgdir}" } diff --git a/extra/gnugo/PKGBUILD b/extra/gnugo/PKGBUILD index 8d0c654ea..db803a1b9 100644 --- a/extra/gnugo/PKGBUILD +++ b/extra/gnugo/PKGBUILD @@ -1,33 +1,31 @@ -# $Id: PKGBUILD 123739 2011-05-12 20:48:23Z andrea $ -# Maintainer: +# $Id: PKGBUILD 149077 2012-02-05 16:47:56Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: damir <damir@archlinux.org> pkgname=gnugo pkgver=3.8 -pkgrel=2 -pkgdesc="A program that plays the game of Go" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/gnugo/" +pkgrel=3 +pkgdesc='Program that plays the game of Go' +url='http://www.gnu.org/software/gnugo/' license=('GPL3' 'custom') -depends=('ncurses' 'glibc' 'texinfo') -install=gnugo.install -source=("http://ftp.gnu.org/gnu/gnugo/$pkgname-$pkgver.tar.gz" +arch=('i686' 'x86_64') +depends=('ncurses') +source=("http://ftp.gnu.org/gnu/gnugo/${pkgname}-${pkgver}.tar.gz" 'LICENSE') -md5sums=('6db0a528df58876d2b0ef1659c374a9a' - '4df5819356804397c553c95ea8164f11') +sha1sums=('a8ce3c7512634f789bc0c964fe23a5a6209f25db' + '0221b29e03fe7356c131429631ad0ac3c8da04d6') build() { - cd "${srcdir}"/$pkgname-$pkgver - ./configure --prefix=/usr - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make } package() { - cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install - rm -r "${pkgdir}"/usr/share/info/dir - gzip "${pkgdir}"/usr/share/info/* - install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}"/usr/share/info + install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}"/LICENSE } diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index 47e8fee3c..542723645 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145789 2012-01-01 01:38:15Z bisson $ +# $Id: PKGBUILD 148758 2012-02-05 11:49:24Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgname=graphicsmagick pkgver=1.3.13 -pkgrel=1 +pkgrel=2 pkgdesc='Image processing system' url='http://www.graphicsmagick.org/' arch=('i686' 'x86_64') @@ -19,37 +19,37 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver sha1sums=('b85b21785bb072fd795f7fc6ac902cffae4e96e6') build() { - cd "${srcdir}/GraphicsMagick-$pkgver" + cd "${srcdir}/GraphicsMagick-${pkgver}" - ./configure \ - --prefix=/usr \ - --with-perl \ - --enable-shared \ - --disable-static \ - --with-gs-font-dir=/usr/share/fonts/Type1 \ + ./configure \ + --prefix=/usr \ + --with-perl \ + --enable-shared \ + --disable-static \ + --with-gs-font-dir=/usr/share/fonts/Type1 \ - make + 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" + 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/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 90865ddae..c6657ed39 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 144296 2011-12-04 10:42:58Z bisson $ - +# $Id: PKGBUILD 148760 2012-02-05 11:49:28Z ibiru $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.28.0 -pkgrel=6 +pkgrel=7 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD index cacb2e3b0..9eb5c7629 100644 --- a/extra/gstreamer0.10-good/PKGBUILD +++ b/extra/gstreamer0.10-good/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135102 2011-08-10 09:44:06Z jgc $ +# $Id: PKGBUILD 148764 2012-02-05 11:49:36Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') pkgver=0.10.30 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index 04888a61b..09a83f3f8 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,34 +1,34 @@ -# $Id: PKGBUILD 144352 2011-12-04 23:08:08Z heftig $ +# $Id: PKGBUILD 148766 2012-02-05 11:49:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb -pkgver=2.14.1 +pkgver=2.14.2 pkgrel=1 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64) license=('GPL') url="http://gthumb.sourceforge.net/" -depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2') +depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2' 'hicolor-icon-theme') makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base') optdepends=('gstreamer0.10-base: video support') options=('!libtool' '!emptydirs') install=gthumb.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('002a6611112273189348871ff7c717fb3c776f5570656389e3d6c5b26bffa11f') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('5386e50e934c7f276584a6c47d0208f4756cf72e0dc6cff19eaf9d8a3ab53d7c') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gthumb "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gthumb "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/gtk-engines/PKGBUILD b/extra/gtk-engines/PKGBUILD index d614c9def..a1f52dd9e 100644 --- a/extra/gtk-engines/PKGBUILD +++ b/extra/gtk-engines/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 92895 2010-10-01 18:33:37Z ibiru $ +# $Id: PKGBUILD 148768 2012-02-05 11:49:45Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gtk-engines pkgver=2.20.2 -pkgrel=1 +pkgrel=2 pkgdesc="Theme engines for GTK+ 2" arch=(i686 x86_64) license=('GPL' 'LGPL') depends=('gtk2>=2.22.0') -makedepends=('pkgconfig' 'intltool') +makedepends=('pkg-config' 'intltool') options=('!libtool') url="http://live.gnome.org/GnomeArt" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2) @@ -20,5 +20,9 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --enable-animation make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index eb71463dd..afb9ec494 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 147944 2012-01-28 16:25:29Z heftig $ +# $Id: PKGBUILD 148770 2012-02-05 11:49:51Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') pkgver=2.24.9 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -51,7 +51,7 @@ package_gtk2() { } package_gtk-update-icon-cache() { pkgdesc="The GTK+ update icon cache tool" - depends=('gdk-pixbuf2') + depends=('gdk-pixbuf2>=2.24.1-3') cd "$srcdir/gtk+-$pkgver/gtk" diff --git a/extra/gtkglext/PKGBUILD b/extra/gtkglext/PKGBUILD index 50170f6a3..cb5edb812 100644 --- a/extra/gtkglext/PKGBUILD +++ b/extra/gtkglext/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134243 2011-08-02 17:13:55Z jgc $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 148772 2012-02-05 11:49:55Z ibiru $ +# Maintainer: # Contributor: Ben <ben@benmazer.net> pkgname=gtkglext pkgver=1.2.0 -pkgrel=6 +pkgrel=7 pkgdesc="opengl extensions for gtk2" arch=('i686' 'x86_64') url="http://gtkglext.sourceforge.net/" @@ -12,16 +12,24 @@ license=('LGPL') depends=('gtk2' 'mesa' 'libxmu') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" - gtk2.20.patch) + '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 + ./configure --prefix=/usr \ + --disable-static make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/gtkhtml/PKGBUILD b/extra/gtkhtml/PKGBUILD index c92e9fcaf..b31a3c08e 100644 --- a/extra/gtkhtml/PKGBUILD +++ b/extra/gtkhtml/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 109846 2011-02-13 13:40:17Z ibiru $ +# $Id: PKGBUILD 148774 2012-02-05 11:49:58Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gtkhtml pkgver=3.32.2 -pkgrel=2 +pkgrel=3 pkgdesc="A lightweight HTML renderer/editor widget for GTK2" arch=(i686 x86_64) license=('GPL') @@ -21,6 +21,10 @@ build() { --localstatedir=/var --disable-static \ --disable-deprecated-warning-flags make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/bin/gtkhtml-editor-test" diff --git a/extra/gtkmm/PKGBUILD b/extra/gtkmm/PKGBUILD index 35801c5cc..a8e549cbd 100644 --- a/extra/gtkmm/PKGBUILD +++ b/extra/gtkmm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 130876 2011-07-08 15:25:31Z ibiru $ +# $Id: PKGBUILD 148776 2012-02-05 11:50:02Z ibiru $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtkmm pkgname=('gtkmm' 'gtkmm-docs') pkgver=2.24.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs') license=('LGPL') diff --git a/extra/gtksourceview2/PKGBUILD b/extra/gtksourceview2/PKGBUILD index 21473004f..78e6de75c 100644 --- a/extra/gtksourceview2/PKGBUILD +++ b/extra/gtksourceview2/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 92017 2010-09-28 16:54:55Z ibiru $ +# $Id: PKGBUILD 148778 2012-02-05 11:50:06Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gtksourceview2 pkgver=2.10.5 -pkgrel=1 +pkgrel=2 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64') license=('GPL') depends=('gtk2>=2.22.0' 'libxml2>=2.7.7') -makedepends=('intltool' 'pkgconfig') +makedepends=('intltool' 'pkg-config') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.10/gtksourceview-${pkgver}.tar.bz2) @@ -20,5 +20,9 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make +} + +package() { + cd "${srcdir}/gtksourceview-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/gv/PKGBUILD b/extra/gv/PKGBUILD index 028bacf99..9eb7f80d6 100644 --- a/extra/gv/PKGBUILD +++ b/extra/gv/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 122132 2011-05-02 09:38:25Z eric $ +# $Id: PKGBUILD 148658 2012-02-05 11:45:52Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gv -pkgver=3.7.2 +pkgver=3.7.3 pkgrel=1 pkgdesc="A program to view PostScript and PDF documents" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gv/" license=('GPL') -depends=('xaw3d' 'ghostscript' 'desktop-file-utils') +depends=('xaw3d>=1.6' 'ghostscript' 'desktop-file-utils') install=gv.install -source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png) -md5sums=('eb47d465755b7291870af66431c6f2e1' +source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png + buildfix.diff) +md5sums=('98ae3e9ce338b64ba5ab622389c5960e' 'cf04652952f2d0903bc7578b4826f50c' - 'ab0e3879dbe39e59ad1c923020c28a86') -sha1sums=('d9573e17f5d88d150fccb257ce205dbceab83e8a' - 'c8230fe08ee6d22525678a97832f44941237d174' - '35b9168e526527001b1b5b8ee34a5b69d9369590') + 'ab0e3879dbe39e59ad1c923020c28a86' + '943baf7a6bb61389a09a4ec71083a900') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # https://trac.macports.org/browser/trunk/dports/print/gv/files/patch-src-Scrollbar.c.diff?rev=89338 + patch -Np0 -i ${srcdir}/buildfix.diff sed -i -e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" src/Makefile.{am,in} ./configure --prefix=/usr make diff --git a/extra/gv/buildfix.diff b/extra/gv/buildfix.diff new file mode 100644 index 000000000..76c88b158 --- /dev/null +++ b/extra/gv/buildfix.diff @@ -0,0 +1,15 @@ +This piece of code is from libXaw3d-1.6/src/Scrollbar.c (Line 644) + +http://bugs.gentoo.org/399753 + +--- src/Scrollbar.c ++++ src/Scrollbar.c +@@ -1006,7 +1006,7 @@ + TOPLOC = newtop; + SHOWNLENGTH = newbot-newtop+1; + +- (*swclass->threeD_class.shadowdraw) (w, event, region, FALSE); ++ (*swclass->threeD_class.shadowdraw) (w, event, region, sbw->threeD.relief, FALSE); + + ENDMESSAGE(Redisplay) + } diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 8c91a9561..b44b06169 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 144049 2011-12-02 20:54:20Z ibiru $ +# $Id: PKGBUILD 148780 2012-02-05 11:50:09Z ibiru $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin -pkgver=2011.2.0 -pkgrel=2 +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-exiftool') + '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=('79dfdac229b4e58f50c893c1238bdd0921ad9da6') +sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b') build() { cd "${srcdir}" diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index ed87911d6..b086a4621 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 135136 2011-08-10 12:54:02Z tpowa $ +# $Id: PKGBUILD 148782 2012-02-05 11:50:17Z ibiru $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hylafax pkgver=6.0.5 -pkgrel=2 +pkgrel=3 pkgdesc="Fax Server" arch=('i686' 'x86_64') install='hylafax.install' @@ -17,49 +17,37 @@ source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz hylafax hylafax.cron.daily config.local - configure-6.0.5.patch) + configure-6.0.5.patch + hylafax-libtiff4.patch) +md5sums=('eb9ac942354ad708e20e4583cec6615f' + '6602288a405324d8c8e3c5eac2bf19fd' + '52beffe7dc296b4f9ce9fd0387f7804e' + '0d2ce24d918226a852539aebf57d3f4a' + '51d9f639bb76e5e39cdc8e2ac07e208d' + '3d239c186f24720e945508d349b069b1') -# build as root for successful build! build() { - uucp_created=0 - if ! grep 'uucp' /etc/passwd > /dev/null; then - uucp_created=1 - groupadd -g 14 uucp &>/dev/null - useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null - useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null - fi - mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts} - mkdir -p $pkgdir/var/{spool/hylafax,lock} - cd $srcdir/${pkgname}-${pkgver} - + cd "$srcdir/${pkgname}-${pkgver}" cp ../config.local . # fix compiling patch -Np0 -i ../configure-6.0.5.patch + patch -Np1 -i ../hylafax-libtiff4.patch ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}" make } package () { - cd $srcdir/${pkgname}-${pkgver} - make ROOT=$pkgdir install - install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax - install -D -m 744 $srcdir/hylafax.cron.daily $pkgdir/etc/cron.daily/hylafax - # remove group if created - if [ $uucp_created -eq 1 ]; then - userdel uucp &>/dev/null - groupdel uucp &>/dev/null - userdel fax &>/dev/null - fi + cd "$srcdir/${pkgname}-${pkgver}" + mkdir -p "$pkgdir"/usr/{bin,lib/fax,sbin,share/ghostscript/fonts} + mkdir -p "$pkgdir"/var/{spool/hylafax,lock} + make ROOT="$pkgdir" install + install -D -m 755 "$srcdir"/hylafax "$pkgdir"/etc/rc.d/hylafax + install -D -m 744 "$srcdir"/hylafax.cron.daily "$pkgdir"/etc/cron.daily/hylafax # add missing awk file for notify-4.1 script - install -D -m 755 $srcdir/${pkgname}-${pkgver}/util/notify.awk \ - $pkgdir/var/spool/hylafax/bin/notify.awk + install -D -m 755 "$srcdir"/${pkgname}-${pkgver}/util/notify.awk \ + "$pkgdir"/var/spool/hylafax/bin/notify.awk # fix permission on /var/lock - chmod 1777 $pkgdir/var/lock + chmod 1777 "$pkgdir"/var/lock - install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT + install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT } -md5sums=('eb9ac942354ad708e20e4583cec6615f' - '6602288a405324d8c8e3c5eac2bf19fd' - '52beffe7dc296b4f9ce9fd0387f7804e' - '0d2ce24d918226a852539aebf57d3f4a' - '51d9f639bb76e5e39cdc8e2ac07e208d') diff --git a/extra/hylafax/hylafax-libtiff4.patch b/extra/hylafax/hylafax-libtiff4.patch new file mode 100644 index 000000000..4a49511f8 --- /dev/null +++ b/extra/hylafax/hylafax-libtiff4.patch @@ -0,0 +1,229 @@ +--- hylafax-6.0.5/configure 2010-09-15 10:42:36.000000000 -0400 ++++ hylafax-5.5.1/configure 2012-01-02 17:44:20.000000000 -0500 +@@ -2531,6 +2566,7 @@ + Note "... checking TIFF library version" + tiff_runlen_t="" + cat>t.c<<EOF ++#include <stdlib.h> + #include <stdio.h> + #include "tiffio.h" + main() +@@ -2550,8 +2586,18 @@ + Note " Found libtiff version ${lib_ver}" + if [ ${header_ver} -ge 19960307 ]; then + case ${lib_ver} in +- 3.4) tiff_runlen_t="uint16" ;; +- 3.[56789]) tiff_runlen_t="uint32" ;; ++ 3.4) tiff_runlen_t="uint16" ++ echo '#define TIFFSTRIPBYTECOUNTS uint32' ++ echo '#define TIFFVERSION TIFF_VERSION' ++ echo '#define TIFFHEADER TIFFHeader';; ++ 3.[56789]) tiff_runlen_t="uint32" ++ echo '#define TIFFSTRIPBYTECOUNTS uint32' ++ echo '#define TIFFVERSION TIFF_VERSION' ++ echo '#define TIFFHEADER TIFFHeader';; ++ 4.0) tiff_runlen_t="uint32" ++ echo '#define TIFFSTRIPBYTECOUNTS uint64' ++ echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' ++ echo '#define TIFFHEADER TIFFHeaderClassic';; + esac + fi + else +@@ -2588,7 +2634,7 @@ + Incompatible TIFF Library. + + HylaFAX ${VERSION} requires TIFF software distribution versions 3.4 through +-3.9. If you do not have up to date TIFF software on your system ++4.0. If you do not have up to date TIFF software on your system + then you can retrieve it from the location where you obtained this software. + The Home Page for version 3.5 and later is http://www.remotesensing.org/libtiff/ + EOF +--- hylafax-6.0.5/hfaxd/FileTransfer.c++ 2010-09-15 10:42:36.000000000 -0400 ++++ hylafax-5.5.1/hfaxd/FileTransfer.c++ 2012-01-02 17:44:19.000000000 -0500 +@@ -164,26 +142,26 @@ + * a single IFD/image from a TIFF file. + */ + typedef struct { +- TIFFDirEntry SubFileType; +- TIFFDirEntry ImageWidth; +- TIFFDirEntry ImageLength; +- TIFFDirEntry BitsPerSample; +- TIFFDirEntry Compression; +- TIFFDirEntry Photometric; +- TIFFDirEntry FillOrder; +- TIFFDirEntry StripOffsets; +- TIFFDirEntry Orientation; +- TIFFDirEntry SamplesPerPixel; +- TIFFDirEntry RowsPerStrip; +- TIFFDirEntry StripByteCounts; +- TIFFDirEntry XResolution; +- TIFFDirEntry YResolution; +- TIFFDirEntry Options; // T4 or T6 +- TIFFDirEntry ResolutionUnit; +- TIFFDirEntry PageNumber; +- TIFFDirEntry BadFaxLines; +- TIFFDirEntry CleanFaxData; +- TIFFDirEntry ConsecutiveBadFaxLines; ++ HFClassicTIFFDirEntry SubFileType; ++ HFClassicTIFFDirEntry ImageWidth; ++ HFClassicTIFFDirEntry ImageLength; ++ HFClassicTIFFDirEntry BitsPerSample; ++ HFClassicTIFFDirEntry Compression; ++ HFClassicTIFFDirEntry Photometric; ++ HFClassicTIFFDirEntry FillOrder; ++ HFClassicTIFFDirEntry StripOffsets; ++ HFClassicTIFFDirEntry Orientation; ++ HFClassicTIFFDirEntry SamplesPerPixel; ++ HFClassicTIFFDirEntry RowsPerStrip; ++ HFClassicTIFFDirEntry StripByteCounts; ++ HFClassicTIFFDirEntry XResolution; ++ HFClassicTIFFDirEntry YResolution; ++ HFClassicTIFFDirEntry Options; // T4 or T6 ++ HFClassicTIFFDirEntry ResolutionUnit; ++ HFClassicTIFFDirEntry PageNumber; ++ HFClassicTIFFDirEntry BadFaxLines; ++ HFClassicTIFFDirEntry CleanFaxData; ++ HFClassicTIFFDirEntry ConsecutiveBadFaxLines; + uint32 link; // offset to next directory + uint32 xres[2]; // X resolution indirect value + uint32 yres[2]; // Y resolution indirect value +@@ -226,10 +204,10 @@ + * amount of image data and then adding in + * the expected data for the TIFF headers. + */ +- uint32* sb; ++ TIFFSTRIPBYTECOUNTS* sb; + TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb); + file_size = sizeof (DirTemplate) + +- sizeof (TIFFHeader) + sizeof (uint16); ++ sizeof (TIFFHEADER) + sizeof (uint16); + for (tstrip_t s = 0, ns = TIFFNumberOfStrips(tif); s < ns; s++) + file_size += sb[s]; + reply(code, "%s for %s (%lu bytes).", +@@ -261,10 +239,10 @@ + if (fd >= 0) { + union { + char buf[512]; +- TIFFHeader h; ++ TIFFHEADER h; + } b; + ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b)); +- if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFF_VERSION && ++ if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFFVERSION && + (b.h.tiff_magic == TIFF_BIGENDIAN || + b.h.tiff_magic == TIFF_LITTLEENDIAN)) { + (void) lseek(fd, 0L, SEEK_SET); // rewind +@@ -318,12 +296,12 @@ + } + + static void +-getLong(TIFF* tif, TIFFDirEntry& de) ++getLong(TIFF* tif, HFClassicTIFFDirEntry& de) + { + TIFFGetField(tif, de.tdir_tag, &de.tdir_offset); + } + static void +-getShort(TIFF* tif, TIFFDirEntry& de) ++getShort(TIFF* tif, HFClassicTIFFDirEntry& de) + { + uint16 v; + TIFFGetField(tif, de.tdir_tag, &v); +@@ -343,7 +321,7 @@ + { + static DirTemplate templ = { + #define TIFFdiroff(v) \ +- (uint32) (sizeof (TIFFHeader) + sizeof (uint16) + \ ++ (uint32) (sizeof (TIFFHEADER) + sizeof (uint16) + \ + (intptr_t) &(((DirTemplate*) 0)->v)) + { TIFFTAG_SUBFILETYPE, TIFF_LONG, 1 }, + { TIFFTAG_IMAGEWIDTH, TIFF_LONG, 1 }, +@@ -368,7 +346,7 @@ + 0, // next directory + { 0, 1 }, { 0, 1 }, // x+y resolutions + }; +-#define NTAGS ((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (TIFFDirEntry)) ++#define NTAGS ((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (HFClassicTIFFDirEntry)) + /* + * Construct the TIFF header for this IFD using + * the preconstructed template above. We extract +@@ -377,14 +355,14 @@ + * of things about the contents of the TIFF file. + */ + struct { +- TIFFHeader h; ++ TIFFHEADER h; + uint16 dircount; + u_char dirstuff[sizeof (templ)]; + } buf; + union { int32 i; char c[4]; } u; u.i = 1; + buf.h.tiff_magic = (u.c[0] == 0 ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN); +- buf.h.tiff_version = TIFF_VERSION; +- buf.h.tiff_diroff = sizeof (TIFFHeader); ++ buf.h.tiff_version = TIFFVERSION; ++ buf.h.tiff_diroff = sizeof (TIFFHEADER); + buf.dircount = (uint16) NTAGS; + getLong(tif, templ.SubFileType); + getLong(tif, templ.ImageWidth); +@@ -412,7 +390,7 @@ + getShort(tif, templ.CleanFaxData); + getLong(tif, templ.ConsecutiveBadFaxLines); + if (buf.h.tiff_magic == TIFF_BIGENDIAN) { +- TIFFDirEntry* dp = &templ.SubFileType; ++ HFClassicTIFFDirEntry* dp = &templ.SubFileType; + for (u_int i = 0; i < NTAGS; i++) { + if (dp->tdir_type == TIFF_SHORT) + dp->tdir_offset <<= 16; +@@ -441,7 +419,7 @@ + bool + HylaFAXServer::sendITIFFData(TIFF* tif, int fdout) + { +- uint32* sb; ++ TIFFSTRIPBYTECOUNTS* sb; + (void) TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb); + tdata_t buf = _TIFFmalloc(sb[0]); + tsize_t bsize = sb[0]; +--- hylafax-6.0.5/hfaxd/FileTransfer.c++ 2012-01-28 15:27:47.000000000 -0500 ++++ hylafax-5.5.1/hfaxd/FileTransfer.c++ 2012-01-28 15:30:12.000000000 -0500 +@@ -69,7 +69,7 @@ + + + static bool +-isTIFF(const TIFFHeader& h) ++isTIFF(const TIFFHEADER& h) + { + if (h.tiff_magic != TIFF_BIGENDIAN && h.tiff_magic != TIFF_LITTLEENDIAN) + return (false); +@@ -82,11 +82,23 @@ + // byte swap version stamp if opposite byte order + if ((u.c[0] == 0) ^ (h.tiff_magic == TIFF_BIGENDIAN)) + TIFFSwabShort(&version); +- return (version == TIFF_VERSION); ++ return (version == TIFFVERSION); + } + + + /* ++ * This is copied right from tiff.h in version 3.8.2. This was necessary ++ * to localize here because it was removed from tiff.h in version 4.0. ++ * In tiff.h 3.8.2 it was known as "TIFFDirEntry". ++ */ ++typedef struct { ++ uint16 tdir_tag; ++ uint16 tdir_type; /* data type */ ++ uint32 tdir_count; /* number of items; length in spec */ ++ uint32 tdir_offset; /* byte offset to field data */ ++} HFClassicTIFFDirEntry; ++ ++/* + * Record a file transfer in the log file. + */ + void +@@ -957,7 +957,7 @@ + if (FileCache::lookup(docname, sb) && S_ISREG(sb.st_mode)) { + union { + char buf[512]; +- TIFFHeader h; ++ TIFFHEADER h; + } b; + ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b)); + if (cc > 2 && b.buf[0] == '%' && b.buf[1] == '!') diff --git a/extra/hylafax/hylafax.install b/extra/hylafax/hylafax.install index bd97d42bd..5dacf4045 100644 --- a/extra/hylafax/hylafax.install +++ b/extra/hylafax/hylafax.install @@ -1,8 +1,6 @@ print_install() { printf "\n" - echo "If installing new:" - printf "\n" echo "Add the following to /etc/inittab and run telinit q" echo " f1:2345:respawn:/usr/lib/fax/faxgetty ttyS0" echo "faxgetty should now be running" @@ -24,16 +22,20 @@ print_remove() { } post_install() { - groupadd -g 14 uucp &>/dev/null - useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null - useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null + post_upgrade print_install } post_upgrade() { - post_install - usermod -d '/' uucp - usermod -d '/' fax + groupadd -g 14 uucp &>/dev/null + useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null + useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null + chown uucp /var/spool/hylafax/{,archive,bin,client,config,dev,docq,doneq,etc} + chown uucp /var/spool/hylafax/{FIFO,info,log,pollq,recvq,sendq,status,tmp} + chown uucp /var/spool/hylafax/etc/{hosts.hfaxd,lutRS18.pcf,xferfaxlog} + chown -R uucp /var/spool/hylafax/etc/templates + usermod -d '/' uucp &>/dev/null + usermod -d '/' fax &>/dev/null } pre_remove() { diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 47c3ccdac..030080c3f 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 144992 2011-12-13 18:04:12Z eric $ +# $Id: PKGBUILD 149151 2012-02-06 00:39:05Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.4.0 +pkgver=6.7.5.1 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" license=('custom') -depends=('libltdl' 'lcms2' 'libxt' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo') +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=('f0310885972341b74670925b503ad8a8b05ad75d' +sha1sums=('6970215ee2b95dbbf1b57b8d65e40b2d0d811acb' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD index dd64f75a4..dda349ac6 100644 --- a/extra/imlib/PKGBUILD +++ b/extra/imlib/PKGBUILD @@ -1,32 +1,30 @@ -# $Id: PKGBUILD 134264 2011-08-02 18:15:21Z jgc $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 148786 2012-02-05 11:50:28Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=imlib pkgver=1.9.15 -pkgrel=10 +pkgrel=11 pkgdesc="General image handling library for X11 and Gtk" arch=('i686' 'x86_64') url="http://freshmeat.net/projects/imlib/" license=('GPL') -depends=('gtk' 'giflib' 'libpng>=1.4.0' 'libtiff>=3.9.2-2' 'libjpeg>=8') +depends=('gtk' 'giflib' 'libpng' 'libtiff') makedepends=('libxt') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2 - debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch libpng14.patch) -md5sums=('7db987e6c52e4daf70d7d0f471238eae' '5f9da697934b6bd3b497ac9160ce4f5c'\ - 'b273d36aa60adbfaacaf6062234e4c1f' '33b832f0dc6c9723cd0dfe9c8d0a6797'\ - '9d8a029f5fb05978db0dbcd4ff38fe23') -sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' 'fe2fd9ce4d7bc62271e724153de39012de8ec5ee'\ - 'ec1b47281c1a7fb21abe841f948ecc56ed13f310' 'af54cb1ee0c8c6122b277284ebdd1022e31df3b5'\ - '20ed6063ba787ac7c2677bb4b135c0b7285c52af') + debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch imlib-1.9.15-libpng15.patch) +sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' + 'fe2fd9ce4d7bc62271e724153de39012de8ec5ee' + 'ec1b47281c1a7fb21abe841f948ecc56ed13f310' + 'af54cb1ee0c8c6122b277284ebdd1022e31df3b5' + '33c3aaa43eb624f2a6ab0406285a8515903333e3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/debian-bug448360.patch" - patch -Np1 -i "${srcdir}/CAN-2004-1026.patch" - patch -Np0 -i "${srcdir}/aclocal-fixes.patch" - patch -Np1 -i "${srcdir}/libpng14.patch" + patch -p1 -i "${srcdir}/debian-bug448360.patch" + patch -p1 -i "${srcdir}/CAN-2004-1026.patch" + patch -p0 -i "${srcdir}/aclocal-fixes.patch" + patch -p0 -i "${srcdir}/imlib-1.9.15-libpng15.patch" sed '/AC_PATH_XTRA/d' -i configure.in libtoolize --force cp /usr/bin/libtool . @@ -34,5 +32,9 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm --disable-static sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/imlib/imlib-1.9.15-libpng15.patch b/extra/imlib/imlib-1.9.15-libpng15.patch new file mode 100644 index 000000000..7837cd488 --- /dev/null +++ b/extra/imlib/imlib-1.9.15-libpng15.patch @@ -0,0 +1,142 @@ +--- gdk_imlib/io-png.c ++++ gdk_imlib/io-png.c +@@ -40,13 +40,13 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -275,13 +275,13 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -301,6 +301,9 @@ + /* Setup Translators */ + if (color_type == PNG_COLOR_TYPE_PALETTE) + png_set_expand(png_ptr); ++ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) ++ png_set_expand(png_ptr); ++ + png_set_strip_16(png_ptr); + png_set_packing(png_ptr); + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) +@@ -440,13 +443,13 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -635,7 +638,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); + return 0; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fclose(f); + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); +--- Imlib/load.c ++++ Imlib/load.c +@@ -197,12 +197,12 @@ + png_destroy_read_struct(&png_ptr, NULL, NULL); + return NULL; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -260,7 +260,8 @@ + png_read_image(png_ptr, lines); + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + ptr = data; +- if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ++ if (color_type == PNG_COLOR_TYPE_GRAY ++ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) + { + for (y = 0; y < *h; y++) + { +@@ -285,6 +286,7 @@ + } + } + } ++#if 0 + else if (color_type == PNG_COLOR_TYPE_GRAY) + { + for (y = 0; y < *h; y++) +@@ -300,6 +302,7 @@ + } + } + } ++#endif + else + { + for (y = 0; y < *h; y++) +--- Imlib/save.c ++++ Imlib/save.c +@@ -342,7 +342,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); + return 0; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fclose(f); + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); +--- Imlib/utils.c ++++ Imlib/utils.c +@@ -1981,14 +1981,13 @@ + png_destroy_read_struct(&png_ptr, NULL, NULL); + return NULL; + } +- +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD index 030f74f2d..191816935 100644 --- a/extra/imlib2/PKGBUILD +++ b/extra/imlib2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136939 2011-09-03 09:44:35Z ronald $ +# $Id: PKGBUILD 148788 2012-02-05 11:50:31Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Arjan Timmerman <arjan.archlinux.org> # Contributor: Tom Newsom <Jeepster.gmx.co.uk> pkgname=imlib2 pkgver=1.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2 sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" # disable optimizations, they cause problems (e.g. FS#12268) [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx" @@ -30,9 +30,9 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install # Install License - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 079ca3009..b7266212d 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143645 2011-11-28 00:27:02Z bisson $ +# $Id: PKGBUILD 148790 2012-02-05 11:50:35Z ibiru $ # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.2 -pkgrel=5 +pkgrel=6 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' arch=('i686' 'x86_64') @@ -20,8 +20,10 @@ optdepends=('pstoedit: latex formulas' 'pyxml: some extensions' 'uniconvertor: reading/writing to some proprietary formats') options=('!libtool') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'libpng15.patch') +sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3' + 'd6512f3cb38ca8e2436dc485aa652490d17b3a52') install=install @@ -34,6 +36,8 @@ build() { sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py sed -i 's|"python"|"python2"|g' src/main.cpp + patch -p1 -i ../libpng15.patch + ./configure --prefix=/usr \ --with-python \ --with-perl \ diff --git a/extra/inkscape/libpng15.patch b/extra/inkscape/libpng15.patch new file mode 100644 index 000000000..e24913ed6 --- /dev/null +++ b/extra/inkscape/libpng15.patch @@ -0,0 +1,40 @@ +--- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp ++++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp +@@ -1443,7 +1443,7 @@ + return NULL; + } + // Set error handler +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return NULL; + } +--- inkscape-0.48.1/src/helper/png-write.cpp ++++ inkscape-0.48.1-mod//src/helper/png-write.cpp +@@ -165,7 +165,7 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file */ + fclose(fp); + png_destroy_write_struct(&png_ptr, &info_ptr); +--- inkscape-0.48.1/src/sp-image.cpp ++++ inkscape-0.48.1-mod//src/sp-image.cpp +@@ -386,9 +386,13 @@ + + #if defined(PNG_iCCP_SUPPORTED) + { +- char* name = 0; ++ png_charp name = 0; + int compression_type = 0; +- char* profile = 0; ++#if (PNG_LIBPNG_VER < 10500) ++ png_charp profile = 0; ++#else ++ png_bytep profile = 0; ++#endif + png_uint_32 proflen = 0; + if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { + // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index f8c8a21f0..e5fcec80a 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146529 2012-01-12 16:16:17Z andyrtr $ +# $Id: PKGBUILD 148792 2012-02-05 11:50:44Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Guillaume ALAUX <guillaume@archlinux.org> @@ -24,26 +24,25 @@ _OPENJDK_CHANGESET=0a76e5390e68 _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver} -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') options=('!emptydirs') -makedepends=('jdk7-openjdk' 'libxp' 'libxslt' - 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' +makedepends=('jdk7-openjdk' 'libxp' 'libxslt' + 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2' 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # fastjar`? [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj') -_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive -#_url=http://icedtea.classpath.org/hg/icedtea7-forest/archive +_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz - ${_url}/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz - ${_url}/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz - ${_url}/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz - ${_url}/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz - ${_url}/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz - ${_url}/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz - ${_url}/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz + ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz + ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz + ${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz + ${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz + ${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz + ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz + ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz fontconfig-paths.diff fix_corba_cmds_path.diff openjdk7_fix_jdk_cmds_path.diff @@ -52,19 +51,9 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh - glibc2_15.diff) - -#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip - -noextract=("${_OPENJDK_CHANGESET}.tar.gz" - "${_CORBA_CHANGESET}.tar.gz" - "${_JAXP_CHANGESET}.tar.gz" - "${_JAXWS_CHANGESET}.tar.gz" - "${_JDK_CHANGESET}.tar.gz" - "${_LANGTOOLS_CHANGESET}.tar.gz" - "${_HOTSPOT_CHANGESET}.tar.gz") + glibc2_15.diff) md5sums=('752721a037a625001fad7a5fc2013f60' - 'ffb12013564794e9abbffbbbd0c58502' + '4c34ddf70124ea90c79201c1afede3e3' '8f8d222d0a6d363d06b40576da5f1ea2' '4abf34372e34cccd74ad337e487ed790' 'f2f40590a83889b8aa1d4631b705092d' @@ -81,6 +70,16 @@ md5sums=('752721a037a625001fad7a5fc2013f60' '62443459da0cb28181feb260dc0e5ce7' 'a4293acadff03bdccbc9b412ad288549') +#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip + +noextract=("${_OPENJDK_CHANGESET}.tar.gz" + "${_CORBA_CHANGESET}.tar.gz" + "${_JAXP_CHANGESET}.tar.gz" + "${_JAXWS_CHANGESET}.tar.gz" + "${_JDK_CHANGESET}.tar.gz" + "${_LANGTOOLS_CHANGESET}.tar.gz" + "${_HOTSPOT_CHANGESET}.tar.gz") + _jvmdir=/usr/lib/jvm/java-7-openjdk [ "$CARCH" = "x86_64" ] && _JARCH=amd64 @@ -144,16 +143,16 @@ package_jre7-openjdk-headless() { optdepends=('libcups: needed for Java Mauve support - libmawt.so' 'fontconfig: needed for Java Mauve support - libmawt.so') provides=('java-runtime=7') - conflicts=('java-runtime') + conflicts=('java-runtime' 'openjdk6') # replaces=('openjdk6') # once we remove openjdk6 pkg from the repos backup=(etc/profile.d/jre.sh etc/profile.d/jre.csh etc/java-7-openjdk/calendars.properties - etc/java-7-openjdk/content-types.properties + etc/java-7-openjdk/content-types.properties etc/java-7-openjdk/cursors/cursors.properties etc/java-7-openjdk/flavormap.properties etc/java-7-openjdk/fontconfig.bfc - etc/java-7-openjdk/fontconfig.properties + etc/java-7-openjdk/fontconfig.properties etc/java-7-openjdk/jvm.cfg etc/java-7-openjdk/logging.properties etc/java-7-openjdk/management/jmxremote.access @@ -265,9 +264,10 @@ package_jre7-openjdk() { 'alsa-lib: for basic sound support' 'giflib: for gif format support' 'libpulse: for advanced sound support' - 'gtk2: for the Gtk+ look and feel - desktop usage') + 'gtk2: for the Gtk+ look and feel - desktop usage') install=jre7-openjdk.install - + conflicts=('openjdk6') + mv ${srcdir}/tmp-desktop-jre/* ${pkgdir} # Link binaries into /usr/bin pushd ${pkgdir}/${_jvmdir}/jre/bin diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 0007c1aa5..07e7d24db 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 147788 2012-01-28 10:33:01Z andrea $ +# $Id: PKGBUILD 148794 2012-02-05 11:50:50Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index 5f07c1c52..7786910e0 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147772 2012-01-28 10:32:30Z andrea $ +# $Id: PKGBUILD 148796 2012-02-05 11:50:53Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc='Document Viewer' arch=('i686' 'x86_64') url="http://kde.org/applications/graphics/okular/" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index 0ca0ef0c0..8d3dcf813 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147887 2012-01-28 10:36:13Z andrea $ +# $Id: PKGBUILD 148798 2012-02-05 11:50:57Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Strigi analyzers for various graphics file formats" url="http://kde.org/" arch=('i686' 'x86_64') diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD index a33b8ed25..4b1862b2f 100644 --- a/extra/kdelibs3/PKGBUILD +++ b/extra/kdelibs3/PKGBUILD @@ -1,34 +1,37 @@ -# $Id: PKGBUILD 123704 2011-05-12 16:07:27Z andrea $ -# Maintainer: +# $Id: PKGBUILD 148802 2012-02-05 11:51:08Z ibiru $ +# 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=11 +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' - 'bzip2' 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates') -makedepends=('pkgconfig' 'cups' 'hspell' 'autoconf') + 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates') +makedepends=('cups' 'hspell') +optdepends=('hspell: for Hebrew spell-checking support') options=('libtool') -install='kdelibs3.install' +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') -md5sums=('43cd55ed15f63b5738d620ef9f9fd568' - 'ca50d4515468cfda80946690c53073f3' - 'a5aedcc9550809ce6672a7dddf9f5ad4' - 'ab14ce2c40698e24e162284d50c6f466' - 'f4e0735475b5de59d738d68a9f467b77' - '11e49bc6aca497f55610146afe217751' - '242f0e4750c019e62e285c0aad0c03b8') + 'openssl.patch' + 'kdelibs3-missing-include.patch') +sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82' + 'c8ca21e4848a627760746d0a8a64bf4f90684c3e' + '50c9de71b102507fb78b192ecc22a5fc3e031bc3' + 'fbd6e773edf3e8bb8e1272629984025e041da2ca' + '5fbbf7a5e2032878815fa055bfb5020f478d2b25' + '35e56fe4c5f71685e64b13f448dcacc620166e06' + '50e92950498463defb9149ffcf8cbc2e8cd1063b' + 'e5f5b8c060a2db9cedb82bf18caadfa869921779') build() { cd "$srcdir"/kdelibs-${pkgver} @@ -39,7 +42,8 @@ build() { 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 -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 diff --git a/extra/kdelibs3/kdelibs3-missing-include.patch b/extra/kdelibs3/kdelibs3-missing-include.patch new file mode 100644 index 000000000..5b84ef746 --- /dev/null +++ b/extra/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/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD index f0be52a61..8f5b25f43 100644 --- a/extra/koffice/PKGBUILD +++ b/extra/koffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142654 2011-11-12 17:18:33Z ibiru $ +# $Id: PKGBUILD 148804 2012-02-05 11:51:14Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -37,7 +37,7 @@ pkgname=( # 'koffice-kdgantt' # still an empty package ) pkgver=2.3.3 -pkgrel=11 +pkgrel=12 arch=('i686' 'x86_64') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD index baf833da8..c60fc2e76 100644 --- a/extra/lablgtk2/PKGBUILD +++ b/extra/lablgtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135692 2011-08-17 10:30:13Z tpowa $ +# $Id: PKGBUILD 148806 2012-02-05 11:51:19Z ibiru $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=lablgtk2 pkgver=2.14.2 -pkgrel=4 +pkgrel=5 pkgdesc=" An Objective Caml interface to gtk2" arch=(i686 x86_64) license=('LGPL') @@ -11,6 +11,7 @@ url="http://lablgtk.forge.ocamlcore.org/" depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview2') makedepends=('ocaml') optdepends=('ocaml: for using the tools') +DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o %o %u') source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz) options=(!makeflags) md5sums=('bad77680a72dab8b915cae99d1ec9b1f') @@ -20,6 +21,10 @@ build() { ./configure --prefix=/usr make world make opt +} + +package() { + cd "${srcdir}/lablgtk-${pkgver}" make DESTDIR="${pkgdir}" install install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/" } diff --git a/extra/lbreakout2/PKGBUILD b/extra/lbreakout2/PKGBUILD index fa036bb63..6e49b8df6 100644 --- a/extra/lbreakout2/PKGBUILD +++ b/extra/lbreakout2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143790 2011-11-29 11:41:15Z giovanni $ +# $Id: PKGBUILD 148808 2012-02-05 11:51:24Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=lbreakout2 pkgver=2.6.3 -pkgrel=2 +pkgrel=3 pkgdesc="A breakout game with nice effects, graphics, and sounds" arch=('i686' 'x86_64') url="http://lgames.sourceforge.net" diff --git a/extra/lcms/PKGBUILD b/extra/lcms/PKGBUILD index effc73c13..a8706fe41 100644 --- a/extra/lcms/PKGBUILD +++ b/extra/lcms/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 87526 2010-08-15 13:47:09Z ibiru $ +# $Id: PKGBUILD 148810 2012-02-05 11:51:27Z ibiru $ # Maintainer: Tobias Kieslich <neri@archlinux.org> # Contributor: Ben <contrasutra@myrealbox.com> pkgname=lcms pkgver=1.19 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight color management development library/engine" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') -depends=('libtiff>=3.9.4') +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} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make - make DESTDIR=${pkgdir} install +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -Dm 644 COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD index 0ac1474d8..e60188213 100644 --- a/extra/lcms2/PKGBUILD +++ b/extra/lcms2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145076 2011-12-16 15:20:33Z eric $ +# $Id: PKGBUILD 148812 2012-02-05 11:51:30Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=lcms2 pkgver=2.3 -pkgrel=1 +pkgrel=2 pkgdesc="Small-footprint color management engine, version 2" arch=('i686' 'x86_64') license=('MIT') diff --git a/extra/libao/PKGBUILD b/extra/libao/PKGBUILD index 8107c96b2..c2e9cebc4 100644 --- a/extra/libao/PKGBUILD +++ b/extra/libao/PKGBUILD @@ -1,42 +1,39 @@ -# $Id: PKGBUILD 110917 2011-02-23 07:11:30Z schiv $ -# Maintainer: +# $Id: PKGBUILD 149069 2012-02-05 16:27:23Z bisson $ # Contributor: dorphell <dorphell@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libao pkgver=1.1.0 -pkgrel=1 -pkgdesc="A cross-platform audio output library and plugins" -url="http://www.xiph.org/ao" +pkgrel=2 +pkgdesc='Cross-platform audio output library and plugins' +url='http://xiph.org/ao/' arch=('i686' 'x86_64') license=('GPL') -depends=('glibc' 'alsa-lib') +options=('!libtool') +depends=('alsa-lib') makedepends=('libpulse') backup=('etc/libao.conf') -options=('!libtool') -conflicts=('libao-pulse') -provides=('libao-pulse=$pkgver-$pkgrel') -replaces=('libao-pulse') source=("http://downloads.xiph.org/releases/ao/${pkgname}-${pkgver}.tar.gz" 'libao.conf') -md5sums=('2b2508c29bc97e4dc218fa162cf883c8' - '3ae8f3e3f1492210b3519af0f1f3c572') +sha1sums=('9301bc4886f170c7122ab62677fb71cf001c04fd' + '558b3d297e0956af6959565db477023dbd492ca0') + +conflicts=('libao-pulse') +provides=("libao-pulse=${pkgver}-${pkgrel}") +replaces=('libao-pulse') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --enable-alsa-mmap \ - ./configure --prefix=/usr \ - --enable-alsa09-mmap \ - --enable-pulseaudio - make + make } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - # Add conf file - install -Dm644 "$srcdir/libao.conf" "$pkgdir/etc/libao.conf" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}"/libao.conf "${pkgdir}"/etc/libao.conf } - -# vim:set ts=2 sw=2 et: diff --git a/extra/libbonoboui/PKGBUILD b/extra/libbonoboui/PKGBUILD index ef75ec844..149816cbd 100644 --- a/extra/libbonoboui/PKGBUILD +++ b/extra/libbonoboui/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 117635 2011-04-04 14:22:52Z ibiru $ +# $Id: PKGBUILD 148814 2012-02-05 11:51:34Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libbonoboui pkgver=2.24.5 -pkgrel=1 +pkgrel=2 pkgdesc="User Interface library for Bonobo" arch=('i686' 'x86_64') license=('GPL' 'LGPL') depends=('libgnomecanvas' 'libgnome') -makedepends=('intltool' 'pkgconfig') +makedepends=('intltool' 'pkg-config') options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2) @@ -19,6 +19,10 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/share/applications/bonobo-browser.desktop" } diff --git a/extra/libchewing/PKGBUILD b/extra/libchewing/PKGBUILD index d1ee325e4..2a4fbb70a 100644 --- a/extra/libchewing/PKGBUILD +++ b/extra/libchewing/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 111534 2011-02-27 15:03:24Z bisson $ +# $Id: PKGBUILD 149033 2012-02-05 15:05:03Z bisson $ # Contributor: damir <damir@archlinux.org> # Contributor: whisky <archlinux.cle(at)gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libchewing pkgver=0.3.3 -pkgrel=1 +pkgrel=2 pkgdesc='Intelligent Zhuyin input method library for traditional Chinese' arch=('i686' 'x86_64') url='http://chewing.csie.net/' diff --git a/extra/libcue/PKGBUILD b/extra/libcue/PKGBUILD index 95e1c4d21..2802c53de 100644 --- a/extra/libcue/PKGBUILD +++ b/extra/libcue/PKGBUILD @@ -1,24 +1,26 @@ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# $Id: PKGBUILD 149035 2012-02-05 15:06:24Z bisson $ # Contributor: said <atvordhosbn[at]gmail[dot]com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libcue pkgver=1.4.0 -pkgrel=2 +pkgrel=3 pkgdesc='Parses so-called cue sheets and handles the parsed data' -arch=('i686' 'x86_64') url='http://sourceforge.net/projects/libcue/' +arch=('i686' 'x86_64') license=('GPL2') depends=('glibc') -source=("http://downloads.sourceforge.net/libcue/$pkgname-$pkgver.tar.bz2") +options=('!libtool') +source=("http://downloads.sourceforge.net/libcue/${pkgname}-${pkgver}.tar.bz2") sha1sums=('3fd31f2da7c0e3967d5f56363f3051a85a8fd50d') build() { - cd "$srcdir/$pkgname-$pkgver" - ./autogen.sh --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh --prefix=/usr --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libdaemon/PKGBUILD b/extra/libdaemon/PKGBUILD index c6bbc1c9c..f12c1fa55 100644 --- a/extra/libdaemon/PKGBUILD +++ b/extra/libdaemon/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 67404 2010-02-06 18:19:24Z giovanni $ +# $Id: PKGBUILD 149075 2012-02-05 16:45:57Z bisson $ # Contributor: Manolis Tzanidakis -# Contributor: Mark Rosenstand <mark@archlinux.org> -# Maintainer: Thayer Williams <thayer@archlinux.org> +# Contributor: Mark Rosenstand <mark@archlinux.org> +# Contributor: Thayer Williams <thayer@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libdaemon pkgver=0.14 -pkgrel=1 -pkgdesc="A lightweight C library which eases the writing of UNIX daemons" -url="http://0pointer.de/lennart/projects/libdaemon/" +pkgrel=2 +pkgdesc='Lightweight C library that eases the writing of UNIX daemons' +url='http://0pointer.de/lennart/projects/libdaemon/' license=('LGPL') arch=('i686' 'x86_64') -depends=('glibc') -source=(http://0pointer.de/lennart/projects/libdaemon/$pkgname-$pkgver.tar.gz) +source=("http://0pointer.de/lennart/projects/libdaemon/${pkgname}-${pkgver}.tar.gz") options=('!libtool') -md5sums=('509dc27107c21bcd9fbf2f95f5669563') +sha1sums=('78a4db58cf3a7a8906c35592434e37680ca83b8f') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --localstatedir=/var --disable-lynx || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --localstatedir=/var --disable-lynx --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libdmapsharing/PKGBUILD b/extra/libdmapsharing/PKGBUILD index fb532e990..93cdb87d1 100644 --- a/extra/libdmapsharing/PKGBUILD +++ b/extra/libdmapsharing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 125725 2011-05-28 15:53:41Z ibiru $ +# $Id: PKGBUILD 148816 2012-02-05 11:51:38Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libdmapsharing pkgver=2.9.12 -pkgrel=1 +pkgrel=2 pkgdesc="A library that implements the DMAP family of protocols" arch=('i686' 'x86_64') url="http://www.flyn.org/projects/libdmapsharing/index.html" diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD index f8d253881..84e3f4569 100644 --- a/extra/libgdiplus/PKGBUILD +++ b/extra/libgdiplus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111499 2011-02-27 11:15:27Z daniel $ +# $Id: PKGBUILD 148818 2012-02-05 11:51:42Z ibiru $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=libgdiplus pkgver=2.10 -pkgrel=1 +pkgrel=2 pkgdesc="An Open Source Implementation of the GDI+ API" arch=(i686 x86_64) license=('MPL' 'LGPL') @@ -11,12 +11,15 @@ url="http://www.mono-project.com" depends=('libtiff>=3.9.2-2' 'cairo>=1.8.10' 'giflib' 'glib2>=2.24.0' 'libexif') makedepends=('pkgconfig') options=('!libtool') -source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('451966e8f637e3a1f02d1d30f900255d') +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng15.patch) +md5sums=('451966e8f637e3a1f02d1d30f900255d' + 'a2d143676bbaceeb88b4c34069e93986') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 <../libpng15.patch ./configure --prefix=/usr --with-cairo=system || return 1 + make || return 1 } diff --git a/extra/libgdiplus/libpng15.patch b/extra/libgdiplus/libpng15.patch new file mode 100644 index 000000000..31a1c0162 --- /dev/null +++ b/extra/libgdiplus/libpng15.patch @@ -0,0 +1,164 @@ +$NetBSD: patch-aa,v 1.8 2011/01/21 10:21:51 wiz Exp $ + +Fix build with png-1.5. + +--- src/pngcodec.c.orig 2010-11-03 16:52:54.000000000 +0000 ++++ src/pngcodec.c +@@ -116,10 +116,15 @@ gdip_load_png_properties (png_structp pn + bitmap_data->dpi_horz = png_get_x_pixels_per_inch(png_ptr, info_ptr); + bitmap_data->dpi_vert = png_get_y_pixels_per_inch(png_ptr, info_ptr); + #elif defined(PNG_pHYs_SUPPORTED) +- if ((info_ptr->valid & PNG_INFO_pHYs) && (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)) { +- bitmap_data->image_flags |= ImageFlagsHasRealDPI; +- bitmap_data->dpi_horz = info_ptr->x_pixels_per_unit * 0.0254; +- bitmap_data->dpi_vert = info_ptr->y_pixels_per_unit * 0.0254; ++ if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) { ++ png_uint_32 res_x, res_y; ++ int unit_type; ++ png_get_pHYs (png_ptr, info_ptr, &res_x, &res_y, &unit_type); ++ if (unit_type == PNG_RESOLUTION_METER) { ++ bitmap_data->image_flags |= ImageFlagsHasRealDPI; ++ bitmap_data->dpi_horz = res_x * 0.0254; ++ bitmap_data->dpi_vert = res_y * 0.0254; ++ } + } + #endif + /* default to screen resolution (if nothing was provided or available) */ +@@ -130,7 +135,7 @@ gdip_load_png_properties (png_structp pn + #if defined(PNG_iCCP_SUPPORTED) + { + png_charp name; +- png_charp profile; ++ png_bytep profile; + png_uint_32 proflen; + int compression_type; + +@@ -292,6 +297,11 @@ gdip_load_png_image_from_file_or_stream + ImageFlags colourspace_flag; + int i; + int j; ++ png_colorp png_palette; ++ int png_num_palette; ++ png_bytep trans_alpha; ++ int num_trans; ++ png_color_16p trans_color; + + width = png_get_image_width (png_ptr, info_ptr); + height = png_get_image_height (png_ptr, info_ptr); +@@ -309,6 +319,8 @@ gdip_load_png_image_from_file_or_stream + } + + /* Copy palette. */ ++ png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette); ++ + num_colours = 1 << bit_depth; + + if (png_get_color_type (png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) { +@@ -321,8 +333,8 @@ gdip_load_png_image_from_file_or_stream + colourspace_flag = ImageFlagsColorSpaceRGB; + + palette_entries = num_colours; +- if (palette_entries > info_ptr->num_palette) { +- palette_entries = info_ptr->num_palette; ++ if (palette_entries > png_num_palette) { ++ palette_entries = png_num_palette; + } + + palette = GdipAlloc (sizeof(ColorPalette) + (num_colours - 1) * sizeof(ARGB)); +@@ -331,29 +343,30 @@ gdip_load_png_image_from_file_or_stream + + for (i=0; i < palette_entries; i++) { + set_pixel_bgra (&palette->Entries[i], 0, +- info_ptr->palette[i].blue, +- info_ptr->palette[i].green, +- info_ptr->palette[i].red, ++ png_palette[i].blue, ++ png_palette[i].green, ++ png_palette[i].red, + 0xFF); /* alpha */ + } + } + ++ png_get_tRNS (png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color); + /* Make sure transparency is respected. */ +- if (info_ptr->num_trans > 0) { ++ if (num_trans > 0) { + palette->Flags |= PaletteFlagsHasAlpha; + colourspace_flag |= ImageFlagsHasAlpha; + +- if (info_ptr->num_trans > info_ptr->num_palette) { +- info_ptr->num_trans = info_ptr->num_palette; ++ if (num_trans > png_num_palette) { ++ num_trans = png_num_palette; + } + +- for (i=0; i < info_ptr->num_trans; i++) { ++ for (i=0; i < num_trans; i++) { + set_pixel_bgra(&palette->Entries[i], 0, +- info_ptr->palette[i].blue, +- info_ptr->palette[i].green, +- info_ptr->palette[i].red, ++ png_palette[i].blue, ++ png_palette[i].green, ++ png_palette[i].red, + #if PNG_LIBPNG_VER > 10399 +- info_ptr->trans_alpha [i]); /* alpha */ ++ trans_alpha [i]); /* alpha */ + #else + info_ptr->trans[i]); /* alpha */ + #endif +@@ -398,6 +411,8 @@ gdip_load_png_image_from_file_or_stream + BYTE bit_depth; + int stride; + int interlace; ++ png_colorp png_palette; ++ int png_num_palette; + png_bytep *row_pointers; + BYTE *rawptr; + int i, j; +@@ -490,32 +505,33 @@ gdip_load_png_image_from_file_or_stream + png_byte palette = 0; + png_byte pix = *rowp++; + ++ png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette); + palette = (pix >> 6) & 0x03; + set_pixel_bgra (rawptr, 0, +- info_ptr->palette[palette].blue, +- info_ptr->palette[palette].green, +- info_ptr->palette[palette].red, ++ png_palette[palette].blue, ++ png_palette[palette].green, ++ png_palette[palette].red, + 0xFF); /* alpha */ + + palette = (pix >> 4) & 0x03; + set_pixel_bgra (rawptr, 4, +- info_ptr->palette[palette].blue, +- info_ptr->palette[palette].green, +- info_ptr->palette[palette].red, ++ png_palette[palette].blue, ++ png_palette[palette].green, ++ png_palette[palette].red, + 0xFF); /* alpha */ + + palette = (pix >> 2) & 0x03; + set_pixel_bgra (rawptr, 8, +- info_ptr->palette[palette].blue, +- info_ptr->palette[palette].green, +- info_ptr->palette[palette].red, ++ png_palette[palette].blue, ++ png_palette[palette].green, ++ png_palette[palette].red, + 0xFF); /* alpha */ + + palette = pix & 0x03; + set_pixel_bgra (rawptr, 12, +- info_ptr->palette[palette].blue, +- info_ptr->palette[palette].green, +- info_ptr->palette[palette].red, ++ png_palette[palette].blue, ++ png_palette[palette].green, ++ png_palette[palette].red, + 0xFF); /* alpha */ + rawptr += 16; + } diff --git a/extra/libgnome-media-profiles/PKGBUILD b/extra/libgnome-media-profiles/PKGBUILD index 93472debf..9cb1b849c 100644 --- a/extra/libgnome-media-profiles/PKGBUILD +++ b/extra/libgnome-media-profiles/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117708 2011-04-04 16:55:18Z ibiru $ +# $Id: PKGBUILD 148822 2012-02-05 11:51:50Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libgnome-media-profiles pkgver=3.0.0 -pkgrel=2 -pkgdesc="" +pkgrel=3 +pkgdesc="Library for management of audio recording profiles" arch=(i686 x86_64) url="http://www.gnome.org" license=('GPL2') @@ -20,6 +20,9 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --disable-static -disable-scrollkeeper \ --disable-schemas-install + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make } diff --git a/extra/libgnomecanvas/PKGBUILD b/extra/libgnomecanvas/PKGBUILD index 6bc8b6893..0fc8f1391 100644 --- a/extra/libgnomecanvas/PKGBUILD +++ b/extra/libgnomecanvas/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 108491 2011-01-31 15:14:46Z jgc $ +# $Id: PKGBUILD 148820 2012-02-05 11:51:45Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgnomecanvas pkgver=2.30.3 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Canvas library" arch=(i686 x86_64) license=('LGPL') depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.21') -makedepends=('pkgconfig' 'intltool') +makedepends=('pkg-config' 'intltool') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2) @@ -19,5 +19,9 @@ build() { ./configure --prefix=/usr --disable-static \ --enable-glade make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/libgnomeui/PKGBUILD b/extra/libgnomeui/PKGBUILD index 7538c8acc..22afc28e6 100644 --- a/extra/libgnomeui/PKGBUILD +++ b/extra/libgnomeui/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 91726 2010-09-27 18:45:46Z ibiru $ +# $Id: PKGBUILD 148824 2012-02-05 11:51:52Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgnomeui -pkgver=2.24.4 +pkgver=2.24.5 pkgrel=1 pkgdesc="User Interface library for GNOME" arch=('i686' 'x86_64') license=('LGPL') -depends=('libbonoboui>=2.24.3' 'libgnome-keyring>=2.31.92' 'libsm') -makedepends=('intltool' 'pkgconfig') +depends=('libbonoboui' 'libgnome-keyring' 'libsm') +makedepends=('intltool' 'pkg-config') options=('!libtool') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a64dcb5af190ec0bfe2ba647ab09a90e4187336fa417d301abfb736be41283b2') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.24/$pkgname-$pkgver.tar.bz2) +sha256sums=('ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/libgnomeui make - make DESTDIR="${pkgdir}" install +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD index 18e28d3e2..d37438633 100644 --- a/extra/libgpod/PKGBUILD +++ b/extra/libgpod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138079 2011-09-16 07:31:23Z ibiru $ +# $Id: PKGBUILD 148826 2012-02-05 11:51:56Z ibiru $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libgpod pkgver=0.8.2 -pkgrel=2 +pkgrel=3 pkgdesc="A shared library to access the contents of an iPod" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/libgtkhtml/PKGBUILD b/extra/libgtkhtml/PKGBUILD index ff795d406..354ced8c4 100644 --- a/extra/libgtkhtml/PKGBUILD +++ b/extra/libgtkhtml/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121256 2011-04-29 21:48:54Z andyrtr $ +# $Id: PKGBUILD 148828 2012-02-05 11:51:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgtkhtml pkgver=2.11.1 -pkgrel=3 +pkgrel=4 pkgdesc="An HTML library for GTK" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/libotf/PKGBUILD b/extra/libotf/PKGBUILD index 85f758c52..14be6a2d6 100644 --- a/extra/libotf/PKGBUILD +++ b/extra/libotf/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 100934 2010-11-26 17:51:11Z bisson $ +# $Id: PKGBUILD 149040 2012-02-05 15:14:11Z bisson $ # Contributor: Ashish Shukla <wahjava.ml@gmail.com> pkgname=libotf pkgver=0.9.12 -pkgrel=1 +pkgrel=2 pkgdesc='OpenType Font library' url='http://www.m17n.org/libotf/' -arch=('i686' 'x86_64') license=('LGPL') -depends=('libxaw' 'freetype2') options=('!libtool') +arch=('i686' 'x86_64') +depends=('libxaw' 'freetype2') source=("http://www.m17n.org/libotf/${pkgname}-${pkgver}.tar.gz") sha1sums=('47872f696a62e8f111960143f3f36b5366398e20') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/extra/libotr/PKGBUILD b/extra/libotr/PKGBUILD index 77e86cba1..2529987dd 100644 --- a/extra/libotr/PKGBUILD +++ b/extra/libotr/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 121299 2011-04-30 13:17:51Z andrea $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> +# $Id: PKGBUILD 149079 2012-02-05 16:55:15Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Bug <Bug2000@gmail.com> pkgname=libotr pkgver=3.2.0 -pkgrel=2 +pkgrel=3 pkgdesc='Off-the-Record Messaging Library and Toolkit' -arch=('i686' 'x86_64') url='http://www.cypherpunks.ca/otr/' license=('GPL' 'LGPL') +arch=('i686' 'x86_64') depends=('libgcrypt') options=('!libtool') source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz") -md5sums=('faba02e60f64e492838929be2272f839') +sha1sums=('e5e10b8ddaf59b0ada6046d156d0431cd2790db9') build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --mandir=/usr/share/man + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libots/PKGBUILD b/extra/libots/PKGBUILD index cd749e574..42f7bcea8 100644 --- a/extra/libots/PKGBUILD +++ b/extra/libots/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 88136 2010-08-19 19:25:04Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 149081 2012-02-05 16:59:38Z bisson $ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libots pkgver=0.5.0 -pkgrel=2 -pkgdesc="Open Text Summarizer" +pkgrel=3 +pkgdesc='Open Text Summarizer' +url='http://libots.sourceforge.net/' arch=('i686' 'x86_64') -url="http://libots.sourceforge.net/" license=('GPL') depends=('libxml2' 'glib2') options=('!libtool' '!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/ots-${pkgver}.tar.gz) -md5sums=('1e140a4bf9d720b4339a5c2bdf4976e8') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/ots-${pkgver}.tar.gz") +sha1sums=('4468bc06470734848c2369a37c84f76ca4ac3f9a') build() { - cd "${srcdir}/ots-${pkgver}" - touch gtk-doc.make - sed -i -e 's/en.xml$//' dic/Makefile.am - libtoolize --force - aclocal - automake --add-missing --force - autoconf - ./configure --prefix=/usr --disable-static - make - make DESTDIR="${pkgdir}" install + cd "${srcdir}/ots-${pkgver}" + touch gtk-doc.make + sed -i -e 's/en.xml$//' dic/Makefile.am + libtoolize --force + aclocal + automake --add-missing --force + autoconf + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/ots-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libpano13/PKGBUILD b/extra/libpano13/PKGBUILD index 472c52610..a2e8e594b 100644 --- a/extra/libpano13/PKGBUILD +++ b/extra/libpano13/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126350 2011-06-05 00:52:37Z eric $ +# $Id: PKGBUILD 148830 2012-02-05 11:52:01Z ibiru $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libpano13 pkgver=2.9.18 -pkgrel=1 +pkgrel=2 pkgdesc="Basic library to calculate panoramical pictures - core functions of the panotools" arch=('i686' 'x86_64') url="http://panotools.sourceforge.net/" diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index 531e9397e..7d26a676c 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 130820 2011-07-08 07:28:34Z andyrtr $ +# $Id: PKGBUILD 148832 2012-02-05 11:52:05Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.4.8 -_apngver=1.4.7 +pkgver=1.5.8 +_apngver=1.5.7 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64') @@ -14,28 +14,28 @@ url="http://www.libpng.org/pub/png/libpng.html" license=('custom') depends=('zlib' 'sh') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz" - "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz") -md5sums=('2ce595d571f2b06a9403ed5bcfa4ecbd' - '4842a4cba3487a64084ca0a7417ff1c7') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" + "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz") +md5sums=('0f7ae352beadaff78073733905613041' + '6c6a674048cec94db1bc35decf0d142c') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" # Add animated PNG (apng) support # see http://sourceforge.net/projects/libpng-apng/ - patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch" + patch -p1 -i "$srcdir/libpng-$_apngver-apng.patch" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install cd contrib/pngminus - make PNGLIB="-L${pkgdir}/usr/lib -lpng" -f makefile.std png2pnm pnm2png - install -m755 png2pnm pnm2png "${pkgdir}/usr/bin/" - install -D -m644 ../../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + make PNGLIB="-L$pkgdir/usr/lib -lpng" -f makefile.std png2pnm pnm2png + install -m755 png2pnm pnm2png "$pkgdir/usr/bin/" + install -D -m644 ../../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 53a37e5c8..bf7c8472b 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146608 2012-01-14 08:15:18Z andyrtr $ +# $Id: PKGBUILD 148834 2012-02-05 11:52:15Z ibiru $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -37,7 +37,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-wiki-publisher') _LOver=3.4.5.2 pkgver=3.4.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') #_LO_tree="3.4" _OFFICEUPD="340" diff --git a/extra/libreoffice/PKGBUILD.next_stable b/extra/libreoffice/PKGBUILD.next_stable index a25819863..a8cb4c5ad 100644 --- a/extra/libreoffice/PKGBUILD.next_stable +++ b/extra/libreoffice/PKGBUILD.next_stable @@ -18,9 +18,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-presenter-screen' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-report-builder') -_LOver=3.4.99.2 -pkgver=3.5.0beta2 -pkgrel=2 +_LOver=3.4.99.3 +pkgver=3.5.0beta3 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -44,7 +44,8 @@ makedepends=( # makedepends _mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://dev-www.libreoffice.org/src" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz - ${_additional_source_url}/a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2 + ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + ${_additional_source_url}/053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2 ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -73,8 +74,9 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz #${_additional_source_url}/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2 http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e - fix_menuicons.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=c3569696294bb264a0c645db12f027d44b4e033f) -noextract=(a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2 + smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810) +noextract=(053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2 + f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip @@ -103,10 +105,11 @@ noextract=(a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip # cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2 ) -md5sums=('e80d9d4b6c6b2a8be882a46bc8757e69' - '31471ad86996629a8c20f3a4d24ee03e' - '3146b8522605d24ce4a259fe73ec3519' - 'a8b25a0bf696fd126a08319d88998492' +md5sums=('3f223ec797a100e557f7138c8ab4a91b' + 'bb08c856e5c9a7a8bcf22fefdb7cf13f' + '83bd4be3370840de3e535b2c974e8af5' + 'f02578f5218f217a9f20e9c30e119c6a' + '053a35c244bf132f806e198ac4d960aa' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -134,7 +137,7 @@ md5sums=('e80d9d4b6c6b2a8be882a46bc8757e69' '7c2549f6b0a8bb604e6c4c729ffdcfe6' '185d60944ea767075d27247c3162b3bc' '60ce5dc9bd098f95c2e621a930c98dd9' - 'f9bd737527dafd3eeb451cf0dd95d7d6') + '661a52a02a31b3afbe4b3b3146061afd') build() { @@ -157,8 +160,8 @@ build() { # buildfixes & bugfixes # one late fix to solve make distro-pack-install issue patch -Np1 -i ${srcdir}/gmake_install.diff - patch -Np1 -i ${srcdir}/fix_menuicons.diff - + patch -Np1 -i ${srcdir}/smp_buildfix.diff + # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 # unset CFLAGS @@ -180,7 +183,7 @@ build() { # non-SMP test build # export MAKEFLAGS="-j1" #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ - touch autogen.lastrun +# touch autogen.lastrun ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ --with-unix-wrapper="libreoffice" \ --enable-split-app-modules \ @@ -232,7 +235,7 @@ build() { --without-system-mozilla \ --without-system-mozilla-headers \ --with-ant-home="/usr/share/java/apache-ant"\ - --with-system-boost\ + --without-system-boost\ --with-system-cairo\ --with-system-libs\ --with-system-mythes\ @@ -258,8 +261,6 @@ build() { touch src.downloaded #./download -# unset MAKEFLAGS -# ./bootstrap make # fake installation to create split file lists mkdir $srcdir/fakeinstall diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index 77f71d413..6cd022366 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 142891 2011-11-17 18:34:59Z ibiru $ +# $Id: PKGBUILD 148836 2012-02-05 11:52:19Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg pkgver=2.34.2 -pkgrel=1 +pkgrel=3 pkgdesc="A SVG viewing library" arch=(i686 x86_64) license=('LGPL') -depends=('gdk-pixbuf2' 'pango' 'libcroco') +depends=('gdk-pixbuf2>=2.24.1-3' 'pango' 'libcroco') makedepends=('intltool' 'gtk2') optdepends=('gtk2: for rsvg-view support') options=('!libtool' '!emptydirs') diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD index 1624b2a52..96058d1c0 100644 --- a/extra/libtiff/PKGBUILD +++ b/extra/libtiff/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 119577 2011-04-12 14:21:49Z eric $ +# $Id: PKGBUILD 148838 2012-02-05 11:52:24Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libtiff -pkgver=3.9.5 +pkgver=4.0.0 pkgrel=1 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64') url="http://www.remotesensing.org/libtiff/" license=('custom') -depends=('libjpeg' 'zlib') -makedepends=('libgl' 'freeglut' 'libxmu' 'libxi') +depends=('libjpeg' 'zlib' 'xz') +makedepends=('freeglut') optdepends=('freeglut: for using tiffgt') options=('!libtool') source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) -md5sums=('8fc7ce3b4e1d0cc8a319336967815084') -sha1sums=('f40aab20fb2f609b5cbc1171c40b66a1445e3773') +sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522') build() { cd "${srcdir}/tiff-${pkgver}" @@ -22,6 +21,11 @@ build() { make } +check() { + cd "${srcdir}/tiff-${pkgver}" + make check +} + package() { cd "${srcdir}/tiff-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/libunique3/PKGBUILD b/extra/libunique3/PKGBUILD index cb9155eeb..13f57a335 100644 --- a/extra/libunique3/PKGBUILD +++ b/extra/libunique3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 127496 2011-06-15 15:11:19Z ibiru $ +# $Id: PKGBUILD 148840 2012-02-05 11:52:26Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=libunique3 pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Library for writing single instance applications for GTK3" arch=('i686' 'x86_64') license=('LGPL') @@ -10,11 +10,11 @@ depends=('gtk3') makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') url="http://live.gnome.org/LibUnique" -source=(http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique-${pkgver}.tar.xz) +source=(http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique-$pkgver.tar.xz) sha256sums=('a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038') build() { - cd "${srcdir}/libunique-${pkgver}" + cd "$srcdir/libunique-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --disable-dbus @@ -22,6 +22,6 @@ build() { } package() { - cd "${srcdir}/libunique-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/libunique-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libupnp/PKGBUILD b/extra/libupnp/PKGBUILD index 82623f37a..eb3ee4e7d 100644 --- a/extra/libupnp/PKGBUILD +++ b/extra/libupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143080 2011-11-22 13:19:50Z giovanni $ +# $Id: PKGBUILD 149147 2012-02-06 00:20:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: kastor <kastor@fobos.org.ar> pkgname=libupnp -pkgver=1.6.14 +pkgver=1.6.15 pkgrel=1 pkgdesc="Portable Open Source UPnP Development Kit" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('glibc') makedepends=('pkgconfig') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/pupnp/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a0497cf15b3e15f7e7ede88b3d04861b') +md5sums=('1b21e5b5fb6185101c467aefd19f0bf7') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libvisual-plugins/PKGBUILD b/extra/libvisual-plugins/PKGBUILD index 604b8788e..dc652b890 100644 --- a/extra/libvisual-plugins/PKGBUILD +++ b/extra/libvisual-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135107 2011-08-10 10:33:28Z jgc $ +# $Id: PKGBUILD 148842 2012-02-05 11:52:32Z ibiru $ # Maintainer: damir <damir@archlinux.org> pkgname=libvisual-plugins pkgver=0.4.0 -pkgrel=4 +pkgrel=5 pkgdesc="plugins for libvisual" arch=("i686" "x86_64") license=('GPL') @@ -40,5 +40,9 @@ build() { --disable-gforce \ --disable-esd make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD index 9cbac31f9..315690cfc 100644 --- a/extra/libwebkit/PKGBUILD +++ b/extra/libwebkit/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 139389 2011-10-01 19:00:15Z ibiru $ +# $Id: PKGBUILD 148844 2012-02-05 11:52:38Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=libwebkit pkgname=(libwebkit libwebkit3) -pkgver=1.6.1 +pkgver=1.6.3 pkgrel=1 pkgdesc="An opensource web content engine" arch=('i686' 'x86_64') url="http://webkitgtk.org/" license=('custom') depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant') -makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') +makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') options=('!libtool' '!emptydirs') install=libwebkit.install -source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz) -md5sums=('c11743694b1b71dad287b2e7a9e73b05') +source=(http://webkitgtk.org/webkit-$pkgver.tar.xz) +sha256sums=('12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3') build() { - cd "${srcdir}/webkit-${pkgver}" + cd "$srcdir/webkit-$pkgver" mkdir build-gtk{2,3} ( cd build-gtk2 && _build --with-gtk=2.0 ) @@ -27,7 +27,7 @@ build() { _build() { PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ --enable-introspection \ - --with-font-backend=freetype --enable-gtk-doc \ + --with-font-backend=freetype \ --with-unicode-backend=icu \ --enable-spellcheck "$@" make all stamp-po @@ -39,14 +39,14 @@ package_libwebkit() { cd "$srcdir/webkit-$pkgver/build-gtk2" make DESTDIR="${pkgdir}" install - install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit/LICENSE" + install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE" } package_libwebkit3() { pkgdesc+=" (for GTK3)" depends+=(gtk3) - cd "${srcdir}/webkit-${pkgver}/build-gtk3" - make DESTDIR="${pkgdir}" install - install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit3/LICENSE" + cd "$srcdir/webkit-$pkgver/build-gtk3" + make DESTDIR="$pkgdir" install + install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE" } diff --git a/extra/libwmf/PKGBUILD b/extra/libwmf/PKGBUILD index 12061510c..e6ac70a29 100644 --- a/extra/libwmf/PKGBUILD +++ b/extra/libwmf/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 87507 2010-08-15 06:45:18Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: FJ <joostef@gmail.com> +# $Id: PKGBUILD 148846 2012-02-05 11:52:43Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libwmf pkgver=0.2.8.4 -pkgrel=8 +pkgrel=9 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)" arch=('i686' 'x86_64') url="http://wvware.sourceforge.net/libwmf.html" -license=("LGPL") -depends=('libpng' 'libx11' 'freetype2' 'libjpeg' 'gsfonts' 'expat') -makedepends=('gtk2' 'libxt' 'pkg-config') +license=('LGPL') +depends=('libpng' 'libx11' 'libjpeg' 'gsfonts') +makedepends=('gtk2' 'libxt') +optdepends=('gdk-pixbuf2: for pixbuf loader') options=('!libtool' '!docs' '!emptydirs') install=libwmf.install source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz - libpng14.patch libwmf-0.2.8.4-useafterfree.patch) -md5sums=('d1177739bf1ceb07f57421f0cee191e0' '33d3c07a1be9f99fd88de220930c5550'\ - '0f02c1cb8a87bf7158634503bf0537e2') -sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' '15edb94eec7c9cea988e83660b334e56bf1fe897'\ - 'ea6d28880840e86c96f9079bfd591da54dcffa5c') + libwmf-0.2.8.4-libpng-1.5.patch libwmf-0.2.8.4-useafterfree.patch) +sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' + '42aa4c2a82e4e14044c875a7f439baea732a355a' + 'ea6d28880840e86c96f9079bfd591da54dcffa5c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/libpng14.patch" - patch -Np1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch" + patch -p1 -i "${srcdir}/libwmf-0.2.8.4-libpng-1.5.patch" + patch -p1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch" ./configure --prefix=/usr \ --with-gsfontdir=/usr/share/fonts/Type1 \ --with-fontdir=/usr/share/fonts/Type1 \ diff --git a/extra/libwmf/libwmf-0.2.8.4-libpng-1.5.patch b/extra/libwmf/libwmf-0.2.8.4-libpng-1.5.patch new file mode 100644 index 000000000..3528c74eb --- /dev/null +++ b/extra/libwmf/libwmf-0.2.8.4-libpng-1.5.patch @@ -0,0 +1,12 @@ +diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h libwmf-0.2.8.4/src/ipa/ipa/bmp.h +--- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h 2011-05-23 19:14:23.000000000 +0200 ++++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2011-05-23 19:15:11.000000000 +0200 +@@ -66,7 +66,7 @@ + return; + } + +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)"); + png_destroy_write_struct (&png_ptr,&info_ptr); + wmf_free (API,buffer); diff --git a/extra/libxfcegui4/PKGBUILD b/extra/libxfcegui4/PKGBUILD index b89360ae7..cfed62154 100644 --- a/extra/libxfcegui4/PKGBUILD +++ b/extra/libxfcegui4/PKGBUILD @@ -1,33 +1,38 @@ -# $Id: PKGBUILD 124284 2011-05-18 17:58:51Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# $Id: PKGBUILD 148848 2012-02-05 11:52:45Z ibiru $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=libxfcegui4 pkgver=4.8.1 -pkgrel=3 -pkgdesc="Various gtk widgets for Xfce" -arch=(i686 x86_64) -license=('GPL2') +pkgrel=4 +pkgdesc="Various Gtk widgets for Xfce" +arch=('i686' 'x86_64') url="http://www.xfce.org/" -depends=('startup-notification' "xfconf>=4.8.0" "libglade" 'libsm' 'hicolor-icon-theme') +license=('GPL2') +depends=('startup-notification' "xfconf>=4.8.0" "libglade" 'libsm' + 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ca0cdeff99f1732307d0fc0672d382ef') +install=$pkgname.install +source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) +sha256sums=('309a81823cdfdb7301bc6a5199e14f0df29b58dae89a9302c7839b9b94812443') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/libxfcegui4/libxfcegui4.install b/extra/libxfcegui4/libxfcegui4.install index fee9e5d11..abf924aa2 100644 --- a/extra/libxfcegui4/libxfcegui4.install +++ b/extra/libxfcegui4/libxfcegui4.install @@ -3,10 +3,12 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 242f0a1e3..bb0d6bff6 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148407 2012-01-31 13:31:47Z giovanni $ +# $Id: PKGBUILD 149149 2012-02-06 00:27:42Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.01.26 +pkgver=2012.02.04 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('db7f0658583b590fb3d4044935f48b8e') +md5sums=('5c9753e027af08c065f156e2a0bec023') build() { cd ${srcdir}/live diff --git a/extra/metacity/PKGBUILD b/extra/metacity/PKGBUILD index 3d028d55b..39f314b11 100644 --- a/extra/metacity/PKGBUILD +++ b/extra/metacity/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 128306 2011-06-22 17:53:59Z ibiru $ +# $Id: PKGBUILD 148852 2012-02-05 11:52:53Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=metacity pkgver=2.34.1 -pkgrel=1 +pkgrel=2 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) license=('GPL') depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') +makedepends=('intltool' 'pkg-config' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') @@ -29,6 +29,6 @@ package() { make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain metacity ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain metacity "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas } diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD index f4a33c5cd..e12fecfbd 100644 --- a/extra/mjpegtools/PKGBUILD +++ b/extra/mjpegtools/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 144422 2011-12-05 18:18:17Z jgc $ +# $Id: PKGBUILD 148854 2012-02-05 11:52:58Z ibiru $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Mantainer: Roberto Carvajal <roberto@archlinux.org> +# Maintainer: Roberto Carvajal <roberto@archlinux.org> pkgname=mjpegtools pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video" arch=(i686 x86_64) license=('GPL') url="http://mjpeg.sourceforge.net/" -depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv' 'texinfo') +depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv') makedepends=('gtk2' 'v4l-utils') optdepends=('gtk2: glav GUI') options=('!makeflags' '!libtool') install=mjpegtools.install source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz mjpegtools-v4l-2.6.38.patch) -md5sums=('903e1e3b967eebcc5fe5626d7517dc46') +md5sums=('903e1e3b967eebcc5fe5626d7517dc46' + '44006d6f844017fe57aa123aa43f4508') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -31,5 +32,3 @@ package() { make DESTDIR="${pkgdir}" install install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/" } -md5sums=('903e1e3b967eebcc5fe5626d7517dc46' - '44006d6f844017fe57aa123aa43f4508') diff --git a/extra/mjpegtools/mjpegtools.install b/extra/mjpegtools/mjpegtools.install index ef149c761..4d1231686 100644 --- a/extra/mjpegtools/mjpegtools.install +++ b/extra/mjpegtools/mjpegtools.install @@ -1,7 +1,8 @@ -infodir=/usr/share/info +infodir=usr/share/info file=mjpeg-howto.info post_install() { + [[ -x usr/bin/install-info ]] || return 0 install-info $infodir/$file.gz $infodir/dir 2> /dev/null } @@ -10,5 +11,6 @@ post_upgrade() { } pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null } diff --git a/extra/mod_mono/PKGBUILD b/extra/mod_mono/PKGBUILD index 21e944d19..781714d14 100644 --- a/extra/mod_mono/PKGBUILD +++ b/extra/mod_mono/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111519 2011-02-27 11:39:59Z daniel $ +# $Id: PKGBUILD 149083 2012-02-05 17:05:29Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=mod_mono pkgver=2.10 -pkgrel=1 +pkgrel=2 pkgdesc="The mono module to make ASP.NET running on top of apache" arch=(i686 x86_64) license=('APACHE') diff --git a/extra/mono-addins/PKGBUILD b/extra/mono-addins/PKGBUILD index 75de85ba0..ccaac768b 100644 --- a/extra/mono-addins/PKGBUILD +++ b/extra/mono-addins/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137544 2011-09-09 07:19:25Z daniel $ +# $Id: PKGBUILD 149085 2012-02-05 17:06:07Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: tardo <tardo@nagi-fanboi.net> pkgname=mono-addins pkgver=0.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="A generic framework for creating extensible applications and for creating libraries which extend those applications" arch=('i686' 'x86_64') url="http://www.mono-project.com/Mono.Addins" diff --git a/extra/mono-basic/PKGBUILD b/extra/mono-basic/PKGBUILD index 0ffd93c05..b0552c5a1 100644 --- a/extra/mono-basic/PKGBUILD +++ b/extra/mono-basic/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111509 2011-02-27 11:33:57Z daniel $ +# $Id: PKGBUILD 149087 2012-02-05 17:06:50Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=mono-basic pkgver=2.10 -pkgrel=1 +pkgrel=2 pkgdesc="Mono Visual Basic.NET compiler" arch=(i686 x86_64) license=('GPL') diff --git a/extra/mono-debugger/PKGBUILD b/extra/mono-debugger/PKGBUILD index b9ba3b347..21946154d 100644 --- a/extra/mono-debugger/PKGBUILD +++ b/extra/mono-debugger/PKGBUILD @@ -2,7 +2,7 @@ pkgname=mono-debugger pkgver=2.10 -pkgrel=1 +pkgrel=2 pkgdesc="The Mono Debugger" arch=(i686 x86_64) license=('GPL') diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index d72219365..fb6bb316e 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,16 +1,16 @@ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=monodevelop-debugger-gdb -pkgver=2.8.5 +pkgver=2.8.6.3 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64') url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=2.8.5' 'gdb') +depends=('monodevelop>=2.8.6.3' 'gdb') makedepends=('mono') source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('57e7c32ba204e69f7d0d3c56e202d0ed') +md5sums=('fe3ffc78fdac028aece6cd2cde0bccc3') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 56d0b0861..c0e3aedc0 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=2.8.5 +pkgver=2.8.6.3 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.1 options=(!makeflags) install=monodevelop.install source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('c1d6a32330b4c22980052009de702483') +md5sums=('54f55372d856206244a1580a2ac70859') build() { export MONO_SHARED_DIR=$srcdir/src/.wabi diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 4710dcecb..312abfcdf 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144459 2011-12-06 06:52:26Z angvp $ +# $Id: PKGBUILD 148654 2012-02-05 10:51:32Z bisson $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> @@ -6,7 +6,7 @@ pkgname=mpd pkgver=0.16.6 -pkgrel=1 +pkgrel=2 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD index 6b92f5ef5..b447bee50 100644 --- a/extra/netpbm/PKGBUILD +++ b/extra/netpbm/PKGBUILD @@ -1,38 +1,35 @@ -# $Id: PKGBUILD 104760 2011-01-04 20:54:47Z eric $ +# $Id: PKGBUILD 148858 2012-02-05 11:53:06Z ibiru $ # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=netpbm -pkgver=10.47.24 +pkgver=10.57.1 pkgrel=1 pkgdesc="A toolkit for manipulation of graphic images" arch=('i686' 'x86_64') license=('custom' 'BSD' 'GPL' 'LGPL') url="http://netpbm.sourceforge.net/" -depends=('perl' 'libjpeg' 'libpng' 'libtiff' 'libxml2') +depends=('perl' 'libpng' 'libtiff' 'libxml2') makedepends=('python2') options=('!makeflags') # Releases after 10.34 are available via SVN only. -# Get Stable tarball here: http://netpbm.sourceforge.net/release.html#tarball -# Get version number in version.mk +# Get Advanced tarball here: http://netpbm.sourceforge.net/release.html#tarball +# Get version number from version.mk # Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/ source=(ftp://ftp.archlinux.org/other/netpbm/${pkgname}-${pkgver}.tar.gz \ ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-22Feb2009.tar.xz \ - libpng-1.4.patch netpbm-CAN-2005-2471.patch \ - netpbm-security-code.patch netpbm-security-scripts.patch) -md5sums=('debf962e9a5531fd3e57143d38165eac' '48efce0093c5f242bce3072958fe88c3'\ - '6a8319e77f2d41881ee11c86b78c51d0' '07ee863e6f951250e8d0a08243c828c7'\ - 'fac4c9bedff9d90ac5a66e93d8c2eb33' 'cbb689129c82d16360d7f840b86789c7') -sha1sums=('02a85bffb8d5771011c17067e07fded26a455ee9' 'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2'\ - 'ab2e67374871b8b6c0c8b69a24e3502e68487759' '456b76004622479f6ee81107c54b5211a1663a6a'\ - '5af979e8fb7d3bbb7e731eed62326bb594bc91b3' '2ac31f714121e08e47af9337c6bbaab3cbfc5c75') + netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch) +sha1sums=('cd0b99333faf994a680d77c5d217034df35ebd4e' + 'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2' + 'b79cf9d42488fea065ba16262ed97694c47af08d' + '4cd5b94a24886ecae3973c5ae104d8298fe5a1f5' + '2ac31f714121e08e47af9337c6bbaab3cbfc5c75') build() { - cd "${srcdir}/stable" - patch -p1 < ../libpng-1.4.patch + cd "${srcdir}/advanced" patch -p1 < ../netpbm-CAN-2005-2471.patch patch -p1 < ../netpbm-security-code.patch patch -p1 < ../netpbm-security-scripts.patch - sed -i 's|#!/bin/env python|#!/bin/env python2|' buildtools/makeman + sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' buildtools/makeman sed -i 's|@python|@python2|' buildtools/manpage.mk cp config.mk.in config.mk @@ -43,42 +40,33 @@ build() { echo 'PNGLIB = libpng.so' >> config.mk echo 'ZLIB = libz.so' >> config.mk - sed -i 's|PKGMANDIR = man|PKGMANDIR = share/man|' common.mk sed -i 's|misc|share/netpbm|' common.mk sed -i 's|/link|/lib|' lib/Makefile sed -i 's|install.manweb install.man|install.man|' GNUmakefile - sed -i '/MANUALS1 = $(BINARIES) $(SCRIPTS)/a\ - MANUALS1 += bmptoppm faxformat gemtopbm jpegtopnm mrf netpbm pamtotiff pamx pgmedge \\\ - pgmnorm pgmoil pgmslice pnmarith pnmcut pnmdepth pnmenlarge pnmfile \\\ - pnminterp pnmnoraw pnmscale pnmsplit pnmtofits pnmtojpeg pnmtopnm pnmtops \\\ - pnmtotiff pnmtotiffcmyk ppmnorm ppmsvgalib ppmtojpeg ppmtotga ppmtouil \\\ - tifftopnm vidtoppm \ - MANUALS3 += libnetpbm_image libnetpbm_ug libpbm libpgm libpm libpnm libppm libsystem libtmpfile \ - MANUALS5 += extendedopacity pfm' common.mk make # Generating useful man pages with html doc cd "${srcdir}/doc" - make MAKEMAN="${srcdir}/stable/buildtools/makeman" USERGUIDE=. \ - -f "${srcdir}/stable/buildtools/manpage.mk" manpages + make MAKEMAN="${srcdir}/advanced/buildtools/makeman" USERGUIDE=. \ + -f "${srcdir}/advanced/buildtools/manpage.mk" manpages } package() { - cd "${srcdir}/stable" - make pkgdir="${pkgdir}/usr" install-run install-dev + cd "${srcdir}/advanced" + make pkgdir="${pkgdir}/usr" PKGMANDIR=share/man install-run install-dev # Removing dummy man pages rm "${pkgdir}"/usr/share/man/man{1,3,5}/* cd "${srcdir}/doc" - make MAKEMAN="${srcdir}/stable/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \ - -f "${srcdir}/stable/buildtools/manpage.mk" installman + make MAKEMAN="${srcdir}/advanced/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \ + -f "${srcdir}/advanced/buildtools/manpage.mk" installman # Replace obsolete utility echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > "${pkgdir}/usr/bin/pgmtopbm" # Licensing. Note that each program in the package has a separate license. - install -D -m644 "${srcdir}/stable/doc/copyright_summary" \ + install -D -m644 "${srcdir}/advanced/doc/copyright_summary" \ "${pkgdir}/usr/share/licenses/${pkgname}/copyright_summary.txt" } diff --git a/extra/netpbm/netpbm-CAN-2005-2471.patch b/extra/netpbm/netpbm-CAN-2005-2471.patch index 8cbbd6d40..3759d7ebe 100644 --- a/extra/netpbm/netpbm-CAN-2005-2471.patch +++ b/extra/netpbm/netpbm-CAN-2005-2471.patch @@ -1,9 +1,9 @@ --- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471 2005-08-15 02:39:46.000000000 +0200 +++ netpbm-10.29/converter/other/pstopnm.c 2005-08-16 15:38:15.000000000 +0200 @@ -711,11 +711,11 @@ - "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'", ghostscriptProg, arg0, - deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", + deviceopt, outfileopt, gopt, ropt, textalphabitsopt, + "-q", "-dNOPAUSE", - "-dSAFER", "-"); + "-dPARANOIDSAFER", "-"); } diff --git a/extra/netpbm/netpbm-security-code.patch b/extra/netpbm/netpbm-security-code.patch index e8fbc29c2..da67a8f92 100644 --- a/extra/netpbm/netpbm-security-code.patch +++ b/extra/netpbm/netpbm-security-code.patch @@ -22,15 +22,15 @@ diff -up netpbm-10.47.04/analyzer/pgmtexture.c.security netpbm-10.47.04/analyzer if (m == NULL) pm_error("Unable to allocate memory for a matrix."); @@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n - m -= ncl; + assert (nch >= ncl); /* allocate rows and set pointers to them */ + if(nch < ncl) + pm_error("assert: h < l"); + overflow_add(nch - ncl, 1); - for (i = nrl; i <= nrh; i++) - { + for (i = nrl; i <= nrh; ++i) { MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1)); + if (m[i] == NULL) diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/converter/other/gemtopnm.c --- netpbm-10.47.04/converter/other/gemtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 +++ netpbm-10.47.04/converter/other/gemtopnm.c 2009-10-21 15:09:33.000000000 +0200 @@ -118,46 +118,6 @@ diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/co buffer = (*cinfo_p->mem->alloc_sarray) ((j_common_ptr) cinfo_p, JPOOL_IMAGE, (unsigned int) cinfo_p->image_width * cinfo_p->input_components, -diff -up netpbm-10.47.04/converter/other/pnmtops.c.security netpbm-10.47.04/converter/other/pnmtops.c ---- netpbm-10.47.04/converter/other/pnmtops.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/pnmtops.c 2009-10-21 15:09:33.000000000 +0200 -@@ -186,16 +186,20 @@ parseCommandLine(int argc, char ** argv, - cmdlineP->canturn = !noturn; - cmdlineP->showpage = !noshowpage; - -+ overflow2(width, 72); - cmdlineP->width = width * 72; -+ overflow2(height, 72); - cmdlineP->height = height * 72; - -- if (imagewidthSpec) -+ if (imagewidthSpec) { -+ overflow2(imagewidth, 72); - cmdlineP->imagewidth = imagewidth * 72; -- else -+ } else - cmdlineP->imagewidth = 0; -- if (imageheightSpec) -+ if (imageheightSpec) { -+ overflow2(imageheight, 72); - cmdlineP->imageheight = imageheight * 72; -- else -+ } else - cmdlineP->imageheight = 0; - - if (!cmdlineP->psfilter && -diff -up netpbm-10.47.04/converter/other/pnmtorle.c.security netpbm-10.47.04/converter/other/pnmtorle.c ---- netpbm-10.47.04/converter/other/pnmtorle.c.security 2009-10-21 13:39:06.000000000 +0200 -+++ netpbm-10.47.04/converter/other/pnmtorle.c 2009-10-21 15:09:33.000000000 +0200 -@@ -19,6 +19,8 @@ - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com> - */ - /* - * pnmtorle - A program which will convert pbmplus (ppm or pgm) images diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/converter/other/pnmtosgi.c --- netpbm-10.47.04/converter/other/pnmtosgi.c.security 2009-10-21 13:39:06.000000000 +0200 +++ netpbm-10.47.04/converter/other/pnmtosgi.c 2009-10-21 15:09:33.000000000 +0200 @@ -216,25 +176,22 @@ diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/con diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/converter/other/sgitopnm.c --- netpbm-10.47.04/converter/other/sgitopnm.c.security 2009-10-21 13:39:06.000000000 +0200 +++ netpbm-10.47.04/converter/other/sgitopnm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -252,13 +252,17 @@ read_channels(ifp, head, table, func, oc - - if (ochan < 0) { - maxchannel = (head->zsize < 3) ? head->zsize : 3; +@@ -252,10 +252,14 @@ read_channels(ifp, head, table, func, oc + MALLOCARRAY_NOFAIL(image, head->ysize); + } else { + maxchannel = MIN(3, head->zsize); + overflow2(head->ysize, maxchannel); MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel); - } else { - maxchannel = ochan + 1; - MALLOCARRAY_NOFAIL(image, head->ysize); } -- if ( table ) -+ if ( table ) { +- if (table) ++ if (table) { + overflow2(head->xsize, 2); + overflow_add(head->xsize*2, 2); MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize)); + } - for( channel = 0; channel < maxchannel; channel++ ) { - #ifdef DEBUG + for(channel = 0; channel < maxchannel; ++channel) { + unsigned int row; diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/converter/other/sirtopnm.c --- netpbm-10.47.04/converter/other/sirtopnm.c.security 2009-10-21 13:39:06.000000000 +0200 +++ netpbm-10.47.04/converter/other/sirtopnm.c 2009-10-21 15:09:33.000000000 +0200 @@ -282,9 +239,9 @@ diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/con *padrightP = h11FixedP->bytes_per_line * 8 - h11FixedP->pixmap_width * h11FixedP->bits_per_pixel; -diff -up netpbm-10.47.04/converter/pbm/icontopbm.c.security netpbm-10.47.04/converter/pbm/icontopbm.c ---- netpbm-10.47.04/converter/pbm/icontopbm.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/icontopbm.c 2009-10-21 15:09:33.000000000 +0200 +diff -up netpbm-10.47.04/converter/other/sunicontopnm.c.security netpbm-10.47.04/converter/other/sunicontopnm.c +--- netpbm-10.47.04/converter/other/sunicontopnm.c.security 2009-10-21 13:39:10.000000000 +0200 ++++ netpbm-10.47.04/converter/other/sunicontopnm.c 2009-10-21 15:09:33.000000000 +0200 @@ -11,6 +11,7 @@ */ @@ -294,17 +251,17 @@ diff -up netpbm-10.47.04/converter/pbm/icontopbm.c.security netpbm-10.47.04/conv #include "nstring.h" #include "pbm.h" @@ -87,6 +88,11 @@ ReadIconFile(FILE * const - if ( *heightP <= 0 ) - pm_error( "invalid height (must be positive): %d", *heightP ); + if (*heightP <= 0) + pm_error("invalid height (must be positive): %d", *heightP); + if ( *widthP > INT_MAX - 16 || *widthP < 0) + pm_error( "invalid width: %d", *widthP); + + overflow2(*widthP + 16, *heightP); + - data_length = BitmapSize( *widthP, *heightP ); - *dataP = (short unsigned int *) malloc( data_length ); - if ( *dataP == NULL ) + } + + diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/converter/pbm/mdatopbm.c --- netpbm-10.47.04/converter/pbm/mdatopbm.c.security 2009-10-21 13:39:10.000000000 +0200 +++ netpbm-10.47.04/converter/pbm/mdatopbm.c 2009-10-21 15:09:33.000000000 +0200 @@ -367,22 +324,6 @@ diff -up netpbm-10.47.04/converter/pbm/pbmto4425.c.security netpbm-10.47.04/conv if(vmap == NULL) { pm_error( "Cannot allocate memory" ); -diff -up netpbm-10.47.04/converter/pbm/pbmtoascii.c.security netpbm-10.47.04/converter/pbm/pbmtoascii.c ---- netpbm-10.47.04/converter/pbm/pbmtoascii.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtoascii.c 2009-10-21 15:09:33.000000000 +0200 -@@ -115,9 +115,11 @@ char* argv[]; - pm_usage( usage ); - - pbm_readpbminit( ifp, &cols, &rows, &format ); -+ overflow_add(cols, gridx); - ccols = ( cols + gridx - 1 ) / gridx; - bitrow = pbm_allocrow( cols ); - sig = (int*) pm_allocrow( ccols, sizeof(int) ); -+ overflow_add(ccols, 1); - line = (char*) pm_allocrow( ccols + 1, sizeof(char) ); - - for ( row = 0; row < rows; row += gridy ) -diff -up netpbm-10.47.04/converter/pbm/pbmtocmuwm.c.security netpbm-10.47.04/converter/pbm/pbmtocmuwm.c diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/converter/pbm/pbmtogem.c --- netpbm-10.47.04/converter/pbm/pbmtogem.c.security 2009-10-21 13:39:10.000000000 +0200 +++ netpbm-10.47.04/converter/pbm/pbmtogem.c 2009-10-21 15:09:33.000000000 +0200 @@ -405,17 +346,6 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/conver rucols = ( cols + 7 ) / 8; bytesperrow = rucols; /* GraphOn uses bytes */ rucols = rucols * 8; -diff -up netpbm-10.47.04/converter/pbm/pbmtoicon.c.security netpbm-10.47.04/converter/pbm/pbmtoicon.c ---- netpbm-10.47.04/converter/pbm/pbmtoicon.c.security 2009-10-21 13:39:10.000000000 +0200 -+++ netpbm-10.47.04/converter/pbm/pbmtoicon.c 2009-10-21 15:38:55.000000000 +0200 -@@ -114,6 +114,7 @@ writeIcon(FILE * const ifP, - unsigned char * bitrow; - unsigned int row; - -+ overflow_add(cols, 15); - bitbuffer = pbm_allocrow_packed(cols + wordintSize); - bitrow = &bitbuffer[1]; - bitbuffer[0] = 0; diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/converter/pbm/pbmtolj.c --- netpbm-10.47.04/converter/pbm/pbmtolj.c.security 2009-10-21 13:39:10.000000000 +0200 +++ netpbm-10.47.04/converter/pbm/pbmtolj.c 2009-10-21 15:09:33.000000000 +0200 @@ -511,13 +441,13 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/conve --- netpbm-10.47.04/converter/pbm/pbmtoybm.c.security 2009-10-21 13:39:10.000000000 +0200 +++ netpbm-10.47.04/converter/pbm/pbmtoybm.c 2009-10-21 15:09:33.000000000 +0200 @@ -45,6 +45,7 @@ main( argc, argv ) - bitrow = pbm_allocrow( cols ); + bitrow = pbm_allocrow(cols); /* Compute padding to round cols up to the nearest multiple of 16. */ + overflow_add(cols, 16); - padright = ( ( cols + 15 ) / 16 ) * 16 - cols; + padright = ((cols + 15) / 16) * 16 - cols; - putinit( cols, rows ); + putinit(cols, rows); diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/converter/pbm/pbmtozinc.c --- netpbm-10.47.04/converter/pbm/pbmtozinc.c.security 2009-10-21 13:39:10.000000000 +0200 +++ netpbm-10.47.04/converter/pbm/pbmtozinc.c 2009-10-21 15:09:33.000000000 +0200 @@ -565,14 +495,14 @@ diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/ diff -up netpbm-10.47.04/converter/pbm/ybmtopbm.c.security netpbm-10.47.04/converter/pbm/ybmtopbm.c --- netpbm-10.47.04/converter/pbm/ybmtopbm.c.security 2009-10-21 13:39:10.000000000 +0200 +++ netpbm-10.47.04/converter/pbm/ybmtopbm.c 2009-10-21 15:09:33.000000000 +0200 -@@ -88,6 +88,7 @@ getinit( file, colsP, rowsP, depthP, pad - pm_error( "EOF / read error" ); +@@ -88,4 +88,5 @@ getinit( file, colsP, rowsP, depthP, pad + pm_error("EOF / read error"); *depthP = 1; + overflow_add(*colsP, 15); - *padrightP = ( ( *colsP + 15 ) / 16 ) * 16 - *colsP; - bitsperitem = 0; - } + *padrightP = ((*colsP + 15) / 16) * 16 - *colsP; +} + diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/converter/pgm/lispmtopgm.c --- netpbm-10.47.04/converter/pgm/lispmtopgm.c.security 2009-10-21 13:39:06.000000000 +0200 +++ netpbm-10.47.04/converter/pgm/lispmtopgm.c 2009-10-21 15:09:33.000000000 +0200 @@ -707,7 +637,7 @@ diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/convert leaftoppm mtvtoppm neotoppm \ - pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \ + pcxtoppm pc1toppm pi1toppm pjtoppm \ - ppmtoacad ppmtoarbtxt \ + ppmtoacad ppmtoapplevol ppmtoarbtxt ppmtoascii \ ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \ ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \ diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/converter/ppm/pcxtoppm.c @@ -894,14 +824,14 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtopict.c.security netpbm-10.47.04/conv --- netpbm-10.47.04/converter/ppm/ppmtopict.c.security 2009-10-21 13:39:10.000000000 +0200 +++ netpbm-10.47.04/converter/ppm/ppmtopict.c 2009-10-21 15:09:33.000000000 +0200 @@ -245,6 +245,8 @@ char *argv[]; - putShort(stdout, 0); /* mode */ - - /* Finally, write out the data. */ -+ overflow_add(cols/MAX_COUNT, 1); -+ overflow_add(cols, cols/MAX_COUNT+1); - packed = (char*) malloc((unsigned)(cols+cols/MAX_COUNT+1)); - oc = 0; - for (row = 0; row < rows; row++) + putShort(stdout, 0); /* mode */ + + /* Finally, write out the data. */ ++ overflow_add(cols/MAX_COUNT, 1); ++ overflow_add(cols, cols/MAX_COUNT+1); + packed = malloc((unsigned)(cols+cols/MAX_COUNT+1)); + for (row = 0, oc = 0; row < rows; row++) + oc += putRow(stdout, row, cols, pixels[row], packed); diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/converter/ppm/ppmtopj.c --- netpbm-10.47.04/converter/ppm/ppmtopj.c.security 2009-10-21 13:39:10.000000000 +0200 +++ netpbm-10.47.04/converter/ppm/ppmtopj.c 2009-10-21 15:09:33.000000000 +0200 @@ -1106,17 +1036,6 @@ diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut. outpam.width = rightcol - leftcol + 1; outpam.height = bottomrow - toprow + 1; -diff -up netpbm-10.47.04/editor/pbmpscale.c.security netpbm-10.47.04/editor/pbmpscale.c ---- netpbm-10.47.04/editor/pbmpscale.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/pbmpscale.c 2009-10-21 15:27:21.000000000 +0200 -@@ -110,6 +110,7 @@ main(int argc, char ** argv) { - inrow[0] = inrow[1] = inrow[2] = NULL; - pbm_readpbminit(ifP, &columns, &rows, &format) ; - -+ overflow2(columns, scale); - outrow = pbm_allocrow(columns*scale) ; - MALLOCARRAY(flags, columns); - if (flags == NULL) diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmreduce.c --- netpbm-10.47.04/editor/pbmreduce.c.security 2009-10-21 13:38:57.000000000 +0200 +++ netpbm-10.47.04/editor/pbmreduce.c 2009-10-21 15:26:13.000000000 +0200 @@ -1249,29 +1168,6 @@ diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmsh newcols = rows * shearfac + cols + 0.999999; pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0); -diff -up netpbm-10.47.04/editor/ppmdither.c.security netpbm-10.47.04/editor/ppmdither.c ---- netpbm-10.47.04/editor/ppmdither.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/editor/ppmdither.c 2009-10-21 15:09:34.000000000 +0200 -@@ -111,6 +111,9 @@ dith_matrix(unsigned int const dith_dim) - (dith_dim * sizeof(int *)) + /* pointers */ - (dith_dim * dith_dim * sizeof(int)); /* data */ - -+ overflow2(dith_dim, sizeof(int *)); -+ overflow3(dith_dim, dith_dim, sizeof(int)); -+ overflow_add(dith_dim * sizeof(int *), dith_dim * dith_dim * sizeof(int)); - dith_mat = (unsigned int **) malloc(dith_mat_sz); - - if (dith_mat == NULL) -@@ -165,7 +168,8 @@ dith_setup(const unsigned int dith_power - if (dith_nb < 2) - pm_error("too few shades for blue, minimum of 2"); - -- MALLOCARRAY(*colormapP, dith_nr * dith_ng * dith_nb); -+ overflow2(dith_nr, dith_ng); -+ *colormapP = malloc3(dith_nr * dith_ng, dith_nb, sizeof(pixel)); - if (*colormapP == NULL) - pm_error("Unable to allocate space for the color lookup table " - "(%d by %d by %d pixels).", dith_nr, dith_ng, dith_nb); diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/editor/specialty/pamoil.c --- netpbm-10.47.04/editor/specialty/pamoil.c.security 2009-10-21 13:38:56.000000000 +0200 +++ netpbm-10.47.04/editor/specialty/pamoil.c 2009-10-21 15:09:33.000000000 +0200 @@ -1283,19 +1179,6 @@ diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/edit MALLOCARRAY(hist, inpam.maxval + 1); if (hist == NULL) pm_error("Unable to allocate memory for histogram."); -diff -up netpbm-10.47.04/generator/pbmpage.c.security netpbm-10.47.04/generator/pbmpage.c ---- netpbm-10.47.04/generator/pbmpage.c.security 2009-10-21 13:38:57.000000000 +0200 -+++ netpbm-10.47.04/generator/pbmpage.c 2009-10-21 15:09:34.000000000 +0200 -@@ -170,6 +170,9 @@ outputPbm(FILE * const file, - /* We round the allocated row space up to a multiple of 8 so the ugly - fast code below can work. - */ -+ -+ overflow_add(bitmap.Width, 7); -+ - pbmrow = pbm_allocrow(((bitmap.Width+7)/8)*8); - - bitmap_cursor = 0; diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/pbmtext.c --- netpbm-10.47.04/generator/pbmtext.c.security 2009-10-21 13:38:57.000000000 +0200 +++ netpbm-10.47.04/generator/pbmtext.c 2009-10-21 15:23:15.000000000 +0200 @@ -1390,16 +1273,6 @@ diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c pm_check(file, check_type, need_raster_size, retval_p); } } -diff -up netpbm-10.47.04/lib/libpbmvms.c.security netpbm-10.47.04/lib/libpbmvms.c ---- netpbm-10.47.04/lib/libpbmvms.c.security 2009-10-21 13:39:00.000000000 +0200 -+++ netpbm-10.47.04/lib/libpbmvms.c 2009-10-21 15:09:34.000000000 +0200 -@@ -1,3 +1,5 @@ -+#warning "NOT AUDITED" -+ - /*************************************************************************** - This file contains library routines needed to build Netpbm for VMS. - However, as of 2000.05.26, when these were split out of libpbm1.c -diff -up netpbm-10.47.04/lib/libpm.c.security netpbm-10.47.04/lib/libpm.c --- netpbm-10.47.04/lib/libpm.c.security 2009-10-21 13:39:00.000000000 +0200 +++ netpbm-10.47.04/lib/libpm.c 2009-10-21 15:09:34.000000000 +0200 @@ -827,4 +827,53 @@ pm_parse_height(const char * const arg) @@ -1482,18 +1355,6 @@ diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmc } { unsigned int const intQuotient = colormap.size / pamP->width; -diff -up netpbm-10.47.04/urt/README.security netpbm-10.47.04/urt/README ---- netpbm-10.47.04/urt/README.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/README 2009-10-21 15:09:34.000000000 +0200 -@@ -18,3 +18,8 @@ in its initializer in the original. But - defines stdout as a variable, so that wouldn't compile. So I changed - it to NULL and added a line to rle_hdr_init to set that field to - 'stdout' dynamically. 2000.06.02 BJH. -+ -+Redid the code to check for maths overflows and other crawly horrors. -+Removed pipe through and compress support (unsafe) -+ -+Alan Cox <alan@redhat.com> diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addhist.c --- netpbm-10.47.04/urt/rle_addhist.c.security 2009-10-21 13:39:11.000000000 +0200 +++ netpbm-10.47.04/urt/rle_addhist.c 2009-10-21 15:09:34.000000000 +0200 @@ -1630,37 +1491,6 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c size *= sizeof(char *); to_hdr->comments = (CONST_DECL char **)malloc( size ); RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" ); -diff -up netpbm-10.47.04/urt/rle.h.security netpbm-10.47.04/urt/rle.h ---- netpbm-10.47.04/urt/rle.h.security 2009-10-21 13:39:11.000000000 +0200 -+++ netpbm-10.47.04/urt/rle.h 2009-10-21 15:09:34.000000000 +0200 -@@ -14,6 +14,9 @@ - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com> -+ * Header declarations needed - */ - /* - * rle.h - Global declarations for Utah Raster Toolkit RLE programs. -@@ -166,6 +169,17 @@ rle_hdr /* End of typedef. * - */ - extern rle_hdr rle_dflt_hdr; - -+/* -+ * Provided by pm library -+ */ -+ -+extern void overflow_add(int, int); -+#define overflow2(a,b) __overflow2(a,b) -+extern void __overflow2(int, int); -+extern void overflow3(int, int, int); -+extern void *malloc2(int, int); -+extern void *malloc3(int, int, int); -+extern void *realloc2(void *, int, int); - - /* Declare RLE library routines. */ - diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_f.c --- netpbm-10.47.04/urt/rle_open_f.c.security 2009-10-21 13:39:11.000000000 +0200 +++ netpbm-10.47.04/urt/rle_open_f.c 2009-10-21 15:15:38.000000000 +0200 @@ -1704,11 +1534,11 @@ diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_ - *noSubprocessP = FALSE; - - if (*mode == 'w') -- asprintfN(&command, "compress > %s", file_name); +- pm_asprintf(&command, "compress > %s", file_name); - else if (*mode == 'a') -- asprintfN(&command, "compress >> %s", file_name); +- pm_asprintf(&command, "compress >> %s", file_name); - else -- asprintfN(&command, "compress -d < %s", file_name); +- pm_asprintf(&command, "compress -d < %s", file_name); - - *fpP = my_popen(command, mode, &thepid); - @@ -1720,7 +1550,7 @@ diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_ - if (*catchingChildrenP < MAX_CHILDREN) - pids[(*catchingChildrenP)++] = thepid; - } -- strfree(command); +- pm_strfree(command); - } else { - *noSubprocessP = TRUE; - *errorP = NULL; @@ -1815,3 +1645,24 @@ diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c #if defined(c_plusplus) && !defined(USE_PROTOTYPES) #define USE_PROTOTYPES +--- advanced/urt/rle_hdr.c.old 2012-01-21 05:57:25.000000000 -0500 ++++ advanced/urt/rle_hdr.c 2012-01-21 05:57:50.000000000 -0500 +@@ -29,6 +29,18 @@ + + #include <string.h> + ++/* ++ * Provided by pm library ++ */ ++ ++extern void overflow_add(int, int); ++#define overflow2(a,b) __overflow2(a,b) ++extern void __overflow2(int, int); ++extern void overflow3(int, int, int); ++extern void *malloc2(int, int); ++/*extern void *malloc3(int, int, int);*/ ++extern void *realloc2(void *, int, int); ++ + /***************************************************************** + * TAG( rle_names ) + * diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD index cd9c5a79b..1b6dd8a5f 100644 --- a/extra/neverball/PKGBUILD +++ b/extra/neverball/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 124594 2011-05-23 08:40:29Z eric $ +# $Id: PKGBUILD 148860 2012-02-05 11:53:11Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=neverball pkgver=1.5.4 -pkgrel=3 +pkgrel=4 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness" arch=('i686' 'x86_64') url="http://neverball.org/" license=('GPL') depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs') makedepends=('mesa') -source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz) -md5sums=('c523b0f72c2035831310e821162f7bd7') -sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7') +source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz neverball-1.5.4-underlink.patch) +sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7' + 'f71982b7187d569c57b30c4c40fedd6c0e72baca') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h + patch -p0 -i ../neverball-1.5.4-underlink.patch if [ "${CARCH}" = "i686" ] ;then make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS="" diff --git a/extra/neverball/neverball-1.5.4-underlink.patch b/extra/neverball/neverball-1.5.4-underlink.patch new file mode 100644 index 000000000..1a848cad3 --- /dev/null +++ b/extra/neverball/neverball-1.5.4-underlink.patch @@ -0,0 +1,22 @@ +--- Makefile.old 2011-06-22 06:30:52.441788160 +0200 ++++ Makefile 2011-06-22 06:31:59.754087534 +0200 +@@ -138,7 +138,7 @@ + endif + + ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \ +- -lvorbisfile $(OGL_LIBS) ++ -lvorbisfile $(OGL_LIBS) -lX11 + + #------------------------------------------------------------------------------ + +--- Makefile.old 2012-01-18 21:28:23.000000000 -0500 ++++ Makefile 2012-01-18 21:28:55.000000000 -0500 +@@ -131,7 +131,7 @@ + OGL_LIBS := -framework OpenGL + endif + +-BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) ++BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm + + ifdef DARWIN + BASE_LIBS += -L/opt/local/lib diff --git a/extra/normalize/PKGBUILD b/extra/normalize/PKGBUILD index 1657800d7..0d3ce5867 100644 --- a/extra/normalize/PKGBUILD +++ b/extra/normalize/PKGBUILD @@ -1,21 +1,35 @@ -# $Id: PKGBUILD 143917 2011-11-30 20:41:17Z giovanni $ +# $Id: PKGBUILD 149021 2012-02-05 14:18:12Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=normalize pkgver=0.7.7 -pkgrel=5 +pkgrel=6 pkgdesc="A tool for adjusting the volume of WAV files to a standard level" arch=('i686' 'x86_64') url="http://normalize.nongnu.org" license=('GPL') depends=('audiofile' 'libmad' 'vorbis-tools' 'lame' 'flac' 'mpg123') -source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('1749b16fc7a08aa5d0cf9f76eeaa8436') +makedepends=('pkg-config' 'intltool') +source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'normalize-0.7.7-audiofile-pkgconfig.patch' + 'normalize-0.7.7-m4.patch') +md5sums=('1749b16fc7a08aa5d0cf9f76eeaa8436' + '77d565e29bef11837e80347adfd42b58' + '0b4bca7bf183275b9f939576ebad4233') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/normalize-0.7.7-audiofile-pkgconfig.patch" + patch -Np0 -i "${srcdir}/normalize-0.7.7-m4.patch" + + touch AUTHORS NEWS ChangeLog + libtoolize --force --copy + aclocal -I m4 + autoreconf + automake --add-missing + ./configure --prefix=/usr \ --mandir=/usr/share/man \ --with-audiofile \ diff --git a/extra/normalize/normalize-0.7.7-audiofile-pkgconfig.patch b/extra/normalize/normalize-0.7.7-audiofile-pkgconfig.patch new file mode 100644 index 000000000..09f211cdf --- /dev/null +++ b/extra/normalize/normalize-0.7.7-audiofile-pkgconfig.patch @@ -0,0 +1,55 @@ +Use pkgconfig to check for audiofile since the audiofile-config script was +removed from >=audiofile-0.3.0. + +--- normalize-0.7.7/configure.ac.orig ++++ normalize-0.7.7/configure.ac +@@ -248,33 +248,16 @@ + + + dnl *** Stuff for audiofile library *** +-dnl v0.2.1 and before have bugs with 24-bit LE files +-AM_PATH_AUDIOFILE([ 0.2.2 ], [ have_audiofile=true ]) +-dnl AC_CHECK_LIB(audiofile, afSetVirtualSampleFormat, have_audiofile=true) ++AC_ARG_WITH(audiofile, AC_HELP_STRING([--with-audiofile], ++ [use the audiofile library (default yes)])) + AH_TEMPLATE([USE_AUDIOFILE], + [Define if you want to use the audiofile library.]) +-AC_ARG_WITH(audiofile, +- AC_HELP_STRING([--with-audiofile], +- [use the audiofile library (default yes)]), +- [ case "$withval" in +- no) with_audiofile=false ;; +- *) with_audiofile=true ;; +- esac ]) + +-use_audiofile=false +-if test x$with_audiofile != xfalse; then +- if test x$have_audiofile = xtrue; then +- AC_DEFINE(USE_AUDIOFILE) +- use_audiofile=true +-dnl AUDIOFILELIBS="-laudiofile" +- elif test x$with_audiofile = xtrue; then +- AC_MSG_ERROR([--with-audiofile specified, but audiofile library not found]) +- fi +-fi +-dnl AC_SUBST(AUDIOFILELIBS) +-test x$use_audiofile = xfalse && AUDIOFILE_LIBS= +-test x$use_audiofile = xfalse && AUDIOFILE_CFLAGS= +-AM_CONDITIONAL(AUDIOFILE, test x$use_audiofile = xtrue) ++AS_IF([test "x$with_audiofile" = "xyes"], [ ++ PKG_CHECK_MODULES([AUDIOFILE], [audiofile]) ++ AC_DEFINE(USE_AUDIOFILE) ++]) ++AM_CONDITIONAL(AUDIOFILE, test x$with_audiofile = xyes) + + + dnl *** Stuff for mad mpeg audio decoder library *** +@@ -330,7 +313,7 @@ + + echo + echo "Configuration:" +-echo " audiofile library: $use_audiofile" ++echo " audiofile library: $with_audiofile" + echo " mpeg audio support: $use_mad" + echo " xmms volume adjust plugin: $use_xmms" + echo diff --git a/extra/normalize/normalize-0.7.7-m4.patch b/extra/normalize/normalize-0.7.7-m4.patch new file mode 100644 index 000000000..2aeb3e451 --- /dev/null +++ b/extra/normalize/normalize-0.7.7-m4.patch @@ -0,0 +1,553 @@ +--- m4/extra.m4 ++++ m4/extra.m4 +@@ -0,0 +1,550 @@ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005 Free Software Foundation, Inc. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++# Configure paths for GLIB ++# Owen Taylor 97-11-3 ++ ++dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or ++dnl gthread is specified in MODULES, pass to glib-config ++dnl ++AC_DEFUN(AM_PATH_GLIB, ++[dnl ++dnl Get the cflags and libraries from the glib-config script ++dnl ++AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], ++ glib_config_prefix="$withval", glib_config_prefix="") ++AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], ++ glib_config_exec_prefix="$withval", glib_config_exec_prefix="") ++AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], ++ , enable_glibtest=yes) ++ ++ if test x$glib_config_exec_prefix != x ; then ++ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" ++ if test x${GLIB_CONFIG+set} != xset ; then ++ GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config ++ fi ++ fi ++ if test x$glib_config_prefix != x ; then ++ glib_config_args="$glib_config_args --prefix=$glib_config_prefix" ++ if test x${GLIB_CONFIG+set} != xset ; then ++ GLIB_CONFIG=$glib_config_prefix/bin/glib-config ++ fi ++ fi ++ ++ for module in . $4 ++ do ++ case "$module" in ++ gmodule) ++ glib_config_args="$glib_config_args gmodule" ++ ;; ++ gthread) ++ glib_config_args="$glib_config_args gthread" ++ ;; ++ esac ++ done ++ ++ AC_PATH_PROG(GLIB_CONFIG, glib-config, no) ++ min_glib_version=ifelse([$1], ,0.99.7,$1) ++ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) ++ no_glib="" ++ if test "$GLIB_CONFIG" = "no" ; then ++ no_glib=yes ++ else ++ GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` ++ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` ++ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_glibtest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$GLIB_LIBS $LIBS" ++dnl ++dnl Now check if the installed GLIB is sufficiently new. (Also sanity ++dnl checks the results of glib-config to some extent ++dnl ++ rm -f conf.glibtest ++ AC_TRY_RUN([ ++#include <glib.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.glibtest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_glib_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_glib_version"); ++ exit(1); ++ } ++ ++ if ((glib_major_version != $glib_config_major_version) || ++ (glib_minor_version != $glib_config_minor_version) || ++ (glib_micro_version != $glib_config_micro_version)) ++ { ++ printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", ++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf ("*** was found! If glib-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); ++ printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); ++ printf("*** before re-running configure\n"); ++ } ++ else if ((glib_major_version != GLIB_MAJOR_VERSION) || ++ (glib_minor_version != GLIB_MINOR_VERSION) || ++ (glib_micro_version != GLIB_MICRO_VERSION)) ++ { ++ printf("*** GLIB header files (version %d.%d.%d) do not match\n", ++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ } ++ else ++ { ++ if ((glib_major_version > major) || ++ ((glib_major_version == major) && (glib_minor_version > minor)) || ++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the glib-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); ++ printf("*** correct copy of glib-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_glib" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$GLIB_CONFIG" = "no" ; then ++ echo "*** The glib-config script installed by GLIB could not be found" ++ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the GLIB_CONFIG environment variable to the" ++ echo "*** full path to glib-config." ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ AC_TRY_LINK([ ++#include <glib.h> ++#include <stdio.h> ++], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ++ echo "***" ++ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" ++ echo "*** came with the system with the command" ++ echo "***" ++ echo "*** rpm --erase --nodeps gtk gtk-devel" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB was incorrectly installed" ++ echo "*** or that you have moved GLIB since it was installed. In the latter case, you" ++ echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GLIB_CFLAGS) ++ AC_SUBST(GLIB_LIBS) ++ rm -f conf.glibtest ++]) ++ ++# Configure paths for GTK+ ++# Owen Taylor 97-11-3 ++ ++dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS ++dnl ++AC_DEFUN(AM_PATH_GTK, ++[dnl ++dnl Get the cflags and libraries from the gtk-config script ++dnl ++AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], ++ gtk_config_prefix="$withval", gtk_config_prefix="") ++AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], ++ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") ++AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], ++ , enable_gtktest=yes) ++ ++ for module in . $4 ++ do ++ case "$module" in ++ gthread) ++ gtk_config_args="$gtk_config_args gthread" ++ ;; ++ esac ++ done ++ ++ if test x$gtk_config_exec_prefix != x ; then ++ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" ++ if test x${GTK_CONFIG+set} != xset ; then ++ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config ++ fi ++ fi ++ if test x$gtk_config_prefix != x ; then ++ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" ++ if test x${GTK_CONFIG+set} != xset ; then ++ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config ++ fi ++ fi ++ ++ AC_PATH_PROG(GTK_CONFIG, gtk-config, no) ++ min_gtk_version=ifelse([$1], ,0.99.7,$1) ++ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) ++ no_gtk="" ++ if test "$GTK_CONFIG" = "no" ; then ++ no_gtk=yes ++ else ++ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` ++ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` ++ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_gtktest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GTK_CFLAGS" ++ LIBS="$GTK_LIBS $LIBS" ++dnl ++dnl Now check if the installed GTK is sufficiently new. (Also sanity ++dnl checks the results of gtk-config to some extent ++dnl ++ rm -f conf.gtktest ++ AC_TRY_RUN([ ++#include <gtk/gtk.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.gtktest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_gtk_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_gtk_version"); ++ exit(1); ++ } ++ ++ if ((gtk_major_version != $gtk_config_major_version) || ++ (gtk_minor_version != $gtk_config_minor_version) || ++ (gtk_micro_version != $gtk_config_micro_version)) ++ { ++ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", ++ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, ++ gtk_major_version, gtk_minor_version, gtk_micro_version); ++ printf ("*** was found! If gtk-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); ++ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); ++ printf("*** before re-running configure\n"); ++ } ++#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) ++ else if ((gtk_major_version != GTK_MAJOR_VERSION) || ++ (gtk_minor_version != GTK_MINOR_VERSION) || ++ (gtk_micro_version != GTK_MICRO_VERSION)) ++ { ++ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", ++ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ gtk_major_version, gtk_minor_version, gtk_micro_version); ++ } ++#endif /* defined (GTK_MAJOR_VERSION) ... */ ++ else ++ { ++ if ((gtk_major_version > major) || ++ ((gtk_major_version == major) && (gtk_minor_version > minor)) || ++ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", ++ gtk_major_version, gtk_minor_version, gtk_micro_version); ++ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); ++ printf("*** correct copy of gtk-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_gtk" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$GTK_CONFIG" = "no" ; then ++ echo "*** The gtk-config script installed by GTK could not be found" ++ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the GTK_CONFIG environment variable to the" ++ echo "*** full path to gtk-config." ++ else ++ if test -f conf.gtktest ; then ++ : ++ else ++ echo "*** Could not run GTK test program, checking why..." ++ CFLAGS="$CFLAGS $GTK_CFLAGS" ++ LIBS="$LIBS $GTK_LIBS" ++ AC_TRY_LINK([ ++#include <gtk/gtk.h> ++#include <stdio.h> ++], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GTK or finding the wrong" ++ echo "*** version of GTK. If it is not finding GTK, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ++ echo "***" ++ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" ++ echo "*** came with the system with the command" ++ echo "***" ++ echo "*** rpm --erase --nodeps gtk gtk-devel" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GTK was incorrectly installed" ++ echo "*** or that you have moved GTK since it was installed. In the latter case, you" ++ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GTK_CFLAGS="" ++ GTK_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GTK_CFLAGS) ++ AC_SUBST(GTK_LIBS) ++ rm -f conf.gtktest ++]) ++ ++# CFLAGS and library paths for XMMS ++# written 15 December 1999 by Ben Gertzfield <che@debian.org> ++ ++dnl Usage: ++dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) ++dnl ++dnl Example: ++dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_ERROR([*** XMMS >= 0.9.5.1 not installed - please install first ***])) ++dnl ++dnl Defines XMMS_CFLAGS, XMMS_LIBS, XMMS_DATA_DIR, XMMS_PLUGIN_DIR, ++dnl XMMS_VISUALIZATION_PLUGIN_DIR, XMMS_INPUT_PLUGIN_DIR, ++dnl XMMS_OUTPUT_PLUGIN_DIR, XMMS_GENERAL_PLUGIN_DIR, XMMS_EFFECT_PLUGIN_DIR, ++dnl and XMMS_VERSION for your plugin pleasure. ++dnl ++ ++dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]]) ++AC_DEFUN(XMMS_TEST_VERSION, [ ++ ++# Determine which version number is greater. Prints 2 to stdout if ++# the second number is greater, 1 if the first number is greater, ++# 0 if the numbers are equal. ++ ++# Written 15 December 1999 by Ben Gertzfield <che@debian.org> ++# Revised 15 December 1999 by Jim Monty <monty@primenet.com> ++ ++ AC_PROG_AWK ++ xmms_got_version=[` $AWK ' \ ++BEGIN { \ ++ print vercmp(ARGV[1], ARGV[2]); \ ++} \ ++ \ ++function vercmp(ver1, ver2, ver1arr, ver2arr, \ ++ ver1len, ver2len, \ ++ ver1int, ver2int, len, i, p) { \ ++ \ ++ ver1len = split(ver1, ver1arr, /\./); \ ++ ver2len = split(ver2, ver2arr, /\./); \ ++ \ ++ len = ver1len > ver2len ? ver1len : ver2len; \ ++ \ ++ for (i = 1; i <= len; i++) { \ ++ p = 1000 ^ (len - i); \ ++ ver1int += ver1arr[i] * p; \ ++ ver2int += ver2arr[i] * p; \ ++ } \ ++ \ ++ if (ver1int < ver2int) \ ++ return 2; \ ++ else if (ver1int > ver2int) \ ++ return 1; \ ++ else \ ++ return 0; \ ++}' $1 $2`] ++ ++ if test $xmms_got_version -eq 2; then # failure ++ ifelse([$4], , :, $4) ++ else # success! ++ ifelse([$3], , :, $3) ++ fi ++]) ++ ++AC_DEFUN(AM_PATH_XMMS, ++[ ++AC_ARG_WITH(xmms-prefix,[ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)], ++ xmms_config_prefix="$withval", xmms_config_prefix="") ++AC_ARG_WITH(xmms-exec-prefix,[ --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)], ++ xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="") ++ ++if test x$xmms_config_exec_prefix != x; then ++ xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix" ++ if test x${XMMS_CONFIG+set} != xset; then ++ XMMS_CONFIG=$xmms_config_exec_prefix/bin/xmms-config ++ fi ++fi ++ ++if test x$xmms_config_prefix != x; then ++ xmms_config_args="$xmms_config_args --prefix=$xmms_config_prefix" ++ if test x${XMMS_CONFIG+set} != xset; then ++ XMMS_CONFIG=$xmms_config_prefix/bin/xmms-config ++ fi ++fi ++ ++AC_PATH_PROG(XMMS_CONFIG, xmms-config, no) ++min_xmms_version=ifelse([$1], ,0.9.5.1, $1) ++ ++if test "$XMMS_CONFIG" = "no"; then ++ no_xmms=yes ++else ++ XMMS_CFLAGS=`$XMMS_CONFIG $xmms_config_args --cflags` ++ XMMS_LIBS=`$XMMS_CONFIG $xmms_config_args --libs` ++ XMMS_VERSION=`$XMMS_CONFIG $xmms_config_args --version` ++ XMMS_DATA_DIR=`$XMMS_CONFIG $xmms_config_args --data-dir` ++ XMMS_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --plugin-dir` ++ XMMS_VISUALIZATION_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args \ ++ --visualization-plugin-dir` ++ XMMS_INPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --input-plugin-dir` ++ XMMS_OUTPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --output-plugin-dir` ++ XMMS_EFFECT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --effect-plugin-dir` ++ XMMS_GENERAL_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --general-plugin-dir` ++ ++ XMMS_TEST_VERSION($XMMS_VERSION, $min_xmms_version, ,no_xmms=version) ++fi ++ ++AC_MSG_CHECKING(for XMMS - version >= $min_xmms_version) ++ ++if test "x$no_xmms" = x; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++else ++ AC_MSG_RESULT(no) ++ ++ if test "$XMMS_CONFIG" = "no" ; then ++ echo "*** The xmms-config script installed by XMMS could not be found." ++ echo "*** If XMMS was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the XMMS_CONFIG environment variable to the" ++ echo "*** full path to xmms-config." ++ else ++ if test "$no_xmms" = "version"; then ++ echo "*** An old version of XMMS, $XMMS_VERSION, was found." ++ echo "*** You need a version of XMMS newer than $min_xmms_version." ++ echo "*** The latest version of XMMS is always available from" ++ echo "*** http://www.xmms.org/" ++ echo "***" ++ ++ echo "*** If you have already installed a sufficiently new version, this error" ++ echo "*** probably means that the wrong copy of the xmms-config shell script is" ++ echo "*** being found. The easiest way to fix this is to remove the old version" ++ echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the" ++ echo "*** correct copy of xmms-config. (In this case, you will have to" ++ echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf" ++ echo "*** so that the correct libraries are found at run-time)" ++ fi ++ fi ++ XMMS_CFLAGS="" ++ XMMS_LIBS="" ++ ifelse([$3], , :, [$3]) ++fi ++AC_SUBST(XMMS_CFLAGS) ++AC_SUBST(XMMS_LIBS) ++AC_SUBST(XMMS_VERSION) ++AC_SUBST(XMMS_DATA_DIR) ++AC_SUBST(XMMS_PLUGIN_DIR) ++AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR) ++AC_SUBST(XMMS_INPUT_PLUGIN_DIR) ++AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR) ++AC_SUBST(XMMS_GENERAL_PLUGIN_DIR) ++AC_SUBST(XMMS_EFFECT_PLUGIN_DIR) ++]) diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD index 6140cb6dc..3d247b376 100644 --- a/extra/ntrack/PKGBUILD +++ b/extra/ntrack/PKGBUILD @@ -1,27 +1,23 @@ -# $Id: PKGBUILD 125701 2011-05-28 10:48:55Z andrea $ +# $Id: PKGBUILD 149014 2012-02-05 14:07:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=ntrack -pkgver=13 -pkgrel=2 +pkgver=16 +pkgrel=1 epoch=1 pkgdesc="A network connectivity tracking library" arch=('i686' 'x86_64') url="http://launchpad.net/ntrack/" license=('LGPL') -depends=('qt' 'libnl' 'gcc-libs') +depends=('qt' 'libnl') makedepends=('python2') -source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz" - 'dead-loop-fix.patch') -md5sums=('90596b924a108f8b4eea52239ba64369' - '02bda6ae15ef04b6a7d9273c37752681') options=('!libtool' '!emptydirs') +source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz") +md5sums=('21691dac43460a6791cba3decbc68242') build() { cd "${srcdir}/${pkgname}-0${pkgver}" - patch -p0 -i "${srcdir}"/dead-loop-fix.patch - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD index 7ee8cac19..aa9cb84b6 100644 --- a/extra/nx-common/PKGBUILD +++ b/extra/nx-common/PKGBUILD @@ -1,35 +1,40 @@ -# $Id: PKGBUILD 128326 2011-06-22 20:29:20Z andyrtr $ +# $Id: PKGBUILD 148862 2012-02-05 11:53:15Z ibiru $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=nx-common pkgver=3.5.0 -pkgrel=2 +pkgrel=3 pkgdesc="NoMachine NX common package for client and server" arch=('i686' 'x86_64') license=('GPL') url="http://nomachine.com/" -depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.4.5' 'openssl>=1.0.0' 'gcc-libs' 'bash') +depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.5.7' 'openssl>=1.0.0' 'gcc-libs' 'bash') makedepends=('xorg-server-devel') source=( #Compression libs and proxy sources http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz - nxcompsh-gcc43.patch) + nxcompsh-gcc43.patch + nx-3.5.0-libpng15.patch) options=(!libtool) md5sums=('ad8c0f133122c6d07732ca69c8759410' '84ade443b79ea079380b754aba9d392e' 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' - 'b6c279654dac421fc3dd1a27d66ff53c') + 'b6c279654dac421fc3dd1a27d66ff53c' + '2966353cabb96829eab291212ef078dc') build() { # nxcomp cd ${srcdir}/nxcomp + patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch + ./configure --prefix=/opt/NX make # nxcompsh cd ${srcdir}/nxcompsh patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch + ./configure --prefix=/opt/NX make # nxssh diff --git a/extra/nx-common/nx-3.5.0-libpng15.patch b/extra/nx-common/nx-3.5.0-libpng15.patch new file mode 100644 index 000000000..c8f2a9559 --- /dev/null +++ b/extra/nx-common/nx-3.5.0-libpng15.patch @@ -0,0 +1,30 @@ +diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp +--- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 ++++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 +@@ -414,7 +414,7 @@ + + png_read_info(pngPtr, infoPtr); + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -565,7 +565,7 @@ + + png_read_info( pngPtr, infoPtr ) ; + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -709,7 +709,7 @@ + png_read_info(pngPtr, infoPtr) ; + + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } diff --git a/extra/nxserver/PKGBUILD b/extra/nxserver/PKGBUILD index de2ce2e34..242c5f08b 100644 --- a/extra/nxserver/PKGBUILD +++ b/extra/nxserver/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 141571 2011-10-31 07:33:57Z andyrtr $ +# $Id: PKGBUILD 148864 2012-02-05 11:53:19Z ibiru $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=nxserver pkgver=3.5.0 -pkgrel=4 +pkgrel=5 pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme." arch=(i686 x86_64) url="http://nomachine.com/" license=('GPL') depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$pkgver - 'libxpm' 'libpng>=1.4.0' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2' + 'libxpm' 'libpng>=1.5.7' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2' 'xorg-sessreg') makedepends=('imake') source=( @@ -27,7 +27,8 @@ http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz # gcc 43 fix -nxcompsh-gcc43.patch) +nxcompsh-gcc43.patch +nx-3.5.0-libpng15.patch) options=(!libtool) md5sums=('12060433a74ac61a1c776d1d6d136117' '84c7f1575d9a1506370125ed050514ab' @@ -38,13 +39,15 @@ md5sums=('12060433a74ac61a1c776d1d6d136117' '488bb4d9b8e9f82dc272b4e6e9c57d30' 'abde2ccc33e31fc695031c2cfb60f3dd' '90a762dd9eb19c8c97876ad837923857' - 'b6c279654dac421fc3dd1a27d66ff53c') + 'b6c279654dac421fc3dd1a27d66ff53c' + '2966353cabb96829eab291212ef078dc') build() { cd ${srcdir} # nxcomp cd ${srcdir}/nxcomp + patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch ./configure --prefix=/opt/NX make # nxcompshad diff --git a/extra/nxserver/nx-3.5.0-libpng15.patch b/extra/nxserver/nx-3.5.0-libpng15.patch new file mode 100644 index 000000000..c8f2a9559 --- /dev/null +++ b/extra/nxserver/nx-3.5.0-libpng15.patch @@ -0,0 +1,30 @@ +diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp +--- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 ++++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 +@@ -414,7 +414,7 @@ + + png_read_info(pngPtr, infoPtr); + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -565,7 +565,7 @@ + + png_read_info( pngPtr, infoPtr ) ; + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -709,7 +709,7 @@ + png_read_info(pngPtr, infoPtr) ; + + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index b4265766c..5ae5b7ba7 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146424 2012-01-10 23:37:44Z eric $ +# $Id: PKGBUILD 148866 2012-02-05 11:53:22Z ibiru $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -7,7 +7,7 @@ pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.3.1_a _realver=2.3.1 -pkgrel=3 +pkgrel=4 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD index a5c7d41c6..48dd55c34 100644 --- a/extra/opengtl/PKGBUILD +++ b/extra/opengtl/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 120658 2011-04-25 21:17:33Z eric $ +# $Id: PKGBUILD 148868 2012-02-05 11:53:26Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Andries Radu <admiral0@live.it> pkgname=opengtl -pkgver=0.9.15.1 +pkgver=0.9.16 pkgrel=1 pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" url="http://www.opengtl.org" arch=('i686' 'x86_64') license=('GPL') -depends=('gcc-libs') -makedepends=('cmake' 'llvm' 'libpng') +depends=('gcc-libs' 'llvm') +makedepends=('cmake' 'libpng') optdepends=('libpng: for using the png extension') source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2) -md5sums=('052fc8504ced601e356e4d20621699f7') -sha1sums=('ddd25b1f5eb11ae0b438c67d5a2a73481e919a0a') +sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048') build() { cd "${srcdir}" diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index 79d5bba98..b4b4e9cca 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,50 +1,48 @@ -# $Id: PKGBUILD 146547 2012-01-12 21:46:06Z andyrtr $ +# $Id: PKGBUILD 148870 2012-02-05 11:53:35Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" _javaver=6 -_icedteaver=1.10.5 -_openjdk_version=b22 -_openjdk_date=28_feb_2011 +_icedteaver=1.11 +_openjdk_version=b24 +_openjdk_date=14_nov_2011 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} pkgrel=1 url='http://icedtea.classpath.org' arch=('i686' 'x86_64') license=('custom') makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2' - 'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'xalan-java' 'libxt' 'nss' + 'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt' #'xalan-java' 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6') options=('!emptydirs') # 'force') # force needed for hg shots source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz - http://icedtea.classpath.org/download/drops/jaxp144_01.zip - http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip + http://icedtea.classpath.org/download/drops/jaxp144_03.zip + http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip fix_jdk_cmds_path.diff fix_corba_cmds_path.diff fontconfig-paths.diff nonreparenting-wm.diff openjdk6.profile - openjdk6.profile.csh - glibc2_15.diff) + openjdk6.profile.csh) noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz - jaxp144_01.zip - jdk6-jaxws-b20.zip + jaxp144_03.zip + jdk6-jaxws2_1_6-2011_06_13.zip jdk6-jaf-b20.zip) -md5sums=('e2316f463b5d9f53f8c5c9020f2a7e5a' - '2d2bbbb0f9b81f1fec41ec730da8a933' - 'ef7a8b3624ea904bf584bc46d79b5e75' - '91adfd41e6f001add4f92ae31216b1e3' +md5sums=('10c1cea1d24c064572abfe9687567948' + '0eabdd360169144336e50081b8d01001' + '9eea471ad474040265c688858fcf09aa' + '8fd91b09b643a19a912b8a75e7a7a9d5' 'bc95c133620bd68c161cac9891592901' '5da3e39fa60985576c4f37d1491efbe2' 'f7e7a212e50abb56a6ef1a2b1bd27405' 'ee1afda124d5927345014ab382ef581e' '9b4d368f5ee08de248eaf029303a446c' '74c4a7adc782edd087802bf92ae3d6d0' - 'fdf295e2f186dfa4d308691a3d7ac8c5' - '0c8f0a398c88f85e0db44b4417562cf3') + 'fdf295e2f186dfa4d308691a3d7ac8c5') build() { @@ -64,18 +62,17 @@ build() { autoreconf -i - export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/glibc2_15.diff" + export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff" export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" unset MAKEFLAGS ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \ - --with-xalan2-jar=/usr/share/java/xalan.jar \ --with-ant-home=/usr/share/java/apache-ant \ --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \ - --with-jaxp-drop-zip=${srcdir}/jaxp144_01.zip \ - --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \ + --with-jaxp-drop-zip=${srcdir}/jaxp144_03.zip \ + --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \ --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \ --disable-bootstrap LD_PRELOAD="" make @@ -84,7 +81,7 @@ build() { package_openjdk6() { pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.' backup=(etc/profile.d/openjdk6.sh) - depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng') + depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7') optdepends=('icedtea-web: web browser plugin + Java Web Start' 'alsa-lib: for sound' 'giflib: for gif format support') diff --git a/extra/pekwm/PKGBUILD b/extra/pekwm/PKGBUILD index bfcdb908d..5ead4972a 100644 --- a/extra/pekwm/PKGBUILD +++ b/extra/pekwm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 131942 2011-07-18 00:09:21Z kevin $ +# $Id: PKGBUILD 148872 2012-02-05 11:53:39Z ibiru $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Eddie Lozon <almostlucky@attbi.com> pkgname=pekwm pkgver=0.1.13 -pkgrel=1 +pkgrel=2 pkgdesc="A small, fast, functional, and flexible window manager" arch=(i686 x86_64) license=('GPL') @@ -24,7 +24,7 @@ md5sums=('51a3f9030817df0304cc1da5110e493a' '5a78fc6653fbb0b7282ecf7f1f81e2c5' '075bf1b9d32bf94780329499e4fa40e3') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # patch -p1 < ../libpng-1.4.patch || return 1 # Default settings: # --enable-shape --enable-xinerama --enable-menus \ @@ -37,10 +37,9 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/xsessions/${pkgname}.desktop -# ${pkgdir}/etc/X11/sessions/${pkgname}.desktop + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/${pkgname}.desktop" \ + "${pkgdir}/usr/share/xsessions/${pkgname}.desktop" } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/perl-time-hires/PKGBUILD b/extra/perl-time-hires/PKGBUILD index 5cba2c5c0..d719fd468 100644 --- a/extra/perl-time-hires/PKGBUILD +++ b/extra/perl-time-hires/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143950 2011-11-30 22:03:46Z giovanni $ +# $Id: PKGBUILD 149153 2012-02-06 00:45:55Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: mezcal <fila at pruda dot com> pkgname=perl-time-hires -pkgver=1.9724 -pkgrel=2 +pkgver=1.9725 +pkgrel=1 pkgdesc="Perl module: high resolution time, sleep, and alarm" arch=('i686' 'x86_64') license=('PerlArtistic') @@ -12,7 +12,7 @@ url="http://search.cpan.org/dist/Time-HiRes/" depends=('perl') options=(!emptydirs) source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Time-HiRes-${pkgver}.tar.gz") -md5sums=('6467b001de9ba5c01785ebbb8ea247cb') +md5sums=('cb1108c076d26f3d2fed0bb91313135a') build() { cd "${srcdir}/Time-HiRes-${pkgver}" diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index 51e4c5126..b49b5d983 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142966 2011-11-19 08:36:20Z eric $ +# $Id: PKGBUILD 148874 2012-02-05 11:53:42Z ibiru $ # Maintainer: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-tk _cpanname=Tk pkgver=804.030 -pkgrel=1 +pkgrel=2 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/${_cpanname}" diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index adafb826c..da0430b2d 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148505 2012-02-02 21:11:43Z pierre $ +# $Id: PKGBUILD 148876 2012-02-05 11:53:48Z ibiru $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -23,7 +23,7 @@ pkgname=('php' 'php-xsl') pkgver=5.3.10 _suhosinver=5.3.9-0.9.10 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' diff --git a/extra/pilot-link/PKGBUILD b/extra/pilot-link/PKGBUILD index b9b8f20b4..d55ceb9bf 100644 --- a/extra/pilot-link/PKGBUILD +++ b/extra/pilot-link/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101454 2010-11-29 09:58:17Z allan $ +# $Id: PKGBUILD 148878 2012-02-05 11:53:52Z ibiru $ # Maintainer: dale <dale@archlinux.org> # todo: add perl support, DESTDIR has no affect on perl @@ -6,13 +6,13 @@ pkgname=pilot-link pkgver=0.12.5 -pkgrel=2 +pkgrel=3 pkgdesc="A suite of tools for connecting to PalmOS handheld devices" arch=(i686 x86_64) license=('GPL' 'LGPL') -depends=('readline>=6.0' 'libpng>=1.4.0' 'libusb-compat' 'popt' 'bluez>=4.59') +depends=('readline>=6.0' 'libpng>=1.5.0' 'libusb-compat' 'popt' 'bluez>=4.59') options=('!libtool') -url=http://www.pilot-link.org/ +url="http://www.pilot-link.org/" source=(http://downloads.pilot-link.org/${pkgname}-${pkgver}.tar.bz2 pilot-link-png14.patch) md5sums=('568c55bf504b044f6fbd50baa407c990' diff --git a/extra/plotutils/PKGBUILD b/extra/plotutils/PKGBUILD index cd8d4f347..91e2c7775 100644 --- a/extra/plotutils/PKGBUILD +++ b/extra/plotutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64564 2010-01-21 06:02:58Z eric $ +# $Id: PKGBUILD 148880 2012-02-05 11:53:57Z ibiru $ # Maintainer: damir <damir@archlinux.org> # Packager: Maksim Sipos (maxsipos at gmail dot com) pkgname=plotutils pkgver=2.6 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686') pkgdesc="Set of utilities and libraries for plotting." url="http://directory.fsf.org/graphics/plotutils.html" @@ -12,16 +12,21 @@ license=("GPL") depends=("libpng" "gcc-libs" "libxaw>=1.0.5") options=('!libtool') install=plotutils.install -source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz) -md5sums=('c08a424bd2438c80a786a7f4b5bb6a40') -sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838') +source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz plotutils-2.6-libpng-1.5.patch) +sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838' + '426f6ee04186af5059ab54322efaf0a6a976682b') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../plotutils-2.6-libpng-1.5.patch ./configure --prefix=/usr \ --with-gnu-ld \ --with-x \ - --enable-libplotter || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --enable-libplotter + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/plotutils/plotutils-2.6-libpng-1.5.patch b/extra/plotutils/plotutils-2.6-libpng-1.5.patch new file mode 100644 index 000000000..b86d9f457 --- /dev/null +++ b/extra/plotutils/plotutils-2.6-libpng-1.5.patch @@ -0,0 +1,31 @@ +fix building with libpng-1.5 + +--- libplot/z_write.c ++++ libplot/z_write.c +@@ -164,7 +164,7 @@ + } + + /* cleanup after libpng errors (error handler does a longjmp) */ +- if (setjmp (png_ptr->jmpbuf)) ++ if (png_jmpbuf (png_ptr)) + { + png_destroy_write_struct (&png_ptr, (png_info **)NULL); + return -1; +@@ -444,7 +444,7 @@ + #endif + } + +- longjmp (png_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf (png_ptr), 1); + } + + static void +@@ -515,7 +515,7 @@ + #endif + } + +- longjmp (png_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf (png_ptr), 1); + } + + static void diff --git a/extra/plotutils/plotutils.install b/extra/plotutils/plotutils.install index dd3ffb74f..d3d033e0c 100644 --- a/extra/plotutils/plotutils.install +++ b/extra/plotutils/plotutils.install @@ -1,7 +1,8 @@ -infodir=/usr/share/info +infodir=usr/share/info post_install() { - install-info $infodir/plotutils.info $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + install-info $infodir/plotutils.info.gz $infodir/dir 2> /dev/null } post_upgrade() { @@ -9,5 +10,6 @@ post_upgrade() { } pre_remove() { - install-info --delete $infodir/plotutils.info $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + install-info --delete $infodir/plotutils.info.gz $infodir/dir 2> /dev/null } diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index bda699447..5a79cd246 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 147127 2012-01-22 11:06:04Z andyrtr $ +# $Id: PKGBUILD 148882 2012-02-05 11:54:01Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') pkgver=0.18.3 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') diff --git a/extra/pygtk/PKGBUILD b/extra/pygtk/PKGBUILD index da57d172a..e82fdbe4d 100644 --- a/extra/pygtk/PKGBUILD +++ b/extra/pygtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138082 2011-09-16 07:34:35Z ibiru $ +# $Id: PKGBUILD 148886 2012-02-05 11:54:15Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=pygtk pkgver=2.24.0 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings for the GTK widget set" arch=('i686' 'x86_64') license=('LGPL') @@ -24,7 +24,7 @@ build() { #https://bugzilla.gnome.org/show_bug.cgi?id=623965 patch -Np1 -i "${srcdir}/python27.patch" - PYTHON=python2 ./configure --prefix=/usr + PYTHON=/usr/bin/python2 ./configure --prefix=/usr make } diff --git a/extra/pygtksourceview2/PKGBUILD b/extra/pygtksourceview2/PKGBUILD index b5e11dcdf..df1db1d63 100644 --- a/extra/pygtksourceview2/PKGBUILD +++ b/extra/pygtksourceview2/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 101307 2010-11-28 20:57:19Z ibiru $ +# $Id: PKGBUILD 148888 2012-02-05 11:54:18Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pygtksourceview2 pkgver=2.10.1 -pkgrel=3 +pkgrel=4 pkgdesc="Python bindings for gtksourceview2" arch=(i686 x86_64) license=('GPL') depends=('gtksourceview2>=2.10.0' 'pygtk>=2.17.0') -makedepends=('intltool' 'pkgconfig') +makedepends=('intltool' 'pkg-config') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${pkgver}.tar.bz2) @@ -19,5 +19,9 @@ build() { PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static --disable-docs make +} + +package() { + cd "${srcdir}/pygtksourceview-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/python-iwscan/PKGBUILD b/extra/python-iwscan/PKGBUILD index 83019f82e..f1038ce59 100644 --- a/extra/python-iwscan/PKGBUILD +++ b/extra/python-iwscan/PKGBUILD @@ -2,7 +2,7 @@ pkgname=python-iwscan pkgver=20090609 -pkgrel=2 +pkgrel=3 pkgdesc="A Python interface to iwlist, using the iwlib library" arch=('i686' 'x86_64') url="http://projects.otaku42.de/browser/python-iwscan" diff --git a/extra/python-notify/PKGBUILD b/extra/python-notify/PKGBUILD index efb98fd88..ad9a615fa 100644 --- a/extra/python-notify/PKGBUILD +++ b/extra/python-notify/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 113112 2011-03-08 08:49:12Z ibiru $ +# $Id: PKGBUILD 148890 2012-02-05 11:54:24Z ibiru $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=python-notify pkgver=0.1.1 -pkgrel=10 +pkgrel=11 pkgdesc="Python bindings for libnotify" arch=('i686' 'x86_64') url="http://www.galago-project.org/" diff --git a/extra/python-pygame/ChangeLog b/extra/python-pygame/ChangeLog index ddfd90fe8..566be3f65 100644 --- a/extra/python-pygame/ChangeLog +++ b/extra/python-pygame/ChangeLog @@ -1,3 +1,7 @@ +2012-01-24 Angel Velasquez <angvp@archlinux.org> + + * Rebuilt against libpng 1.5 + 2010-08-24 Eric Belanger <eric@archlinux.org> * Rebuilt for python2 diff --git a/extra/python-pygame/PKGBUILD b/extra/python-pygame/PKGBUILD index a3447b7ce..ef664c8cd 100644 --- a/extra/python-pygame/PKGBUILD +++ b/extra/python-pygame/PKGBUILD @@ -1,38 +1,40 @@ -# $Id: PKGBUILD 88496 2010-08-24 05:39:06Z eric $ +# $Id: PKGBUILD 148892 2012-02-05 11:54:30Z ibiru $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: john(?) -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=python-pygame pkgver=1.9.1 -pkgrel=3 +pkgrel=4 pkgdesc="Python game library" arch=('i686' 'x86_64') url="http://www.pygame.org/" license=('LGPL') -depends=('python2' 'sdl_mixer' 'libvorbis' 'sdl_ttf' 'sdl_image' 'smpeg') +depends=('sdl_mixer' 'libvorbis' 'sdl_ttf' 'sdl_image' 'smpeg') +makedepends=('python2' 'portmidi') replaces=('pygame') provides=('pygame') changelog=ChangeLog -source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz 'config.patch') -md5sums=('1c4cdc708d17c8250a2d78ef997222fc' 'aaa668f3cd710d8604114501ea6a6f48') -sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa' '285815e28705d5a2aea53c9d952d35fddf10dd13') +source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz 'config.patch' +'pygame-v4l.patch') +md5sums=('1c4cdc708d17c8250a2d78ef997222fc' + 'aaa668f3cd710d8604114501ea6a6f48' + '9915b63865c16519e80007909beed876') build() { cd "${srcdir}/pygame-${pkgver}release" patch -Np0 -i "${srcdir}/config.patch" - python2 config.py -auto + patch -Np1 -i "${srcdir}/pygame-v4l.patch" } package() { cd "${srcdir}/pygame-${pkgver}release" + python2 config.py -auto python2 setup.py install --root="${pkgdir}" --prefix=/usr - # Copying the examples and tests cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame" cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests" - # Fixing permissions chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/* } diff --git a/extra/python-pygame/pygame-v4l.patch b/extra/python-pygame/pygame-v4l.patch new file mode 100644 index 000000000..3b5a2b9d2 --- /dev/null +++ b/extra/python-pygame/pygame-v4l.patch @@ -0,0 +1,88 @@ +diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in +*** pygame-1.9.1release/Setup.in Thu Jul 2 06:41:56 2009 +--- pygame-1.9.1release-v4lpatch//Setup.in Thu Mar 24 17:31:22 2011 +*************** +*** 34,40 **** + _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG) + movie src/movie.c $(SDL) $(SMPEG) $(DEBUG) + scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG) +! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG) + pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG) + + GFX = src/SDL_gfx/SDL_gfxPrimitives.c +--- 34,40 ---- + _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG) + movie src/movie.c $(SDL) $(SMPEG) $(DEBUG) + scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG) +! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG) + pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG) + + GFX = src/SDL_gfx/SDL_gfxPrimitives.c +diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c +*** pygame-1.9.1release/src/_camera.c Sun Mar 15 20:30:41 2009 +--- pygame-1.9.1release-v4lpatch//src/_camera.c Thu Mar 24 16:58:18 2011 +*************** +*** 160,179 **** + { + #if defined(__unix__) + if (v4l2_open_device(self) == 0) { +! if (v4l_open_device(self) == 0) { +! v4l2_close_device(self); +! return NULL; +! } else { +! self->camera_type = CAM_V4L; +! if (v4l_init_device(self) == 0) { +! v4l2_close_device(self); +! return NULL; +! } +! if (v4l_start_capturing(self) == 0) { +! v4l2_close_device(self); +! return NULL; +! } +! } + } else { + self->camera_type = CAM_V4L2; + if (v4l2_init_device(self) == 0) { +--- 160,167 ---- + { + #if defined(__unix__) + if (v4l2_open_device(self) == 0) { +! v4l2_close_device(self); +! return NULL; + } else { + self->camera_type = CAM_V4L2; + if (v4l2_init_device(self) == 0) { +diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h +*** pygame-1.9.1release/src/camera.h Fri Oct 10 04:37:10 2008 +--- pygame-1.9.1release-v4lpatch//src/camera.h Thu Mar 24 16:44:32 2011 +*************** +*** 39,45 **** + + #include <asm/types.h> /* for videodev2.h */ + +- #include <linux/videodev.h> + #include <linux/videodev2.h> + #endif + +--- 39,44 ---- +*************** +*** 51,57 **** + #define RGB_OUT 1 + #define YUV_OUT 2 + #define HSV_OUT 4 +- #define CAM_V4L 1 + #define CAM_V4L2 2 + + struct buffer +--- 50,55 ---- +*************** +*** 111,118 **** + int v4l2_close_device (PyCameraObject* self); + int v4l2_open_device (PyCameraObject* self); + +- /* internal functions specific to v4l */ +- int v4l_open_device (PyCameraObject* self); +- int v4l_init_device(PyCameraObject* self); +- int v4l_start_capturing(PyCameraObject* self); + #endif +--- 109,112 ---- diff --git a/extra/python-wpactrl/PKGBUILD b/extra/python-wpactrl/PKGBUILD index 0f3f9b84c..d77c859c4 100644 --- a/extra/python-wpactrl/PKGBUILD +++ b/extra/python-wpactrl/PKGBUILD @@ -2,7 +2,7 @@ pkgname=python-wpactrl pkgver=20090609 -pkgrel=2 +pkgrel=3 pkgdesc="A Python extension for wpa_supplicant/hostapd control interface access" arch=('i686' 'x86_64') url="http://projects.otaku42.de/wiki/PythonWpaCtrl" diff --git a/extra/pywebkitgtk/PKGBUILD b/extra/pywebkitgtk/PKGBUILD index df78ea739..9fec0ff5d 100644 --- a/extra/pywebkitgtk/PKGBUILD +++ b/extra/pywebkitgtk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 132031 2011-07-19 09:51:13Z angvp $ +# $Id: PKGBUILD 148894 2012-02-05 11:54:35Z ibiru $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: kasa <biuta.jr@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=pywebkitgtk pkgver=1.1.8 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings to the WebKit GTK+ port" arch=('i686' 'x86_64') url="http://code.google.com/p/pywebkitgtk/" diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index f1d7baaae..aa0f8e916 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146639 2012-01-15 08:31:08Z tpowa $ +# $Id: PKGBUILD 148898 2012-02-05 11:54:47Z ibiru $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm pkgver=1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64) license=('GPL2' 'LGPL2.1') @@ -20,7 +20,7 @@ options=(!strip) build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # fix esound building ./configure --prefix=/usr \ --python=/usr/bin/python2 \ @@ -32,7 +32,7 @@ build() # Use latest seabios version # https://bugs.archlinux.org/task/27616 - cd ${srcdir}/ + cd "${srcdir}/" git clone git://git.seabios.org/seabios.git cd seabios find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' @@ -42,27 +42,27 @@ build() package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install # Use latest seabios version # https://bugs.archlinux.org/task/27616 - cp ${srcdir}/seabios/out/bios.bin ${pkgdir}/usr/share/qemu/bios.bin + cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin" # symbolic link for backwards compatibility - ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu-kvm + ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu-kvm" # symbolic link for to qemu binary for emulator apps - ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu + ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu" # symbolic link for to qemu binary for emulator apps - ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/kvm + ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/kvm" # fix man page - mv ${pkgdir}/usr/share/man/man1/qemu.1 \ - ${pkgdir}/usr/share/man/man1/qemu-kvm.1 + mv "${pkgdir}/usr/share/man/man1/qemu.1" \ + "${pkgdir}/usr/share/man/man1/qemu-kvm.1" # install udev rules - install -D -m644 ${srcdir}/65-kvm.rules \ - ${pkgdir}/lib/udev/rules.d/65-kvm.rules + install -D -m644 "${srcdir}/65-kvm.rules" \ + "${pkgdir}/lib/udev/rules.d/65-kvm.rules" # strip scripts directory - find ${pkgdir}/usr/bin -type f -perm -u+w 2>/dev/null | while read binary ; do + find "${pkgdir}/usr/bin" -type f -perm -u+w 2>/dev/null | while read binary ; do case "$(file -bi "$binary")" in *application/x-executable*) # Binaries /usr/bin/strip $STRIP_BINARIES "$binary";; diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index f82f81201..87ae4ea37 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146673 2012-01-16 08:01:45Z tpowa $ +# $Id: PKGBUILD 148896 2012-02-05 11:54:40Z ibiru $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu pkgver=1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') @@ -17,7 +17,7 @@ options=(!strip) build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's/lib64/lib/g' x86_64.ld ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ --python=/usr/bin/python2 \ @@ -26,7 +26,7 @@ build() make # Use latest seabios version # https://bugs.archlinux.org/task/27616 - cd ${srcdir}/ + cd "${srcdir}/" git clone git://git.seabios.org/seabios.git cd seabios find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' @@ -35,16 +35,16 @@ build() } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install # Use latest seabios version # https://bugs.archlinux.org/task/27616 - cp ${srcdir}/seabios/out/bios.bin ${pkgdir}/usr/share/qemu/bios.bin + cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin" - install -D -m644 ${srcdir}/65-kvm.rules \ - ${pkgdir}/lib/udev/rules.d/65-kvm.rules + install -D -m644 "${srcdir}/65-kvm.rules" \ + "${pkgdir}/lib/udev/rules.d/65-kvm.rules" # strip scripts directory - find ${pkgdir}/usr/src/linux-${_kernver}/scripts -type f -perm -u+w 2>/dev/null | while read binary ; do + find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do case "$(file -bi "$binary")" in *application/x-executable*) # Binaries /usr/bin/strip $STRIP_BINARIES "$binary";; diff --git a/extra/qiv/PKGBUILD b/extra/qiv/PKGBUILD index fc98e1dc2..42b84139a 100644 --- a/extra/qiv/PKGBUILD +++ b/extra/qiv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134996 2011-08-09 20:30:46Z eric $ +# $Id: PKGBUILD 148900 2012-02-05 11:54:52Z ibiru $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=qiv pkgver=2.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer" arch=('i686' 'x86_64') url="http://spiegl.de/qiv/" diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD index a57ce304e..909bd3e9e 100644 --- a/extra/qrencode/PKGBUILD +++ b/extra/qrencode/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 143784 2011-11-29 10:37:04Z bluewind $ +# $Id: PKGBUILD 148902 2012-02-05 11:54:55Z ibiru $ # Maintainer: Florian Pritz< flo@xinu.at> # Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=qrencode pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="C library for encoding data in a QR Code symbol." arch=(i686 x86_64) -depends=('libpng>=1.4.0') +depends=('libpng>=1.5.0') makedepends=(sdl) url="http://megaui.net/fukuchi/works/qrencode/index.en.html" license=('GPL') diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 2edcd2cea..97f3cac36 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 145319 2011-12-21 20:46:53Z andrea $ +# $Id: PKGBUILD 148904 2012-02-05 11:55:04Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.0 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -17,20 +17,25 @@ options=('!libtool') _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop') + 'qtconfig.desktop' + 'fix-qurl.patch') md5sums=('e8a5fdbeba2927c948d9f477a6abe904' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' - '6b771c8a81dd90b45e8a79afa0e5bbfd') + '6b771c8a81dd90b45e8a79afa0e5bbfd' + '7bc255a36733d0fbc80c1902ade4beca') build() { cd "${srcdir}"/${_pkgfqn} + # (FS#27757) + patch -p1 -i "${srcdir}"/fix-qurl.patch + export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf diff --git a/extra/qt/fix-qurl.patch b/extra/qt/fix-qurl.patch new file mode 100644 index 000000000..1c666dba4 --- /dev/null +++ b/extra/qt/fix-qurl.patch @@ -0,0 +1,13 @@ +diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp +--- qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile 2011-10-03 22:44:32.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp 2011-10-27 12:58:35.706815049 -0500 +@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString & + QString QUrl::toLocalFile() const + { + // the call to isLocalFile() also ensures that we're parsed +- if (!isLocalFile()) ++ // Treat URLs with no scheme as local for backward compatibility ++ if (!isLocalFile() && (!d || !d->scheme.isEmpty())) + return QString(); + + QString tmp; diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index c0e85d265..0145907e8 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145341 2011-12-21 20:47:33Z andrea $ +# $Id: PKGBUILD 148906 2012-02-05 11:55:17Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=qt3 pkgver=3.3.8 -pkgrel=21 +pkgrel=22 pkgdesc="The QT3 gui toolkit" arch=('i686' 'x86_64') url="http://www.trolltech.com/products/qt/index.html" @@ -15,12 +15,12 @@ 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-png14.patch qt-copy-kde-patches.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' - 'c8ea644266f4d6d6be9adf894f03138b8eca3fc2' + '3d19510c46016a1a211d97bf8f82b01498b1b33c' '9cb2e5bec782069692ee337cfa171539d9d73753' '116afa0e737bdf27ea27f9b3653aeb56db9ec151' 'ca5ecb29c7f1c826d48703339a3371038e306bb7' @@ -61,7 +61,7 @@ build() { # fix build with gcc 4.6.0 patch -p1 -i "${srcdir}"/gcc-4.6.patch - patch -p0 -i "${srcdir}"/qt3-png14.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 diff --git a/extra/qt3/qt3-png15.patch b/extra/qt3/qt3-png15.patch new file mode 100644 index 000000000..e64fea36a --- /dev/null +++ b/extra/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/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD index 41c84d82a..1689779ab 100644 --- a/extra/qtiplot/PKGBUILD +++ b/extra/qtiplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136909 2011-09-02 18:19:47Z ronald $ +# $Id: PKGBUILD 148908 2012-02-05 11:55:28Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir.archlinux.org> # Contributor: Gergely Imreh <imrehg@gmail.com> pkgname=qtiplot pkgver=0.9.8.8 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://soft.proindependent.com/qtiplot.html" pkgdesc="Data analysis and scientific plotting - free clone of Origin" @@ -24,16 +24,20 @@ source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2 qtiplot.xml qtiplot-0.9.8.6-gold.patch qtiplot-0.9.8.6-kde.patch - qtiplot-0.9.8.6-tamuanova.patch) + qtiplot-0.9.8.6-tamuanova.patch + qwtplot3d-qt-4.8.0.patch + qwtplot3d-libpng15.patch) sha1sums=('02801cdf31b543c0f5d7ef1b1f358f0738d93d48' '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8' '4301cb2a36024a10108b689990d28c4fe5c7416e' - 'b3af6c866b3e63b537b418b6d00e57ef468f8f2b' + '326ee6bc623a637d058ab7ee9f65fede40a23a09' '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909' '285f57d865956d93250ec548288c5bface096b6b' 'b534a609f317cf3117d6495909854cdacea20124' 'a1d4bec744c9b8fe29bf177851e66c97cdd9d975' - '830b518e3ef63625df84363a8047417124f243b0') + '830b518e3ef63625df84363a8047417124f243b0' + '3d4c471dda29a04d432f8e0a4c5b977068cdae72' + '4a45ee21f028f34da75d83c0d3e1d08c5f928892') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -58,6 +62,8 @@ build() { # Make qwtplot3d cd ../qwtplot3d + patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch" + patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch" qmake make diff --git a/extra/qtiplot/build.conf.archlinux b/extra/qtiplot/build.conf.archlinux index 342377578..7ccded7fa 100644 --- a/extra/qtiplot/build.conf.archlinux +++ b/extra/qtiplot/build.conf.archlinux @@ -3,7 +3,7 @@ isEmpty( QTI_ROOT ) { } SYS_INCLUDEPATH = /usr/include -SYS_LIBS = -L/usr/lib +SYS_LIBS = -L/usr/lib -lGLU MUPARSER_LIBS = -lmuparser GSL_LIBS = -lgsl -lgslcblas @@ -18,6 +18,7 @@ LIB_ORIGIN_LIBS = -lorigin2 QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine TAMUANOVA_LIBS = -ltamuanova TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova +LIBPNG_LIBS = -lpng PYTHON = python2 LUPDATE = lupdate diff --git a/extra/qtiplot/qwtplot3d-libpng15.patch b/extra/qtiplot/qwtplot3d-libpng15.patch new file mode 100644 index 000000000..828f0c6d8 --- /dev/null +++ b/extra/qtiplot/qwtplot3d-libpng15.patch @@ -0,0 +1,10 @@ +--- 3rdparty/gl2ps/gl2ps.c.orig 2012-01-29 18:15:34.000000000 -0500 ++++ 3rdparty/gl2ps/gl2ps.c 2012-01-29 18:16:08.000000000 -0500 +@@ -47,6 +47,7 @@ + #endif + + #if defined(GL2PS_HAVE_LIBPNG) ++#include <zlib.h> + #include <png.h> + #endif + diff --git a/extra/qtiplot/qwtplot3d-qt-4.8.0.patch b/extra/qtiplot/qwtplot3d-qt-4.8.0.patch new file mode 100644 index 000000000..9d30f6b7b --- /dev/null +++ b/extra/qtiplot/qwtplot3d-qt-4.8.0.patch @@ -0,0 +1,34 @@ +diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h +--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:42:01.000000000 -0500 ++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:58:30.000000000 -0500 +@@ -2,12 +2,7 @@ + #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code + + #include <time.h> +- +-#if QT_VERSION < 0x040000 +-#include <qgl.h> +-#else +-#include <QtOpenGL/qgl.h> +-#endif ++#include <QtOpenGL> + + #include "qwt3d_types.h" + #include "qwt3d_io.h" +diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h +--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:42:01.000000000 -0500 ++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:57:21.000000000 -0500 +@@ -2,11 +2,8 @@ + #define __openglhelper_2003_06_06_15_49__ + + #include "qglobal.h" +-#if QT_VERSION < 0x040000 +-#include <qgl.h> +-#else +-#include <QtOpenGL/qgl.h> +-#endif ++#include <QtOpenGL> ++#include <GL/glu.h> + + namespace Qwt3D + { diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 6848e5354..7f2401e01 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 147988 2012-01-29 11:59:55Z ronald $ +# $Id: PKGBUILD 148910 2012-02-05 11:55:33Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r pkgver=2.14.1 -pkgrel=1 +pkgrel=2 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 9e5a9dc9d..7d3c2f1e2 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135894 2011-08-20 03:53:06Z eric $ +# $Id: PKGBUILD 148912 2012-02-05 11:55:38Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool pkgver=1.4.5 -pkgrel=4 +pkgrel=5 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" @@ -16,7 +16,6 @@ optdepends=('tcl: to use corresponding binding' \ 'lua: to use corresponding binding') options=('!libtool' '!emptydirs' '!makeflags') source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) -md5sums=('4d116dba9a0888d8aaac179e35d3980a') sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35') build() { diff --git a/extra/rssh/PKGBUILD b/extra/rssh/PKGBUILD index 131c0ed16..c1d9e08f7 100644 --- a/extra/rssh/PKGBUILD +++ b/extra/rssh/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 100737 2010-11-25 18:27:36Z bisson $ -# Maintainer: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 149042 2012-02-05 15:15:17Z bisson $ +# Contributor: Judd Vinet <jvinet@zeroflux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + pkgname=rssh pkgver=2.3.3 -pkgrel=2 -pkgdesc='A restricted shell for use with OpenSSH, allowing only scp and/or sftp' -arch=('i686' 'x86_64') +pkgrel=3 +pkgdesc='Restricted shell for use with OpenSSH, allowing only scp and/or sftp' url='http://www.pizzashack.org/rssh/' -depends=('openssh' 'glibc') -backup=('etc/rssh.conf') license=('custom:rssh') -source=("http://downloads.sourceforge.net/sourceforge/rssh/rssh-$pkgver.tar.gz" +arch=('i686' 'x86_64') +backup=('etc/rssh.conf') +depends=('openssh') +source=("http://downloads.sourceforge.net/sourceforge/rssh/rssh-${pkgver}.tar.gz" 'destdir.patch' 'rsync.patch') sha1sums=('0a6dd80b5e6059e0db12c9f1276121dd966b610a' @@ -17,18 +19,22 @@ sha1sums=('0a6dd80b5e6059e0db12c9f1276121dd966b610a' '41f32f8a77b3a2b924ede6044ab67846e06b5d20') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../destdir.patch + patch -p1 -i ../rsync.patch # FS#21783, debian patch - patch -p1 < ../destdir.patch - patch -p1 < ../rsync.patch # FS#21783, debian patch + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/rssh \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ - ./configure --prefix=/usr --libexecdir=/usr/lib/rssh \ - --mandir=/usr/share/man --sysconfdir=/etc make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/rssh/LICENSE + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/rssh/LICENSE } diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index 6d0d26c57..10a12a174 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140036 2011-10-05 21:49:29Z ibiru $ +# $Id: PKGBUILD 148914 2012-02-05 11:55:45Z ibiru $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,12 +6,12 @@ pkgname=sane pkgver=1.0.22 -pkgrel=4 +pkgrel=5 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64') license=('GPL') -depends=('libtiff>=3.9.2-2' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash') +depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash') makedepends=('texlive-latexextra') install=$pkgname.install backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) @@ -19,6 +19,10 @@ source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname- 'sane.xinetd' 'libv4l-0.8.3.patch' 'xerox_mfp_fix_usb_devices.patch') +md5sums=('fadf56a60f4776bfb24491f66b617cf5' + 'da946cc36fb83612162cf9505986d4b2' + 'e645a8921cff9f18ffbdabb2ed885060' + 'cfef73e7db7c28308914d3db6767d852') options=(!libtool) build() { @@ -46,12 +50,8 @@ package () { install -D -m0644 tools/udev/libsane.rules \ "${pkgdir}/lib/udev/rules.d/53-sane.rules" # fix udev rules - sed -i 's|NAME="%k", ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules + sed -i 's|NAME="%k", ||g' "${pkgdir}/lib/udev/rules.d/53-sane.rules" # install xinetd file install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane" } -md5sums=('fadf56a60f4776bfb24491f66b617cf5' - 'da946cc36fb83612162cf9505986d4b2' - 'e645a8921cff9f18ffbdabb2ed885060' - 'cfef73e7db7c28308914d3db6767d852') diff --git a/extra/sane/sane.install b/extra/sane/sane.install index cbecf7b2e..5ec361eea 100644 --- a/extra/sane/sane.install +++ b/extra/sane/sane.install @@ -1,14 +1,7 @@ post_install() { - getent group scanner >/dev/null 2>&1 || groupadd -g 96 scanner &>/dev/null /bin/cat <<THEEND NOTE ---- Add your user to group 'scanner' to use scanner devices. THEEND } - -post_remove() { - if getent group scanner >/dev/null 2>&1; then - groupdel scanner - fi -} diff --git a/extra/scim-anthy/PKGBUILD b/extra/scim-anthy/PKGBUILD index ba47b28a5..08dfac7cc 100644 --- a/extra/scim-anthy/PKGBUILD +++ b/extra/scim-anthy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 110875 2011-02-22 20:13:47Z bisson $ +# $Id: PKGBUILD 148916 2012-02-05 11:55:48Z ibiru $ # Contributor: damir <damir@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=scim-anthy pkgver=1.2.7 -pkgrel=2 +pkgrel=3 _filecode=37309 pkgdesc='Japanese input method module for SCIM' arch=('i686' 'x86_64') diff --git a/extra/scim-chewing/PKGBUILD b/extra/scim-chewing/PKGBUILD index d9e6451b5..c9e01f6f7 100644 --- a/extra/scim-chewing/PKGBUILD +++ b/extra/scim-chewing/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 111539 2011-02-27 15:04:14Z bisson $ +# $Id: PKGBUILD 149044 2012-02-05 15:19:54Z 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=1 +pkgrel=3 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') +arch=('i686' 'x86_64') +makedepends=('intltool') +depends=('scim' 'libchewing') source=("http://chewing.csie.net/download/scim/${pkgname}-${pkgver}.tar.bz2") sha1sums=('f6c8d16f19f17449ee169f1ca787350353e93b05') diff --git a/extra/scim-m17n/PKGBUILD b/extra/scim-m17n/PKGBUILD index 4fcb26155..7938e7768 100644 --- a/extra/scim-m17n/PKGBUILD +++ b/extra/scim-m17n/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 110890 2011-02-22 20:14:59Z bisson $ +# $Id: PKGBUILD 149048 2012-02-05 15:25:52Z bisson $ # Contributor: Camille Moncelier <pix@devlife.org> # Contributor: damir <damir@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=scim-m17n pkgver=0.2.3 -pkgrel=3 +pkgrel=4 pkgdesc='Multilingual input method module for SCIM' -arch=('i686' 'x86_64') url='http://www.scim-im.org/' license=('GPL') -depends=('scim' 'm17n-lib') options=('!libtool') +arch=('i686' 'x86_64') +depends=('scim' 'm17n-lib') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz") sha1sums=('96172846eaa211d2bde0f76184990d13e5ecdaea') diff --git a/extra/scim-pinyin/PKGBUILD b/extra/scim-pinyin/PKGBUILD index 3f8e1e149..abf1fe1d8 100644 --- a/extra/scim-pinyin/PKGBUILD +++ b/extra/scim-pinyin/PKGBUILD @@ -1,33 +1,35 @@ -# $Id: PKGBUILD 77980 2010-04-19 08:02:17Z allan $ -# Maintainer: +# $Id: PKGBUILD 149097 2012-02-05 17:19:20Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributer: Gan Lu <rhythm.gan@gmail.com> pkgname=scim-pinyin pkgver=0.5.91 -pkgrel=5 -pkgdesc="Chinese 拼音 (PinYin) input for SCIM" +pkgrel=6 +pkgdesc='Chinese pinyin input for SCIM' +url='http://www.scim-im.org/' arch=('i686' 'x86_64') -url="http://www.scim-im.org/" -license=GPL -depends=('scim>=1.4.7') +license=('GPL') +depends=('scim') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz - scim-pinyin-0.5.91-gcc43.patch) -md5sums=('fb96d3545090d7681ea03edaced4eccb' - 'ef84582d9bac7ac250d2d64cf260ad39') +source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz" + 'gcc43.patch') +sha1sums=('58bea437a211b7af8420057541a38933a41841c7' + 'b78ecec237ee0e04ec43604fcc344ff43ccfb7b3') build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/scim-pinyin-0.5.91-gcc43.patch - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../gcc43.patch + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-static \ + + make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } - - diff --git a/extra/scim-pinyin/gcc43.patch b/extra/scim-pinyin/gcc43.patch new file mode 100644 index 000000000..91a948d5d --- /dev/null +++ b/extra/scim-pinyin/gcc43.patch @@ -0,0 +1,44 @@ +diff -up scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_phrase.cpp +--- scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 2008-02-25 16:27:05.000000000 +0800 ++++ scim-pinyin-0.5.91/src/scim_phrase.cpp 2008-02-25 16:26:41.000000000 +0800 +@@ -28,6 +28,7 @@ + #define SCIM_PHRASE_MAX_RELATION 1000 + + #include <scim.h> ++#include <cstring> + #include "scim_pinyin_private.h" + #include "scim_phrase.h" + +diff -up scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 scim-pinyin-0.5.91/src/scim_special_table.cpp +--- scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 2008-02-25 16:27:55.000000000 +0800 ++++ scim-pinyin-0.5.91/src/scim_special_table.cpp 2008-02-25 16:28:08.000000000 +0800 +@@ -22,6 +22,7 @@ + + #include <time.h> + #include <scim.h> ++#include <cstring> + #include "scim_pinyin_private.h" + #include "scim_special_table.h" + +diff -up scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin.cpp +--- scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 2008-02-25 16:26:10.000000000 +0800 ++++ scim-pinyin-0.5.91/src/scim_pinyin.cpp 2008-02-25 16:26:26.000000000 +0800 +@@ -29,6 +29,7 @@ + #define Uses_SCIM_LOOKUP_TABLE + + #include <scim.h> ++#include <cstring> + #include "scim_pinyin.h" + + // Internal functions +diff -up scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp +--- scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 2008-02-25 16:27:15.000000000 +0800 ++++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp 2008-02-25 16:27:28.000000000 +0800 +@@ -27,6 +27,7 @@ + #define Uses_SCIM_LOOKUP_TABLE + + #include <scim.h> ++#include <cstring> + #include "scim_pinyin_private.h" + #include "scim_phrase.h" + #include "scim_pinyin.h" diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD index ca35f2882..e702643b6 100644 --- a/extra/scim-tables/PKGBUILD +++ b/extra/scim-tables/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 134848 2011-08-07 23:21:19Z bisson $ +# $Id: PKGBUILD 148920 2012-02-05 11:55:57Z ibiru $ # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=scim-tables pkgver=0.5.10 -pkgrel=1 +pkgrel=2 pkgdesc='Generic table input method module for SCIM' -arch=('i686' 'x86_64') url='http://www.scim-im.org/' +arch=('i686' 'x86_64') license=('GPL') depends=('scim') options=('!libtool') diff --git a/extra/scim-uim/PKGBUILD b/extra/scim-uim/PKGBUILD index b93293cf4..8d87455fa 100644 --- a/extra/scim-uim/PKGBUILD +++ b/extra/scim-uim/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 92903 2010-10-01 19:04:42Z bisson $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 149050 2012-02-05 15:34:14Z bisson $ +# Contributor: damir <damir@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org pkgname=scim-uim pkgver=0.2.0 -pkgrel=4 +pkgrel=5 pkgdesc='UIM bridging input engine for SCIM' -arch=('i686' 'x86_64') url='http://www.scim-im.org/' license=('GPL') -depends=('scim>=1.4.8' 'uim>=1.5.5') -options=(!libtool) -source=("http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz" +options=('!libtool') +depends=('scim' 'uim') +arch=('i686' 'x86_64') +source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz" 'scim-uim-0.2.0-fix-gcc43-build.patch' - 'uim-1.5.5-header.diff') + 'uim-1.5.5-header.patch') sha1sums=('456621d5969b6552c3c33c83cf295aa4134fff0a' 'a9d67946f956d0572c73065e2b4b268bfdf149e3' '3b083260910f7855b5446960ab1203c052f4b56c') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 < ../scim-uim-0.2.0-fix-gcc43-build.patch - patch -p1 < ../uim-1.5.5-header.diff - ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../scim-uim-0.2.0-fix-gcc43-build.patch + patch -p1 -i ../uim-1.5.5-header.patch + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/scim-uim/uim-1.5.5-header.patch b/extra/scim-uim/uim-1.5.5-header.patch new file mode 100644 index 000000000..0e6565827 --- /dev/null +++ b/extra/scim-uim/uim-1.5.5-header.patch @@ -0,0 +1,13 @@ +--- scim-uim-0.2.0.orig/src/scim_uim_imengine.cpp ++++ scim-uim-0.2.0/src/scim_uim_imengine.cpp +@@ -34,7 +34,8 @@ + + #include <scim.h> + #include "scim_uim_imengine.h" +-#include <uim/uim-compat-scm.h> ++#include <uim/uim-scm.h> ++#include <uim/uim-util.h> + + #define scim_module_init uim_LTX_scim_module_init + #define scim_module_exit uim_LTX_scim_module_exit + diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD index 5af43d7ed..3ad378912 100644 --- a/extra/scribus/PKGBUILD +++ b/extra/scribus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146995 2012-01-20 06:04:00Z remy $ +# $Id: PKGBUILD 148922 2012-02-05 11:56:01Z ibiru $ # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: Ben <ben@benmazer.net> @@ -6,7 +6,7 @@ pkgname=scribus pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="A desktop publishing program" arch=('i686' 'x86_64') url="http://www.scribus.net" @@ -23,7 +23,9 @@ sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809') build() { cd "${srcdir}" - sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' ${pkgname}-${pkgver}/scribus/plugins/scriptplugin/scripts/ColorChart.py + sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ + -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + ${pkgname}-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/* mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/sdl_image/PKGBUILD b/extra/sdl_image/PKGBUILD index 7643e2ba8..3f5fefb58 100644 --- a/extra/sdl_image/PKGBUILD +++ b/extra/sdl_image/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 147083 2012-01-21 17:53:25Z heftig $ +# $Id: PKGBUILD 148924 2012-02-05 11:56:07Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sdl_image pkgver=1.2.12 -pkgrel=1 +pkgrel=2 pkgdesc="A simple library to load images of various formats as SDL surfaces" arch=('i686' 'x86_64') license=('custom') diff --git a/extra/skanlite/PKGBUILD b/extra/skanlite/PKGBUILD index 269f9b724..2e9e27742 100644 --- a/extra/skanlite/PKGBUILD +++ b/extra/skanlite/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145180 2011-12-19 08:38:09Z andrea $ +# $Id: PKGBUILD 148928 2012-02-05 11:56:16Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=skanlite pkgver=0.8 -pkgrel=1 +pkgrel=2 pkgdesc="Image Scanning Application for KDE" arch=('i686' 'x86_64') url='http://kde-apps.org/content/show.php?content=109803' diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 6dea30917..fc74689a8 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141487 2011-10-30 22:51:16Z bisson $ +# $Id: PKGBUILD 148930 2012-02-05 11:56:28Z ibiru $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -6,7 +6,7 @@ pkgname=slim pkgver=1.3.2 -pkgrel=6 +pkgrel=7 pkgdesc='Desktop-independent graphical login manager for X11' arch=('i686' 'x86_64') url='http://slim.berlios.de/' @@ -17,38 +17,38 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'rc.d' 'pam.d' 'logrotate' - 'gcc44.patch' 'ptr_pam.patch' 'no-host.patch' 'restart.patch' 'sigterm.patch' 'session-name.patch' - 'tty-slowness.patch') + 'tty-slowness.patch' + 'slim-1.3.2-libpng15.patch') sha1sums=('e421d5487732c8317f8f591906661e014b036358' '6fe0ba83509af634bce47be34e30995965bffc79' 'a0e991ef0ac5120465a3be014a26e70ba073b6ae' 'b969cc902c1d9915a5609141a652c77b2732407b' - '51121d451116c768d0fc027ff1ea70aaaef036e7' '640668c984a13593a1bfba8d3b503c005d5f401e' 'b86eddd083fb9f6259e46c735f55ebe76c655bd3' '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435' '0b35048723c527fb824c5e0f9b9064f751871785' 'fdd35562ce010babaeb793f92f9906fdcdaf3f9f' - '213fefe8533c845ea8c40585b6a8097820d5e5d2') + '213fefe8533c845ea8c40585b6a8097820d5e5d2' + '3cd674e548f4e0aadbbd32a67b4efd1ed263afef') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's/png12/png14/g' Makefile - patch -p1 -i ../gcc44.patch # FS#14815: lacks include for gcc-4.4 + sed -i -e 's/png12/png15/g' Makefile patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM patch -p1 -i ../no-host.patch # cf patch: do not set PAM host patch -p1 -i ../restart.patch # cf patch: restart X server if killed patch -p1 -i ../sigterm.patch # FS#23984: do not wait for input when SIGTERM'd patch -p1 -i ../session-name.patch # FS#26693: fix default session name patch -p1 -i ../tty-slowness.patch # FS#18313: fix sluggish TTY after slim start + patch -p0 -i ../slim-1.3.2-libpng15.patch make USE_PAM=1 } diff --git a/extra/slim/slim-1.3.2-libpng15.patch b/extra/slim/slim-1.3.2-libpng15.patch new file mode 100644 index 000000000..720608567 --- /dev/null +++ b/extra/slim/slim-1.3.2-libpng15.patch @@ -0,0 +1,11 @@ +--- png.c ++++ png.c +@@ -57,7 +57,7 @@ + return(0); + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); + fclose(infile); diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index 774654feb..5973fa422 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142642 2011-11-12 17:15:40Z ibiru $ +# $Id: PKGBUILD 148932 2012-02-05 11:56:32Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.3.2 -pkgrel=4 +pkgrel=5 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64') url="http://sox.sourceforge.net/" @@ -25,7 +25,7 @@ sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3' build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch" - sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am + sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in ./configure --prefix=/usr --sysconfdir=/etc \ --with-dyn-default --with-distro="Arch Linux" make diff --git a/extra/streamtuner/PKGBUILD b/extra/streamtuner/PKGBUILD index f449a3f89..ea344e218 100644 --- a/extra/streamtuner/PKGBUILD +++ b/extra/streamtuner/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94130 2010-10-04 18:10:32Z andyrtr $ +# $Id: PKGBUILD 148934 2012-02-05 11:56:39Z ibiru $ # Contributor: Greg Grabinski <greg@grabinski.ch> # Maintainer: ndreas Radke <andyrtr@archlinux.org> pkgname=streamtuner pkgver=0.99.99 -pkgrel=11 +pkgrel=12 pkgdesc="A stream directory browser" arch=('i686' 'x86_64') url="http://www.nongnu.org/streamtuner/" @@ -26,12 +26,12 @@ md5sums=('2027b7c34e85b594524b0b4351c14362' build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p0 -i ${srcdir}/streamtuner-0.99.99-live365.diff || return 1 - patch -p0 -i ${srcdir}/streamtuner-0.99.99-pygtk-2.6.diff || return 1 + patch -p0 -i ${srcdir}/streamtuner-0.99.99-live365.diff + patch -p0 -i ${srcdir}/streamtuner-0.99.99-pygtk-2.6.diff # fix http://bugs.archlinux.org/task/10308 - patch -p0 -i ${srcdir}/streamtuner-0.99.99-shoutcast.diff || return 1 + patch -p0 -i ${srcdir}/streamtuner-0.99.99-shoutcast.diff # fix http://bugs.archlinux.org/task/11463 - patch -p1 -i ${srcdir}/shoutcast-redesign-patch.diff || return 1 + patch -p1 -i ${srcdir}/shoutcast-redesign-patch.diff # python2 fixes sed -i "s:^for ac_prog in python:for ac_prog in python2:" ${srcdir}/${pkgname}-${pkgver}/configure diff --git a/extra/taglib-sharp/PKGBUILD b/extra/taglib-sharp/PKGBUILD index bde9d495e..e36a4a057 100644 --- a/extra/taglib-sharp/PKGBUILD +++ b/extra/taglib-sharp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75153 2010-03-31 23:10:28Z giovanni $ +# $Id: PKGBUILD 149091 2012-02-05 17:08:11Z daniel $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Carlos Ruiz <cailovirtual@gmail.com> pkgname=taglib-sharp pkgver=2.0.3.7 -pkgrel=1 +pkgrel=2 pkgdesc="Free and Open Source library for the .NET 2.0 and Mono frameworks which will let you tag your software with as much or as little detail as you like without slowing you down." arch=('i686' 'x86_64') url="http://www.taglib-sharp.com/Main_Page" diff --git a/extra/timidity++/PKGBUILD b/extra/timidity++/PKGBUILD index 82ced473c..bbfec5b5a 100644 --- a/extra/timidity++/PKGBUILD +++ b/extra/timidity++/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 89194 2010-08-30 06:14:52Z eric $ +# $Id: PKGBUILD 148660 2012-02-05 11:45:59Z ibiru $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=timidity++ pkgver=2.13.2 -pkgrel=10 +pkgrel=11 pkgdesc="A MIDI to WAVE converter and player" arch=('i686' 'x86_64') url="http://timidity.sourceforge.net" license=('GPL') depends=('libao' 'libvorbis' 'jack' 'ncurses') -makedepends=('xaw3d' 'gtk2' 'tk' 'libxaw') +makedepends=('xaw3d>=1.6' 'gtk2' 'tk' 'libxaw') optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface' \ 'xaw3d: for using the Xaw interface') backup=('etc/timidity++/timidity.cfg') @@ -18,14 +18,22 @@ source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.bz2 \ timidity.cfg timidity++.sh 2.13.2-gcc4.patch TiMidity++-2.13.2+flac-1.1.3.patch \ timidity++-2.13.2-exiterror.patch timidity++-2.13.2-gtk26.patch \ timidity++-2.13.2-polling.patch) -md5sums=('a82ceeb2245e22f4de2b41da21eaee32' '3fcc8f065c959205113fa7e9ab2be3c6'\ - '35606c12af9c6be9361d64fc536f046f' '0868926c5290817cacb9a1849bc043c2'\ - 'fcbd27ff83066f69a3f8bd2442a3b3e2' '31bdaea612f18e2c3d45a8a73ab44c81'\ - '16a4adec164836d4390dc6b0f9a69ce9' '3f0034ead451cdd1078868e9e9b0494c') -sha1sums=('8e603146e1164335303a5ac5dff291f369241b4e' '660b3afbb720d26e8f008034cee66dd8da082d6e'\ - '9f3e732a7ca1e97119a76df62ecf154df04d4f77' '8d50618a2379c078b07e8d0fc59457855c16106c'\ - '59b0dbe3cde8f7b41d83676d8c37809255d3fb36' '7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60'\ - 'ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4' '6abaedaecdecabf9dc76c062f7157571aed53984') +md5sums=('a82ceeb2245e22f4de2b41da21eaee32' + '3fcc8f065c959205113fa7e9ab2be3c6' + '35606c12af9c6be9361d64fc536f046f' + '0868926c5290817cacb9a1849bc043c2' + 'fcbd27ff83066f69a3f8bd2442a3b3e2' + '31bdaea612f18e2c3d45a8a73ab44c81' + '16a4adec164836d4390dc6b0f9a69ce9' + '3f0034ead451cdd1078868e9e9b0494c') +sha1sums=('8e603146e1164335303a5ac5dff291f369241b4e' + '660b3afbb720d26e8f008034cee66dd8da082d6e' + '9f3e732a7ca1e97119a76df62ecf154df04d4f77' + '8d50618a2379c078b07e8d0fc59457855c16106c' + '59b0dbe3cde8f7b41d83676d8c37809255d3fb36' + '7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60' + 'ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4' + '6abaedaecdecabf9dc76c062f7157571aed53984') build() { cd "${srcdir}/TiMidity++-${pkgver}" @@ -39,7 +47,7 @@ build() { ./configure --prefix=/usr --mandir=/usr/share/man --with-default-path=/etc/timidity++/ \ --enable-server --enable-alsaseq --enable-spectrogram \ - --enable-audio=alsa,oss,ao,vorbis,flac,esd,jack \ + --enable-audio=alsa,oss,ao,vorbis,flac,jack \ --enable-dynamic=ncurses,tcltk,vt100,xaw,gtk \ --disable-gtktest make diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index e5c25695b..e1db1dc7d 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145110 2011-12-17 04:30:48Z heftig $ +# $Id: PKGBUILD 148940 2012-02-05 11:56:59Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -7,7 +7,7 @@ pkgbase=tracker pkgname=(tracker libtracker-sparql) pkgver=0.12.9 _tver=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="All-in-one indexer, search tool and metadata database" arch=('i686' 'x86_64') license=('GPL') @@ -33,6 +33,8 @@ build() { --enable-libflac \ --enable-libvorbis + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make } diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index a74dbfd64..82cb5c8de 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147746 2012-01-27 20:01:33Z ibiru $ +# $Id: PKGBUILD 148942 2012-02-05 11:57:05Z ibiru $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=3 +pkgrel=4 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64') url="http://tcforge.berlios.de/" diff --git a/extra/transfig/PKGBUILD b/extra/transfig/PKGBUILD index 6a223da76..a17e6047f 100644 --- a/extra/transfig/PKGBUILD +++ b/extra/transfig/PKGBUILD @@ -1,36 +1,37 @@ -# $Id: PKGBUILD 81063 2010-05-26 10:19:14Z jgc $ -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 148944 2012-02-05 11:57:10Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=transfig -pkgver=3.2.5c -pkgrel=3 +pkgver=3.2.5d +pkgrel=1 pkgdesc="Format conversion utility that can be used with xfig" arch=('i686' 'x86_64') url="http://www.xfig.org" license=('custom') depends=('libpng' 'libxpm') makedepends=('imake') -source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE) -md5sums=('0cc55ed6b4ae67a3e610e501acd694f9' 'a0b2ea903821c46dbc77afefc06d1aa4') -sha1sums=('20013b350e81400943cd91744173445d7bd4d98e' 'b8b712871615308b8b6add92f86d218437d652f2') +source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE \ + transfig-3.2.5d-libpng-1.5.patch) +sha1sums=('90ff277cc9b3fa0d0313052fcf5e3ffad8652abc' + 'b8b712871615308b8b6add92f86d218437d652f2' + '9f9f332b0b31e58e59542bc1568df9617b71710a') build() { - cd ${srcdir}/${pkgname}.${pkgver} - sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/' transfig/Imakefile || return 1 - sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile || return 1 + cd "${srcdir}/${pkgname}.${pkgver}" + sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/' transfig/Imakefile + sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile + patch -p1 -i ../transfig-3.2.5d-libpng-1.5.patch - xmkmf || return 1 - make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles || return 1 - make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig || return 1 + xmkmf + make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles + make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig } package() { - cd ${srcdir}/${pkgname}.${pkgver} + cd "${srcdir}/${pkgname}.${pkgver}" - make DESTDIR=${pkgdir} XFIGLIBDIR=/usr/share/xfig \ - FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \ - install install.man || return 1 - install -Dm644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 + make DESTDIR="${pkgdir}" XFIGLIBDIR=/usr/share/xfig \ + FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \ + install install.man + install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/transfig/transfig-3.2.5d-libpng-1.5.patch b/extra/transfig/transfig-3.2.5d-libpng-1.5.patch new file mode 100644 index 000000000..e6f15e43e --- /dev/null +++ b/extra/transfig/transfig-3.2.5d-libpng-1.5.patch @@ -0,0 +1,39 @@ +http://bugs.gentoo.org/show_bug.cgi?id=356751 + +Index: transfig.3.2.5d/fig2dev/dev/readpng.c +=================================================================== +--- transfig.3.2.5d.orig/fig2dev/dev/readpng.c ++++ transfig.3.2.5d/fig2dev/dev/readpng.c +@@ -62,7 +62,7 @@ read_png(file,filetype,pic,llx,lly) + } + + /* set long jump here */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* if we get here there was a problem reading the file */ + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + return 0; +@@ -78,15 +78,17 @@ read_png(file,filetype,pic,llx,lly) + png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, + &interlace_type, &compression_type, &filter_type); + +- if (info_ptr->valid & PNG_INFO_gAMA) +- png_set_gamma(png_ptr, 2.2, info_ptr->gamma); +- else +- png_set_gamma(png_ptr, 2.2, 0.45); ++ png_fixed_point gamma = 0.45; ++ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma); ++ png_set_gamma(png_ptr, 2.2, gamma); + +- if (info_ptr->valid & PNG_INFO_bKGD) ++ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { + /* set the background to the one supplied */ +- png_set_background(png_ptr, &info_ptr->background, ++ png_color_16p background; ++ png_get_bKGD(png_ptr,info_ptr,&background); ++ png_set_background(png_ptr, background, + PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); ++ } + else { + /* blend the canvas background using the alpha channel */ + if (bgspec) { diff --git a/extra/tsocks/PKGBUILD b/extra/tsocks/PKGBUILD index 0c65f8794..ae03265d3 100644 --- a/extra/tsocks/PKGBUILD +++ b/extra/tsocks/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 111127 2011-02-24 08:00:08Z bisson $ +# $Id: PKGBUILD 149054 2012-02-05 15:38:18Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=tsocks pkgver=1.8beta5 -pkgrel=4 +pkgrel=5 pkgdesc='Transparent SOCKS proxying library' -arch=('i686' 'x86_64') url='http://tsocks.sourceforge.net/' license=('GPL') +arch=('i686' 'x86_64') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") sha1sums=('489f88c5df999ba21b27cdaa7836d9426d062aec') diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index 69f4609af..c7f54c6bf 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 146987 2012-01-19 22:31:36Z foutrelis $ +# $Id: PKGBUILD 148946 2012-02-05 11:57:15Z ibiru $ # 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=3 +pkgrel=4 pkgdesc="D-Bus service for applications to request thumbnails" arch=('i686' 'x86_64') url="http://git.xfce.org/xfce/tumbler/" diff --git a/extra/tuxpuck/PKGBUILD b/extra/tuxpuck/PKGBUILD index bbd316b5d..aecbcdaa6 100644 --- a/extra/tuxpuck/PKGBUILD +++ b/extra/tuxpuck/PKGBUILD @@ -1,22 +1,41 @@ -# $Id: PKGBUILD 63695 2010-01-18 10:38:26Z andrea $ +# $Id: PKGBUILD 148948 2012-02-05 11:57:19Z ibiru $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=tuxpuck pkgver=0.8.2 -pkgrel=4 +pkgrel=5 pkgdesc="Airhockey with tux" arch=('i686' 'x86_64') url="http://home.no.net/munsuun/tuxpuck/" license=('GPL2') -depends=('libjpeg>=8' 'sdl' 'libpng>=1.4.0' 'libvorbis') +depends=('libjpeg' 'sdl' 'libpng' 'libvorbis') makedepends=('freetype2') options=('!makeflags') -source=(http://ftp.de.debian.org/debian/pool/main/t/${pkgname}/${pkgname}_$pkgver.orig.tar.gz) -md5sums=('fc839abc2b1f3eafae397e1ed6487079') +source=("http://ftp.de.debian.org/debian/pool/main/t/${pkgname}/${pkgname}_$pkgver.orig.tar.gz" + 'tuxpuck-0.8.2-ldflags.patch' + 'tuxpuck-0.8.2-libpng15.patch') +md5sums=('fc839abc2b1f3eafae397e1ed6487079' + 'cb914d211bf3f519b7700fda180612b0' + 'a4da530d670a0c30ac0840aab1db0dca') build() { cd $srcdir/$pkgname-$pkgver - sed -i 's|usr/man|usr/share/man|' Makefile || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + + sed -i 's|usr/man|usr/share/man|' Makefile + sed -i -e 's/-Werror//' \ + -e '/^CC/d' \ + Makefile \ + utils/Makefile \ + data/Makefile + + patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-ldflags.patch" + patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-libpng15.patch" + + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install } diff --git a/extra/tuxpuck/tuxpuck-0.8.2-ldflags.patch b/extra/tuxpuck/tuxpuck-0.8.2-ldflags.patch new file mode 100644 index 000000000..28fcef48a --- /dev/null +++ b/extra/tuxpuck/tuxpuck-0.8.2-ldflags.patch @@ -0,0 +1,11 @@ +--- Makefile.old 2010-10-05 10:34:57.000000000 +0200 ++++ Makefile 2010-10-05 10:35:28.000000000 +0200 +@@ -20,7 +20,7 @@ + + $(NAME) : $(OBJS) + cd data; $(MAKE) +- $(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \ ++ $(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \ + -ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME) + + w32icon.o : data/icons/tuxpuck.ico diff --git a/extra/tuxpuck/tuxpuck-0.8.2-libpng15.patch b/extra/tuxpuck/tuxpuck-0.8.2-libpng15.patch new file mode 100644 index 000000000..ca9539f39 --- /dev/null +++ b/extra/tuxpuck/tuxpuck-0.8.2-libpng15.patch @@ -0,0 +1,63 @@ +--- png.c.old 2011-09-14 16:25:54.415338149 +0200 ++++ png.c 2011-09-14 17:41:02.190803110 +0200 +@@ -38,6 +38,8 @@ + png_color_16 *transv; + SDL_RWops *src = NULL; + Uint32 size; ++ int num_palette; ++ png_colorp png_palette; + + memcpy(&size, data, sizeof(Uint32)); + if (memcounter) +@@ -74,7 +76,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))) { + SDL_SetError("Error reading the PNG file."); + goto done; + } +@@ -142,9 +144,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; +@@ -152,7 +154,7 @@ + } + } + surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, +- bit_depth * info_ptr->channels, Rmask, Gmask, ++ bit_depth * png_get_channels(png_ptr, info_ptr), Rmask, Gmask, + Bmask, Amask); + if (surface == NULL) { + SDL_SetError("Out of memory"); +@@ -197,12 +199,15 @@ + 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 { ++ png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette); ++ if (num_palette > 0) { ++ palette->ncolors = num_palette; ++ for (i = 0; i < num_palette; ++i) { ++ palette->colors[i].b = png_palette[i].blue; ++ palette->colors[i].g = png_palette[i].green; ++ palette->colors[i].r = png_palette[i].red; ++ } + } + } + } diff --git a/extra/unison/PKGBUILD b/extra/unison/PKGBUILD index 059ab98a2..6227a9041 100644 --- a/extra/unison/PKGBUILD +++ b/extra/unison/PKGBUILD @@ -1,46 +1,51 @@ -# $Id: PKGBUILD 126943 2011-06-08 20:05:25Z tpowa $ +# $Id: PKGBUILD 148950 2012-02-05 11:57:26Z ibiru $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=unison pkgver=2.40.63 -pkgrel=2 +pkgrel=3 pkgdesc="Unison is a file-synchronization tool" arch=(i686 x86_64) license=('GPL2') url="http://www.cis.upenn.edu/~bcpierce/unison" depends=('glibc') makedepends=('ocaml' 'lablgtk2' 'imagemagick') +optdepends=('gtk2: for gtk2 support') source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz $pkgname.desktop) +md5sums=('3281207850cf6f0a17fe73f371893bd3' + '2daecba7705455a8e4b769e48b059872') options=(!makeflags) build() { - cd $startdir/src/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" CFLAGS="" make clean make mkProjectInfo make UISTYLE=text DEBUGGING=false THREADS=true - mkdir -p $startdir/pkg/usr/bin - install -Dm755 unison $startdir/pkg/usr/bin/unison + mv unison unison-text # clean the builddir and rebuild with gtk support # broken at the moment! # make clean # make mkProjectInfo # make UISTYLE=gtk DEBUGGING=false THREADS=true - # install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk + # install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk # clean the builddir and rebuild with gtk2 support make clean make mkProjectInfo make UISTYLE=gtk2 DEBUGGING=false THREADS=true - install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk2 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -Dm755 unison-text "$pkgdir"/usr/bin/unison + install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk2 # install a .desktop file; create a compliant icon from ico file and install the png - install -Dm644 ../$pkgname.desktop $startdir/pkg/usr/share/applications/$pkgname.desktop + install -Dm644 ../$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop convert win32rc/U.ico unison.png - install -Dm644 ${pkgname}-1.png $startdir/pkg/usr/share/pixmaps/$pkgname.png + install -Dm644 ${pkgname}-1.png "$pkgdir"/usr/share/pixmaps/$pkgname.png # make symlink for .desktop file - cd $startdir/pkg//usr/bin + cd "$pkgdir"/usr/bin ln -s unison-gtk2 unison-x11 } -md5sums=('3281207850cf6f0a17fe73f371893bd3' - '2daecba7705455a8e4b769e48b059872') diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD index 316933b34..3d3762728 100644 --- a/extra/vice/PKGBUILD +++ b/extra/vice/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143992 2011-12-01 15:40:19Z giovanni $ +# $Id: PKGBUILD 148952 2012-02-05 11:57:30Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vice pkgver=2.3 -pkgrel=4 +pkgrel=5 pkgdesc="A Versatile Commodore Emulator" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index 6bc34f5fe..fe4b87cda 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 144876 2011-12-08 20:54:22Z andyrtr $ +# $Id: PKGBUILD 148954 2012-02-05 11:57:34Z ibiru $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgbase=vigra pkgname=('vigra' 'vigra-doc') pkgver=1.8.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://hci.iwr.uni-heidelberg.de/vigra/" license=('custom:MIT') makedepends=(# runtime deps - 'libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw' + 'libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw' # additional makedeps 'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy') options=('!libtool') @@ -38,7 +38,7 @@ check() { package_vigra() { pkgdesc="Computer vision library" - depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw') + depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw') optdepends=('python2: for python bindings' 'boost-libs: for python bindings') diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 09a939f80..21fdca9d7 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 147739 2012-01-27 19:27:41Z ibiru $ +# $Id: PKGBUILD 148956 2012-02-05 11:57:41Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.13 -pkgrel=3 +pkgrel=5 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -39,12 +39,18 @@ backup=('usr/share/vlc/http/.hosts' 'usr/share/vlc/lua/http/dialogs/.hosts') options=('!libtool') install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('9678fb7a04808b6e0de63746d35e4bb1') +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'vlc-1.1.13-skin2_theme_loader.patch' + 'vlc-1.1.13-youtube.patch') +md5sums=('9678fb7a04808b6e0de63746d35e4bb1' + 'f7c2ea18da9570d633f5fd834a1f72c8' + '26dbd3574219daf4babc2f127a3229bc') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/vlc-1.1.13-skin2_theme_loader.patch" + patch -Np1 -i "${srcdir}/vlc-1.1.13-youtube.patch" sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c ./configure --prefix=/usr \ diff --git a/extra/vlc/vlc-1.1.13-skin2_theme_loader.patch b/extra/vlc/vlc-1.1.13-skin2_theme_loader.patch new file mode 100644 index 000000000..5230b6485 --- /dev/null +++ b/extra/vlc/vlc-1.1.13-skin2_theme_loader.patch @@ -0,0 +1,29 @@ +--- a/modules/gui/skins2/src/theme_loader.cpp 2012-02-02 17:52:07.000000000 +0100 ++++ b/modules/gui/skins2/src/theme_loader.cpp 2012-02-02 17:52:19.000000000 +0100 +@@ -768,7 +768,7 @@ + { + void *toClose = currentGzVp; + currentGzVp = NULL; currentGzFd = -1; +- return gzclose( toClose ); ++ return gzclose( (gzFile) toClose ); + } + return -1; + } +@@ -777,7 +777,7 @@ + { + if( currentGzVp != NULL && fd != -1 ) + { +- return gzread( currentGzVp, p_buffer, i_length ); ++ return gzread( (gzFile) currentGzVp, p_buffer, i_length ); + } + return -1; + } +@@ -786,7 +786,7 @@ + { + if( currentGzVp != NULL && fd != -1 ) + { +- return gzwrite( currentGzVp, const_cast<void*>(p_buffer), i_length ); ++ return gzwrite( (gzFile) currentGzVp, const_cast<void*>(p_buffer), i_length ); + } + return -1; + } diff --git a/extra/vlc/vlc-1.1.13-youtube.patch b/extra/vlc/vlc-1.1.13-youtube.patch new file mode 100644 index 000000000..e1a0f49b4 --- /dev/null +++ b/extra/vlc/vlc-1.1.13-youtube.patch @@ -0,0 +1,221 @@ +--- a/share/lua/playlist/youtube.lua 2011-08-06 11:30:49.000000000 +0200 ++++ b/share/lua/playlist/youtube.lua 2012-02-02 16:05:32.000000000 +0100 +@@ -1,7 +1,7 @@ + --[[ + $Id$ + +- Copyright © 2007-2009 the VideoLAN team ++ Copyright © 2007-2011 the VideoLAN team + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -24,13 +24,27 @@ + return res + end + +-function get_arturl( path, video_id ) +- if string.match( vlc.path, "iurl=" ) then +- return vlc.strings( get_url_param( vlc.path, "iurl" ) ) ++function get_arturl() ++ local iurl = get_url_param( vlc.path, "iurl" ) ++ if iurl then ++ return iurl + end +- if not arturl then +- return "http://img.youtube.com/vi/"..video_id.."/default.jpg" ++ local video_id = get_url_param( vlc.path, "v" ) ++ if not video_id then ++ return nil ++ end ++ return "http://img.youtube.com/vi/"..video_id.."/default.jpg" ++end ++ ++function get_prefres() ++ local prefres = -1 ++ if vlc.var and vlc.var.inherit then ++ prefres = vlc.var.inherit(nil, "preferred-resolution") ++ if prefres == nil then ++ prefres = -1 ++ end + end ++ return prefres + end + + -- Probe function. +@@ -47,18 +61,17 @@ + return false + end + end +- return ( string.match( vlc.path, "watch%?v=" ) -- the html page +- or string.match( vlc.path, "watch_fullscreen%?video_id=" ) -- the fullscreen page +- or string.match( vlc.path, "p.swf" ) -- the (old?) player url +- or string.match( vlc.path, "jp.swf" ) -- the (new?) player url (as of 24/08/2007) +- or string.match( vlc.path, "player2.swf" ) ) -- another player url ++ return ( string.match( vlc.path, "/watch%?" ) -- the html page ++ or string.match( vlc.path, "/v/" ) -- video in swf player ++ or string.match( vlc.path, "/player2.swf" ) ) -- another player url + end + + -- Parse function. + function parse() +- if string.match( vlc.path, "watch%?v=" ) ++ if string.match( vlc.path, "/watch%?" ) + then -- This is the HTML page's URL +- -- fmt is the format of the video: 18 is HQ (mp4) ++ -- fmt is the format of the video ++ -- (cf. http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs) + fmt = get_url_param( vlc.path, "fmt" ) + while true do + -- Try to find the video's title +@@ -71,27 +84,42 @@ + end + if string.match( line, "<meta name=\"description\"" ) then + -- Don't ask me why they double encode ... +- _,_,description = vlc.strings.resolve_xml_special_chars(vlc.strings.resolve_xml_special_chars(string.find( line, "content=\"(.-)\"" ))) ++ _,_,description = string.find( line, "content=\"(.-)\"" ) ++ description = vlc.strings.resolve_xml_special_chars( description ) ++ description = vlc.strings.resolve_xml_special_chars( description ) + end +- if string.match( line, "subscribe_to_user=" ) then +- _,_,artist = string.find( line, "subscribe_to_user=([^&]*)" ) ++ if string.match( line, "<meta property=\"og:image\"" ) then ++ _,_,arturl = string.find( line, "content=\"(.-)\"" ) + end +- -- CURRENT: var swfConfig = { [a lot of stuff...], "video_id": "OHVvVmUNBFc", "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA"}; +- -- OLD 1: var swfArgs = {hl:'en',BASE_YT_URL:'http://youtube.com/',video_id:'XPJ7d8dq0t8',l:'292',t:'OEgsToPDskLFdOYrrlDm3FQPoQBYaCP1',sk:'0gnr-AE6QZJEZmCMd3lq_AC'}; +- -- OLD 2: var swfArgs = { "BASE_YT_URL": "http://youtube.com", "video_id": "OHVvVmUNBFc", "l": 88, "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA", "tk": "mEL4E7PqHeaZp5OG19NQThHt9mXJU4PbRTOw6lz9osHi4Hixp7RE1w=="}; +- -- OLD 3: 'SWF_ARGS': { [a lot of stuff...], "video_id": "OHVvVmUNBFc", "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA"}; +- if ( string.match( line, "PLAYER_CONFIG" ) or string.match( line, "swfConfig" ) or string.match( line, "SWF_ARGS" ) or string.match( line, "swfArgs" ) ) and string.match( line, "video_id" ) then +- if string.match( line, "BASE_YT_URL" ) then +- _,_,base_yt_url = string.find( line, "\"BASE_YT_URL\": \"(.-)\"" ) ++ if string.match( line, " rel=\"author\"" ) then ++ _,_,artist = string.find( line, "href=\"/user/([^\"]*)\"" ) ++ end ++ -- JSON parameters, also formerly known as "swfConfig", ++ -- "SWF_ARGS", "swfArgs", "PLAYER_CONFIG" ... ++ if string.match( line, "playerConfig" ) then ++ if not fmt then ++ prefres = get_prefres() ++ if prefres >= 0 then ++ fmt_list = string.match( line, "\"fmt_list\": \"(.-)\"" ) ++ if fmt_list then ++ for itag,height in string.gmatch( fmt_list, "(%d+)\\/%d+x(%d+)\\/[^,]+" ) do ++ -- Apparently formats are listed in quality ++ -- order, so we take the first one that works, ++ -- or fallback to the lowest quality ++ fmt = itag ++ if tonumber(height) <= prefres then ++ break ++ end ++ end ++ end ++ end + end +- _,_,t = string.find( line, "\"t\": \"(.-)\"" ) +- -- vlc.msg.err( t ) +- -- video_id = string.gsub( line, ".*&video_id:'([^']*)'.*", "%1" ) +- fmt_url_map = string.match( line, "\"url_encoded_fmt_stream_map\": \"(.-)\"" ) +- if fmt_url_map then ++ ++ url_map = string.match( line, "\"url_encoded_fmt_stream_map\": \"(.-)\"" ) ++ if url_map then + -- FIXME: do this properly +- fmt_url_map = string.gsub( fmt_url_map, "\\u0026", "&" ) +- for url,itag in string.gmatch( fmt_url_map, "url=([^&,]+).-&itag=(%d+)" ) do ++ url_map = string.gsub( url_map, "\\u0026", "&" ) ++ for url,itag in string.gmatch( url_map, "url=([^&,]+)[^,]*&itag=(%d+)" ) do + -- Apparently formats are listed in quality order, + -- so we can afford to simply take the first one + if not fmt or tonumber( itag ) == tonumber( fmt ) then +@@ -101,75 +129,37 @@ + end + end + end +- -- Also available on non-HTML5 pages: var swfHTML = (isIE) ? "<object [...]><param name=\"flashvars\" value=\"rv.2.thumbnailUrl=http%3A%2F%2Fi4.ytimg.com%2Fvi%2F3MLp7YNTznE%2Fdefault.jpg&rv.7.length_seconds=384 [...] &video_id=OHVvVmUNBFc [...] &t=OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp [...] +- elseif string.match( line, "swfHTML" ) and string.match( line, "video_id" ) then +- _,_,t = string.find( line, "&t=(.-)&" ) +- -- Also available in HTML5 pages: videoPlayer.setAvailableFormat("http://v6.lscache4.c.youtube.com/videoplayback?ip=82.0.0.0&sparams=id%2Cexpire%2Cip%2Cipbits%2Citag%2Calgorithm%2Cburst%2Cfactor&algorithm=throttle-factor&itag=45&ipbits=8&burst=40&sver=3&expire=1275688800&key=yt1&signature=6ED860441298D1157FF3013A5D72727F25831F09.4C196BEA9F8F9B83CE678D79AD918B83D5E98B46&factor=1.25&id=7117715cf57d18d4", "video/webm; codecs="vp8.0, vorbis"", "hd720"); +- elseif string.match( line, "videoPlayer%.setAvailableFormat" ) then +- url,itag = string.match( line, "videoPlayer%.setAvailableFormat%(\"(.-itag=(%d+).-)\",.+%)" ) +- if url then +- -- For now, WebM formats are listed only in the HTML5 +- -- section, that is also only when HTML5 is enabled. +- -- Format 45 is 720p, and 43 is lower resolution. +- if tonumber( itag ) == 45 or ( tonumber( itag ) == 43 and not webm_path ) then +- webm_path = url +- end +- -- Grab something if fmt_url_map failed +- if not path and ( not fmt or tonumber( itag ) == tonumber( fmt ) ) then +- path = url +- end +- end ++ -- There is also another version of the parameters, encoded ++ -- differently, as an HTML attribute of an <object> or <embed> ++ -- tag; but we don't need it now + end + end + +- if not video_id then +- video_id = get_url_param( vlc.path, "v" ) ++ if not path then ++ vlc.msg.err( "Couldn't extract youtube video URL, please check for updates to this script" ) ++ return { } + end +- arturl = get_arturl( vlc.path, video_id ) + +- if not fmt then +- -- Prefer WebM formats if this is an &html5=True URL +- html5 = get_url_param( vlc.path, "html5" ) +- if html5 == "True" and webm_path then +- path = webm_path +- end ++ if not arturl then ++ arturl = get_arturl() + end + +- if not path then +- if not base_yt_url then +- base_yt_url = "http://youtube.com/" +- end +- if fmt then +- format = "&fmt=" .. fmt +- else +- format = "" +- end +- +- if t then +- path = base_yt_url .. "get_video?video_id="..video_id.."&t="..t..format +- else +- -- This shouldn't happen ... but keep it as a backup. +- path = "http://www.youtube.com/v/"..video_id +- end +- end + return { { path = path; name = name; description = description; artist = artist; arturl = arturl } } + else -- This is the flash player's URL +- if string.match( vlc.path, "title=" ) then +- name = vlc.strings.decode_uri(get_url_param( vlc.path, "title" )) +- end + video_id = get_url_param( vlc.path, "video_id" ) +- arturl = get_arturl( vlc.path, video_id ) ++ if not video_id then ++ _,_,video_id = string.find( vlc.path, "/v/([^?]*)" ) ++ end ++ if not video_id then ++ vlc.msg.err( "Couldn't extract youtube video URL" ) ++ return { } ++ end + fmt = get_url_param( vlc.path, "fmt" ) + if fmt then + format = "&fmt=" .. fmt + else + format = "" + end +- if not string.match( vlc.path, "t=" ) then +- -- This sucks, we're missing "t" which is now mandatory. Let's +- -- try using another url +- return { { path = "http://www.youtube.com/v/"..video_id; name = name; arturl = arturl } } +- end +- return { { path = "http://www.youtube.com/get_video.php?video_id="..video_id.."&t="..get_url_param( vlc.path, "t" )..format; name = name; arturl = arturl } } ++ return { { path = "http://www.youtube.com/watch?v="..video_id..format } } + end + end diff --git a/extra/w3m/PKGBUILD b/extra/w3m/PKGBUILD index 80e79e08b..6b6976e42 100644 --- a/extra/w3m/PKGBUILD +++ b/extra/w3m/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 106210 2011-01-15 11:51:10Z bisson $ +# $Id: PKGBUILD 149052 2012-02-05 15:37:14Z bisson $ # Contributor: dorphell <dorphell@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=w3m pkgver=0.5.3 -pkgrel=1 +pkgrel=2 pkgdesc='Text-based Web browser, as well as pager' -arch=('i686' 'x86_64') url='http://w3m.sourceforge.net/' license=('custom') -depends=('openssl' 'gc' 'ncurses' 'zlib') +arch=('i686' 'x86_64') makedepends=('imlib2') optdepends=('imlib2: for graphics support') -source=("http://downloads.sourceforge.net/sourceforge/w3m/$pkgname-$pkgver.tar.gz") +depends=('openssl' 'gc' 'ncurses') +source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz") sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" + + sed 's/file_handle/file_handle_rofl/g' -i istream.* + ./configure \ --prefix=/usr \ --libexecdir=/usr/lib \ @@ -23,15 +27,16 @@ build() { --with-imagelib=imlib2 \ --with-termlib=ncurses \ --disable-w3mmailer \ - --disable-mouse + --disable-mouse \ + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - install -d "$pkgdir"/usr/share/{doc,licenses}/"$pkgname" - find doc/* | grep -v CVS | xargs -i install "{}" "$pkgdir/usr/share/doc/$pkgname/" - ln -s "../../doc/$pkgname/README" "$pkgdir/usr/share/licenses/$pkgname/" -}
\ No newline at end of file + install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" + find doc/* | grep -v CVS | xargs -i install "{}" "${pkgdir}/usr/share/doc/${pkgname}" + ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}" +} diff --git a/extra/webkit-sharp/PKGBUILD b/extra/webkit-sharp/PKGBUILD index 9d3179e53..3bb034776 100644 --- a/extra/webkit-sharp/PKGBUILD +++ b/extra/webkit-sharp/PKGBUILD @@ -5,7 +5,7 @@ pkgname=webkit-sharp pkgver=0.3 -pkgrel=3 +pkgrel=4 pkgdesc="Mono/.NET bindings for the WebKit rendering engine" arch=('i686' 'x86_64') url="http://www.mono-project.com/" diff --git a/extra/wesnoth/PKGBUILD b/extra/wesnoth/PKGBUILD index 6631575b6..c3ec48db6 100644 --- a/extra/wesnoth/PKGBUILD +++ b/extra/wesnoth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144065 2011-12-02 20:54:51Z ibiru $ +# $Id: PKGBUILD 148958 2012-02-05 11:57:49Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Jacobo Arvelo <unix4all@ya.com> @@ -6,12 +6,12 @@ pkgname=wesnoth pkgver=1.8.6 -pkgrel=3 +pkgrel=4 pkgdesc="A turn-based strategy game on a fantasy world" arch=('i686' 'x86_64') license=('GPL') url="http://www.wesnoth.org/" -depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core') +depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core' 'python2') makedepends=('boost') install=wesnoth.install options=(!emptydirs) @@ -20,7 +20,7 @@ source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t wesnoth-1.8.6-boost-foreach.patch wesnoth.tmpfiles.conf) md5sums=('f1c3179869b01b61e253e74aeb241034' - 'ca7412ffc4682ef55ddf82d56b0e2f08' + '3b0d2edcb45e8ecc8c790f92bdcb0087' 'dc414ab7e1334941548e9db6db9c2460' 'b8122f5054e3895c9c054e87460869dc') @@ -31,6 +31,7 @@ build() { ./autogen.sh ./configure --prefix=/usr --localstatedir=/var --enable-tools \ --enable-editor --enable-server --with-fifodir=/run/wesnothd + make } package() { diff --git a/extra/wesnoth/wesnoth-libpng-1.4.0.patch b/extra/wesnoth/wesnoth-libpng-1.4.0.patch index be8adfcaa..338f467af 100644 --- a/extra/wesnoth/wesnoth-libpng-1.4.0.patch +++ b/extra/wesnoth/wesnoth-libpng-1.4.0.patch @@ -12,3 +12,13 @@ diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/ex if(!png_ptr) throw exploder_failure("Unable to initialize the png write structure"); +--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600 ++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600 +@@ -15,6 +15,7 @@ + #include "exploder_utils.hpp" + #include "game_config.hpp" + #include "serialization/string_utils.hpp" ++#include <zlib.h> + #include <png.h> + + exploder_point::exploder_point(const std::string &s) diff --git a/extra/windowmaker-crm-git/PKGBUILD b/extra/windowmaker-crm-git/PKGBUILD index 4037626f8..8cc7010f9 100644 --- a/extra/windowmaker-crm-git/PKGBUILD +++ b/extra/windowmaker-crm-git/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146365 2012-01-09 19:01:56Z daniel $ +# $Id: PKGBUILD 148962 2012-02-05 11:58:02Z ibiru $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=windowmaker-crm-git pkgver=20120109 -pkgrel=1 +pkgrel=2 pkgdesc="An X11 window manager with a NEXTSTEP look and feel - git version from Carlos R. Mafra" arch=(i686 x86_64) url="http://www.windowmaker.org" diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD index ecda30c8f..3d2af63f9 100644 --- a/extra/windowmaker/PKGBUILD +++ b/extra/windowmaker/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146321 2012-01-09 18:41:18Z daniel $ +# $Id: PKGBUILD 148960 2012-02-05 11:57:55Z ibiru $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=windowmaker pkgver=0.95.0 -pkgrel=1 +pkgrel=2 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" arch=(i686 x86_64) url="http://www.windowmaker.org/" diff --git a/extra/wv/PKGBUILD b/extra/wv/PKGBUILD index 0e8208ae6..678a75878 100644 --- a/extra/wv/PKGBUILD +++ b/extra/wv/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 82057 2010-06-08 10:05:16Z jgc $ +# $Id: PKGBUILD 148964 2012-02-05 11:58:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=wv -pkgver=1.2.7 +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) +arch=('i686' 'x86_64') url="http://sourceforge.net/projects/wvware" -license=(GPL) -depends=('libgsf>=1.14.18' 'libpng>=1.4.2' 'sh') +license=('GPL') +depends=('libgsf' 'libpng' 'sh') makedepends=('pkg-config') options=('!libtool') -source=(http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz - fix-soname.patch) -sha256sums=('a3a367062e894770fc3ef63bbf7e285cb025253f972fa899c16931f741e856ea' - '0fccf12cc5db8481dfcd5cffa987545e060f8bb526c9c910fd76a18468bd7ce1') +source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +md5sums=('dbccf2e9f747e50c913b7e3d126b73f7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix-soname.patch" || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + + ./configure --prefix=/usr \ + --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install } diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD index 8ecf8e479..62dfb906d 100644 --- a/extra/wxgtk/PKGBUILD +++ b/extra/wxgtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144988 2011-12-13 14:41:40Z eric $ +# $Id: PKGBUILD 148966 2012-02-05 11:58:12Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxgtk pkgver=2.8.12.1 -pkgrel=2 +pkgrel=3 pkgdesc="GTK+ implementation of wxWidgets API for GUI" arch=('i686' 'x86_64') url="http://wxwidgets.org" @@ -18,7 +18,7 @@ build() { cd "${srcdir}/wxPython-src-${pkgver}" # cd "${srcdir}/wxGTK-${pkgver}" ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --disable-optimize --enable-mediactrl --with-regex=sys \ + --enable-graphics_ctx --disable-optimize --enable-mediactrl --with-regex=builtin \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ --disable-precomp-headers make diff --git a/extra/xaos/PKGBUILD b/extra/xaos/PKGBUILD index 3d3a5b31b..0daa23321 100644 --- a/extra/xaos/PKGBUILD +++ b/extra/xaos/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137880 2011-09-12 06:35:34Z eric $ +# $Id: PKGBUILD 148968 2012-02-05 11:58:17Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xaos pkgver=3.5 -pkgrel=4 +pkgrel=5 pkgdesc="A fast portable real-time interactive fractal zoomer" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/xaos/" @@ -11,12 +11,13 @@ license=('GPL') depends=('gsl' 'libpng' 'aalib') options=('!makeflags') install=xaos.install -source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz) -md5sums=('465d1469b276501a58bf325e493ea591') -sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801') +source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz xaos-3.5-libpng15.patch) +sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801' + '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../xaos-3.5-libpng15.patch ./configure --prefix=/usr --with-gsl --with-aa-driver make } diff --git a/extra/xaos/xaos-3.5-libpng15.patch b/extra/xaos/xaos-3.5-libpng15.patch new file mode 100644 index 000000000..beece8339 --- /dev/null +++ b/extra/xaos/xaos-3.5-libpng15.patch @@ -0,0 +1,131 @@ +http://code.google.com/p/gnuxaos/issues/detail?id=55 + +--- src/util/png.c ++++ src/util/png.c +@@ -3,6 +3,7 @@ + #include <aconfig.h> + #ifdef USE_PNG + #include <png.h> ++#include <zlib.h> + #endif + #include <stdlib.h> + #include <stdio.h> +@@ -31,6 +32,9 @@ + png_structp png_ptr; + png_infop info_ptr; + png_color palette[256]; ++ png_color_8 sig_bit; ++ int color_type; ++ int bit_depth; + volatile unsigned short a = 255; + volatile unsigned char *b = (volatile unsigned char *) &a; + #ifdef _undefined_ +@@ -59,7 +63,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); + return "No memory to create png info structure"; + } +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(file); + return strerror(errno); +@@ -78,57 +82,70 @@ + png_set_compression_window_bits(png_ptr, 15); + png_set_compression_method(png_ptr, 8); + +- info_ptr->width = image->width; +- info_ptr->height = image->height; +- /*info_ptr->gamma=1.0; */ +- info_ptr->gamma = 0.5; +- info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs; +- info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth); +- info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight); ++ switch (image->palette->type) ++ { ++ case C256: ++ color_type = PNG_COLOR_TYPE_PALETTE; ++ bit_depth = image->bytesperpixel * 8; ++ break; ++ case SMALLITER: ++ case LARGEITER: ++ case GRAYSCALE: ++ color_type = PNG_COLOR_TYPE_GRAY; ++ bit_depth = image->bytesperpixel * 8; ++ break; ++ case TRUECOLOR: ++ case TRUECOLOR24: ++ case TRUECOLOR16: ++ color_type = PNG_COLOR_TYPE_RGB; ++ bit_depth = 8; ++ break; ++ } + ++ png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth, ++ color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, ++ PNG_FILTER_TYPE_BASE); + + switch (image->palette->type) { + case C256: + { + int i; +- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; +- info_ptr->bit_depth = image->bytesperpixel * 8; +- info_ptr->palette = palette; +- info_ptr->valid |= PNG_INFO_PLTE; ++ png_color png_palette[257]; ++ int png_num_palette; + for (i = 0; i < image->palette->end; i++) +- info_ptr->palette[i].red = image->palette->rgb[i][0], +- info_ptr->palette[i].green = image->palette->rgb[i][1], +- info_ptr->palette[i].blue = image->palette->rgb[i][2], +- info_ptr->num_palette = image->palette->end; ++ png_palette[i].red = image->palette->rgb[i][0], ++ png_palette[i].green = image->palette->rgb[i][1], ++ png_palette[i].blue = image->palette->rgb[i][2], ++ png_num_palette = image->palette->end; ++ png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette); + } + break; +- case SMALLITER: +- case LARGEITER: +- case GRAYSCALE: +- info_ptr->color_type = PNG_COLOR_TYPE_GRAY; +- info_ptr->bit_depth = image->bytesperpixel * 8; +- break; + case TRUECOLOR: + case TRUECOLOR24: + case TRUECOLOR16: +- info_ptr->color_type = PNG_COLOR_TYPE_RGB; +- info_ptr->bit_depth = 8; +- info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec; +- info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec; +- info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec; ++ sig_bit.red = 8 - image->palette->info.truec.rprec; ++ sig_bit.green = 8 - image->palette->info.truec.gprec; ++ sig_bit.blue = 8 - image->palette->info.truec.bprec; ++ png_set_sBIT(png_ptr, info_ptr, &sig_bit); + break; + } +- info_ptr->interlace_type = 0; ++ ++ png_write_info (png_ptr, info_ptr); ++ + #ifdef _undefined_ + png_set_text(png_ptr, info_ptr, comments, + sizeof(comments) / sizeof(png_text)); + #endif + +- png_write_info(png_ptr, info_ptr); ++ png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */); ++ png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth), ++ (png_uint_32) (100 / image->pixelheight), ++ PNG_RESOLUTION_UNKNOWN); ++ + /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */ + png_set_packing(png_ptr); + if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16)) +- png_set_shift(png_ptr, &(info_ptr->sig_bit)); ++ png_set_shift (png_ptr, &sig_bit); + if (*b == 255) + png_set_swap(png_ptr); + png_set_bgr(png_ptr); diff --git a/extra/xaw3d/PKGBUILD b/extra/xaw3d/PKGBUILD index 8854d9e98..84992447c 100644 --- a/extra/xaw3d/PKGBUILD +++ b/extra/xaw3d/PKGBUILD @@ -1,51 +1,29 @@ -# $Id: PKGBUILD 124576 2011-05-23 03:13:29Z eric $ +# $Id: PKGBUILD 148656 2012-02-05 11:45:47Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xaw3d -pkgver=1.5E -pkgrel=3 +pkgver=1.6 +pkgrel=1 pkgdesc="Three-D Athena widgets" arch=('i686' 'x86_64') url="http://directory.fsf.org/project/xaw3d/" license=('MIT') -depends=('libxmu' 'libxpm') -makedepends=('imake') -options=('!makeflags') -source=(ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-${pkgver}.tar.gz - Xaw3d-1.5E-xorg-imake.patch - Xaw3d-1.5-i18n.patch - Xaw3d-1.5-box.c.patch - Xaw3d-1.5-debian-fixes.patch - xaw3d.patch - Xaw3d-1.5E-warnings.patch - Xaw3d-ia64.patch - LICENSE) -md5sums=('29ecfdcd6bcf47f62ecfd672d31269a1' - '2cca7950cf7d270609bc810b8996f0a9' - 'e7105bc1452f0c5f5d0bcdcf212aac0c' - 'c061ab65467766f5817752ef216e3cc2' - '33bf0f1b52822b7293a3f45474178dfe' - '5acb23e5a52c75e62a22aef59882df14' - 'c3aa4cbf95442081e7af810c13306cc9' - 'f766e8eb6371cbb1f68af4f2932dc118' - '5b6b0242b3f53b7fe308e702abe28561') +depends=('libxmu') +makedepends=('xorg-util-macros') +options=('!libtool') +source=(http://xorg.freedesktop.org/archive/individual/lib/libXaw3d-${pkgver}.tar.bz2) +md5sums=('db88f0c5afc5f285e046d84e15ad30de') build() { - cd "${srcdir}/xc/lib/Xaw3d" - patch -Np0 -i "${srcdir}/Xaw3d-1.5E-xorg-imake.patch" - patch -Np4 -i "${srcdir}/xaw3d.patch" - patch -Np4 -i "${srcdir}/Xaw3d-ia64.patch" - patch -Np4 -i "${srcdir}/Xaw3d-1.5-i18n.patch" - patch -Np4 -i "${srcdir}/Xaw3d-1.5-box.c.patch" - patch -Np4 -i "${srcdir}/Xaw3d-1.5-debian-fixes.patch" - patch -Np4 -i "${srcdir}/Xaw3d-1.5E-warnings.patch" - ln -s .. X11 - xmkmf - make CDEBUGFLAGS="${CFLAGS} -DARROW_SCROLLBAR" + cd "${srcdir}/libXaw3d-${pkgver}" + ./configure --prefix=/usr --disable-static + make } package() { - cd "${srcdir}/xc/lib/Xaw3d" - make DESTDIR="${pkgdir}" SHLIBDIR=/usr/lib INCDIR=/usr/include install - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + cd "${srcdir}/libXaw3d-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/xawtv/PKGBUILD b/extra/xawtv/PKGBUILD index e9876a82e..1b382052c 100644 --- a/extra/xawtv/PKGBUILD +++ b/extra/xawtv/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 130228 2011-07-04 14:14:56Z jgc $ +# $Id: PKGBUILD 148970 2012-02-05 11:58:22Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Jason Chu <jason@archlinux.org> pkgname=xawtv pkgver=3.101 -pkgrel=1 +pkgrel=2 pkgdesc="A simple Xaw-based TV program which uses the bttv driver or video4linux" arch=('i686' 'x86_64') url="http://git.linuxtv.org/xawtv3.git" license=('GPL') -depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 'zvbi' 'libxinerama' 'lirc-utils' 'libxft' 'libxaw' 'xorg-fonts-misc') +depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 'zvbi' 'libxinerama' 'lirc-utils' 'libxft' 'libxaw' 'xorg-fonts-misc' 'libxxf86vm') makedepends=('mesa') source=(http://linuxtv.org/downloads/xawtv/xawtv-${pkgver}.tar.bz2) md5sums=('330ce1789595e370be34ad4cae3dc3fa') @@ -21,5 +21,9 @@ build() { autoheader ./configure --prefix=/usr --disable-motif --disable-quicktime make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/xbill/03_fix_ftbfs_binutils_gold.diff b/extra/xbill/03_fix_ftbfs_binutils_gold.diff new file mode 100644 index 000000000..09436cd79 --- /dev/null +++ b/extra/xbill/03_fix_ftbfs_binutils_gold.diff @@ -0,0 +1,15 @@ +Description: Fix FTBFS with binutils-gold +Author: Vincent Legout <vincent@legout.info> +Bug-Debian: http://bugs.debian.org/556690 +Last-Update: 2009-12-08 +--- a/Makefile.in ++++ b/Makefile.in +@@ -21,7 +21,7 @@ + VPATH = @srcdir@ + + ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -I$(srcdir) +-ALL_LDFLAGS = $(CFLAGS) $(LDFLAGS) ++ALL_LDFLAGS = $(CFLAGS) $(LDFLAGS) -lXpm + IMAGE_DEFINES=-DIMAGES=\"${datadir}/xbill\" + SCORE_DEFINES=-DSCOREFILE=\"${localstatedir}/xbill.scores\" + diff --git a/extra/xbill/PKGBUILD b/extra/xbill/PKGBUILD index 98054c7eb..6e696a388 100644 --- a/extra/xbill/PKGBUILD +++ b/extra/xbill/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 122895 2011-05-07 05:36:47Z eric $ +# $Id: PKGBUILD 148662 2012-02-05 11:46:02Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xbill pkgver=2.1 -pkgrel=7 +pkgrel=8 pkgdesc="A game that tests your reflexes as you seek and destroy all forms of Bill" arch=('i686' 'x86_64') url="http://www.xbill.org/" license=('GPL') -depends=('xaw3d') +depends=('xaw3d>=1.6') makedepends=('libxaw') install=xbill.install -source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz) -md5sums=('585e4866b15255a24203db9959407b2f') +source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz + 03_fix_ftbfs_binutils_gold.diff) +md5sums=('585e4866b15255a24203db9959407b2f' + 'e260a6cd4f9af003d249961cb60e2d01') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # taken from Debian + patch -Np1 -i ${srcdir}/03_fix_ftbfs_binutils_gold.diff + autoconf -v -f ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var/games \ --disable-motif --enable-athena --disable-gtk make diff --git a/extra/xclip/PKGBUILD b/extra/xclip/PKGBUILD index 57834cdc0..0e5d405e5 100644 --- a/extra/xclip/PKGBUILD +++ b/extra/xclip/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 110900 2011-02-22 20:16:09Z bisson $ +# $Id: PKGBUILD 149046 2012-02-05 15:20:59Z bisson $ # Contributor: damir <damir@archlinux.org> # Committer: Manolis Tzanidakis <manolis@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=xclip pkgver=0.12 -pkgrel=2 +pkgrel=3 pkgdesc='Command line interface to the X11 clipboard' -arch=('i686' 'x86_64') url='http://sourceforge.net/projects/xclip' license=('GPL') depends=('libxmu') +arch=('i686' 'x86_64') source=("http://downloads.sourceforge.net/sourceforge/xclip/${pkgname}-${pkgver}.tar.gz") sha1sums=('aed2cff18b9aecfe3377ad064c6a67518bbec211') diff --git a/extra/xfce4-datetime-plugin/PKGBUILD b/extra/xfce4-datetime-plugin/PKGBUILD index 3d9e2a532..3db483abe 100644 --- a/extra/xfce4-datetime-plugin/PKGBUILD +++ b/extra/xfce4-datetime-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104742 2011-01-04 20:29:21Z andyrtr $ +# $Id: PKGBUILD 148972 2012-02-05 11:58:26Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-datetime-plugin pkgver=0.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="A date and time display plugin for the Xfce panel" arch=('i686' 'x86_64') license=('GPL2') diff --git a/extra/xfce4-notes-plugin/PKGBUILD b/extra/xfce4-notes-plugin/PKGBUILD index 889e1ac02..ddb4568f4 100644 --- a/extra/xfce4-notes-plugin/PKGBUILD +++ b/extra/xfce4-notes-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104757 2011-01-04 20:53:16Z andyrtr $ +# $Id: PKGBUILD 148974 2012-02-05 11:58:30Z ibiru $ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Contributor: Ben Mazer <contrasutra@myrealbox.com> pkgname=xfce4-notes-plugin pkgver=1.7.7 -pkgrel=2 +pkgrel=3 pkgdesc="A notes plugin for the Xfce4 panel" arch=('i686' 'x86_64') license=('GPL2') diff --git a/extra/xfce4-quicklauncher-plugin/PKGBUILD b/extra/xfce4-quicklauncher-plugin/PKGBUILD index d783ecf24..29a0615e6 100644 --- a/extra/xfce4-quicklauncher-plugin/PKGBUILD +++ b/extra/xfce4-quicklauncher-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104771 2011-01-04 21:40:42Z andyrtr $ +# $Id: PKGBUILD 148976 2012-02-05 11:58:38Z ibiru $ # Maintainer: # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-quicklauncher-plugin pkgver=1.9.4 -pkgrel=5 +pkgrel=6 pkgdesc="plugin that creates 4 little application launcher in the Xfce4 panel" arch=('i686' 'x86_64') license=('GPL2') diff --git a/extra/xfce4-sensors-plugin/PKGBUILD b/extra/xfce4-sensors-plugin/PKGBUILD index d2e465791..6ab299b08 100644 --- a/extra/xfce4-sensors-plugin/PKGBUILD +++ b/extra/xfce4-sensors-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136067 2011-08-22 12:16:31Z andyrtr $ +# $Id: PKGBUILD 148978 2012-02-05 11:58:42Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Merk Matthias <macem@chello.at> pkgname=xfce4-sensors-plugin pkgver=1.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="A lm_sensors plugin for the Xfce panel" arch=('i686' 'x86_64') license=('GPL2') diff --git a/extra/xfig/PKGBUILD b/extra/xfig/PKGBUILD index 45c07d0dc..0527c33ee 100644 --- a/extra/xfig/PKGBUILD +++ b/extra/xfig/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 101110 2010-11-28 02:40:08Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 148664 2012-02-05 11:46:09Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xfig pkgver=3.2.5b -pkgrel=5 +pkgrel=7 pkgdesc="An interactive drawing tool" arch=('i686' 'x86_64') url="http://www.xfig.org/userman/" license=('custom') -depends=('libpng' 'libjpeg' 'xaw3d' 'libxi' 'desktop-file-utils' 'gsfonts') +depends=('libpng' 'libjpeg' 'xaw3d>=1.6' 'libxi' 'desktop-file-utils' 'gsfonts' 'libxpm') makedepends=('imake') optdepends=('transfig: to use the frontend to convert fig files') options=('!makeflags' '!emptydirs') @@ -17,19 +17,20 @@ source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \ xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \ xfig-3.2.5-enable-Xaw3d.patch xfig-3.2.5-urwfonts.patch \ xfig-3.2.5-fhs.patch xfig-3.2.5-missing-protos.patch \ - xfig.3.2.5-modularX.patch xfig-3.2.5b-fix-eps-reading.patch LICENSE xfig.desktop) -md5sums=('499b0ce103a6b353453bf7e327f9a3b9' '5c2bc208c8ee852bc9ffa00dcbfd8241'\ - 'a4b91e4aaf48ed07f4a579a1f692ef82' '46c6fb15d26c9fe03e558bdacc0b0a53'\ - 'c5b7dc054063f02c6bfcd132dae82b6f' 'b532871c792716465e3b05967bcfba10'\ - 'de059a6b8ce287942c7da35d19ee46f3' '7347389f7fdecd582579845df0c0b664'\ - 'fa14e85b5365d07ca8deca9ea47d4e6a' 'f405b7a96f3401c12153fe6170a7d8f1'\ - '8ac2de637c9148aa4a32978910822230') -sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542' '926ad99c7221baa4aa9e9737722958860b2700fc'\ - 'b7c03fb70066ff476a4039a8c0f8930c15edef68' '33bff26b42ce164e79de11808b5b34b363f0d59f'\ - 'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb' '39bec6bac9746b643b05fd1286826113ede07ff6'\ - 'bd76cd50be6a5789cfd6f182309cfd7056be04f3' 'a1285f4e61ad2eec040460ab03e8022098e7f78e'\ - '12a64ddaf65a73e23ef74f31483515a0e262768c' '31edf4cfab708820ea3f114d095dfef5aa88e5aa'\ - '9011b8fa6143e37525b28cc9800a3bf2d6b008d2') + xfig.3.2.5-modularX.patch xfig-3.2.5b-fix-eps-reading.patch \ + xfig-3.2.5b-libpng-1.5.patch LICENSE xfig.desktop) +sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542' + '926ad99c7221baa4aa9e9737722958860b2700fc' + 'b7c03fb70066ff476a4039a8c0f8930c15edef68' + '33bff26b42ce164e79de11808b5b34b363f0d59f' + 'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb' + '39bec6bac9746b643b05fd1286826113ede07ff6' + 'bd76cd50be6a5789cfd6f182309cfd7056be04f3' + 'a1285f4e61ad2eec040460ab03e8022098e7f78e' + '12a64ddaf65a73e23ef74f31483515a0e262768c' + '83032eb61c8dc96d5fc509a1ce632528457d4598' + '31edf4cfab708820ea3f114d095dfef5aa88e5aa' + '9011b8fa6143e37525b28cc9800a3bf2d6b008d2') build() { cd "${srcdir}/${pkgname}.${pkgver}" @@ -41,6 +42,7 @@ build() { patch -p1 < ../xfig-3.2.5-urwfonts.patch patch -p1 < ../xfig-3.2.5-missing-protos.patch patch -p1 < ../xfig-3.2.5b-fix-eps-reading.patch + patch -p1 < ../xfig-3.2.5b-libpng-1.5.patch chmod 755 Libraries xmkmf diff --git a/extra/xfig/xfig-3.2.5b-libpng-1.5.patch b/extra/xfig/xfig-3.2.5b-libpng-1.5.patch new file mode 100644 index 000000000..7d9c3f15e --- /dev/null +++ b/extra/xfig/xfig-3.2.5b-libpng-1.5.patch @@ -0,0 +1,70 @@ +Index: xfig.3.2.5b/f_readpng.c +=================================================================== +--- xfig.3.2.5b.orig/f_readpng.c ++++ xfig.3.2.5b/f_readpng.c +@@ -73,7 +73,7 @@ read_png(FILE *file, int filetype, F_pic + } + + /* set long jump recovery here */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* if we get here there was a problem reading the file */ + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + close_picfile(file,filetype); +@@ -90,15 +90,17 @@ read_png(FILE *file, int filetype, F_pic + png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, + &interlace_type, &compression_type, &filter_type); + +- if (info_ptr->valid & PNG_INFO_gAMA) +- png_set_gamma(png_ptr, 2.2, info_ptr->gamma); +- else +- png_set_gamma(png_ptr, 2.2, 0.45); ++ png_fixed_point gamma = 0.45; ++ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma); ++ png_set_gamma(png_ptr, 2.2, gamma); + +- if (info_ptr->valid & PNG_INFO_bKGD) ++ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { + /* set the background to the one supplied */ +- png_set_background(png_ptr, &info_ptr->background, ++ png_color_16p background; ++ png_get_bKGD(png_ptr,info_ptr,&background); ++ png_set_background(png_ptr, background, + PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); ++ } + else { + /* blend the canvas background using the alpha channel */ + background.red = x_bg_color.red >> 8; +@@ -136,7 +138,11 @@ read_png(FILE *file, int filetype, F_pic + + if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) { + png_get_hIST(png_ptr, info_ptr, &histogram); ++#if PNG_LIBPNG_VER_MAJOR <= 1 && PNG_LIBPNG_VER_MINOR < 5 + png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0); ++#else ++ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0); ++#endif + } + } + if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { +Index: xfig.3.2.5b/f_wrpng.c +=================================================================== +--- xfig.3.2.5b.orig/f_wrpng.c ++++ xfig.3.2.5b/f_wrpng.c +@@ -20,6 +20,7 @@ + #include "w_msgpanel.h" + #include "w_setup.h" + #include <png.h> ++#include <zlib.h> + + /* + * Write PNG file from rgb data +@@ -59,7 +60,7 @@ write_png(FILE *file, unsigned char *dat + } + + /* set long jump recovery here */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* if we get here there was a problem reading the file */ + png_destroy_write_struct(&png_ptr, &info_ptr); + return False; diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD index d5ca4e7ee..15e2b70d1 100644 --- a/extra/xine-ui/PKGBUILD +++ b/extra/xine-ui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146430 2012-01-10 23:37:56Z eric $ +# $Id: PKGBUILD 148980 2012-02-05 11:58:50Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-ui pkgver=0.99.6 -pkgrel=4 +pkgrel=5 pkgdesc="A free video player for Unix" arch=('i686' 'x86_64') license=('GPL') @@ -16,12 +16,13 @@ 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) + fix_lirc.diff xine-ui-xdg.diff xine-ui-0.99.6-libpng15.patch) sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e' 'b2df43ede3a9d1a34b80139704a4cbbc7295c584' '8bbd39f61de7b6991385457a4944b8ea104da88b' '2361df9ddad59c426b0f863414c6d527b463a38a' - '9c70c6543dae6815710b239b4638ffe3843bac86') + '9c70c6543dae6815710b239b4638ffe3843bac86' + 'bc7ec3153e61553dee8c0b6e04d1ca7cfe4a6f14') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,6 +30,7 @@ build() { 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 \ diff --git a/extra/xine-ui/xine-ui-0.99.6-libpng15.patch b/extra/xine-ui/xine-ui-0.99.6-libpng15.patch new file mode 100644 index 000000000..6a5fb5522 --- /dev/null +++ b/extra/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/extra/xorg-font-util/PKGBUILD b/extra/xorg-font-util/PKGBUILD index d23ec52bc..5dd73707c 100644 --- a/extra/xorg-font-util/PKGBUILD +++ b/extra/xorg-font-util/PKGBUILD @@ -1,27 +1,37 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 149063 2012-02-05 16:06:39Z bisson $ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=xorg-font-util pkgver=1.2.0 -pkgrel=1 -pkgdesc="X.Org font utilities" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" +pkgrel=2 +pkgdesc='X.Org font utilities' +url='http://xorg.freedesktop.org/' +arch=('i686' 'x86_64') license=('custom') makedepends=('xorg-util-macros') +source=("${url}/releases/individual/font/font-util-${pkgver}.tar.bz2") +sha1sums=('011fa9c8fe08d9f6f848df570374ed1cb7488146') + replaces=('font-util') provides=('font-util') conflicts=('font-util') groups=('xorg-fonts' 'xorg') -source=(${url}/releases/individual/font/font-util-${pkgver}.tar.bz2) -sha1sums=('011fa9c8fe08d9f6f848df570374ed1cb7488146') build() { - cd "${srcdir}/font-util-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-mapdir=/usr/share/fonts/util --with-fontrootdir=/usr/share/fonts - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + cd "${srcdir}/font-util-${pkgver}" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --with-mapdir=/usr/share/fonts/util \ + --with-fontrootdir=/usr/share/fonts \ + + make +} + +package() { + cd "${srcdir}/font-util-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xorg-setxkbmap/PKGBUILD b/extra/xorg-setxkbmap/PKGBUILD index b25f37dc1..cbc76fc6a 100644 --- a/extra/xorg-setxkbmap/PKGBUILD +++ b/extra/xorg-setxkbmap/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 113688 2011-03-10 14:45:16Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 149065 2012-02-05 16:09:19Z bisson $ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=xorg-setxkbmap pkgver=1.2.0 -pkgrel=2 -pkgdesc="Set the keyboard using the X Keyboard Extension" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" +pkgrel=3 +pkgdesc='Set the keyboard using the X Keyboard Extension' +url='http://xorg.freedesktop.org/' license=('custom') +arch=('i686' 'x86_64') depends=('libxkbfile') makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(${url}/releases/individual/app/setxkbmap-${pkgver}.tar.bz2) +source=("${url}/releases/individual/app/setxkbmap-${pkgver}.tar.bz2") sha1sums=('860785e16313d30792fe62604f65d84281812322') +groups=('xorg-apps' 'xorg') + build() { - cd "${srcdir}/setxkbmap-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + cd "${srcdir}/setxkbmap-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/setxkbmap-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xorg-xcursorgen/PKGBUILD b/extra/xorg-xcursorgen/PKGBUILD index f798e9591..567b50873 100644 --- a/extra/xorg-xcursorgen/PKGBUILD +++ b/extra/xorg-xcursorgen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113731 2011-03-10 15:00:48Z jgc $ +# $Id: PKGBUILD 148982 2012-02-05 11:58:53Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xcursorgen pkgver=1.0.4 -pkgrel=2 +pkgrel=3 pkgdesc="Create an X cursor file from PNG images" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -18,6 +18,10 @@ build() { cd "${srcdir}/xcursorgen-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xcursorgen-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xorg-xev/PKGBUILD b/extra/xorg-xev/PKGBUILD index 70f75e86b..23ad46247 100644 --- a/extra/xorg-xev/PKGBUILD +++ b/extra/xorg-xev/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 113751 2011-03-10 15:22:05Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 149060 2012-02-05 15:59:34Z bisson $ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=xorg-xev pkgver=1.1.0 -pkgrel=2 -pkgdesc="Print contents of X events" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" +pkgrel=3 +pkgdesc='Print contents of X events' +url='http://xorg.freedesktop.org/' +arch=('i686' 'x86_64') license=('custom') depends=('libx11') makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xev-${pkgver}.tar.bz2) +source=("http://xorg.freedesktop.org/archive/individual/app/xev-${pkgver}.tar.bz2") sha1sums=('77dcbdaa2046db56f31936f921843bd05df2255f') +groups=('xorg-apps' 'xorg') + build() { - cd "${srcdir}/xev-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + cd "${srcdir}/xev-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xev-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD index 531985301..c06616e23 100644 --- a/extra/xsane/PKGBUILD +++ b/extra/xsane/PKGBUILD @@ -1,46 +1,50 @@ -# $Id: PKGBUILD 100458 2010-11-23 17:10:57Z tpowa $ +# $Id: PKGBUILD 148984 2012-02-05 11:58:59Z ibiru $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgbase=xsane pkgname=('xsane' 'xsane-gimp') pkgver=0.998 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="http://www.xsane.org" license=('GPL2') makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp') source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz xsane-0.995-xdg-open.patch) +md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa' + '15541ff0ddc10acfa2059cf99d5478eb') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" # fix use "xdg-open" instead of "netscape" to launch help browser - taken from Fedora - patch -Np1 -i ${srcdir}/xsane-0.995-xdg-open.patch || return 1 - + patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch" + sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c + ./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp - /usr/bin/make || return 1 + make mv src/xsane src/xsane-gimp # build again with gimp enabled make clean ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp + make } package_xsane() { pkgdesc="A GTK-based X11 frontend for SANE and plugin for Gimp." install=$pkgname.install depends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg') - optdepends=('xsane-gimp; for gimp plugin support') - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install || return 1 + optdepends=('xsane-gimp: for gimp plugin support') + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install } package_xsane-gimp() { pkgdesc="XSane Gimp plugin" depends=('xsane' 'gimp') - cd "$srcdir/$pkgname-$pkgver" - install -D -m755 src/xsane-gimp ${pkgdir}/usr/bin/xsane-gimp || return 1 + cd "$srcdir/$pkgbase-$pkgver" + install -D -m755 src/xsane-gimp "${pkgdir}/usr/bin/xsane-gimp" ## For making Gimp Plugin available /bin/mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins" @@ -62,5 +66,3 @@ package_xsane-gimp() { #115 fi #116 fi } -md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa' - '15541ff0ddc10acfa2059cf99d5478eb') diff --git a/extra/xsp/PKGBUILD b/extra/xsp/PKGBUILD index 85730ab32..46625467b 100644 --- a/extra/xsp/PKGBUILD +++ b/extra/xsp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120915 2011-04-27 09:28:00Z daniel $ +# $Id: PKGBUILD 149095 2012-02-05 17:09:35Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=xsp pkgver=2.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="A simple webserver based on mono - provides ASP.NET support" arch=(i686 x86_64) license=('custom') diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 0f423222d..56196484e 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148515 2012-02-02 23:34:39Z ibiru $ +# $Id: PKGBUILD 148986 2012-02-05 11:59:04Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner pkgver=10.0 -pkgrel=0 +pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') diff --git a/extra/yakuake/PKGBUILD b/extra/yakuake/PKGBUILD index 6fe44c6cb..260601529 100644 --- a/extra/yakuake/PKGBUILD +++ b/extra/yakuake/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 107962 2011-01-28 08:00:39Z andrea $ +# $Id: PKGBUILD 149017 2012-02-05 14:08:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: James Rayner <iphitus@gmail.com> # Contributor: leeghoofd <abcdefg@solcon.nl> pkgname=yakuake pkgver=2.9.8 -pkgrel=1 -pkgdesc="A KDE konsole application with the look and feel of that in the Quake engine" +pkgrel=2 +pkgdesc="A drop-down terminal emulator based on KDE konsole technology" arch=('i686' 'x86_64') -url="http://yakuake.kde.org" +url='http://yakuake.kde.org/' license=('GPL') depends=('kdebase-konsole') makedepends=('cmake' 'automoc4') @@ -22,7 +22,6 @@ build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/extra/zvbi/PKGBUILD b/extra/zvbi/PKGBUILD index 8ad534a47..e80fae342 100644 --- a/extra/zvbi/PKGBUILD +++ b/extra/zvbi/PKGBUILD @@ -1,25 +1,38 @@ -# $Id: PKGBUILD 101442 2010-11-29 09:37:06Z jgc $ +# $Id: PKGBUILD 148988 2012-02-05 11:59:13Z ibiru $ # Maintainer: # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> + pkgname=zvbi pkgver=0.2.33 -pkgrel=3 +pkgrel=4 pkgdesc="VBI capture and decoding library" url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome" -arch=(i686 x86_64) +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) +source=("http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2" + 'fix-includes.patch' + 'zvbi-0.2.33-libpng15.patch') md5sums=('1741a6045c3eedfb611d645f2da69ac8' - '38766bc59e1571133d0399f0102da653') + '38766bc59e1571133d0399f0102da653' + '4434de7addc438be8c5a33274146bd11') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix-includes.patch" - ./configure --prefix=/usr --disable-static --mandir=/usr/share/man + 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/extra/zvbi/zvbi-0.2.33-libpng15.patch b/extra/zvbi/zvbi-0.2.33-libpng15.patch new file mode 100644 index 000000000..262677376 --- /dev/null +++ b/extra/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/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index bc6b67c12..0effda0b4 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -61,7 +61,7 @@ build() { if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile msg2 "Adding loongson-community patches" - patch -Np1 -i ${srcdir}/${_basekernel}.*-*-loongson-community.patch + patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch patch -Np0 -i "${srcdir}/lxo-config.patch" # ensure N32, add localversion and remove uevent helper as per diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD index 9ade92f8b..f601af07a 100644 --- a/mozilla-testing/iceweasel-libre/PKGBUILD +++ b/mozilla-testing/iceweasel-libre/PKGBUILD @@ -12,15 +12,15 @@ _pgo=false # We're getting this from Debian Sid _debname=iceweasel -_debver=9.0.1 -_debrel=1 +_debver=10.0 +_debrel=2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} -pkgrel=2.1 +pkgrel=1 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -81,6 +81,16 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" iceweasel-install-dir.patch region.properties vendor.js) +md5sums=('bc86bf0d74649f9b3fcde6dfa914141e' + '131782b1ca9d24f40dff8f456558988d' + '659b08b8f14429dd1b7f9229b6fbd1b2' + 'eab149c1994ab14392e55af3abb08e80' + 'ac29b01c189f20abae2f3eef1618ffc0' + 'a485a2b5dc544a8a2bd40c985d2e5813' + '3c1a7d6984b47a0ab36a5d8e6672cb2b' + 'e529742c0a425648087bc3ce537fe4c5' + 'f1c76e7e244257856a386ca2de69bdf0' + '0d053487907de4376d67d8f499c5502b') if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname=$pkgver") @@ -95,7 +105,10 @@ dpkg-source() { mv mozilla-release "${_debname}-${_debver}" mv debian "${_debname}-${_debver}" cd "${_debname}-${_debver}" - quilt push -a + + rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true + + quilt push -af find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this? cd .. } @@ -168,13 +181,3 @@ package() { ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin" } -md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d' - '6cde9fe38df1434fdcc0f3a078b0238e' - 'd9b5f2a893ad80da492aec8c9a7cbb7c' - 'eab149c1994ab14392e55af3abb08e80' - 'ac29b01c189f20abae2f3eef1618ffc0' - 'a485a2b5dc544a8a2bd40c985d2e5813' - '3c1a7d6984b47a0ab36a5d8e6672cb2b' - 'e529742c0a425648087bc3ce537fe4c5' - 'f1c76e7e244257856a386ca2de69bdf0' - '0d053487907de4376d67d8f499c5502b') diff --git a/multilib/lib32-cairo/PKGBUILD b/multilib/lib32-cairo/PKGBUILD index a8cbc6b72..1af993d35 100644 --- a/multilib/lib32-cairo/PKGBUILD +++ b/multilib/lib32-cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 43547 2011-03-27 14:25:07Z bluewind $ +# $Id: PKGBUILD 63485 2012-02-05 11:45:09Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> _pkgbasename=cairo pkgname=lib32-$_pkgbasename pkgver=1.10.2 -pkgrel=2 +pkgrel=3 pkgdesc="Cairo vector graphics library (32-bit)" arch=('x86_64') url="http://cairographics.org/" diff --git a/multilib/lib32-gdk-pixbuf2/PKGBUILD b/multilib/lib32-gdk-pixbuf2/PKGBUILD index eef9aca26..28b102d55 100644 --- a/multilib/lib32-gdk-pixbuf2/PKGBUILD +++ b/multilib/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/lib32-libcanberra/PKGBUILD b/multilib/lib32-libcanberra/PKGBUILD index 8b2bd102d..e72787f26 100644 --- a/multilib/lib32-libcanberra/PKGBUILD +++ b/multilib/lib32-libcanberra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46313 2011-05-05 01:10:02Z heftig $ +# $Id: PKGBUILD 63487 2012-02-05 11:45:14Z ibiru $ # Maintainer: Florian Pritz <flo@xssn.at> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -6,7 +6,7 @@ _pkgbasename=libcanberra pkgbase=lib32-$_pkgbasename pkgname=(lib32-libcanberra lib32-libcanberra-pulse) pkgver=0.28 -pkgrel=1 +pkgrel=2 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification (32-bit)" arch=(x86_64) license=('LGPL') @@ -29,6 +29,9 @@ build() { --disable-static --with-builtin=dso --enable-null --disable-oss \ --enable-alsa --disable-gstreamer --enable-pulse --disable-udev \ --libdir=/usr/lib32 + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make } diff --git a/multilib/lib32-libcups/PKGBUILD b/multilib/lib32-libcups/PKGBUILD index 3d744f140..bd87da0ee 100644 --- a/multilib/lib32-libcups/PKGBUILD +++ b/multilib/lib32-libcups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55132 2011-09-03 08:41:17Z bluewind $ +# $Id: PKGBUILD 63488 2012-02-05 11:45:17Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> _pkgbasename=libcups pkgname=lib32-$_pkgbasename pkgver=1.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="The CUPS Printing System - client libraries (32-bit)" arch=('x86_64') license=('GPL') diff --git a/multilib/lib32-libglade/PKGBUILD b/multilib/lib32-libglade/PKGBUILD index 029d31cc8..ebea314ea 100644 --- a/multilib/lib32-libglade/PKGBUILD +++ b/multilib/lib32-libglade/PKGBUILD @@ -6,7 +6,7 @@ _pkgbasename=libglade pkgname=lib32-libglade pkgver=2.6.4 -pkgrel=4 +pkgrel=5 pkgdesc="Allows you to load glade interface files in a program at runtime (32-bit)" arch=('x86_64') license=('LGPL') diff --git a/multilib/lib32-libpng/PKGBUILD b/multilib/lib32-libpng/PKGBUILD index 8900a4465..afde907c6 100644 --- a/multilib/lib32-libpng/PKGBUILD +++ b/multilib/lib32-libpng/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55366 2011-09-10 11:13:13Z pschmitz $ +# $Id: PKGBUILD 63797 2012-02-05 12:43:41Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> @@ -6,8 +6,8 @@ _pkgbasename=libpng pkgname=lib32-$_pkgbasename -pkgver=1.4.8 -_apngver=1.4.7 +pkgver=1.5.8 +_apngver=1.5.7 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files (32-bit)" arch=('x86_64') @@ -18,8 +18,8 @@ makedepends=(gcc-multilib) options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz" "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz") -md5sums=('2ce595d571f2b06a9403ed5bcfa4ecbd' - '4842a4cba3487a64084ca0a7417ff1c7') +md5sums=('0f7ae352beadaff78073733905613041' + '6c6a674048cec94db1bc35decf0d142c') build() { export CC="gcc -m32" @@ -32,11 +32,6 @@ build() { # see http://sourceforge.net/projects/libpng-apng/ patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch" -# libtoolize --force --copy -# aclocal -# autoconf -# automake --add-missing - ./configure --prefix=/usr --libdir=/usr/lib32 make } diff --git a/multilib/lib32-libtiff/PKGBUILD b/multilib/lib32-libtiff/PKGBUILD index 5385f25b6..aa897475c 100644 --- a/multilib/lib32-libtiff/PKGBUILD +++ b/multilib/lib32-libtiff/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 60337 2011-12-11 19:52:32Z bluewind $ +# $Id: PKGBUILD 63490 2012-02-05 11:45:27Z ibiru $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> _pkgbasename=libtiff pkgname=lib32-$_pkgbasename -pkgver=3.9.5 +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=('lib32-libgl' 'lib32-libxmu' 'lib32-libxi' gcc-multilib) +makedepends=(gcc-multilib) options=('!libtool') source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) -md5sums=('8fc7ce3b4e1d0cc8a319336967815084') -sha1sums=('f40aab20fb2f609b5cbc1171c40b66a1445e3773') +sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522') build() { export CC="gcc -m32" @@ -27,6 +26,11 @@ build() { make } +check() { + cd "${srcdir}/tiff-${pkgver}" + make check +} + package() { cd "${srcdir}/tiff-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/multilib/lib32-pango/PKGBUILD b/multilib/lib32-pango/PKGBUILD index d1236f4a4..5c845b59a 100644 --- a/multilib/lib32-pango/PKGBUILD +++ b/multilib/lib32-pango/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 62209 2012-01-18 10:47:32Z heftig $ +# $Id: PKGBUILD 63491 2012-02-05 11:45:36Z ibiru $ # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> # Maintainer: Biru Ionut <ionut@archlinux.ro> _pkgbasename=pango pkgname=lib32-$_pkgbasename pkgver=1.29.4 -pkgrel=2 +pkgrel=3 pkgdesc="A library for layout and rendering of text (32-bit)" arch=('x86_64') license=('LGPL') diff --git a/multilib/lib32-qt/PKGBUILD b/multilib/lib32-qt/PKGBUILD index df9d41c2e..e15090c1a 100644 --- a/multilib/lib32-qt/PKGBUILD +++ b/multilib/lib32-qt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61795 2012-01-07 22:38:21Z bluewind $ +# $Id: PKGBUILD 63492 2012-02-05 11:45:40Z ibiru $ # Maintainer: Florian Pritz <flo@xssn.at> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ _pkgbasename=qt pkgname=lib32-$_pkgbasename pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc='A cross-platform application and UI framework (32-bit)' arch=('x86_64') url='http://qt-project.org/' diff --git a/multilib/lib32-sdl_image/PKGBUILD b/multilib/lib32-sdl_image/PKGBUILD index bf60a1817..9acf0ed8d 100644 --- a/multilib/lib32-sdl_image/PKGBUILD +++ b/multilib/lib32-sdl_image/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 62665 2012-01-23 18:29:11Z svenstaro $ +# $Id: PKGBUILD 63483 2012-02-05 11:45:03Z ibiru $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: SpepS <dreamspepser at yahoo dot it> _pkgbasename=sdl_image pkgname=lib32-$_pkgbasename pkgver=1.2.12 -pkgrel=1 +pkgrel=2 pkgdesc="A simple library to load images of various formats as SDL surfaces (32-bit)" arch=('x86_64') url="http://www.libsdl.org/projects/SDL_image/" diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 1570ea528..b6c269b76 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63437 2012-02-03 12:26:35Z bluewind $ +# $Id: PKGBUILD 63493 2012-02-05 11:45:46Z ibiru $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> @@ -6,7 +6,7 @@ pkgname=wine pkgver=1.4rc2 -pkgrel=1 +pkgrel=2 _pkgbasever=${pkgver/rc/-rc} diff --git a/staging/ettercap/PKGBUILD b/staging/ettercap/PKGBUILD new file mode 100644 index 000000000..656311dc9 --- /dev/null +++ b/staging/ettercap/PKGBUILD @@ -0,0 +1,70 @@ +# $Id: PKGBUILD 149171 2012-02-06 04:26:56Z allan $ +# Maintainer: +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgbase=ettercap +pkgname=('ettercap' 'ettercap-gtk') +pkgver=NG_0.7.4.2 +_origver=${pkgver/_/-} +pkgrel=2 +arch=('i686' 'x86_64') +url="http://ettercap.sourceforge.net/" +license=('GPL') +makedepends=('libpcap' 'libltdl' 'libnet' 'gtk2' 'hicolor-icon-theme') +options=('!libtool' '!makeflags' '!emptydirs') +source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz") +md5sums=('ab2354bf9c91195f06ad0b5d058565a4') + +build() { + cd "${srcdir}" + sed -i 's/su-to-root -c/gksu/' ${pkgbase}-${_origver}/desktop/ettercap.desktop + + cp -r ${pkgbase}-${_origver} ${pkgbase}-${_origver}-gtk + + cd ${pkgbase}-${_origver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --datarootdir=/usr/share \ + --enable-plugins \ + --enable-https \ + --disable-gtk + make + + cd ../${pkgbase}-${_origver}-gtk + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --datarootdir=/usr/share \ + --enable-plugins \ + --enable-https \ + --enable-gtk + make +} + +package_ettercap() { + pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console" + depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet') + backup=('etc/etter.conf') + + cd "${srcdir}"/${pkgbase}-${_origver} + make DESTDIR="${pkgdir}" install +} + +package_ettercap-gtk() { + pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK" + depends=('ettercap' 'gtk2' 'hicolor-icon-theme') + optdepends=('gksu: to run ettercap from the menu') + install=ettercap-gtk.install + + cd "${srcdir}"/${pkgbase}-${_origver}-gtk + install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk + install -Dm644 desktop/ettercap.desktop \ + "${pkgdir}"/usr/share/applications/ettercap.desktop + install -Dm644 share/ettercap.png \ + "${pkgdir}"/usr/share/ettercap/ettercap.png + install -Dm644 desktop/ettercap.xpm \ + "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/ettercap.xpm + install -Dm644 desktop/ettercap.svg \ + "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/ettercap.svg +} diff --git a/staging/ettercap/ettercap-gtk.install b/staging/ettercap/ettercap-gtk.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/staging/ettercap/ettercap-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/staging/glib2/PKGBUILD b/staging/glib2/PKGBUILD new file mode 100644 index 000000000..d941d1363 --- /dev/null +++ b/staging/glib2/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 149165 2012-02-06 04:06:32Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=glib2 +pkgver=2.30.2 +pkgrel=2 +pkgdesc="Common C routines used by GTK+ and other libs" +url="http://www.gtk.org/" +arch=(i686 x86_64) +license=('LGPL') +depends=('pcre' 'libffi') +makedepends=('pkgconfig' 'python2') +optdepends=('python2: for gdbus-codegen') +options=('!libtool' '!docs' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz + glib2.sh + glib2.csh) +sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82' + '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' + '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') + +build() { + cd "${srcdir}/glib-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-pcre=system \ + --disable-fam + make +} + +package() { + cd "${srcdir}/glib-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/etc/profile.d" + install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/" + install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/" + + for _i in "${pkgdir}/etc/bash_completion.d/"*; do + chmod -x "${_i}" + done + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen +} diff --git a/staging/glib2/glib2.csh b/staging/glib2/glib2.csh new file mode 100644 index 000000000..7aa3a2ffa --- /dev/null +++ b/staging/glib2/glib2.csh @@ -0,0 +1 @@ +setenv G_BROKEN_FILENAMES 1 diff --git a/staging/glib2/glib2.sh b/staging/glib2/glib2.sh new file mode 100644 index 000000000..96a056e1e --- /dev/null +++ b/staging/glib2/glib2.sh @@ -0,0 +1 @@ +export G_BROKEN_FILENAMES=1 diff --git a/staging/grep/PKGBUILD b/staging/grep/PKGBUILD new file mode 100644 index 000000000..cb98ef16f --- /dev/null +++ b/staging/grep/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 149159 2012-02-06 01:59:43Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=grep +pkgver=2.10 +pkgrel=2 +pkgdesc="A string search utility" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.gnu.org/software/grep/grep.html" +groups=('base') +depends=('glibc' 'pcre' 'sh') +makedepends=('texinfo') +install=${pkgname}.install +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('709915434d09f5db655e5ebd7fd6bb7f' + '9ad5c390a6ad7f566c58db28ddb06aed') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --without-included-regex + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/staging/grep/grep.install b/staging/grep/grep.install new file mode 100644 index 000000000..7cd31301f --- /dev/null +++ b/staging/grep/grep.install @@ -0,0 +1,21 @@ +infodir=usr/share/info +filelist=(grep.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 +} + diff --git a/staging/less/PKGBUILD b/staging/less/PKGBUILD new file mode 100644 index 000000000..76568817c --- /dev/null +++ b/staging/less/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 149161 2012-02-06 02:15:27Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=less +pkgver=444 +pkgrel=3 +pkgdesc="A terminal based program for viewing text files" +license=('GPL3') +arch=('i686' 'x86_64') +url="http://www.greenwoodsoftware.com/less" +groups=('base') +depends=('ncurses' 'pcre') +source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) +md5sums=('56f9f76ffe13f70155f47f6b3c87d421' + 'd5fafbd94a9cfdeaad0c82143a033fe5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix="${pkgdir}"/usr install +} diff --git a/staging/pcre/PKGBUILD b/staging/pcre/PKGBUILD new file mode 100644 index 000000000..3e1085ae4 --- /dev/null +++ b/staging/pcre/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 149157 2012-02-06 01:57:58Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> + +pkgname=pcre +pkgver=8.30 +pkgrel=1 +pkgdesc="A library that implements Perl 5-style regular expressions" +arch=('i686' 'x86_64') +url="http://www.pcre.org/" +license=('BSD') +depends=('gcc-libs') +options=('!libtool') +source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('98e8928cccc945d04279581e778fbdff' + '01eee0333fa71687e0b6756db77f94ad') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" + ./configure --prefix=/usr --enable-pcre16 --enable-jit \ + --enable-utf8 --enable-unicode-properties + make +} + +check() { + cd "${srcdir}"/${pkgname}-${pkgver} + make check +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/staging/slang/PKGBUILD b/staging/slang/PKGBUILD new file mode 100644 index 000000000..533512f2e --- /dev/null +++ b/staging/slang/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 149167 2012-02-06 04:07:35Z allan $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=slang +pkgver=2.2.4 +pkgrel=2 +pkgdesc="S-Lang is a powerful interpreted language" +arch=('i686' 'x86_64') +url="http://www.jedsoft.org/slang/" +license=('GPL') +depends=('glibc' 'pcre' 'zlib') +backup=('etc/slsh.rc') +options=('!makeflags') +source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2{,.asc}) +md5sums=('7fcfd447e378f07dd0c0bae671fe6487' + '0e37091fe52b4ef609c3cee8eda0e101') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install-all +} diff --git a/staging/xfce4-verve-plugin/PKGBUILD b/staging/xfce4-verve-plugin/PKGBUILD new file mode 100644 index 000000000..29814c68c --- /dev/null +++ b/staging/xfce4-verve-plugin/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 149169 2012-02-06 04:15:31Z allan $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Tobias Kieslich <tobias (at) archlinux.org> + +pkgname=xfce4-verve-plugin +pkgver=1.0.0 +pkgrel=2 +pkgdesc="command line plugin Xfce4 panel" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://xfce-goodies.berlios.de/" +groups=('xfce4-goodies') +depends=('xfce4-panel' 'libxfcegui4') +makedepends=('intltool') +replaces=('verve-plugin') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.tar.bz2) +md5sums=('ed7039c40d6e560ed8bcf9a324d2ae86') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/avidemux/PKGBUILD b/testing/avidemux/PKGBUILD new file mode 100644 index 000000000..8afc3cbe8 --- /dev/null +++ b/testing/avidemux/PKGBUILD @@ -0,0 +1,116 @@ +# $Id: PKGBUILD 149121 2012-02-05 21:34:30Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgbase=avidemux +pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') +pkgver=2.5.6 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL') +url="http://fixounet.free.fr/avidemux/" +makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ + 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva') +options=('!makeflags') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) +sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5') + +build() { + cd "${srcdir}/${pkgbase}_${pkgver}" + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. + make + +# plugin build expects libraries to be already installed; we fake a prefix +# in build/ by symlinking all libraries to build/lib/ + mkdir -p lib + cd lib + find ../avidemux -name '*.so*' | xargs ln -sft . + cd ../../plugins + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \ + -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \ + -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \ + -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON .. + make +} + +package_avidemux-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split)" + depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') + optdepends=('lame: for the corresponding audio encoder plugin' + 'faac: for the corresponding audio encoder plugin' + 'faad2: for the corresponding audio decoder plugin' + 'opencore-amr: for the corresponding audio decoder plugin' + 'jack: for the corresponding audio device plugin' + 'libpulse: for the corresponding audio device plugin' + 'sdl: for the corresponding audio device plugin' + 'x264: for the corresponding video encoder plugin' + 'xvidcore: for the corresponding video encoder plugin') + provides=('avidemux') + conflicts=('avidemux') + replaces=('avidemux') + + cd "${srcdir}/${pkgbase}_${pkgver}/build" + make DESTDIR="${pkgdir}" install + + cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build" + make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}"/usr/share/avidemux + rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4} + rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so + + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so" + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so" + + install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" + install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" +} + +package_avidemux-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" + depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') + install=avidemux.install + + cd "${srcdir}/${pkgbase}_${pkgver}" + install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk" + + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter + + install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" + install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" + + install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" + sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" +} + +package_avidemux-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" + depends=("avidemux-cli=${pkgver}" 'qt') + install=avidemux.install + + cd "${srcdir}/${pkgbase}_${pkgver}" + install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4" + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter + + install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" + install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" + + install -d "${pkgdir}/usr/share/avidemux/i18n" + install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n" + + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" +} diff --git a/testing/avidemux/avidemux.install b/testing/avidemux/avidemux.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/testing/avidemux/avidemux.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD new file mode 100644 index 000000000..140c7b4db --- /dev/null +++ b/testing/ffmpeg/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 149123 2012-02-05 21:34:34Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgname=ffmpeg +pkgver=20120127 +pkgrel=2 +pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" +arch=('i686' 'x86_64') +url="http://ffmpeg.org/" +license=('GPL') +depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib) +makedepends=('yasm' 'git' 'libvdpau') +#git clone git://git.videolan.org/ffmpeg.git +source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz) +md5sums=('dc706cdb31801b4746f37459b0c38b7e') + +build() { + cd "$srcdir/$pkgname" + + ./configure \ + --prefix=/usr \ + --enable-libmp3lame \ + --enable-libvorbis \ + --enable-libxvid \ + --enable-libx264 \ + --enable-libvpx \ + --enable-libtheora \ + --enable-libgsm \ + --enable-libspeex \ + --enable-postproc \ + --enable-shared \ + --enable-x11grab \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libschroedinger \ + --enable-libopenjpeg \ + --enable-librtmp \ + --enable-libpulse \ + --enable-gpl \ + --enable-version3 \ + --enable-runtime-cpudetect \ + --disable-debug \ + --disable-static + + make + make tools/qt-faststart + make doc/ff{mpeg,play,server}.1 +} + +package() { + cd "$srcdir/$pkgname" + make DESTDIR="$pkgdir" install install-man + install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gstreamer0.10-ugly/PKGBUILD b/testing/gstreamer0.10-ugly/PKGBUILD new file mode 100644 index 000000000..0de558ff8 --- /dev/null +++ b/testing/gstreamer0.10-ugly/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 149135 2012-02-05 21:34:55Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gstreamer0.10-ugly +pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') +pkgver=0.10.18 +pkgrel=5 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +url="http://gstreamer.freedesktop.org/" +options=(!libtool) +source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2) +md5sums=('04a7009a4efea2844075949c111f5e4d') + +build() { + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ + --with-package-origin="http://www.archlinux.org/" + make + sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile +} + +package_gstreamer0.10-ugly() { + pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries" + depends=('gstreamer0.10-base>=0.10.34') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_gstreamer0.10-ugly-plugins() { + pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" + depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') + groups=('gstreamer0.10-plugins') + replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make -C ext DESTDIR="${pkgdir}" install +} diff --git a/testing/libvpx/PKGBUILD b/testing/libvpx/PKGBUILD new file mode 100644 index 000000000..be5b7375e --- /dev/null +++ b/testing/libvpx/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 149119 2012-02-05 21:34:27Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=libvpx +pkgver=1.0.0 +pkgrel=1 +pkgdesc="The VP8 Codec SDK" +arch=('i686' 'x86_64') +url="http://www.webmproject.org/" +license=('BSD') +depends=('glibc') +makedepends=('yasm') +source=(http://webm.googlecode.com/files/$pkgname-v$pkgver.tar.bz2) +sha1sums=('2919e11074fef72fc61ef1a75160050ffaad6074') + +build() { + cd "$srcdir/$pkgname-v$pkgver" + ./configure --prefix=/usr --enable-vp8 \ + --enable-runtime-cpu-detect \ + --enable-shared \ + --enable-postproc \ + --enable-pic \ + --disable-install-docs \ + --disable-install-srcs + make +} + +package() { + cd "$srcdir/$pkgname-v$pkgver" + make DIST_DIR="$pkgdir/usr" install + install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules new file mode 100644 index 000000000..d2c167324 --- /dev/null +++ b/testing/lvm2/11-dm-initramfs.rules @@ -0,0 +1,3 @@ +# needed with new udev/mkinitcpio and as implemented in dracut: +# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54> +SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD new file mode 100644 index 000000000..28df43607 --- /dev/null +++ b/testing/lvm2/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 149163 2012-02-06 03:08:51Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgbase=lvm2 +pkgname=('lvm2' 'device-mapper') +pkgver=2.02.90 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://sourceware.org/lvm2/" +license=('GPL2' 'LGPL2.1') +groups=('base') +source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} + lvm2_install + lvm2_hook + 11-dm-initramfs.rules) +sha1sums=('de37e533e5f3af6a18c1acadd7a07ae06150d7d6' + '61c4b46dff520f9c178062930ea9f169019f57e6' + '7f108b2f2056eb050fc898bf5190ecf9145aed8a' + '7d63aa838703c9f986531a78164b556f765f5cce' + 'f6a554eea9557c3c236df2943bb6e7e723945c41') + +build() { + cd "${srcdir}/LVM2.${pkgver}" + sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh + unset LDFLAGS + ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ + --includedir=/usr/include --with-usrlibdir=/usr/lib \ + --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ + --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules + make +} + +package_device-mapper() { + pkgdesc="Device mapper userspace library and tools" + url="http://sourceware.org/dm/" + depends=('glibc' 'udev') + + cd "${srcdir}/LVM2.${pkgver}" + make DESTDIR="${pkgdir}" install_device-mapper + # extra udev rule for device-mapper in initramfs + install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules" +} + +package_lvm2() { + pkgdesc="Logical Volume Manager 2 utilities" + depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') + conflicts=('lvm' 'mkinitcpio<0.7') + backup=('etc/lvm/lvm.conf') + options=('!makeflags') + + cd "${srcdir}/LVM2.${pkgver}" + make DESTDIR="${pkgdir}" install_lvm2 + # install applib + make -C liblvm DESTDIR="${pkgdir}" install + # /etc directories + install -d "${pkgdir}"/etc/lvm/{archive,backup} + # mkinitcpio hook + install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" + install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" +} diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook new file mode 100644 index 000000000..efb104998 --- /dev/null +++ b/testing/lvm2/lvm2_hook @@ -0,0 +1,25 @@ +# vim:set ft=sh: +run_hook () +{ + /sbin/modprobe -q dm-mod >/dev/null 2>&1 + if [ -e "/sys/class/misc/device-mapper" ]; then + if [ ! -e "/dev/mapper/control" ]; then + local major minor + IFS=: read major minor < /sys/class/misc/device-mapper/dev + mkdir /dev/mapper + mknod "/dev/mapper/control" c ${major} ${minor} + fi + + # If the lvmwait= parameter has been specified on the command line + # wait for the device(s) before trying to activate the volume group(s) + for pvdev in ${lvmwait//,/ }; do + poll_device ${pvdev} ${rootdelay} + done + + [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" + + msg "Activating logical volumes..." + [ -d /etc/lvm ] && /sbin/lvm vgscan + eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET + fi +} diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install new file mode 100644 index 000000000..94175b523 --- /dev/null +++ b/testing/lvm2/lvm2_install @@ -0,0 +1,29 @@ +# vim: set ft=sh: + +build() +{ + MODULES=" dm-mod dm-snapshot dm-mirror" + BINARIES="" + FILES="" + SCRIPT="lvm2" + + add_binary "/sbin/lvm" + add_binary "/sbin/dmsetup" + add_file "/lib/udev/rules.d/10-dm.rules" + add_file "/lib/udev/rules.d/13-dm-disk.rules" + add_file "/lib/udev/rules.d/95-dm-notify.rules" + add_file "/lib/udev/rules.d/11-dm-lvm.rules" + add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads the necessary modules for an LVM2 root device. + + The optional lvmwait= parameter followed by a comma-separated + list of device names can be given on the command line. + It will cause the hook to wait until all given devices exist + before trying to scan and activate any volume groups. +HELPEOF +} diff --git a/testing/mediastreamer/PKGBUILD b/testing/mediastreamer/PKGBUILD new file mode 100644 index 000000000..d0c29868d --- /dev/null +++ b/testing/mediastreamer/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 149141 2012-02-05 21:37:56Z ibiru $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Adrià Arrufat <swiftscythe@gmail.com> + +pkgname=mediastreamer +pkgver=2.8.0 +pkgrel=2 +pkgdesc="A library written in C that allows you to create and run audio and video streams" +arch=('i686' 'x86_64') +url="http://www.linphone.org/" +license=('GPL') +depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') +makedepends=('intltool') +#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('79f6e4d927ebf15e9967511d8a88ce74') +options=('!libtool') + +build() { + cd "${srcdir}"/$pkgname-$pkgver + ./autogen.sh + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/testing/opal/PKGBUILD b/testing/opal/PKGBUILD new file mode 100644 index 000000000..9fd9c104a --- /dev/null +++ b/testing/opal/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 149137 2012-02-05 21:34:57Z ibiru $ +# Maintainer: Jan de Groot <jan@archlinux.org> +# Contributor: Tom K <tomk@runbox.com> +pkgname=opal +pkgver=3.10.2 +pkgrel=4 +pkgdesc="Open Phone Abstraction Library" +arch=(i686 x86_64) +url="http://www.ekiga.org" +license=('GPL') +depends=('ptlib' 'libtheora' 'x264' 'speex') +makedepends=('ffmpeg') +options=(!makeflags) +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('8e227978263c07502b2bc4c9de0e71be1b95d673fe858bfd907910adfb2eb205') + +build() { + cd "${srcdir}/opal-${pkgver}" + CXXFLAGS="$CXXFLAGS -fpermissive" \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd "${srcdir}/opal-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD index 39f54a751..7eec6e572 100644 --- a/testing/vlc/PKGBUILD +++ b/testing/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148497 2012-02-02 17:27:11Z giovanni $ +# $Id: PKGBUILD 149139 2012-02-05 21:34:59Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.13 -pkgrel=5 +pkgrel=6 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/testing/x264/PKGBUILD b/testing/x264/PKGBUILD new file mode 100644 index 000000000..292840a72 --- /dev/null +++ b/testing/x264/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 149117 2012-02-05 21:34:25Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: damir <damir@archlinux.org> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgname=x264 +pkgver=20120204 +pkgrel=1 +pkgdesc="free library for encoding H264/AVC video streams" +arch=('i686' 'x86_64') +url="http://www.videolan.org/developers/x264.html" +license=('GPL') +depends=('glibc') +makedepends=('yasm') +source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2) +md5sums=('4d793ecc4f9d308724ea47edf400f312') + +build() { + cd "$srcdir/$pkgname-snapshot-$pkgver-2245-stable" + + ./configure --enable-shared + + make +} +package() { + cd "$srcdir/$pkgname-snapshot-$pkgver-2245-stable" + + make DESTDIR="$pkgdir" \ + bindir=/usr/bin \ + libdir=/usr/lib \ + includedir=/usr/include \ + install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/xulrunner/PKGBUILD b/testing/xulrunner/PKGBUILD index bac8ddd72..beff32fcf 100644 --- a/testing/xulrunner/PKGBUILD +++ b/testing/xulrunner/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 148425 2012-01-31 19:04:34Z ibiru $ +# $Id: PKGBUILD 149133 2012-02-05 21:34:51Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner pkgver=10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2') -makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') url="http://wiki.mozilla.org/XUL:Xul_Runner" source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2 mozconfig - mozilla-pkgconfig.patch) + mozilla-pkgconfig.patch + libvpx.patch) options=('!emptydirs') replaces=('xulrunner-oss') md5sums=('13c61203ccfa583e5a54b4dc22f41233' '8dfb78c5bd0581c8cf4753813132bf0b' - '27271ce647a83906ef7a24605e840d61') + '27271ce647a83906ef7a24605e840d61' + '5d418ecdbdb9f40597df6b978b0b5ee5') build() { cd "$srcdir/mozilla-release" @@ -25,6 +27,7 @@ build() { #fix libdir/sdkdir - fedora patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" + patch -Np1 -i "$srcdir/libvpx.patch" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" diff --git a/testing/xulrunner/libvpx.patch b/testing/xulrunner/libvpx.patch new file mode 100644 index 000000000..f883b8e08 --- /dev/null +++ b/testing/xulrunner/libvpx.patch @@ -0,0 +1,12 @@ +diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in +--- mozilla-release.orig/configure.in 2012-02-05 16:01:35.722024142 +0000 ++++ mozilla-release/configure.in 2012-02-05 16:03:34.871064547 +0000 +@@ -5629,7 +5629,7 @@ + dnl v0.9.6 one to check for. + AC_TRY_COMPILE([ + #include <vpx/vpx_decoder.h> +- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) ++ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) + #error "test failed." + #endif + ], |