diff options
Diffstat (limited to 'community-testing')
409 files changed, 0 insertions, 25777 deletions
diff --git a/community-testing/amsn/PKGBUILD b/community-testing/amsn/PKGBUILD deleted file mode 100644 index 2b2c84101..000000000 --- a/community-testing/amsn/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 63431 2012-02-02 21:11:19Z jelle $ -# 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=2 -pkgdesc="MSN client written in Tcl/Tk" -arch=('i686' 'x86_64') -url="http://amsn.sourceforge.net/" -license=('GPL2') -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 amsn-0.98.4-libpng15.patch amsn-0.98.4-v4l2.patch) -md5sums=('96fd20e8709ced4443432d125a5e0a5a' - '182eef321e78632499c24b3009c085ad' - '02d4ec8faed521387d6e44481f43c91a') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # 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 - - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/amsn/amsn-0.98.4-libpng15.patch b/community-testing/amsn/amsn-0.98.4-libpng15.patch deleted file mode 100644 index 24f875d02..000000000 --- a/community-testing/amsn/amsn-0.98.4-libpng15.patch +++ /dev/null @@ -1,471 +0,0 @@ ---- 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-testing/amsn/amsn-0.98.4-v4l2.patch b/community-testing/amsn/amsn-0.98.4-v4l2.patch deleted file mode 100644 index 815a6ad19..000000000 --- a/community-testing/amsn/amsn-0.98.4-v4l2.patch +++ /dev/null @@ -1,33 +0,0 @@ -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-testing/amsn/amsn-jpeg7.patch b/community-testing/amsn/amsn-jpeg7.patch deleted file mode 100644 index d9c9f103d..000000000 --- a/community-testing/amsn/amsn-jpeg7.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- utils/TkCximage/src/CxImage/ximajpg.cpp.orig 2009-07-18 05:29:43.000000000 -0300 -+++ utils/TkCximage/src/CxImage/ximajpg.cpp 2009-07-18 05:30:31.000000000 -0300 -@@ -142,6 +142,7 @@ - */ //</DP> - - // Set the scale <ignacio> -+ SetJpegScale(8); // Set an initial value (FIX for jpeg-7) - cinfo.scale_denom = GetJpegScale(); - - // Borrowed the idea from GIF implementation <ignacio> diff --git a/community-testing/amsn/amsn-libpng14.patch b/community-testing/amsn/amsn-libpng14.patch deleted file mode 100644 index 8b6e8a05d..000000000 --- a/community-testing/amsn/amsn-libpng14.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- utils/TkCximage/src/CxImage/ximapng.cpp 2008-03-07 20:14:37.000000000 +0100 -+++ utils/TkCximage/src/CxImage/ximapng.cpp_fixed 2010-01-28 23:08:13.000000000 +0100 -@@ -142,9 +142,9 @@ - if (info_ptr->num_trans!=0){ //palette transparency - if (info_ptr->num_trans==1){ - if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){ -- info.nBkgndIndex = info_ptr->trans_values.index; -+ info.nBkgndIndex = info_ptr->trans_color.index; - } else{ -- info.nBkgndIndex = info_ptr->trans_values.gray>>nshift; -+ info.nBkgndIndex = info_ptr->trans_color.gray>>nshift; - } - } - if (info_ptr->num_trans>1){ -@@ -152,7 +152,7 @@ - if (pal){ - DWORD ip; - for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++) -- pal[ip].rgbReserved=info_ptr->trans[ip]; -+ pal[ip].rgbReserved=info_ptr->trans_alpha[ip]; - for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){ - pal[ip].rgbReserved=255; - } -@@ -166,9 +166,9 @@ - int num_trans; - png_color_16 *image_background; - if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){ -- 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); -+ 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); - info.nBkgndColor.rgbReserved = 0; - info.nBkgndIndex = 0; - } -@@ -417,12 +417,12 @@ - if (info.nBkgndIndex >= 0){ - info_ptr->num_trans = 1; - info_ptr->valid |= PNG_INFO_tRNS; -- 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; -+ 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; - - // the transparency indexes start from 0 for non grayscale palette - if (!bGrayScale && head.biClrUsed && info.nBkgndIndex) -@@ -443,7 +443,7 @@ - trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved; - info_ptr->num_trans = (WORD)nc; - info_ptr->valid |= PNG_INFO_tRNS; -- info_ptr->trans = trans; -+ info_ptr->trans_alpha = trans; - } - - // copy the palette colors diff --git a/community-testing/amsn/amsn.changelog b/community-testing/amsn/amsn.changelog deleted file mode 100644 index 8dab097ad..000000000 --- a/community-testing/amsn/amsn.changelog +++ /dev/null @@ -1,8 +0,0 @@ -2010-12-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 0.98.4 - -2010-03-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 0.98.3 - -2009-07-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * FS#15542 fixed in 0.97.2-14 diff --git a/community-testing/ario/PKGBUILD b/community-testing/ario/PKGBUILD deleted file mode 100644 index 4c6a86ea3..000000000 --- a/community-testing/ario/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 63040 2012-01-30 18:51:46Z ibiru $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - -pkgname=ario -pkgver=1.5.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' 'perl-xml-parser') -options=('!libtool') -install=$pkgname.install -changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz) -sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e') - -build() { - cd "${srcdir}/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc - make - } - -package () { - cd "${srcdir}/$pkgname-$pkgver" - - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/ario/ario.changelog b/community-testing/ario/ario.changelog deleted file mode 100644 index baca8a7b1..000000000 --- a/community-testing/ario/ario.changelog +++ /dev/null @@ -1,36 +0,0 @@ -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 - -2010-08-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 1.5 - -2010-02-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 1.4.4 - -2010-01-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 1.4.3 - -2009-12-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * updated to major version 1.4.2 - -2009-12-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * updated to major version 1.4.1 - -2009-12-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * updated to major version 1.4 - -2009-05-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * 'taglib' dependency added - version 1.3-2 - -2009-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * updated to major version 1.3 - -2009-03-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * updated to major version 1.2.2 - -2009-01-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * adopted in [community] - * updated to major version 1.2.1 diff --git a/community-testing/ario/ario.install b/community-testing/ario/ario.install deleted file mode 100644 index b711352cb..000000000 --- a/community-testing/ario/ario.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/armagetronad/PKGBUILD b/community-testing/armagetronad/PKGBUILD deleted file mode 100644 index f66768d68..000000000 --- a/community-testing/armagetronad/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 63042 2012-01-30 18:51:56Z ibiru $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> -# Contributor: Filippo 'JoeyrS' Civiletti <joeyrs@gmail.com> - -pkgname=armagetronad -pkgver=0.2.8.3.1 -pkgrel=3 -pkgdesc='A Tron Clone in 3D.' -arch=('i686' 'x86_64') -url='http://armagetronad.net/' -license=('GPL') -depends=('sdl_image' 'libxml2' 'sdl_mixer' 'mesa' 'ftgl') -source=(http://downloads.sourceforge.net/sourceforge/armagetronad/armagetronad-$pkgver.src.tar.gz - armagetronad.desktop - gcc43.patch) -md5sums=('ed8dbdec493de5cd4535a787f35eed1b' - '29d1b1231acadff12cf3014a3867ba5c' - '9045d99559ef33fc18136630e8de916c') - -build() { - cd armagetronad-$pkgver - - # python2 fix - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' language/update.py - - sed -i 's|FTGL.h|ftgl.h|g' configure - sed -i 's|png_check_sig|png_sig_cmp|g' configure - patch -p1 < ../gcc43.patch - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --disable-games \ - --enable-automakedefaults - make - make DESTDIR=$pkgdir install - install -D -m 644 $srcdir/armagetronad.desktop $pkgdir/usr/share/applications/armagetronad.desktop - rm -rf $pkgdir/usr/share/applnk - rm $pkgdir/usr/bin/armagetronad-uninstall - mv $pkgdir/usr/bin/armagetronad $pkgdir/usr/bin/armagetronad_bin - printf "#!/bin/bash\n/usr/bin/armagetronad_bin --configdir /etc/armagetronad --datadir /usr/share/armagetronad" > $pkgdir/usr/bin/armagetronad - chmod +x $pkgdir/usr/bin/armagetronad -} diff --git a/community-testing/armagetronad/armagetronad.desktop b/community-testing/armagetronad/armagetronad.desktop deleted file mode 100644 index 125b4261d..000000000 --- a/community-testing/armagetronad/armagetronad.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Armagetronad -GenericName=3D Tron clone -GenericName[pl]=Klon gry Tron w 3D -Exec=armagetronad -Icon=/usr/share/armagetronad/desktop/icons/small/armagetronad.png -Categories=Game; -Terminal=false -Type=Application -Encoding=UTF-8 -StartupNotify=false diff --git a/community-testing/armagetronad/gcc43.patch b/community-testing/armagetronad/gcc43.patch deleted file mode 100644 index 358f48221..000000000 --- a/community-testing/armagetronad/gcc43.patch +++ /dev/null @@ -1,210 +0,0 @@ -diff -ur a/src/network/md5.cpp b/src/network/md5.cpp ---- a/src/network/md5.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/network/md5.cpp 2009-08-24 20:21:51.000000000 +0200 -@@ -75,7 +75,7 @@ - */ - - #include "md5.h" -- -+#include<cstring> - #include <string> - #include <memory> - -Tylko w b/src/network: md5.cpp~ -diff -ur a/src/network/nNetwork.cpp b/src/network/nNetwork.cpp ---- a/src/network/nNetwork.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/network/nNetwork.cpp 2009-08-24 20:20:40.000000000 +0200 -@@ -24,7 +24,7 @@ - *************************************************************************** - - */ -- -+#include<cstring> - #include "tMemManager.h" - #include "tInitExit.h" - #include "nSimulatePing.h" -Tylko w b/src/network: nNetwork.cpp~ -diff -ur a/src/network/nNetwork.h b/src/network/nNetwork.h ---- a/src/network/nNetwork.h 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/network/nNetwork.h 2009-08-24 20:21:18.000000000 +0200 -@@ -27,7 +27,7 @@ - - #ifndef ArmageTron_NET_H - #define ArmageTron_NET_H -- -+#include<cstring> - #include "tError.h" - #include "tString.h" - #include "tHeap.h" -Tylko w b/src/network: nNetwork.h~ -diff -ur a/src/network/nSocket.h b/src/network/nSocket.h ---- a/src/network/nSocket.h 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/network/nSocket.h 2009-08-24 20:22:09.000000000 +0200 -@@ -33,7 +33,7 @@ - - #ifndef NET_SOCKET_H - #define NET_SOCKET_H -- -+#include<cstring> - #include <iostream> - #include "tConsole.h" - #include "tException.h" -Tylko w b/src/network: nSocket.h~ -diff -ur a/src/render/rModel.h b/src/render/rModel.h ---- a/src/render/rModel.h 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/render/rModel.h 2009-08-24 20:20:57.000000000 +0200 -@@ -27,7 +27,7 @@ - - #ifndef ArmageTron_MODEL_H - #define ArmageTron_MODEL_H -- -+#include<cstring> - #include "defs.h" - #include "tArray.h" - #include "tLinkedList.h" -Tylko w b/src/render: rModel.h~ -diff -ur a/src/tools/tArray.cpp b/src/tools/tArray.cpp ---- a/src/tools/tArray.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tArray.cpp 2009-08-24 20:22:25.000000000 +0200 -@@ -27,7 +27,7 @@ - */ - - #define NO_MALLOC_REPLACEMENT -- -+#include<cstring> - #include "tMemManager.h" - #include <iostream> - #include <stdlib.h> -Tylko w b/src/tools: tArray.cpp~ -diff -ur a/src/tools/tCommandLine.cpp b/src/tools/tCommandLine.cpp ---- a/src/tools/tCommandLine.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tCommandLine.cpp 2009-08-24 20:24:19.000000000 +0200 -@@ -30,7 +30,7 @@ - #ifndef TCOMMANDLINE_H_INCLUDED - #include "tCommandLine.h" - #endif -- -+#include<cstring> - #include "tLocale.h" - #include "tConfiguration.h" - #include "tException.h" -Tylko w b/src/tools: tCommandLine.cpp~ -diff -ur a/src/tools/tConfiguration.cpp b/src/tools/tConfiguration.cpp ---- a/src/tools/tConfiguration.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tConfiguration.cpp 2009-08-24 20:22:42.000000000 +0200 -@@ -24,7 +24,7 @@ - *************************************************************************** - - */ -- -+#include<cstring> - #include "config.h" - #include <fstream> - #include <iomanip> -Tylko w b/src/tools: tConfiguration.cpp~ -diff -ur a/src/tools/tCrypt.cpp b/src/tools/tCrypt.cpp ---- a/src/tools/tCrypt.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tCrypt.cpp 2009-08-24 20:22:54.000000000 +0200 -@@ -24,7 +24,7 @@ - *************************************************************************** - - */ -- -+#include<cstring> - #include "tCrypt.h" - #include "tMemManager.h" - -Tylko w b/src/tools: tCrypt.cpp~ -diff -ur a/src/tools/tDirectories.cpp b/src/tools/tDirectories.cpp ---- a/src/tools/tDirectories.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tDirectories.cpp 2009-08-24 20:23:06.000000000 +0200 -@@ -27,7 +27,7 @@ - */ - - #include "config.h" -- -+#include<cstring> - #include <errno.h> - #include <sys/types.h> - #include <stdio.h> -Tylko w b/src/tools: tDirectories.cpp~ -diff -ur a/src/tools/tError.cpp b/src/tools/tError.cpp ---- a/src/tools/tError.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tError.cpp 2009-08-24 20:28:01.000000000 +0200 -@@ -24,8 +24,9 @@ - *************************************************************************** - - */ -- -+#include<cstring> - #include "config.h" -+#include<cstdlib> - #include <iostream> - #if HAVE_UNISTD_H - #include <unistd.h> -Tylko w b/src/tools: tError.cpp~ -diff -ur a/src/tools/tLocale.cpp b/src/tools/tLocale.cpp ---- a/src/tools/tLocale.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tLocale.cpp 2009-08-24 20:23:49.000000000 +0200 -@@ -30,7 +30,7 @@ - #include "tConsole.h" - #include "tDirectories.h" - #include "tSafePTR.h" -- -+#include<cstring> - #include <fstream> - #include <string> - #include <map> -Tylko w b/src/tools: tLocale.cpp~ -diff -ur a/src/tools/tMemManager.cpp b/src/tools/tMemManager.cpp ---- a/src/tools/tMemManager.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tMemManager.cpp 2009-08-24 20:24:42.000000000 +0200 -@@ -29,7 +29,7 @@ - #define NO_MALLOC_REPLACEMENT - - #include "defs.h" -- -+#include<cstring> - #include <iostream> - #include <sstream> - #include <stdio.h> // need basic C IO since STL IO does memory management -Tylko w b/src/tools: tMemManager.cpp~ -diff -ur a/src/tools/tRandom.cpp b/src/tools/tRandom.cpp ---- a/src/tools/tRandom.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tRandom.cpp 2009-08-24 20:24:31.000000000 +0200 -@@ -29,7 +29,7 @@ - #ifndef TRANDOM_H_INCLUDED - #include "tRandom.h" - #endif -- -+#include<cstdlib> - #ifdef HAVE_STDLIB - #include <stdlib.h> - #endif -Tylko w b/src/tools: tRandom.cpp~ -diff -ur a/src/tools/tString.cpp b/src/tools/tString.cpp ---- a/src/tools/tString.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tString.cpp 2009-08-24 20:24:03.000000000 +0200 -@@ -24,7 +24,7 @@ - *************************************************************************** - - */ -- -+#include<cstring> - #include "tMemManager.h" - #include "tString.h" - #include "tLocale.h" -Tylko w b/src/tools: tString.cpp~ -diff -ur a/src/tron/gAIBase.h b/src/tron/gAIBase.h ---- a/src/tron/gAIBase.h 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tron/gAIBase.h 2009-08-24 20:21:33.000000000 +0200 -@@ -29,7 +29,7 @@ - #define ArmageTron_AIBASE_H - - #include "rSDL.h" -- -+#include<memory> - #include "eTimer.h" - #include "ePath.h" - #include "ePlayer.h" -Tylko w b/src/tron: gAIBase.h~ diff --git a/community-testing/balsa/PKGBUILD b/community-testing/balsa/PKGBUILD deleted file mode 100644 index 43eae5357..000000000 --- a/community-testing/balsa/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 62015 2012-01-14 12:24:56Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Roman Kyrylych <roman@archlinux.org> - -pkgname=balsa -pkgver=2.4.11 -pkgrel=1 -pkgdesc="An e-mail client for GNOME" -arch=('i686' 'x86_64') -license=('GPL') -url='http://pawsa.fedorapeople.org/balsa/' -depends=('gmime' 'libwebkit' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview2' 'gtkspell' 'gnome-icon-theme' 'desktop-file-utils') -makedepends=('perlxml' 'gnome-doc-utils' 'intltool') -install=balsa.install -source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - gmime26.patch) -md5sums=('915c622b6385aa4f83d5eee8f31ee8e8' - '108d33f533558a371189441edce7d7e6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/gmime26.patch" - autoreconf -fi - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-ssl \ - --with-gpgme=gpgme-config \ - --with-gss \ - --with-ldap \ - --with-gtksourceview \ - --with-gtkspell \ - --with-rubrica \ - --with-sqlite \ - --without-nm \ - --without-gnome \ - --with-html-widget=webkit - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GTK_UPDATE_ICON_CACHE=/bin/true DESTDIR="${pkgdir}" install -} diff --git a/community-testing/balsa/balsa.install b/community-testing/balsa/balsa.install deleted file mode 100644 index 1f167b5e9..000000000 --- a/community-testing/balsa/balsa.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/balsa/gmime26.patch b/community-testing/balsa/gmime26.patch deleted file mode 100644 index fe4e6a9fa..000000000 --- a/community-testing/balsa/gmime26.patch +++ /dev/null @@ -1,1372 +0,0 @@ -From 393d0077495cb750ee47bab6ec44a60906a95179 Mon Sep 17 00:00:00 2001 -From: Peter Bloomfield <PeterBloomfield@bellsouth.net> -Date: Mon, 28 Nov 2011 03:00:55 +0000 -Subject: Build with GMime 2.6.0 - - * configure.in: check for GMime >= 2.5.7 - * libbalsa/gmime-application-pkcs7.c - (g_mime_application_pkcs7_sign), (g_mime_application_pkcs7_verify), - (g_mime_application_pkcs7_encrypt), - (g_mime_application_pkcs7_decrypt): build with GMime >= 2.5.7. - * libbalsa/gmime-application-pkcs7.h: ditto. - * libbalsa/gmime-gpgme-context.c (g_mime_gpgme_context_get_type), - (g_mime_gpgme_context_class_init), (g_mime_gpgme_context_finalize), - (g_mime_gpgme_digest_id): ditto. - * libbalsa/gmime-gpgme-context.h: ditto. - * libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_sign_encrypt), - (g_mime_part_rfc2440_verify), (g_mime_part_rfc2440_decrypt): - ditto. - * libbalsa/gmime-part-rfc2440.h: ditto. - * libbalsa/rfc3156.c (password_request_func), - (libbalsa_sign_mime_object), (libbalsa_encrypt_mime_object), - (libbalsa_body_check_signature), (libbalsa_body_decrypt): ditto. ---- -diff --git a/ChangeLog b/ChangeLog -index bd95e68..d5c62f5 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,25 @@ -+2011-11-27 Peter Bloomfield -+ -+ Build with GMime 2.6.0 -+ -+ * configure.in: check for GMime >= 2.5.7 -+ * libbalsa/gmime-application-pkcs7.c -+ (g_mime_application_pkcs7_sign), (g_mime_application_pkcs7_verify), -+ (g_mime_application_pkcs7_encrypt), -+ (g_mime_application_pkcs7_decrypt): build with GMime >= 2.5.7. -+ * libbalsa/gmime-application-pkcs7.h: ditto. -+ * libbalsa/gmime-gpgme-context.c (g_mime_gpgme_context_get_type), -+ (g_mime_gpgme_context_class_init), (g_mime_gpgme_context_finalize), -+ (g_mime_gpgme_digest_id): ditto. -+ * libbalsa/gmime-gpgme-context.h: ditto. -+ * libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_sign_encrypt), -+ (g_mime_part_rfc2440_verify), (g_mime_part_rfc2440_decrypt): -+ ditto. -+ * libbalsa/gmime-part-rfc2440.h: ditto. -+ * libbalsa/rfc3156.c (password_request_func), -+ (libbalsa_sign_mime_object), (libbalsa_encrypt_mime_object), -+ (libbalsa_body_check_signature), (libbalsa_body_decrypt): ditto. -+ - 2011-11-22 Pawel Salek - - * NEWS, configure.in: release balsa-2.4.11 -diff --git a/configure.in b/configure.in -index 4a8320e..64d99f3 100644 ---- a/configure.in -+++ b/configure.in -@@ -307,7 +307,12 @@ fi - case "$with_gmime" in - 2.4) ;; - 2.6) AC_DEFINE([HAVE_GMIME_2_6], [1], -- [Defined to build with GMime version 2.5 or 2.6]) ;; -+ [Defined to build with GMime version 2.5 or 2.6]) -+ if $PKG_CONFIG --atleast-version=2.5.7 gmime-2.6; then -+ AC_DEFINE([HAVE_GMIME_2_5_7], [1], -+ [Defined when GMime version is at least 2.5.7]) -+ fi -+ ;; - *) AC_MSG_ERROR([unknown GMime version $with_gmime]) ;; - esac - -diff --git a/libbalsa/gmime-application-pkcs7.c b/libbalsa/gmime-application-pkcs7.c -index 12f4f8f..63b8087 100644 ---- a/libbalsa/gmime-application-pkcs7.c -+++ b/libbalsa/gmime-application-pkcs7.c -@@ -96,8 +96,14 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content, - GMimeFilter *crlf_filter, *from_filter; - - g_return_val_if_fail (GMIME_IS_PART (pkcs7), -1); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail (GMIME_IS_CIPHER_CONTEXT (ctx), -1); - g_return_val_if_fail (ctx->sign_protocol != NULL, -1); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail (GMIME_IS_CRYPTO_CONTEXT (ctx), -1); -+ g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol(ctx) -+ != NULL, -1); -+#endif /* HAVE_GMIME_2_5_7 */ - g_return_val_if_fail (GMIME_IS_OBJECT (content), -1); - - /* Prepare all the parts for signing... */ -@@ -127,7 +133,14 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content, - sig_data_stream = g_mime_stream_mem_new (); - - /* get the signed content */ -- if (g_mime_cipher_context_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1) { -+#ifndef HAVE_GMIME_2_5_7 -+ if (g_mime_cipher_context_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (g_mime_crypto_context_sign -+ (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, -+ sig_data_stream, err) == -1) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref (filtered_stream); - g_object_unref (sig_data_stream); - g_object_unref (stream); -@@ -168,9 +181,15 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content, - * decrypting it again. In this case, validity is undefined. - */ - GMimeObject * -+#ifndef HAVE_GMIME_2_5_7 - g_mime_application_pkcs7_verify(GMimePart * pkcs7, - GMimeSignatureValidity ** validity, - GMimeCipherContext * ctx, GError ** err) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_application_pkcs7_verify(GMimePart * pkcs7, -+ GMimeSignatureList ** list, -+ GMimeCryptoContext * ctx, GError ** err) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeObject *decrypted; - GMimeDataWrapper *wrapper; -@@ -181,8 +200,14 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7, - const char *smime_type; - - g_return_val_if_fail(GMIME_IS_PART(pkcs7), NULL); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_IS_CIPHER_CONTEXT(ctx), NULL); - g_return_val_if_fail(ctx->encrypt_protocol != NULL, NULL); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(GMIME_IS_CRYPTO_CONTEXT(ctx), NULL); -+ g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx) -+ != NULL, NULL); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* some sanity checks */ - smime_type = -@@ -208,9 +233,16 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7, - g_object_unref(crlf_filter); - - /* get the cleartext */ -+#ifndef HAVE_GMIME_2_5_7 - *validity = g_mime_cipher_context_verify(ctx, GMIME_CIPHER_HASH_DEFAULT, - ciphertext, filtered_stream, err); -- if (!*validity) { -+ if (!*validity) -+#else /* HAVE_GMIME_2_5_7 */ -+ *list = g_mime_crypto_context_verify(ctx, GMIME_CIPHER_ALGO_DEFAULT, -+ ciphertext, filtered_stream, err); -+ if (!*list) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref(filtered_stream); - g_object_unref(ciphertext); - g_object_unref(stream); -@@ -248,7 +280,12 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7, - */ - int - g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content, -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext *ctx, GPtrArray *recipients, -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext *ctx, -+ GPtrArray *recipients, -+#endif /* HAVE_GMIME_2_5_7 */ - GError **err) - { - GMimeDataWrapper *wrapper; -@@ -257,8 +294,14 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content, - GMimeFilter *crlf_filter; - - g_return_val_if_fail (GMIME_IS_PART (pkcs7), -1); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail (GMIME_IS_CIPHER_CONTEXT (ctx), -1); - g_return_val_if_fail (ctx->encrypt_protocol != NULL, -1); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail (GMIME_IS_CRYPTO_CONTEXT (ctx), -1); -+ g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx) -+ != NULL, -1); -+#endif /* HAVE_GMIME_2_5_7 */ - g_return_val_if_fail (GMIME_IS_OBJECT (content), -1); - - /* get the cleartext */ -@@ -279,7 +322,15 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content, - - /* encrypt the content stream */ - ciphertext = g_mime_stream_mem_new (); -- if (g_mime_cipher_context_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1) { -+#ifndef HAVE_GMIME_2_5_7 -+ if (g_mime_cipher_context_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (g_mime_crypto_context_encrypt -+ (ctx, FALSE, NULL, -+ GMIME_CIPHER_ALGO_DEFAULT, -+ recipients, stream, ciphertext, err) == -1) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref (ciphertext); - g_object_unref (stream); - return -1; -@@ -313,8 +364,14 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content, - * err with more information about the reason. - */ - GMimeObject * -+#ifndef HAVE_GMIME_2_5_7 - g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx, - GError **err) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, -+ GMimeCryptoContext *ctx, -+ GError **err) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeObject *decrypted; - GMimeDataWrapper *wrapper; -@@ -325,8 +382,14 @@ g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx, - const char *smime_type; - - g_return_val_if_fail(GMIME_IS_PART(pkcs7), NULL); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_IS_CIPHER_CONTEXT(ctx), NULL); - g_return_val_if_fail(ctx->encrypt_protocol != NULL, NULL); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(GMIME_IS_CRYPTO_CONTEXT(ctx), NULL); -+ g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx) -+ != NULL, NULL); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* some sanity checks */ - smime_type = -@@ -353,7 +416,13 @@ g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx, - g_object_unref(crlf_filter); - - /* get the cleartext */ -- if (g_mime_cipher_context_decrypt(ctx, ciphertext, filtered_stream, err) == NULL) { -+#ifndef HAVE_GMIME_2_5_7 -+ if (g_mime_cipher_context_decrypt(ctx, ciphertext, filtered_stream, err) == NULL) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (g_mime_crypto_context_decrypt -+ (ctx, ciphertext, filtered_stream, err) == NULL) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref(filtered_stream); - g_object_unref(ciphertext); - g_object_unref(stream); -diff --git a/libbalsa/gmime-application-pkcs7.h b/libbalsa/gmime-application-pkcs7.h -index 03fa401..6678ff5 100644 ---- a/libbalsa/gmime-application-pkcs7.h -+++ b/libbalsa/gmime-application-pkcs7.h -@@ -28,7 +28,11 @@ extern "C" { - #endif /* __cplusplus */ - - #include <gmime/gmime-part.h> -+#ifndef HAVE_GMIME_2_5_7 - #include <gmime/gmime-cipher-context.h> -+#else /* HAVE_GMIME_2_5_7 */ -+#include <gmime/gmime-crypto-context.h> -+#endif /* HAVE_GMIME_2_5_7 */ - - #undef HAS_APPLICATION_PKCS7_MIME_SIGNED_SUPPORT - -@@ -39,21 +43,40 @@ extern "C" { - * Balsa always encodes S/MIME signed stuff as multipart/signed. */ - int g_mime_application_pkcs7_sign(GMimePart * pkcs7, - GMimeObject * content, -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext * ctx, -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext * ctx, -+#endif /* HAVE_GMIME_2_5_7 */ - const char *userid, GError ** err); - #endif - -+#ifndef HAVE_GMIME_2_5_7 - GMimeObject *g_mime_application_pkcs7_verify(GMimePart * pkcs7, - GMimeSignatureValidity ** validity, - GMimeCipherContext * ctx, GError ** err); -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeObject *g_mime_application_pkcs7_verify(GMimePart * pkcs7, -+ GMimeSignatureList ** validity, -+ GMimeCryptoContext * ctx, GError ** err); -+#endif /* HAVE_GMIME_2_5_7 */ - - int g_mime_application_pkcs7_encrypt(GMimePart * pkcs7, - GMimeObject * content, -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext * ctx, -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext * ctx, -+#endif /* HAVE_GMIME_2_5_7 */ - GPtrArray * recipients, GError ** err); - -+#ifndef HAVE_GMIME_2_5_7 - GMimeObject *g_mime_application_pkcs7_decrypt(GMimePart * pkcs7, - GMimeCipherContext * ctx, GError ** err); -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeObject *g_mime_application_pkcs7_decrypt(GMimePart * pkcs7, -+ GMimeCryptoContext * ctx, GError ** err); -+#endif /* HAVE_GMIME_2_5_7 */ - - #ifdef __cplusplus - } -diff --git a/libbalsa/gmime-gpgme-context.c b/libbalsa/gmime-gpgme-context.c -index 24b140b..0c56f94 100644 ---- a/libbalsa/gmime-gpgme-context.c -+++ b/libbalsa/gmime-gpgme-context.c -@@ -27,6 +27,9 @@ - #include <unistd.h> - #include <glib.h> - #include <gmime/gmime.h> -+#ifdef HAVE_GMIME_2_5_7 -+#include <gmime/gmime-certificate.h> -+#endif /* HAVE_GMIME_2_5_7 */ - #include <gpgme.h> - #include <time.h> - #include <glib/gi18n.h> -@@ -44,6 +47,7 @@ static gboolean g_mime_gpgme_context_check_protocol(GMimeGpgmeContextClass - protocol, - GError ** error); - -+#ifndef HAVE_GMIME_2_5_7 - static GMimeCipherHash g_mime_gpgme_hash_id(GMimeCipherContext * ctx, - const char *hash); - -@@ -70,6 +74,46 @@ static GMimeSignatureValidity *g_mime_gpgme_decrypt(GMimeCipherContext * - GMimeStream * istream, - GMimeStream * ostream, - GError ** err); -+#else /* HAVE_GMIME_2_5_7 */ -+static GMimeDigestAlgo g_mime_gpgme_digest_id(GMimeCryptoContext * ctx, -+ const char *hash); -+ -+static const char *g_mime_gpgme_digest_name(GMimeCryptoContext * ctx, -+ GMimeDigestAlgo hash); -+ -+static const char -+ *g_mime_gpgme_get_signature_protocol(GMimeCryptoContext * context); -+static const char -+ *g_mime_gpgme_get_encryption_protocol(GMimeCryptoContext * context); -+static const char -+ *g_mime_gpgme_get_key_exchange_protocol(GMimeCryptoContext * context); -+ -+static int g_mime_gpgme_sign(GMimeCryptoContext * ctx, -+ const char * userid, -+ GMimeDigestAlgo hash, -+ GMimeStream * istream, -+ GMimeStream * ostream, -+ GError ** err); -+ -+static GMimeSignatureList *g_mime_gpgme_verify(GMimeCryptoContext * ctx, -+ GMimeDigestAlgo hash, -+ GMimeStream * istream, -+ GMimeStream * sigstream, -+ GError ** err); -+ -+static int g_mime_gpgme_encrypt(GMimeCryptoContext * ctx, -+ gboolean sign, -+ const char *userid, -+ GMimeDigestAlgo digest, -+ GPtrArray * recipients, -+ GMimeStream * istream, -+ GMimeStream * ostream, GError ** err); -+ -+static GMimeDecryptResult *g_mime_gpgme_decrypt(GMimeCryptoContext * ctx, -+ GMimeStream * istream, -+ GMimeStream * ostream, -+ GError ** err); -+#endif /* HAVE_GMIME_2_5_7 */ - - - /* internal passphrase callback */ -@@ -102,7 +146,11 @@ static void g_set_error_from_gpgme(GError ** error, gpgme_error_t gpgme_err, - const gchar * message); - - -+#ifndef HAVE_GMIME_2_5_7 - static GMimeCipherContextClass *parent_class = NULL; -+#else /* HAVE_GMIME_2_5_7 */ -+static GMimeCryptoContextClass *parent_class = NULL; -+#endif /* HAVE_GMIME_2_5_7 */ - - - GType -@@ -124,8 +172,13 @@ g_mime_gpgme_context_get_type(void) - }; - - type = -+#ifndef HAVE_GMIME_2_5_7 - g_type_register_static(GMIME_TYPE_CIPHER_CONTEXT, - "GMimeGpgmeContext", &info, 0); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_type_register_static(GMIME_TYPE_CRYPTO_CONTEXT, -+ "GMimeGpgmeContext", &info, 0); -+#endif /* HAVE_GMIME_2_5_7 */ - } - - return type; -@@ -136,19 +189,39 @@ static void - g_mime_gpgme_context_class_init(GMimeGpgmeContextClass * klass) - { - GObjectClass *object_class = G_OBJECT_CLASS(klass); -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContextClass *cipher_class = - GMIME_CIPHER_CONTEXT_CLASS(klass); -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContextClass *crypto_class = -+ GMIME_CRYPTO_CONTEXT_CLASS(klass); -+#endif /* HAVE_GMIME_2_5_7 */ - - parent_class = g_type_class_ref(G_TYPE_OBJECT); - - object_class->finalize = g_mime_gpgme_context_finalize; - -+#ifndef HAVE_GMIME_2_5_7 - cipher_class->hash_id = g_mime_gpgme_hash_id; - cipher_class->hash_name = g_mime_gpgme_hash_name; - cipher_class->sign = g_mime_gpgme_sign; - cipher_class->verify = g_mime_gpgme_verify; - cipher_class->encrypt = g_mime_gpgme_encrypt; - cipher_class->decrypt = g_mime_gpgme_decrypt; -+#else /* HAVE_GMIME_2_5_7 */ -+ crypto_class->digest_id = g_mime_gpgme_digest_id; -+ crypto_class->digest_name = g_mime_gpgme_digest_name; -+ crypto_class->get_signature_protocol = -+ g_mime_gpgme_get_signature_protocol; -+ crypto_class->get_encryption_protocol = -+ g_mime_gpgme_get_encryption_protocol; -+ crypto_class->get_key_exchange_protocol = -+ g_mime_gpgme_get_key_exchange_protocol; -+ crypto_class->sign = g_mime_gpgme_sign; -+ crypto_class->verify = g_mime_gpgme_verify; -+ crypto_class->encrypt = g_mime_gpgme_encrypt; -+ crypto_class->decrypt = g_mime_gpgme_decrypt; -+#endif /* HAVE_GMIME_2_5_7 */ - - if (gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP) == - GPG_ERR_NO_ERROR) -@@ -190,7 +263,11 @@ g_mime_gpgme_context_finalize(GObject * object) - } - - #if !defined(HAVE_GMIME_2_6) -+#ifndef HAVE_GMIME_2_5_7 - g_object_unref(GMIME_CIPHER_CONTEXT(ctx)->session); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_object_unref(GMIME_CRYPTO_CONTEXT(ctx)->session); -+#endif /* HAVE_GMIME_2_5_7 */ - #endif /* HAVE_GMIME_2_6 */ - - G_OBJECT_CLASS(parent_class)->finalize(object); -@@ -200,15 +277,26 @@ g_mime_gpgme_context_finalize(GObject * object) - /* - * Convert a hash algorithm name to a number - */ -+#ifndef HAVE_GMIME_2_5_7 - static GMimeCipherHash - g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash) -+#else /* HAVE_GMIME_2_5_7 */ -+static GMimeDigestAlgo -+g_mime_gpgme_digest_id(GMimeCryptoContext * ctx, const char *hash) -+#endif /* HAVE_GMIME_2_5_7 */ - { -+#ifndef HAVE_GMIME_2_5_7 - if (hash == NULL) - return GMIME_CIPHER_HASH_DEFAULT; -+#else /* HAVE_GMIME_2_5_7 */ -+ if (hash == NULL) -+ return GMIME_DIGEST_ALGO_DEFAULT; -+#endif /* HAVE_GMIME_2_5_7 */ - - if (!g_ascii_strcasecmp(hash, "pgp-")) - hash += 4; - -+#ifndef HAVE_GMIME_2_5_7 - if (!g_ascii_strcasecmp(hash, "md2")) - return GMIME_CIPHER_HASH_MD2; - else if (!g_ascii_strcasecmp(hash, "md5")) -@@ -223,6 +311,22 @@ g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash) - return GMIME_CIPHER_HASH_HAVAL5160; - - return GMIME_CIPHER_HASH_DEFAULT; -+#else /* HAVE_GMIME_2_5_7 */ -+ if (!g_ascii_strcasecmp(hash, "md2")) -+ return GMIME_DIGEST_ALGO_MD2; -+ else if (!g_ascii_strcasecmp(hash, "md5")) -+ return GMIME_DIGEST_ALGO_MD5; -+ else if (!g_ascii_strcasecmp(hash, "sha1")) -+ return GMIME_DIGEST_ALGO_SHA1; -+ else if (!g_ascii_strcasecmp(hash, "ripemd160")) -+ return GMIME_DIGEST_ALGO_RIPEMD160; -+ else if (!g_ascii_strcasecmp(hash, "tiger192")) -+ return GMIME_DIGEST_ALGO_TIGER192; -+ else if (!g_ascii_strcasecmp(hash, "haval-5-160")) -+ return GMIME_DIGEST_ALGO_HAVAL5160; -+ -+ return GMIME_DIGEST_ALGO_DEFAULT; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -@@ -230,7 +334,11 @@ g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash) - * Convert a hash algorithm number to a string - */ - static const char * -+#ifndef HAVE_GMIME_2_5_7 - g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_gpgme_digest_name(GMimeCryptoContext * context, GMimeDigestAlgo hash) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context); - char *p; -@@ -239,6 +347,7 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash) - g_return_val_if_fail(ctx->gpgme_ctx, NULL); - - /* note: this is only a subset of the hash algorithms gpg(me) supports */ -+#ifndef HAVE_GMIME_2_5_7 - switch (hash) { - case GMIME_CIPHER_HASH_MD2: - p = "pgp-md2"; -@@ -258,6 +367,27 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash) - case GMIME_CIPHER_HASH_HAVAL5160: - p = "pgp-haval-5-160"; - break; -+#else /* HAVE_GMIME_2_5_7 */ -+ switch (hash) { -+ case GMIME_DIGEST_ALGO_MD2: -+ p = "pgp-md2"; -+ break; -+ case GMIME_DIGEST_ALGO_MD5: -+ p = "pgp-md5"; -+ break; -+ case GMIME_DIGEST_ALGO_SHA1: -+ p = "pgp-sha1"; -+ break; -+ case GMIME_DIGEST_ALGO_RIPEMD160: -+ p = "pgp-ripemd160"; -+ break; -+ case GMIME_DIGEST_ALGO_TIGER192: -+ p = "pgp-tiger192"; -+ break; -+ case GMIME_DIGEST_ALGO_HAVAL5160: -+ p = "pgp-haval-5-160"; -+ break; -+#endif /* HAVE_GMIME_2_5_7 */ - default: - if (!(p = ctx->micalg)) - return p; -@@ -270,6 +400,29 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash) - return p; - } - -+#ifdef HAVE_GMIME_2_5_7 -+static const char * -+g_mime_gpgme_get_signature_protocol(GMimeCryptoContext * context) -+{ -+ GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context); -+ return ctx->sign_protocol; -+} -+ -+static const char * -+g_mime_gpgme_get_encryption_protocol(GMimeCryptoContext * context) -+{ -+ GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context); -+ return ctx->encrypt_protocol; -+} -+ -+static const char * -+g_mime_gpgme_get_key_exchange_protocol(GMimeCryptoContext * context) -+{ -+ GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context); -+ return ctx->key_protocol; -+} -+ -+#endif /* HAVE_GMIME_2_5_7 */ - - /* - * Wrapper to convert the passphrase returned from the gmime session to gpgme. -@@ -279,7 +432,11 @@ g_mime_session_passphrase(void *HOOK, const char *UID_HINT, - const char *PASSPHRASE_INFO, int PREV_WAS_BAD, - int FD) - { -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext *ctx = GMIME_CIPHER_CONTEXT(HOOK); -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext *ctx = GMIME_CRYPTO_CONTEXT(HOOK); -+#endif /* HAVE_GMIME_2_5_7 */ - #if defined(HAVE_GMIME_2_6) - GMimeStream *stream; - gboolean rc; -@@ -366,9 +523,15 @@ cb_data_release(void *handle) - * arg, but set the value in the context. - */ - static int -+#ifndef HAVE_GMIME_2_5_7 - g_mime_gpgme_sign(GMimeCipherContext * context, const char *userid, - GMimeCipherHash hash, GMimeStream * istream, - GMimeStream * ostream, GError ** error) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_gpgme_sign(GMimeCryptoContext * context, const char *userid, -+ GMimeDigestAlgo hash, GMimeStream * istream, -+ GMimeStream * ostream, GError ** error) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context; - gpgme_sig_mode_t sig_mode; -@@ -460,6 +623,7 @@ g_mime_gpgme_sign(GMimeCipherContext * context, const char *userid, - } - - -+#ifndef HAVE_GMIME_2_5_7 - /* - * In standard mode, verify that sigstream contains a detached signature for - * istream. In single-part mode (RFC 2440, RFC 2633 application/pkcs7-mime), -@@ -471,13 +635,33 @@ static GMimeSignatureValidity * - g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash, - GMimeStream * istream, GMimeStream * sigstream, - GError ** error) -+#else /* HAVE_GMIME_2_5_7 */ -+/* -+ * In standard mode, verify that sigstream contains a detached signature for -+ * istream. In single-part mode (RFC 2440, RFC 2633 application/pkcs7-mime), -+ * istream contains clearsigned data, and sigstream will be filled with the -+ * verified plaintext. The routine returns a GMimeSignatureList object. -+ * More information is saved in the context's signature object. -+ * On error error is set accordingly. -+ */ -+static GMimeSignatureList * -+g_mime_gpgme_verify(GMimeCryptoContext * context, GMimeDigestAlgo hash, -+ GMimeStream * istream, GMimeStream * sigstream, -+ GError ** error) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context; - gpgme_ctx_t gpgme_ctx; - gpgme_protocol_t protocol; - gpgme_error_t err; - gpgme_data_t msg, sig; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *validity; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeSignatureList *list; -+ GMimeSignature *signature; -+ -+#endif /* HAVE_GMIME_2_5_7 */ - struct gpgme_data_cbs cbs = { - (gpgme_data_read_cb_t) g_mime_gpgme_stream_rd, /* read method */ - (gpgme_data_write_cb_t) g_mime_gpgme_stream_wr, /* write method */ -@@ -521,6 +705,7 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash, - ctx->sig_state = - g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx); - -+#ifndef HAVE_GMIME_2_5_7 - validity = g_mime_signature_validity_new(); - if (ctx->sig_state) { - switch (ctx->sig_state->status) -@@ -536,12 +721,44 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash, - } - } else - g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN); -+#else /* HAVE_GMIME_2_5_7 */ -+ list = g_mime_signature_list_new(); -+ signature = g_mime_signature_new(); -+ g_mime_signature_list_add(list, signature); -+ -+ if (ctx->sig_state) { -+ switch (ctx->sig_state->status) -+ { -+ case GPG_ERR_NO_ERROR: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_GOOD); -+ break; -+ case GPG_ERR_NOT_SIGNED: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_ERROR); -+ g_mime_signature_set_errors(signature, -+ GMIME_SIGNATURE_ERROR_NONE); -+ break; -+ default: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_BAD); -+ } -+ } else { -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_ERROR); -+ g_mime_signature_set_errors(signature, GMIME_SIGNATURE_ERROR_NONE); -+ } -+#endif /* HAVE_GMIME_2_5_7 */ - - /* release gmgme data buffers */ - gpgme_data_release(msg); - gpgme_data_release(sig); - -+#ifndef HAVE_GMIME_2_5_7 - return validity; -+#else /* HAVE_GMIME_2_5_7 */ -+ return list; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -@@ -549,10 +766,19 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash, - * Encrypt istream to ostream for recipients. If sign is set, sign by userid. - */ - static int -+#ifndef HAVE_GMIME_2_5_7 - g_mime_gpgme_encrypt(GMimeCipherContext * context, gboolean sign, - const char *userid, GPtrArray * recipients, - GMimeStream * istream, GMimeStream * ostream, - GError ** error) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_gpgme_encrypt(GMimeCryptoContext * context, gboolean sign, -+ const char *userid, -+ GMimeDigestAlgo digest, -+ GPtrArray * recipients, -+ GMimeStream * istream, GMimeStream * ostream, -+ GError ** error) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context; - gpgme_ctx_t gpgme_ctx; -@@ -653,9 +879,15 @@ g_mime_gpgme_encrypt(GMimeCipherContext * context, gboolean sign, - * Decrypt istream to ostream. In RFC 2440 mode, also try to check an included - * signature (if any). - */ -+#ifndef HAVE_GMIME_2_5_7 - static GMimeSignatureValidity * - g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, - GMimeStream * ostream, GError ** error) -+#else /* HAVE_GMIME_2_5_7 */ -+static GMimeDecryptResult * -+g_mime_gpgme_decrypt(GMimeCryptoContext * context, GMimeStream * istream, -+ GMimeStream * ostream, GError ** error) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context; - gpgme_ctx_t gpgme_ctx; -@@ -668,7 +900,13 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, - NULL, /* seek method */ - cb_data_release /* release method */ - }; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *validity; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeDecryptResult *result; -+ GMimeSignatureList *list; -+ GMimeSignature *signature; -+#endif /* HAVE_GMIME_2_5_7 */ - - /* some paranoia checks */ - g_return_val_if_fail(ctx, NULL); -@@ -716,6 +954,7 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, - /* try to get information about the signature (if any) */ - ctx->sig_state = g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx); - -+#ifndef HAVE_GMIME_2_5_7 - validity = g_mime_signature_validity_new(); - if (ctx->sig_state) { - switch (ctx->sig_state->status) -@@ -733,14 +972,57 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, - g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN); - - return validity; -+#else /* HAVE_GMIME_2_5_7 */ -+ list = g_mime_signature_list_new(); -+ signature = g_mime_signature_new(); -+ g_mime_signature_list_add(list, signature); -+ result = g_mime_decrypt_result_new(); -+ g_mime_decrypt_result_set_signatures(result, list); -+ -+ if (ctx->sig_state) { -+ switch (ctx->sig_state->status) -+ { -+ case GPG_ERR_NO_ERROR: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_GOOD); -+ break; -+ case GPG_ERR_NOT_SIGNED: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_ERROR); -+ g_mime_signature_set_errors(signature, -+ GMIME_SIGNATURE_ERROR_NONE); -+ break; -+ default: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_BAD); -+ } -+ } else { -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_ERROR); -+ g_mime_signature_set_errors(signature, GMIME_SIGNATURE_ERROR_NONE); -+ } -+ -+ return result; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -+#ifndef HAVE_GMIME_2_5_7 - /* - * Create a new gpgme cipher context with protocol. If anything fails, return - * NULL and set error. - */ -+#else /* HAVE_GMIME_2_5_7 */ -+/* -+ * Create a new gpgme crypto context with protocol. If anything fails, return -+ * NULL and set error. -+ */ -+#endif /* HAVE_GMIME_2_5_7 */ -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext * -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeCryptoContext * -+#endif /* HAVE_GMIME_2_5_7 */ - #if defined(HAVE_GMIME_2_6) - g_mime_gpgme_context_new(GMimePasswordRequestFunc request_passwd, - gpgme_protocol_t protocol, GError ** error) -@@ -749,7 +1031,11 @@ g_mime_gpgme_context_new(GMimeSession * session, - gpgme_protocol_t protocol, GError ** error) - #endif /* HAVE_GMIME_2_6 */ - { -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext *cipher; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext *crypto; -+#endif /* HAVE_GMIME_2_5_7 */ - GMimeGpgmeContext *ctx; - gpgme_error_t err; - gpgme_ctx_t gpgme_ctx; -@@ -766,14 +1052,22 @@ g_mime_gpgme_context_new(GMimeSession * session, - return NULL; - } - -+#ifndef HAVE_GMIME_2_5_7 - /* create the cipher context */ -+#else /* HAVE_GMIME_2_5_7 */ -+ /* create the crypto context */ -+#endif /* HAVE_GMIME_2_5_7 */ - ctx = g_object_new(GMIME_TYPE_GPGME_CONTEXT, NULL, NULL); - if (!ctx) { - gpgme_release(gpgme_ctx); - return NULL; - } else - ctx->gpgme_ctx = gpgme_ctx; -+#ifndef HAVE_GMIME_2_5_7 - cipher = (GMimeCipherContext *) ctx; -+#else /* HAVE_GMIME_2_5_7 */ -+ crypto = (GMimeCryptoContext *) ctx; -+#endif /* HAVE_GMIME_2_5_7 */ - - /* check if the requested protocol is available */ - if (!g_mime_gpgme_context_check_protocol -@@ -785,23 +1079,47 @@ g_mime_gpgme_context_new(GMimeSession * session, - - /* setup according to requested protocol */ - #if defined(HAVE_GMIME_2_6) -+#ifndef HAVE_GMIME_2_5_7 - cipher->request_passwd = request_passwd; -+#else /* HAVE_GMIME_2_5_7 */ -+ crypto->request_passwd = request_passwd; -+#endif /* HAVE_GMIME_2_5_7 */ - #else /* HAVE_GMIME_2_6 */ -+#ifndef HAVE_GMIME_2_5_7 - cipher->session = session; -+#else /* HAVE_GMIME_2_5_7 */ -+ crypto->session = session; -+#endif /* HAVE_GMIME_2_5_7 */ - g_object_ref(session); - #endif /* HAVE_GMIME_2_6 */ - gpgme_set_protocol(gpgme_ctx, protocol); - if (protocol == GPGME_PROTOCOL_OpenPGP) { -+#ifndef HAVE_GMIME_2_5_7 - cipher->sign_protocol = "application/pgp-signature"; - cipher->encrypt_protocol = "application/pgp-encrypted"; - cipher->key_protocol = NULL; /* FIXME */ -+#else /* HAVE_GMIME_2_5_7 */ -+ ctx->sign_protocol = "application/pgp-signature"; -+ ctx->encrypt_protocol = "application/pgp-encrypted"; -+ ctx->key_protocol = NULL; /* FIXME */ -+#endif /* HAVE_GMIME_2_5_7 */ - } else { -+#ifndef HAVE_GMIME_2_5_7 - cipher->sign_protocol = "application/pkcs7-signature"; - cipher->encrypt_protocol = "application/pkcs7-mime"; - cipher->key_protocol = NULL; /* FIXME */ -+#else /* HAVE_GMIME_2_5_7 */ -+ ctx->sign_protocol = "application/pkcs7-signature"; -+ ctx->encrypt_protocol = "application/pkcs7-mime"; -+ ctx->key_protocol = NULL; /* FIXME */ -+#endif /* HAVE_GMIME_2_5_7 */ - } - -+#ifndef HAVE_GMIME_2_5_7 - return cipher; -+#else /* HAVE_GMIME_2_5_7 */ -+ return crypto; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -diff --git a/libbalsa/gmime-gpgme-context.h b/libbalsa/gmime-gpgme-context.h -index 585d927..19c5fae 100644 ---- a/libbalsa/gmime-gpgme-context.h -+++ b/libbalsa/gmime-gpgme-context.h -@@ -63,7 +63,11 @@ typedef gboolean(*GMimeGpgmeKeyTrustCB) (const gchar * name, - GMimeGpgmeContext * ctx); - - struct _GMimeGpgmeContext { -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext parent_object; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext parent_object; -+#endif /* HAVE_GMIME_2_5_7 */ - - gpgme_ctx_t gpgme_ctx; /* gpgme context */ - gboolean singlepart_mode; /* set context to single-part mode (RFC 2440, 2633) */ -@@ -73,11 +77,21 @@ struct _GMimeGpgmeContext { - GMimeGpgmeKeySelectCB key_select_cb; /* key selection callback */ - GMimeGpgmeKeyTrustCB key_trust_cb; /* low trust key cb */ - gpgme_passphrase_cb_t passphrase_cb; /* passphrase callback */ -+#ifdef HAVE_GMIME_2_5_7 -+ -+ const gchar *sign_protocol; -+ const gchar *encrypt_protocol; -+ const gchar *key_protocol; -+#endif /* HAVE_GMIME_2_5_7 */ - }; - - - struct _GMimeGpgmeContextClass { -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContextClass parent_class; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContextClass parent_class; -+#endif /* HAVE_GMIME_2_5_7 */ - - gboolean has_proto_openpgp; - gboolean has_proto_cms; -@@ -86,10 +100,17 @@ struct _GMimeGpgmeContextClass { - - GType g_mime_gpgme_context_get_type(void); - #if defined(HAVE_GMIME_2_6) -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext *g_mime_gpgme_context_new(GMimePasswordRequestFunc - request_passwd, - gpgme_protocol_t protocol, - GError ** error); -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeCryptoContext *g_mime_gpgme_context_new(GMimePasswordRequestFunc -+ request_passwd, -+ gpgme_protocol_t protocol, -+ GError ** error); -+#endif /* HAVE_GMIME_2_5_7 */ - #else /* HAVE_GMIME_2_6 */ - GMimeCipherContext *g_mime_gpgme_context_new(GMimeSession * session, - gpgme_protocol_t protocol, -diff --git a/libbalsa/gmime-part-rfc2440.c b/libbalsa/gmime-part-rfc2440.c -index 795d2e1..e79c4cb 100644 ---- a/libbalsa/gmime-part-rfc2440.c -+++ b/libbalsa/gmime-part-rfc2440.c -@@ -112,8 +112,13 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part, - - g_return_val_if_fail(GMIME_IS_PART(part), -1); - g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), -1); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->sign_protocol != NULL, - -1); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol -+ (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, -1); -+#endif /* HAVE_GMIME_2_5_7 */ - g_return_val_if_fail(recipients != NULL || sign_userid != NULL, -1); - - /* get the raw content */ -@@ -131,14 +136,27 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part, - ctx->singlepart_mode = TRUE; - if (recipients == NULL) - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_cipher_context_sign(GMIME_CIPHER_CONTEXT(ctx), sign_userid, - GMIME_CIPHER_HASH_DEFAULT, stream, - cipherstream, err); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_crypto_context_sign(GMIME_CRYPTO_CONTEXT(ctx), sign_userid, -+ GMIME_CIPHER_ALGO_DEFAULT, stream, -+ cipherstream, err); -+#endif /* HAVE_GMIME_2_5_7 */ - else - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_cipher_context_encrypt(GMIME_CIPHER_CONTEXT(ctx), - sign_userid != NULL, sign_userid, - recipients, stream, cipherstream, err); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_crypto_context_encrypt(GMIME_CRYPTO_CONTEXT(ctx), -+ sign_userid != NULL, sign_userid, -+ GMIME_CIPHER_ALGO_DEFAULT, -+ recipients, stream, cipherstream, err); -+#endif /* HAVE_GMIME_2_5_7 */ - if (result == -1) { - g_object_unref(cipherstream); - return -1; -@@ -202,18 +220,31 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part, - * set on err to provide more information. Upon success, the content - * of part is replaced by the verified output of the crypto engine. - */ -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity * -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeSignatureList * -+#endif /* HAVE_GMIME_2_5_7 */ - g_mime_part_rfc2440_verify(GMimePart * part, - GMimeGpgmeContext * ctx, GError ** err) - { - GMimeStream *stream, *plainstream; - GMimeDataWrapper * wrapper; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeSignatureList *list; -+#endif /* HAVE_GMIME_2_5_7 */ - - g_return_val_if_fail(GMIME_IS_PART(part), NULL); - g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), NULL); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->sign_protocol != NULL, - NULL); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol -+ (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, NULL); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* get the raw content */ - wrapper = g_mime_part_get_content_object(GMIME_PART(part)); -@@ -227,13 +258,25 @@ g_mime_part_rfc2440_verify(GMimePart * part, - - /* verify the signature */ - ctx->singlepart_mode = TRUE; -+#ifndef HAVE_GMIME_2_5_7 - valid = - g_mime_cipher_context_verify(GMIME_CIPHER_CONTEXT(ctx), - GMIME_CIPHER_HASH_DEFAULT, stream, - plainstream, err); -+#else /* HAVE_GMIME_2_5_7 */ -+ list = -+ g_mime_crypto_context_verify(GMIME_CRYPTO_CONTEXT(ctx), -+ GMIME_CIPHER_ALGO_DEFAULT, stream, -+ plainstream, err); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* upon success, replace the signed content by the checked one */ -- if (valid) { -+#ifndef HAVE_GMIME_2_5_7 -+ if (valid) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (list) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - GMimeDataWrapper *wrapper = g_mime_data_wrapper_new(); - - g_mime_data_wrapper_set_stream(wrapper, plainstream); -@@ -242,7 +285,11 @@ g_mime_part_rfc2440_verify(GMimePart * part, - } - g_object_unref(plainstream); - -+#ifndef HAVE_GMIME_2_5_7 - return valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ return list; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -@@ -255,19 +302,32 @@ g_mime_part_rfc2440_verify(GMimePart * part, - * verified and the result is placed in ctx by the underlying gpgme - * context. - */ -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity * -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeDecryptResult * -+#endif /* HAVE_GMIME_2_5_7 */ - g_mime_part_rfc2440_decrypt(GMimePart * part, - GMimeGpgmeContext * ctx, GError ** err) - { - GMimeStream *stream, *plainstream; - GMimeDataWrapper * wrapper; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *result; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeDecryptResult *result; -+#endif /* HAVE_GMIME_2_5_7 */ - gchar *headbuf = g_malloc0(1024); - - g_return_val_if_fail(GMIME_IS_PART(part), NULL); - g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), NULL); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->encrypt_protocol != - NULL, NULL); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol -+ (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, NULL); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* get the raw content */ - wrapper = g_mime_part_get_content_object(part); -@@ -284,8 +344,13 @@ g_mime_part_rfc2440_decrypt(GMimePart * part, - - /* decrypt and (if possible) verify the input */ - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_cipher_context_decrypt(GMIME_CIPHER_CONTEXT(ctx), stream, - plainstream, err); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_crypto_context_decrypt(GMIME_CRYPTO_CONTEXT(ctx), stream, -+ plainstream, err); -+#endif /* HAVE_GMIME_2_5_7 */ - - if (result != NULL) { - GMimeStream *filter_stream; -diff --git a/libbalsa/gmime-part-rfc2440.h b/libbalsa/gmime-part-rfc2440.h -index 48be5a4..cc1901a 100644 ---- a/libbalsa/gmime-part-rfc2440.h -+++ b/libbalsa/gmime-part-rfc2440.h -@@ -53,12 +53,21 @@ int g_mime_part_rfc2440_sign_encrypt(GMimePart * part, - GPtrArray * recipients, - const char *sign_userid, - GError ** err); -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *g_mime_part_rfc2440_verify(GMimePart * part, - GMimeGpgmeContext * ctx, - GError ** err); - GMimeSignatureValidity *g_mime_part_rfc2440_decrypt(GMimePart * part, - GMimeGpgmeContext * - ctx, GError ** err); -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeSignatureList *g_mime_part_rfc2440_verify(GMimePart * part, -+ GMimeGpgmeContext * ctx, -+ GError ** err); -+GMimeDecryptResult *g_mime_part_rfc2440_decrypt(GMimePart * part, -+ GMimeGpgmeContext * ctx, -+ GError ** err); -+#endif /* HAVE_GMIME_2_5_7 */ - - #ifdef __cplusplus - } -diff --git a/libbalsa/rfc3156.c b/libbalsa/rfc3156.c -index a56e12c..df4a2e1 100644 ---- a/libbalsa/rfc3156.c -+++ b/libbalsa/rfc3156.c -@@ -268,9 +268,15 @@ libbalsa_message_body_protection(LibBalsaMessageBody * body) - - #if defined(HAVE_GMIME_2_6) - static gboolean -+#ifndef HAVE_GMIME_2_5_7 - password_request_func(GMimeCipherContext * ctx, const char *user_id, - const char *prompt_ctx, gboolean reprompt, - GMimeStream * response, GError ** err) -+#else /* HAVE_GMIME_2_5_7 */ -+password_request_func(GMimeCryptoContext * ctx, const char *user_id, -+ const char *prompt_ctx, gboolean reprompt, -+ GMimeStream * response, GError ** err) -+#endif /* HAVE_GMIME_2_5_7 */ - { - gint fd; - gchar *name_used; -@@ -366,9 +372,16 @@ libbalsa_sign_mime_object(GMimeObject ** content, const gchar * rfc822_for, - return FALSE; - } - -+#ifndef HAVE_GMIME_2_5_7 - if (g_mime_multipart_signed_sign - (mps, *content, GMIME_CIPHER_CONTEXT(ctx), rfc822_for, -- GMIME_CIPHER_HASH_DEFAULT, error) != 0) { -+ GMIME_CIPHER_HASH_DEFAULT, error) != 0) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (g_mime_multipart_signed_sign -+ (mps, *content, GMIME_CRYPTO_CONTEXT(ctx), rfc822_for, -+ GMIME_DIGEST_ALGO_DEFAULT, error) != 0) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref(mps); - g_object_unref(ctx); - #if !defined(HAVE_GMIME_2_6) -@@ -458,10 +471,18 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for, - - encrypted_obj = GMIME_OBJECT(mpe); - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_multipart_encrypted_encrypt(mpe, *content, - GMIME_CIPHER_CONTEXT(ctx), - FALSE, NULL, - recipients, error); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_multipart_encrypted_encrypt(mpe, *content, -+ GMIME_CRYPTO_CONTEXT(ctx), -+ FALSE, NULL, -+ GMIME_DIGEST_ALGO_DEFAULT, -+ recipients, error); -+#endif /* HAVE_GMIME_2_5_7 */ - } - #ifdef HAVE_SMIME - else { -@@ -471,9 +492,15 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for, - encrypted_obj = GMIME_OBJECT(pkcs7); - ctx->singlepart_mode = TRUE; - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_application_pkcs7_encrypt(pkcs7, *content, - GMIME_CIPHER_CONTEXT(ctx), - recipients, error); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_application_pkcs7_encrypt(pkcs7, *content, -+ GMIME_CRYPTO_CONTEXT(ctx), -+ recipients, error); -+#endif /* HAVE_GMIME_2_5_7 */ - } - #endif - -@@ -565,8 +592,14 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - #if !defined(HAVE_GMIME_2_6) - GMimeSession *session; - #endif /* HAVE_GMIME_2_6 */ -- GMimeCipherContext *ctx; -+#ifndef HAVE_GMIME_2_5_7 -+ GMimeCipherContext *g_mime_ctx; - GMimeSignatureValidity *valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext *g_mime_ctx; -+ GMimeSignatureList *valid; -+#endif /* HAVE_GMIME_2_5_7 */ -+ GMimeGpgmeContext *ctx; - GError *error = NULL; - - /* paranoia checks */ -@@ -592,12 +625,12 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - /* try to create GMimeGpgMEContext */ - #if !defined(HAVE_GMIME_2_6) - session = g_object_new(g_mime_session_get_type(), NULL, NULL); -- ctx = g_mime_gpgme_context_new(session, protocol, &error); -+ g_mime_ctx = g_mime_gpgme_context_new(session, protocol, &error); - #else /* HAVE_GMIME_2_6 */ -- ctx = -+ g_mime_ctx = - g_mime_gpgme_context_new(password_request_func, protocol, &error); - #endif /* HAVE_GMIME_2_6 */ -- if (ctx == NULL) { -+ if (g_mime_ctx == NULL) { - if (error) { - libbalsa_information(LIBBALSA_INFORMATION_ERROR, "%s: %s", - _("creating a gpgme context failed"), -@@ -613,6 +646,7 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - body->parts->next->sig_info->status = GPGME_SIG_STAT_ERROR; - return FALSE; - } -+ ctx = GMIME_GPGME_CONTEXT(g_mime_ctx); - - /* S/MIME uses the protocol application/pkcs7-signature, but some ancient - mailers, not yet knowing RFC 2633, use application/x-pkcs7-signature, -@@ -622,14 +656,19 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - g_mime_object_get_content_type_parameter(GMIME_OBJECT (body->mime_part), - "protocol"); - if (!g_ascii_strcasecmp(cms_protocol, "application/x-pkcs7-signature")) -+#ifndef HAVE_GMIME_2_5_7 -+ g_mime_ctx->sign_protocol = cms_protocol; -+#else /* HAVE_GMIME_2_5_7 */ - ctx->sign_protocol = cms_protocol; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - /* verify the signature */ - - libbalsa_mailbox_lock_store(body->message->mailbox); - valid = g_mime_multipart_signed_verify(GMIME_MULTIPART_SIGNED -- (body->mime_part), ctx, &error); -+ (body->mime_part), g_mime_ctx, -+ &error); - libbalsa_mailbox_unlock_store(body->message->mailbox); - - if (valid == NULL) { -@@ -642,12 +681,16 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - libbalsa_information(LIBBALSA_INFORMATION_ERROR, - _("signature verification failed")); - } -- if (GMIME_GPGME_CONTEXT(ctx)->sig_state) { -- body->parts->next->sig_info = GMIME_GPGME_CONTEXT(ctx)->sig_state; -+ if (ctx->sig_state) { -+ body->parts->next->sig_info = ctx->sig_state; - g_object_ref(G_OBJECT(body->parts->next->sig_info)); - } -+#ifndef HAVE_GMIME_2_5_7 - g_mime_signature_validity_free(valid); -- g_object_unref(ctx); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_object_unref(valid); -+#endif /* HAVE_GMIME_2_5_7 */ -+ g_object_unref(g_mime_ctx); - #if !defined(HAVE_GMIME_2_6) - g_object_unref(session); - #endif /* HAVE_GMIME_2_6 */ -@@ -747,14 +790,26 @@ libbalsa_body_decrypt(LibBalsaMessageBody * body, - libbalsa_mailbox_lock_store(body->message->mailbox); - if (protocol == GPGME_PROTOCOL_OpenPGP) - mime_obj = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_multipart_encrypted_decrypt(GMIME_MULTIPART_ENCRYPTED(body->mime_part), - GMIME_CIPHER_CONTEXT(ctx), - &error); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_multipart_encrypted_decrypt(GMIME_MULTIPART_ENCRYPTED(body->mime_part), -+ GMIME_CRYPTO_CONTEXT(ctx), -+ NULL, -+ &error); -+#endif /* HAVE_GMIME_2_5_7 */ - #ifdef HAVE_SMIME - else if (smime_signed) { -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeSignatureList *valid; -+#endif /* HAVE_GMIME_2_5_7 */ - - ctx->singlepart_mode = TRUE; -+#ifndef HAVE_GMIME_2_5_7 - mime_obj = - g_mime_application_pkcs7_verify(GMIME_PART(body->mime_part), - &valid, -@@ -766,6 +821,19 @@ libbalsa_body_decrypt(LibBalsaMessageBody * body, - g_mime_application_pkcs7_decrypt(GMIME_PART(body->mime_part), - GMIME_CIPHER_CONTEXT(ctx), - &error); -+#else /* HAVE_GMIME_2_5_7 */ -+ mime_obj = -+ g_mime_application_pkcs7_verify(GMIME_PART(body->mime_part), -+ &valid, -+ GMIME_CRYPTO_CONTEXT(ctx), -+ &error); -+ g_object_unref(valid); -+ } else -+ mime_obj = -+ g_mime_application_pkcs7_decrypt(GMIME_PART(body->mime_part), -+ GMIME_CRYPTO_CONTEXT(ctx), -+ &error); -+#endif /* HAVE_GMIME_2_5_7 */ - #endif - libbalsa_mailbox_unlock_store(body->message->mailbox); - -@@ -906,7 +974,11 @@ libbalsa_rfc2440_verify(GMimePart * part, GMimeGpgmeSigstat ** sig_info) - GMimeSession *session; - #endif /* HAVE_GMIME_2_6 */ - GMimeGpgmeContext *ctx; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeSignatureList *valid; -+#endif /* HAVE_GMIME_2_5_7 */ - GError *error = NULL; - gpgme_error_t retval; - -@@ -978,7 +1050,11 @@ libbalsa_rfc2440_verify(GMimePart * part, GMimeGpgmeSigstat ** sig_info) - } - - /* clean up */ -+#ifndef HAVE_GMIME_2_5_7 - g_mime_signature_validity_free(valid); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_object_unref(valid); -+#endif /* HAVE_GMIME_2_5_7 */ - retval = ctx->sig_state->status; - g_object_unref(ctx); - #if !defined(HAVE_GMIME_2_6) --- -cgit v0.9.0.2 diff --git a/community-testing/blender/PKGBUILD b/community-testing/blender/PKGBUILD deleted file mode 100644 index 0f23b4ae5..000000000 --- a/community-testing/blender/PKGBUILD +++ /dev/null @@ -1,102 +0,0 @@ -# $Id: PKGBUILD 145008 2011-12-14 03:12:03Z eric $ -# Contributor: John Sowiak <john@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -# Apparently, the blender guys refuse to release source tarballs for -# intermediate releases that deal mainly with binaries but incorporate tiny -# minor changes from svn. Since I'm sick and tired of the urges of users that -# look for release numbers only, we make a messy PKGBUILD that can checkout svn -# release if necessary. - -#_svn=true -_svn=false - -pkgname=blender -pkgver=2.61 -pkgrel=4 -epoch=3 -pkgdesc="A fully integrated 3D graphics creation suite" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.blender.org" -depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ - 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ - 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'openimageio') -makedepends=('cmake' 'boost' 'cuda-toolkit') -optdepends=('cuda-toolkit: cycles renderer cuda support') -options=(!strip) -install=blender.install -if [ $_svn = false ]; then - source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) - md5sums=('11a4721ff92286f678bb2e05e5f29c97') -else - source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) - md5sums=('7579d1139d0d6025df8afcfca64a65c4') -fi - -# source PKGBUILD && mksource -mksource() { - [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) - _svnver=38016 - _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" - _svnmod="$pkgname-$pkgver" - mkdir ${pkgname}-$pkgver - pushd ${pkgname}-$pkgver - svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod - find . -depth -type d -name .svn -exec rm -rf {} \; - tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* - popd -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - mkdir build - cd build - - [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF" - - cmake .. \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_BUILD_TYPE:STRING=Release \ - -DWITH_INSTALL_PORTABLE:BOOL=OFF \ - -DWITH_PYTHON_INSTALL:BOOL=OFF \ - -DWITH_OPENCOLLADA:BOOL=ON \ - -DOPENIMAGEIO_ROOT_DIR:STRING=/usr \ - -DWITH_GAMEENGINE:BOOL=ON \ - -DWITH_PLAYER:BOOL=ON \ - -DWITH_BUILTIN_GLEW:BOOL=OFF \ - -DWITH_CODEC_FFMPEG:BOOL=ON \ - -DWITH_CODEC_SNDFILE:BOOL=ON \ - -DWITH_CYCLES:BOOL=ON \ - -DWITH_CYCLES_CUDA_BINARIES:BOOL=ON \ - -DCUDA_TOOLKIT_ROOT_DIR:STRING=/opt/cuda-toolkit/ \ - -DWITH_FFTW3:BOOL=ON \ - -DWITH_MOD_OCEANSIM:BOOL=ON \ - -DPYTHON_VERSION:STRING=3.2 \ - -DPYTHON_LIBPATH:STRING=/usr/lib \ - -DPYTHON_LIBRARY:STRING=python3.2mu \ - -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \ - $ENABLESSE2 - - make $MAKEFLAGS - - cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ - "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ - cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi - chmod 755 bmake - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver/build" - make DESTDIR="${pkgdir}" install - python -m compileall "${pkgdir}/usr/share/blender" - -# install plugins - install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} - cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ - "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ - cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ - "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ -} diff --git a/community-testing/blender/blender.install b/community-testing/blender/blender.install deleted file mode 100644 index 724bfce00..000000000 --- a/community-testing/blender/blender.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/bwbar/PKGBUILD b/community-testing/bwbar/PKGBUILD deleted file mode 100644 index 06a608c23..000000000 --- a/community-testing/bwbar/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 63046 2012-01-30 18:52:14Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Mark Rosenstand <mark@borkware.net> - -pkgname=bwbar -pkgver=1.2.3 -pkgrel=3 -arch=(i686 x86_64) -pkgdesc="Generates text and graphical readout of the current bandwidth usage." -url="http://www.kernel.org/pub/software/web/bwbar/" -license=("GPL") -depends=('libpng') -#source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.gz) -source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.gz) -md5sums=('766265ddf0615b552ff19d12f78be719') - -build() { - cd $srcdir/$pkgname-$pkgver - sed -i '1,1i#include <zlib.h>' bwbar.c - sed -i 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|' bwbar.c - ./configure - make - install -D -m755 bwbar $pkgdir/usr/bin/bwbar -} diff --git a/community-testing/calibre/PKGBUILD b/community-testing/calibre/PKGBUILD deleted file mode 100644 index 447c71d53..000000000 --- a/community-testing/calibre/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 63048 2012-01-30 18:52:27Z 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.37 -pkgrel=2 -pkgdesc="Ebook management application" -arch=('i686' 'x86_64') -url="http://calibre-ebook.com/" -license=('GPL3') -depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' - 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' - 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' - 'python-imaging' 'desktop-file-utils' 'shared-mime-info' - 'python-dnspython' 'unrar' 'python2-pyqt' 'icu') -makedepends=('python2-pycountry') -optdepends=('ipython: to use calibre-debug') -install=calibre.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" - 'desktop_integration.patch' - 'calibre-mount-helper') -md5sums=('7e313e9bf84e046d5ccfa0e9e4c06b26' - '253ce4fe5d01f8ff76b63cd3825755ea' - '675cd87d41342119827ef706055491e7') - -build() { - cd "${srcdir}/${pkgname}" - - #rm -rf src/{cherrypy,pyPdf} - rm -rf src/cherrypy - sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py - sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ - $(find . -regex ".*.py\|.*.recipe") - - python2 setup.py build -# python2 setup.py resources - python2 setup.py translations -} - -package() { - cd "${srcdir}/${pkgname}" - - patch -Np1 -i "${srcdir}/desktop_integration.patch" - - # More on desktop integration (e.g. enforce arch defaults) - sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ - -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \ - -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \ - -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \ - -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py - - # Fix the environment module location - sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py - - install -d "${pkgdir}/usr/lib/python2.7/site-packages" - python2 setup.py install --root="${pkgdir}" --prefix=/usr \ - --staging-bindir="${pkgdir}/usr/bin" \ - --staging-libdir="${pkgdir}/usr/lib" \ - --staging-sharedir="${pkgdir}/usr/share" - - find "${pkgdir}" -type d -empty -delete - - # Decompress the man pages so makepkg will do it for us. - for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do - bzip2 -d "${decom}" - done - - # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/ - rm -rf ${pkgdir}/usr/bin/calibre-mount-helper - install -m 755 ${srcdir}/calibre-mount-helper "${pkgdir}/usr/bin" -} diff --git a/community-testing/calibre/calibre-mount-helper b/community-testing/calibre/calibre-mount-helper deleted file mode 100644 index 00cac4270..000000000 --- a/community-testing/calibre/calibre-mount-helper +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -e -# Replacement for upstream mount helper using udisks/eject -# (C) 2010 Martin Pitt <mpitt@debian.org> - -ACTION="$1" -DEV="$2" - -case "$ACTION" in - mount) - udisks --mount "$DEV" - - # check if mount worked. If not, fail - # udisks does return 0 even if mount failed - mount | grep -q "$DEV" || exit 0 - ;; - - eject) - eject "$DEV" - ;; - - cleanup) - ;; - - *) - echo "unknown action" >&2 - exit 1 -esac - diff --git a/community-testing/calibre/calibre.install b/community-testing/calibre/calibre.install deleted file mode 100644 index 6210bd0ab..000000000 --- a/community-testing/calibre/calibre.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/calibre/desktop_integration.patch b/community-testing/calibre/desktop_integration.patch deleted file mode 100644 index 4dbf53757..000000000 --- a/community-testing/calibre/desktop_integration.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/src/calibre/linux.py 2011-06-17 19:56:05.000000000 +0200 -+++ b/src/calibre/linux.py 2011-06-18 00:07:46.000000000 +0200 -@@ -339,51 +339,39 @@ - - with TemporaryDirectory() as tdir: - with CurrentDir(tdir): -- render_img('mimetypes/lrf.png', 'calibre-lrf.png') -- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True) -- self.icon_resources.append(('mimetypes', 'application-lrf', '128')) -- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) -- self.icon_resources.append(('mimetypes', 'application-lrs', -- '128')) -- render_img('lt.png', 'calibre-gui.png') -- check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True) -- self.icon_resources.append(('apps', 'calibre-gui', '128')) -- render_img('viewer.png', 'calibre-viewer.png') -- check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) -- self.icon_resources.append(('apps', 'calibre-viewer', '128')) -+ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') -+ os.mkdir(dir) -+ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) -+ render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) -+ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) - - mimetypes = set([]) - for x in all_input_formats(): - mt = guess_type('dummy.'+x)[0] -- if mt and 'chemical' not in mt and 'ctc-posml' not in mt: -+ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt: - mimetypes.add(mt) - - def write_mimetypes(f): - f.write('MimeType=%s;\n'%';'.join(mimetypes)) - -- f = open('calibre-lrfviewer.desktop', 'wb') -+ dir = os.path.join(self.opts.staging_sharedir,'../applications') -+ os.mkdir(dir) -+ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb') - f.write(VIEWER) - f.close() -- f = open('calibre-ebook-viewer.desktop', 'wb') -+ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') - f.write(EVIEWER) - write_mimetypes(f) - f.close() -- f = open('calibre-gui.desktop', 'wb') -+ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') - f.write(GUI) - write_mimetypes(f) - f.close() -- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', -- 'calibre-ebook-viewer.desktop') -- for x in des: -- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] -- check_call(' '.join(cmd), shell=True) -- self.menu_resources.append(x) -- check_call(['xdg-desktop-menu', 'forceupdate']) -- f = open('calibre-mimetypes', 'wb') -+ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') -+ os.makedirs(dir) -+ f = open(os.path.join(dir, 'calibre.xml'), 'wb') - f.write(MIME) - f.close() -- self.mime_resources.append('calibre-mimetypes') -- check_call('xdg-mime install ./calibre-mimetypes', shell=True) - except Exception: - if self.opts.fatal_errors: - raise diff --git a/community-testing/caph/PKGBUILD b/community-testing/caph/PKGBUILD deleted file mode 100644 index 0d99f5aca..000000000 --- a/community-testing/caph/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 63050 2012-01-30 18:52:36Z 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=2 -pkgdesc="A sandbox game based on physics which uses doodles as a primary gameplay element" -license=('GPL') -url="http://sourceforge.net/projects/caphgame/" -depends=('sdl' 'libgl' 'libpng') -makedepends=('mesa') -source=("http://sourceforge.net/projects/caphgame/files/caph/caphgame-${pkgver}/caph-${pkgver}.tar.bz2" - "caph.desktop") -md5sums=('dbc2cfbb5cd98a77c5b731515d3a77b9' - '79c6448995026f77fd912dd109b50287') - -build() { - cd $srcdir/caph-${pkgver}/src - mkdir -p $pkgdir/usr/{bin,share/{caph/maps,doc/caph}} - ./confg - ./build -} - -package() { - cd $srcdir/caph-${pkgver}/src - install -D -m755 ./caph $pkgdir/usr/bin/caph - install -D -m644 ../doc/caph/* $pkgdir/usr/share/doc/caph/ || true - install -D -m644 ../share/caph/* $pkgdir/usr/share/caph/ || true - install -D -m644 ../share/caph/maps/* $pkgdir/usr/share/caph/maps || true - install -D -m644 $srcdir/caph.desktop $pkgdir/usr/share/applications/caph.desktop - install -D -m644 ../share/caph/brush.png $pkgdir/usr/share/pixmaps/caph.png -} - -# vim: sw=2:ts=2 et: diff --git a/community-testing/caph/caph.desktop b/community-testing/caph/caph.desktop deleted file mode 100644 index 6cc6c711c..000000000 --- a/community-testing/caph/caph.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Caph -Comment=Sandbox game based on physics -Exec=caph -Icon=caph.png -Categories=Game;LogicGame; diff --git a/community-testing/clanlib/PKGBUILD b/community-testing/clanlib/PKGBUILD deleted file mode 100644 index aa424de20..000000000 --- a/community-testing/clanlib/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 63054 2012-01-30 18:52:49Z ibiru $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -pkgname=clanlib -pkgver=2.3.4 -pkgrel=2 -pkgdesc="A multi-platform game development library." -arch=('i686' 'x86_64') -url="http://clanlib.org/" -license=('zlib') -depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite3') -makedepends=('doxygen' 'graphviz') -options=('!libtool') -source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz) -md5sums=('cc89f632aa194399e909bbbd13beca1b') - -build() { - cd ${srcdir}/ClanLib-${pkgver} - - ./configure --prefix=/usr --enable-docs - - make - # Somehow this breaks. :( - #make html -} - -package() { - cd ${srcdir}/ClanLib-${pkgver} - - make DESTDIR=${pkgdir} install - #make DESTDIR=${pkgdir} install-html - - install -d ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ -} - -# vim: sw=2:ts=2 et: diff --git a/community-testing/compiz/PKGBUILD b/community-testing/compiz/PKGBUILD deleted file mode 100644 index 0d049ce7c..000000000 --- a/community-testing/compiz/PKGBUILD +++ /dev/null @@ -1,125 +0,0 @@ -# $Id: PKGBUILD 17032 2010-05-17 11:13:51Z rvanharen $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Hussam Al-Tayeb ht990332@gmail.com -# Contributor: Khashayar Naderehvandi <khashayar [at] naderehvandi [dot] net> -# Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com> - -pkgbase=compiz -pkgname=('compiz-core' - 'compiz-decorator-kde' - 'compiz-decorator-gtk') -pkgver=0.8.8 -pkgrel=3 -pkgdesc="Composite manager for Aiglx and Xgl" -url="http://www.compiz.org/" -license=('GPL' 'LGPL' 'MIT') -arch=('i686' 'x86_64') -groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion') -makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace' - 'startup-notification' 'librsvg' 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse' 'metacity') -options=(!libtool !emptydirs) -conflicts=('compiz' 'compiz-core-git' 'compiz-git') -replaces=('compiz') -source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz compiz-build.patch) -sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e' - '148656352f8a20b3781ee185025c5c8d4b7d720f') - -build() -{ - cd "$srcdir/compiz-$pkgver" - patch -p1 -i ../compiz-build.patch - ./configure --prefix=/usr \ - --enable-gnome \ - --enable-gtk \ - --enable-metacity \ - --enable-gconf \ - --with-gconf-schema-file-dir=/etc/gconf/schemas \ - --enable-dbus \ - --enable-librsvg \ - --disable-kde \ - --enable-kde4 - - make -} - -package_compiz-core() -{ - - pkgdesc="Composite manager for Aiglx and Xgl" - depends=('startup-notification' 'librsvg' \ - 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse') - - 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 - - # install MIT license - install -Dm644 "$srcdir/compiz-$pkgver/COPYING.MIT" \ - "$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT" -} - -package_compiz-decorator-gtk() -{ - pkgdesc="Compiz decorator for GNOME" - depends=('gnome-control-center' 'libwnck' 'compiz-core' 'metacity') - install=compiz-decorator-gtk.install - - cd "$srcdir/compiz-$pkgver" - - pushd gtk - make DESTDIR="$pkgdir" install - install -Dm644 window-decorator/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 - done - - gconf-merge-schema \ - "${pkgdir}"/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \ - "${srcdir}"/compiz-$pkgver/metadata/*.schemas - - 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 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} - - # install MIT license - install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \ - "$pkgdir"/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT -} - -package_compiz-decorator-kde() -{ - pkgdesc="Compiz decorator for KDE" - depends=('kdebase-workspace' 'compiz-core') - - 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} - - # install MIT license - install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \ - "$pkgdir"/usr/share/licenses/compiz-decorator-kde/COPYING.MIT -} - diff --git a/community-testing/compiz/compiz-build.patch b/community-testing/compiz/compiz-build.patch deleted file mode 100644 index f22a3fa21..000000000 --- a/community-testing/compiz/compiz-build.patch +++ /dev/null @@ -1,18 +0,0 @@ -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-testing/compiz/compiz-decorator-gtk.install b/community-testing/compiz/compiz-decorator-gtk.install deleted file mode 100644 index b3738fda9..000000000 --- a/community-testing/compiz/compiz-decorator-gtk.install +++ /dev/null @@ -1,28 +0,0 @@ -post_install() { - export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` - usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/gwd.schemas > /dev/null - usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null - kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1 - update-desktop-database -q - -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` - usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/gwd.schemas >/dev/null - usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null -} - -post_remove() { - kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1 - update-desktop-database -q -} - diff --git a/community-testing/coq/PKGBUILD b/community-testing/coq/PKGBUILD deleted file mode 100644 index 15223d9d4..000000000 --- a/community-testing/coq/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: George Giorgidze <giorgidze@gmail.com> - -pkgname=coq -pkgver=8.3pl3 -pkgrel=2 -pkgdesc='Formal proof management system.' -arch=('i686' 'x86_64') -url='http://coq.inria.fr/' -license=('GPL') -options=('!emptydirs') -depends=('gtk2' 'lablgtk2' 'ocaml') -makedepends=('camlp5-transitional' 'netpbm' 'hevea') -source=("http://coq.inria.fr/distrib/V${pkgver}/files/coq-${pkgver}.tar.gz") -md5sums=('37e9a52110a025128667c03fed75f9c2') - -build() { - cd coq-${pkgver} - - ./configure \ - -prefix '/usr' \ - -mandir '/usr/share/man' \ - -opt \ - -with-doc yes - - make world - - make doc-html -} - -package() { - cd coq-${pkgver} - - make COQINSTALLPREFIX=${pkgdir} install - - make COQINSTALLPREFIX=${pkgdir} install-doc-html -} diff --git a/community-testing/critter/PKGBUILD b/community-testing/critter/PKGBUILD deleted file mode 100644 index 078c9650d..000000000 --- a/community-testing/critter/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 63060 2012-01-30 18:53:12Z ibiru $ -# Contributor: Allan McRae <mcrae_allan@hotmail.com> -# Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us> - -pkgname=critter -_origname=CriticalMass -pkgver=1.0.2 -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" -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 - patch -Np0 -i ../criticalmass-1.0.2-libpng15.patch - sed -i 's|-lpng12|-lpng15|g' configure - - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd ${srcdir}/$_origname-${pkgver} - - make DESTDIR=${pkgdir} install - - install -Dm644 critter.png ${pkgdir}/usr/share/pixmaps/critter.png - install -Dm644 ../critter.desktop \ - ${pkgdir}/usr/share/applications/critter.desktop -} diff --git a/community-testing/critter/criticalmass-1.0.2-libpng15.patch b/community-testing/critter/criticalmass-1.0.2-libpng15.patch deleted file mode 100644 index ac1b8c0c6..000000000 --- a/community-testing/critter/criticalmass-1.0.2-libpng15.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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-testing/critter/critter-gcc43.patch b/community-testing/critter/critter-gcc43.patch deleted file mode 100644 index ade42d8e4..000000000 --- a/community-testing/critter/critter-gcc43.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Naur CriticalMass-1.0.2-old/tinyxml/tinyxml.cpp CriticalMass-1.0.2/tinyxml/tinyxml.cpp ---- CriticalMass-1.0.2-old/tinyxml/tinyxml.cpp 2003-03-03 12:34:58.000000000 +1000 -+++ CriticalMass-1.0.2/tinyxml/tinyxml.cpp 2008-04-01 22:26:47.000000000 +1000 -@@ -22,7 +22,8 @@ - */
-
- #include "tinyxml.h"
--
-+#include <cstring>
-+#include <cstdlib>
-
- TiXmlNode::TiXmlNode( NodeType _type )
- {
-diff -Naur CriticalMass-1.0.2-old/tinyxml/tinyxmlparser.cpp CriticalMass-1.0.2/tinyxml/tinyxmlparser.cpp ---- CriticalMass-1.0.2-old/tinyxml/tinyxmlparser.cpp 2003-03-03 12:34:58.000000000 +1000 -+++ CriticalMass-1.0.2/tinyxml/tinyxmlparser.cpp 2008-04-01 22:27:02.000000000 +1000 -@@ -24,7 +24,7 @@ -
- #include "tinyxml.h"
- #include <ctype.h>
--
-+#include <cstring>
- const char* TiXmlBase::SkipWhiteSpace( const char* p )
- {
- while ( p && *p &&
-diff -Naur CriticalMass-1.0.2-old/utils/ResourceManager.cpp CriticalMass-1.0.2/utils/ResourceManager.cpp ---- CriticalMass-1.0.2-old/utils/ResourceManager.cpp 2005-01-02 12:59:29.000000000 +1000 -+++ CriticalMass-1.0.2/utils/ResourceManager.cpp 2008-04-01 22:27:19.000000000 +1000 -@@ -15,6 +15,7 @@ - #include <iomanip> - #include <sys/types.h> - #include <sys/stat.h> -+#include <cstring> - - #include <Trace.hpp> - #include <ResourceManager.hpp> -diff -Naur CriticalMass-1.0.2-old/utils/Value.hpp CriticalMass-1.0.2/utils/Value.hpp ---- CriticalMass-1.0.2-old/utils/Value.hpp 2004-12-18 12:41:24.000000000 +1000 -+++ CriticalMass-1.0.2/utils/Value.hpp 2008-04-01 22:27:39.000000000 +1000 -@@ -17,6 +17,7 @@ - - #include <stdio.h> - #include <string> -+#include <cstdlib> - - #include <Trace.hpp> - -diff -Naur CriticalMass-1.0.2-old/utils/zStream.cpp CriticalMass-1.0.2/utils/zStream.cpp ---- CriticalMass-1.0.2-old/utils/zStream.cpp 2005-08-01 06:06:14.000000000 +1000 -+++ CriticalMass-1.0.2/utils/zStream.cpp 2008-04-01 22:28:03.000000000 +1000 -@@ -17,6 +17,7 @@ - #include <zStream.hpp> - #include <zStreamBufferImplLZMA.hpp> - #include <zStreamBufferImplZLib.hpp> -+#include <cstdlib> - - ofstream &operator<<( ofstream &outfile, Uint32 i) - { -diff -Naur CriticalMass-1.0.2-old/utils/zStreamBufferImplZLib.cpp CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp ---- CriticalMass-1.0.2-old/utils/zStreamBufferImplZLib.cpp 2005-08-01 06:06:14.000000000 +1000 -+++ CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp 2008-04-01 22:28:23.000000000 +1000 -@@ -14,6 +14,7 @@ - // - #include <Trace.hpp> - #include <zStreamBufferImplZLib.hpp> -+#include <cstdlib> - - bool ziStreamBufferImplZLib::init( void) - { diff --git a/community-testing/critter/critter.desktop b/community-testing/critter/critter.desktop deleted file mode 100644 index ded5a9fbf..000000000 --- a/community-testing/critter/critter.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Critical Mass -Comment=SDL/OpenGL space shoot'em up game -Exec=critter -Icon=critter -Terminal=false -Type=Application -StartupNotify=true -Categories=Game; diff --git a/community-testing/cwiid/PKGBUILD b/community-testing/cwiid/PKGBUILD deleted file mode 100644 index bea7e8c3f..000000000 --- a/community-testing/cwiid/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 63062 2012-01-30 18:53:20Z 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=10 -pkgdesc="Linux Nintendo Wiimote interface" -arch=('i686' 'x86_64') -url="http://abstrakraft.org/cwiid" -depends=('bluez' 'gtk2' 'python2') -makedepends=('flex' 'bison') -license=('GPL') -install=cwiid.install -source=("http://abstrakraft.org/cwiid/downloads/$pkgname-$pkgver.tgz" - 'bluez4.patch') -md5sums=('8d574afdeedc5e5309c87a72d744316a' - '19b288723d1f2b97a3e5288ab9de3313') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # bluez v4 compatibility - patch -Np1 -i "$srcdir/bluez4.patch" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --disable-ldconfig \ - --with-python=python2 - - LDFLAGS+="$(pkg-config --libs bluez) -lrt -pthread" make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - chmod 644 "$pkgdir/usr/lib/libcwiid.a" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/cwiid/bluez4.patch b/community-testing/cwiid/bluez4.patch deleted file mode 100644 index dbbc790c5..000000000 --- a/community-testing/cwiid/bluez4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cwiid-0.6.00.orig/libcwiid/bluetooth.c.old 2008-09-30 16:52:55.000000000 -0500 -+++ cwiid-0.6.00.orig/libcwiid/bluetooth.c 2008-09-30 16:53:19.000000000 -0500 -@@ -122,7 +122,7 @@ - } - - /* timeout (10000) in milliseconds */ -- if (hci_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN, -+ if (hci_read_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN, - (*bdinfo)[bdinfo_count].name, 10000)) { - cwiid_err(NULL, "Bluetooth name read error"); - err = 1; diff --git a/community-testing/cwiid/cwiid.install b/community-testing/cwiid/cwiid.install deleted file mode 100644 index 05e698be7..000000000 --- a/community-testing/cwiid/cwiid.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - echo "==> In order to use wminput ensure you load the uinput kernel" - echo "==> module and have assigned correct access to /dev/uinput" -} - -post_upgrade() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/darktable/PKGBUILD b/community-testing/darktable/PKGBUILD deleted file mode 100644 index 62fd7c7fe..000000000 --- a/community-testing/darktable/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 63064 2012-01-30 18:53:27Z 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> - -pkgname=darktable -pkgver=0.9.3 -_pkgver=0.9 -pkgrel=5 -pkgdesc="Utility to organize and develop raw images" -arch=('i686' 'x86_64') -url=http://darktable.sf.net/ -license=('GPL3') -depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' - 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3') -makedepends=('intltool>=0.40' 'cmake' 'librsvg') -# 'gnome-doc-utils' 'libxslt' 'fop') -optdepends=('librsvg') -install=darktable.install -options=(!libtool) -source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) -md5sums=('49253a3a2990a4bf8e0b0a19295f19bd') - -build() { - cd $srcdir/$pkgname-$pkgver -# mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt - mkdir -p build - cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DDONT_INSTALL_GCONF_SCHEMAS=True \ - -DBINARY_PACKAGE_BUILD=1 \ - -DUSE_GCONF_BACKEND=Off \ - -DBUILD_USERMANUAL=False \ - .. - make -} - -package() { - cd $srcdir/$pkgname-$pkgver/build - make DESTDIR=$pkgdir install - mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" -# mkdir -p "${pkgdir}/usr/share/gconf/schemas/" -# mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/" -} diff --git a/community-testing/darktable/darktable.install b/community-testing/darktable/darktable.install deleted file mode 100644 index 9fd6af293..000000000 --- a/community-testing/darktable/darktable.install +++ /dev/null @@ -1,23 +0,0 @@ -pkgname=darktable - -post_install() { -# usr/sbin/gconfpkg --install ${pkgname} - [ -x `which update-desktop-database` ] && update-desktop-database -q -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { -# usr/sbin/gconfpkg --uninstall ${pkgname} - true -} - -post_remove() { - [ -x `which update-desktop-database` ] && update-desktop-database -q -} diff --git a/community-testing/dbmail/PKGBUILD b/community-testing/dbmail/PKGBUILD deleted file mode 100644 index e7fd4b3ad..000000000 --- a/community-testing/dbmail/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 62080 2012-01-15 19:14:39Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> - -pkgname=dbmail -pkgver=3.0.0_rc3 -pkgrel=1 -pkgdesc="Fast and scalable sql based mail services" -arch=('i686' 'x86_64') -depends=('gmime' 'libzdb' 'mhash' 'libevent') -makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1' - 'sqlite3' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve') -optdepends=('postgresql-libs: for PostgreSQL storage backend' - 'sqlite3: for SQLite storage backend' - 'libmysqlclient: for MySQL storage backend' - 'libldap: for LDAP authentication' - 'libsieve: for dbmail-sieve') -url="http://www.dbmail.org" -license=('GPL') -options=('!libtool' 'zipman') -backup=(etc/conf.d/dbmail) -conflicts=('dbmail') -provides=('dbmail') -source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz - dbmail.conf.d - dbmail.rc.d) -md5sums=('52c3b9aad310efc90a6a2fff0552f73e' - 'e7f72bc360decdb2475266391ad12329' - '099225611da20ec194c092ac9befc33c') - -build() { - cd $srcdir/dbmail-${pkgver/_/-}/ - - [ -f Makefile ] || ./configure --prefix=/usr \ - --with-mysql --with-pgsql --with-sqlite --with-ldap --with-sieve - make -} - -package() { - cd $srcdir/dbmail-${pkgver/_/-}/ - make DESTDIR=$pkgdir install - (cd man && make && make install DESTDIR=$pkgdir) - - mkdir $pkgdir/etc - install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample - install -Dm644 ../dbmail.conf.d $pkgdir/etc/conf.d/dbmail - install -Dm755 ../dbmail.rc.d $pkgdir/etc/rc.d/dbmail - mkdir $pkgdir/usr/share/dbmail - cp -r sql/* $pkgdir/usr/share/dbmail/ - cp dbmail.schema $pkgdir/usr/share/dbmail/ -} diff --git a/community-testing/dbmail/dbmail-2.2.10-pam-support.patch b/community-testing/dbmail/dbmail-2.2.10-pam-support.patch deleted file mode 100644 index 805a7f609..000000000 --- a/community-testing/dbmail/dbmail-2.2.10-pam-support.patch +++ /dev/null @@ -1,251 +0,0 @@ -diff -wbBur dbmail-2.2.10/configure.in dbmail-2.2.10.pam/configure.in ---- dbmail-2.2.10/configure.in 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/configure.in 2008-09-18 16:43:04.000000000 +0400 -@@ -78,6 +78,13 @@ - - AC_SUBST(CRYPTLIB) - -+dnl Check for PAM -+AC_SUBST(PAMLIBS,"") -+AC_CHECK_HEADERS(security/pam_appl.h, -+ [AC_CHECK_LIB(pam,pam_start, -+ [AC_DEFINE(HAVE_PAM,1,[Define if you have PAN including devel headers]) -+ PAMLIBS="-lpam"],,)]) -+ - AC_SUBST(MYSQLLIB) - AC_SUBST(MYSQLALIB) - AC_SUBST(MYSQLLTLIB) -diff -wbBur dbmail-2.2.10/dbmail-user.c dbmail-2.2.10.pam/dbmail-user.c ---- dbmail-2.2.10/dbmail-user.c 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/dbmail-user.c 2008-09-18 16:43:04.000000000 +0400 -@@ -157,7 +157,7 @@ - "md5", "md5-raw", "md5sum", "md5sum-raw", - "md5-hash", "md5-hash-raw", "md5-digest", "md5-digest-raw", - "md5-base64", "md5-base64-raw", "md5base64", "md5base64-raw", -- "shadow", "", NULL -+ "shadow", "pam", "", NULL - }; - - /* These must correspond to the easy text names. */ -@@ -166,7 +166,7 @@ - MD5_HASH, MD5_HASH_RAW, MD5_DIGEST, MD5_DIGEST_RAW, - MD5_HASH, MD5_HASH_RAW, MD5_DIGEST, MD5_DIGEST_RAW, - MD5_BASE64, MD5_BASE64_RAW, MD5_BASE64, MD5_BASE64_RAW, -- SHADOW, PLAINTEXT, PWTYPE_NULL -+ SHADOW, PWTYPE_PAM, PLAINTEXT, PWTYPE_NULL - }; - - memset(pw, 0, 50); -@@ -251,6 +251,12 @@ - *enctype = "crypt"; - } - break; -+#ifdef HAVE_PAM -+ case PWTYPE_PAM: -+ null_strncpy(pw, passwd, 49); -+ *enctype = "pam"; -+ break; -+#endif - default: - qerrorf("Error: password type not supported [%s].\n", - passwdtype); -diff -wbBur dbmail-2.2.10/dbmail-user.h dbmail-2.2.10.pam/dbmail-user.h ---- dbmail-2.2.10/dbmail-user.h 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/dbmail-user.h 2008-09-18 16:43:04.000000000 +0400 -@@ -34,7 +34,7 @@ - typedef enum { - PLAINTEXT = 0, PLAINTEXT_RAW, CRYPT, CRYPT_RAW, - MD5_HASH, MD5_HASH_RAW, MD5_DIGEST, MD5_DIGEST_RAW, -- MD5_BASE64, MD5_BASE64_RAW, SHADOW, PWTYPE_NULL -+ MD5_BASE64, MD5_BASE64_RAW, SHADOW, PWTYPE_PAM, PWTYPE_NULL - } pwtype_t; - - int mkpassword(const char * const user, const char * const passwd, -diff -wbBur dbmail-2.2.10/modules/authsql.c dbmail-2.2.10.pam/modules/authsql.c ---- dbmail-2.2.10/modules/authsql.c 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/modules/authsql.c 2008-09-18 16:43:04.000000000 +0400 -@@ -27,6 +27,19 @@ - #include "dbmail.h" - #define THIS_MODULE "auth" - -+#ifdef HAVE_PAM -+#include <security/pam_appl.h> -+ -+#ifndef DEFAULT_DBMAIL_PAM_SERVICE -+#define DEFAULT_DBMAIL_PAM_SERVICE "dbmail" -+#endif -+ -+#ifndef DEFAULT_DBMAIL_PAM_TTL -+#define DEFAULT_DBMAIL_PAM_TTL 60 -+#endif -+ -+#endif -+ - extern db_param_t _db_params; - #define DBPFX _db_params.pfx - -@@ -49,17 +62,80 @@ - */ - static int __auth_query(const char *thequery); - -+#ifdef HAVE_PAM -+ -+static char *pam_password = NULL; /* Workaround for Solaris 2.6 brokenness */ -+static pam_handle_t *pamh = NULL; -+static int pam_ttl = DEFAULT_DBMAIL_PAM_TTL; -+static char *pam_service = DEFAULT_DBMAIL_PAM_SERVICE; -+static time_t pamh_created = 0; -+/* -+ * A simple "conversation" function returning the supplied password. -+ * Has a bit to much error control, but this is my first PAM application -+ * so I'd rather check everything than make any mistakes. The function -+ * expects a single converstation message of type PAM_PROMPT_ECHO_OFF. -+ */ -+static int -+password_conversation(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr) -+{ -+ if (num_msg != 1 || msg[0]->msg_style != PAM_PROMPT_ECHO_OFF) { -+ TRACE(TRACE_ERROR, "Unexpected PAM converstaion '%d/%s'", msg[0]->msg_style, msg[0]->msg); -+ return PAM_CONV_ERR; -+ } -+ if (!appdata_ptr) { -+ /* Workaround for Solaris 2.6 where the PAM library is broken -+ * and does not pass appdata_ptr to the conversation routine -+ */ -+ appdata_ptr = pam_password; -+ } -+ if (!appdata_ptr) { -+ TRACE(TRACE_ERROR, "ERROR: No password available to password_converstation!"); -+ return PAM_CONV_ERR; -+ } -+ *resp = calloc(num_msg, sizeof(struct pam_response)); -+ if (!*resp) { -+ TRACE(TRACE_ERROR, "Out of memory!"); -+ return PAM_CONV_ERR; -+ } -+ (*resp)[0].resp = strdup((char *) appdata_ptr); -+ (*resp)[0].resp_retcode = 0; -+ -+ return ((*resp)[0].resp ? PAM_SUCCESS : PAM_CONV_ERR); -+} -+ -+static struct pam_conv conv = -+{ -+ &password_conversation, -+ NULL -+}; -+ -+#endif -+ -+ - int auth_connect() - { - /* this function is only called after a connection has been made - * if, in the future this is not the case, db.h should export a - * function that enables checking for the database connection - */ -+#ifdef HAVE_PAM -+ -+#endif - return 0; - } - - int auth_disconnect() - { -+#ifdef HAVE_PAM -+ int retval=PAM_SUCCESS; -+ if (pamh) { -+ retval = pam_end(pamh, retval); -+ if (retval != PAM_SUCCESS) { -+ pamh = NULL; -+ TRACE(TRACE_ERROR, "failed to release PAM authenticator"); -+ } -+ } -+#endif - return 0; - } - -@@ -458,7 +534,71 @@ - is_validated = (strncmp(md5str, query_result, 32) == 0) ? 1 : 0; - g_free(md5str); - } -+#ifdef HAVE_PAM -+ else if (strcasecmp(query_result, "pam") == 0) { -+ int retval=0; -+ TRACE(TRACE_DEBUG, "validating using pam for user [%s] pass:[%s]",real_username,password); -+ conv.appdata_ptr = (char *) password; -+ pam_password= password; -+ if (pam_ttl == 0) { -+ /* Create PAM connection */ -+ retval = pam_start(pam_service, real_username, &conv, &pamh); -+ if (retval != PAM_SUCCESS) { -+ TRACE(TRACE_ERROR, "failed to create PAM authenticator"); -+ goto pam_error; -+ } -+ } else if (!pamh || (time(NULL) - pamh_created) >= pam_ttl || pamh_created > time(NULL)) { -+ /* Close previous PAM connection */ -+ if (pamh) { -+ retval = pam_end(pamh, retval); -+ if (retval != PAM_SUCCESS) { -+ TRACE(TRACE_WARNING, "failed to release PAM authenticator"); -+ } -+ pamh = NULL; -+ } -+ /* Initialize persistent PAM connection */ -+ retval = pam_start(pam_service, "dbmail@", &conv, &pamh); -+ if (retval != PAM_SUCCESS) { -+ TRACE(TRACE_ERROR, "failed to create PAM authenticator"); -+ goto pam_error; -+ } -+ pamh_created = time(NULL); -+ } -+ retval = PAM_SUCCESS; -+ if (pam_ttl != 0) { -+ if (retval == PAM_SUCCESS) -+ retval = pam_set_item(pamh, PAM_USER, real_username); -+ if (retval == PAM_SUCCESS) -+ retval = pam_set_item(pamh, PAM_CONV, &conv); -+ } -+ if (retval == PAM_SUCCESS) -+ retval = pam_authenticate(pamh, 0); -+ if (retval == PAM_SUCCESS ) //&& !no_acct_mgmt -+ retval = pam_acct_mgmt(pamh, 0); -+ if (retval == PAM_SUCCESS) { -+ is_validated=1; -+ } else { -+pam_error: -+ is_validated=0; -+ } -+ /* cleanup */ -+ retval = PAM_SUCCESS; -+#ifdef PAM_AUTHTOK -+ if (pam_ttl != 0) { -+ if (retval == PAM_SUCCESS) -+ retval = pam_set_item(pamh, PAM_AUTHTOK, NULL); -+ } -+#endif -+ if (pam_ttl == 0 || retval != PAM_SUCCESS) { -+ retval = pam_end(pamh, retval); -+ if (retval != PAM_SUCCESS) { -+ TRACE(TRACE_WARNING, "failed to release PAM authenticator\n"); -+ } -+ pamh = NULL; -+ } - -+ } -+#endif - if (is_validated) { - db_user_log_login(*user_idnr); - } else { -diff -wbBur dbmail-2.2.10/modules/Makefile.am dbmail-2.2.10.pam/modules/Makefile.am ---- dbmail-2.2.10/modules/Makefile.am 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/modules/Makefile.am 2008-09-18 16:44:53.000000000 +0400 -@@ -60,7 +60,7 @@ - - # This one is always built. - libauth_sql_la_SOURCES = authsql.c --libauth_sql_la_LIBADD = @CRYPTLIB@ -+libauth_sql_la_LIBADD = @CRYPTLIB@ @PAMLIBS@ - - if LDAP - libauth_ldap_la_SOURCES = authldap.c diff --git a/community-testing/dbmail/dbmail.conf.d b/community-testing/dbmail/dbmail.conf.d deleted file mode 100644 index 73309a4a2..000000000 --- a/community-testing/dbmail/dbmail.conf.d +++ /dev/null @@ -1,9 +0,0 @@ -# Parameters to be passed to dbmail -# -# -# Select the service you want started with dbmail -# -# Available options : -# dbmail-imapd dbmail-pop3d dbmail-lmtpd dbmail-timsieved -# -DBMAIL_DAEMONS="dbmail-imapd" diff --git a/community-testing/dbmail/dbmail.rc.d b/community-testing/dbmail/dbmail.rc.d deleted file mode 100644 index 92c34e5d2..000000000 --- a/community-testing/dbmail/dbmail.rc.d +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -[ -f /etc/conf.d/dbmail ] && . /etc/conf.d/dbmail - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - for daemon in $DBMAIL_DAEMONS; do - stat_busy "Starting DbMail ${daemon}" - /usr/sbin/${daemon} - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - done - add_daemon dbmail - ;; - stop) - for daemon in $DBMAIL_DAEMONS; do - stat_busy "Stopping DbMail ${daemon}" - pid=$(cat /var/run/${daemon}.pid) - kill $pid - sleep 4 - stat_done - done - rm_daemon dbmail - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac - -exit 0 diff --git a/community-testing/devil/PKGBUILD b/community-testing/devil/PKGBUILD deleted file mode 100644 index 5a9fd947a..000000000 --- a/community-testing/devil/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 63066 2012-01-30 18:53:37Z ibiru $ -# Maintainer: Laurent Carlier <lordheavym@gmail.org> -# Contributor: damir <damir@archlinux.org> -# Contributor: TheHoff <forums> - -pkgname=devil -pkgver=1.7.8 -pkgrel=10 -pkgdesc="Library for reading several different image formats" -arch=('i686' 'x86_64') -url="http://openil.sourceforge.net/" -depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr') -install=devil.install -options=('!libtool' '!docs' '!emptydirs') -license=('GPL') -source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch) -md5sums=('7918f215524589435e5ec2e8736d5e1d' - '0f839ccefd43b0ee8b4b3f99806147fc') - -build() { - cd ${srcdir}/devil-$pkgver - - patch -Np1 -i ${srcdir}/libpng14.patch - - ./configure --prefix=/usr --enable-ILU - make -} - -package() { - cd ${srcdir}/devil-$pkgver - - make prefix=${pkgdir}/usr install -} diff --git a/community-testing/devil/devil.install b/community-testing/devil/devil.install deleted file mode 100644 index 8336ac3d1..000000000 --- a/community-testing/devil/devil.install +++ /dev/null @@ -1,11 +0,0 @@ -infodir=usr/share/info - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null -} diff --git a/community-testing/devil/libpng14.patch b/community-testing/devil/libpng14.patch deleted file mode 100644 index b8434692b..000000000 --- a/community-testing/devil/libpng14.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c ---- devil-1.7.8.orig/src-IL/src/il_icon.c 2009-03-08 09:10:09.000000000 +0200 -+++ devil-1.7.8/src-IL/src/il_icon.c 2010-01-17 00:54:09.000000000 +0200 -@@ -525,7 +525,7 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -- png_set_gray_1_2_4_to_8(ico_png_ptr); -+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); - } - - // Expand RGB images with transparency to full alpha channels -diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c ---- devil-1.7.8.orig/src-IL/src/il_png.c 2009-03-08 09:10:09.000000000 +0200 -+++ devil-1.7.8/src-IL/src/il_png.c 2010-01-17 00:55:26.000000000 +0200 -@@ -105,7 +105,7 @@ - Read = iread(Signature, 1, 8); - iseek(-Read, IL_SEEK_CUR); - -- return png_check_sig(Signature, 8); -+ return png_sig_cmp(Signature, 0, 8) == 0; - } - - -@@ -278,7 +278,7 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (png_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); - } - - // Expand RGB images with transparency to full alpha channels diff --git a/community-testing/dia/PKGBUILD b/community-testing/dia/PKGBUILD deleted file mode 100644 index 43f9da7e9..000000000 --- a/community-testing/dia/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 63068 2012-01-30 18:53:45Z ibiru $ -# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Gregor Ibic <gregor.ibic@intelicom.si> - -pkgname=dia -pkgver=0.97.2 -pkgrel=2 -pkgdesc="A GTK+ based diagram creation program" -arch=('i686' 'x86_64') -license=('GPL') -url="http://live.gnome.org/Dia" -install=dia.install -depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2') -makedepends=('intltool' 'python2' 'docbook-xsl') -optdepends=('python2') -options=('!libtool' 'docs') -source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz" - "dia-overflow-fix.patch") -md5sums=('1e1180a513fb567709b09bc19f12105e' - '8fd9a2ad35b5a6fd8c758d7c73dbfe66') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - export PYTHON=/usr/bin/python2 - sed -i 's#python2\.1#python2 python2.1#' configure -# patch -p1 <$srcdir/dia-overflow-fix.patch - - ./configure --prefix=/usr \ - --with-cairo \ - --with-python \ - --disable-gnome \ - --with-hardbooks - sed -i 's#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data doc tests installer#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data tests installer#' Makefile - make - cd doc - make html -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - cd doc - make DESTDIR="${pkgdir}" install-html - ln -sf dia/html "${pkgdir}"/usr/share/dia/help -} diff --git a/community-testing/dia/dia-overflow-fix.patch b/community-testing/dia/dia-overflow-fix.patch deleted file mode 100644 index a6e64f3c6..000000000 --- a/community-testing/dia/dia-overflow-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -wbBur dia-0.97.1/plug-ins/xfig/xfig-export.c dia-0.97.1.my/plug-ins/xfig/xfig-export.c ---- dia-0.97.1/plug-ins/xfig/xfig-export.c 2009-11-07 17:28:34.000000000 +0300 -+++ dia-0.97.1.my/plug-ins/xfig/xfig-export.c 2010-11-15 17:44:05.640896280 +0300 -@@ -417,6 +417,9 @@ - if (text[i] > 127) { - newlen += 3; - } -+ if (text[i] == '\\') { -+ newlen += 1; -+ } - } - returntext = g_malloc(sizeof(char)*(newlen+1)); - j = 0; -@@ -1085,10 +1088,10 @@ - figtext = figText(renderer, (unsigned char *) text); - /* xfig texts are specials */ - fprintf(renderer->file, "4 %d %d %d 0 %d %s 0.0 6 0.0 0.0 %d %d %s\\001\n", -- figAlignment(renderer, alignment), -- figColor(renderer, color), -- figDepth(renderer), -- figFont(renderer), -+ (int)figAlignment(renderer, alignment), -+ (int)figColor(renderer, color), -+ (int)figDepth(renderer), -+ (int)figFont(renderer), - xfig_dtostr(d_buf, figFontSize(renderer)), - (int)figCoord(renderer, pos->x), - (int)figCoord(renderer, pos->y), diff --git a/community-testing/dia/dia.install b/community-testing/dia/dia.install deleted file mode 100644 index a49438e1f..000000000 --- a/community-testing/dia/dia.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/dillo/PKGBUILD b/community-testing/dillo/PKGBUILD deleted file mode 100644 index 93cda3eda..000000000 --- a/community-testing/dillo/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 63070 2012-01-30 18:53:52Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: dorphell <dorphell@archlinux.org> - -pkgname=dillo -pkgver=3.0.2 -pkgrel=2 -pkgdesc="A small, fast graphical web browser built on FLTK" -arch=(i686 x86_64) -url="http://www.dillo.org" -license=('GPL') -depends=('fltk' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor' - 'libxi' 'libxinerama') -backup=(etc/dillo/{dillorc,dpidrc}) -source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2) -md5sums=('81b82112cefcc7d54fe2972a21f42930') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-dlgui \ - --enable-ssl - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/directfb/DirectFB-1.4.9-libpng-1.5.patch b/community-testing/directfb/DirectFB-1.4.9-libpng-1.5.patch deleted file mode 100644 index e428afbaf..000000000 --- a/community-testing/directfb/DirectFB-1.4.9-libpng-1.5.patch +++ /dev/null @@ -1,244 +0,0 @@ -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-testing/directfb/PKGBUILD b/community-testing/directfb/PKGBUILD deleted file mode 100644 index 30d2d048d..000000000 --- a/community-testing/directfb/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 63072 2012-01-30 18:54:00Z ibiru $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=directfb -pkgver=1.4.14 -pkgrel=2 -pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device" -arch=('i686' 'x86_64') -url="http://www.directfb.org" -license=('LGPL') -depends=('gcc-libs' 'libjpeg' 'sdl' 'sysfsutils' 'libpng' 'freetype2') -options=('!libtool') -changelog=$pkgname.changelog -source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz DirectFB-1.4.9-libpng-1.5.patch) -md5sums=('de0745d25a6ac9e337d4d5572df85471' - '84f3181e96692efc5ff68e5dac19541f') - -build() { - cd "${srcdir}/DirectFB-${pkgver}" - patch -p1 -i ../DirectFB-1.4.9-libpng-1.5.patch - ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-zlib \ - --enable-x11 --enable-sdl --disable-vnc --disable-osx \ - --enable-video4linux2 --enable-voodoo - make -} - -package() { - cd "${srcdir}/DirectFB-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/directfb/directfb.changelog b/community-testing/directfb/directfb.changelog deleted file mode 100644 index 721fd1deb..000000000 --- a/community-testing/directfb/directfb.changelog +++ /dev/null @@ -1,40 +0,0 @@ -2010-11-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - - * directfb 1.4.11-1 - * Upstream update - -2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - - * directfb 1.4.5-1 - * Upstream update - -2010-01-20 Eric Belanger <eric@archlinux.org> - - * directfb 1.4.3-1 - * Upstream update - -2009-11-08 Eric Belanger <eric@archlinux.org> - - * directfb 1.4.2-1 - * Upstream update - -2009-07-13 Eric Belanger <eric@archlinux.org> - - * directfb 1.4.1-1 - * Upstream update - -2009-05-03 Eric Belanger <eric@archlinux.org> - - * directfb 1.2.8-1 - * Upstream update - -2009-03-06 Eric Belanger <eric@archlinux.org> - - * directfb 1.2.7-1 - * Upstream update - -2008-07-29 Eric Belanger <eric@archlinux.org> - - * directfb 1.2.0-1 - * Upstream update - * Added ChangeLog diff --git a/community-testing/djview4/PKGBUILD b/community-testing/djview4/PKGBUILD deleted file mode 100644 index 6c50c2c13..000000000 --- a/community-testing/djview4/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 63074 2012-01-30 18:54:08Z 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=2 -pkgdesc='Portable DjVu viewer and browser plugin' -url='http://djvu.sourceforge.net/djview4.html' -license=('GPL') -arch=('i686' 'x86_64') -depends=('qt' 'djvulibre') -source=("http://downloads.sourceforge.net/djvu/djview-${pkgver}.tar.gz") -sha1sums=('266d207afb63a1ee63eed054190bf88888fda572') - -install=install - -build() { - cd "${srcdir}/djview-${pkgver}" - QTDIR=/usr ./configure --prefix=/usr - sed 's/netscape/mozilla/g' -i nsdejavu/Makefile - sed 's/swap/rofl_swap/g' -i src/qdjvuwidget.cpp - make -} - -package() { - cd "${srcdir}/djview-${pkgver}" - make DESTDIR="${pkgdir}" install-djview install-nsdejavu - - cd desktopfiles - install -Dm644 hi32-djview4.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/djvulibre-djview4.png - install -Dm644 hi64-djview4.png "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/djvulibre-djview4.png - install -Dm644 hi64-djview4.png "${pkgdir}"/usr/share/pixmaps/djvulibre-djview4.png - install -Dm644 djvulibre-djview4.desktop "${pkgdir}"/usr/share/applications/djvulibre-djview4.desktop -} diff --git a/community-testing/djview4/install b/community-testing/djview4/install deleted file mode 100644 index f2bd04ceb..000000000 --- a/community-testing/djview4/install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - if type xdg-icon-resource &>/dev/null; then - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/dosbox/PKGBUILD b/community-testing/dosbox/PKGBUILD deleted file mode 100644 index 70e8decca..000000000 --- a/community-testing/dosbox/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 63076 2012-01-30 18:54:22Z ibiru $ -# Maintainer : -# Contribute : Jelle van der Waa <jelle@vdwaa.nl> -# Contributor: James Rayner <james@archlinux.org> -# Contributor: Ben <ben@benmazer.net> - -pkgname=dosbox -pkgver=0.74 -pkgrel=3 -pkgdesc="An emulator with builtin DOS for running DOS Games" -arch=('i686' 'x86_64') -url="http://dosbox.sourceforge.net/" -license=('GPL') -depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs') -makedepends=('mesa') -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" - sed -i 's/png_check_sig/png_sig_cmp/' configure - ./configure --prefix=/usr \ - --sysconfdir=/etc/dosbox - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - - # install docs, make does not install them - 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" -} -md5sums=('b9b240fa87104421962d14eee71351e8' - '2aac25fc06979e375953fcc36824dc5e' - '85169ca599028bee8e29e0b3b7b34dd8' - '3fba2e3c7c43290319b2928f40ed30e5') diff --git a/community-testing/dosbox/dosbox.desktop b/community-testing/dosbox/dosbox.desktop deleted file mode 100644 index dbaf05ced..000000000 --- a/community-testing/dosbox/dosbox.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=dosbox Emulator -GenericName=Emulator -Comment=An emulator to run old DOS games -Icon=dosbox -Exec=dosbox -Terminal=false -Categories=Emulator;Application; diff --git a/community-testing/dosbox/dosbox.png b/community-testing/dosbox/dosbox.png Binary files differdeleted file mode 100644 index b8a917986..000000000 --- a/community-testing/dosbox/dosbox.png +++ /dev/null diff --git a/community-testing/dosbox/gcc46.patch b/community-testing/dosbox/gcc46.patch deleted file mode 100644 index eae9ae63e..000000000 --- a/community-testing/dosbox/gcc46.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h ---- dosbox-0.74/include/dos_inc.h 2010-05-10 17:43:54.000000000 +0000 -+++ dosbox-0.74.new//include/dos_inc.h 2011-06-17 20:42:43.982548979 +0000 -@@ -28,6 +28,8 @@ - #include "mem.h" - #endif - -+#include <stddef.h> //for offsetof -+ - #ifdef _MSC_VER - #pragma pack (1) - #endif diff --git a/community-testing/dsniff/PKGBUILD b/community-testing/dsniff/PKGBUILD deleted file mode 100644 index d705f8887..000000000 --- a/community-testing/dsniff/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 61872 2012-01-09 18:49:25Z stephane $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: ViNS <gladiator@fastwebnet.it> - -pkgname=dsniff -pkgver=2.4b1 -pkgrel=21 -pkgdesc="Collection of tools for network auditing and penetration testing" -url="http://www.monkey.org/~dugsong/dsniff/" -arch=('i686' 'x86_64') -license=('BSD') -depends=('libpcap' 'openssl' 'libxmu' 'glib2' 'libnet' 'libnids') -source=("http://www.monkey.org/~dugsong/${pkgname}/beta/$pkgname-$pkgver.tar.gz" - "http://ftp.de.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_2.4b1+debian-18.diff.gz") -md5sums=('2f761fa3475682a7512b0b43568ee7d6' - 'fbc9f62f9ab2f98f24f53ad497c1ce5d') - -build() { - cd $srcdir/$pkgname-2.4 - patch -N < "${srcdir}"/dsniff_2.4b1+debian-18.diff - for i in *.dpatch; do - patch -N < "$i" - done - - LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir"/$pkgname-2.4 - make prefix="$pkgdir"/usr install - install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE - - install -d "$pkgdir"/usr/share - mv "$pkgdir"/usr/man "$pkgdir"/usr/share/ -} diff --git a/community-testing/efax-gtk/PKGBUILD b/community-testing/efax-gtk/PKGBUILD deleted file mode 100644 index 180af8917..000000000 --- a/community-testing/efax-gtk/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 63078 2012-01-30 18:54:29Z ibiru $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=efax-gtk -pkgver=3.2.9 -pkgrel=2 -pkgdesc="A GUI front end for the 'efax' fax program" -arch=('i686' 'x86_64') -url="http://efax-gtk.sourceforge.net/" -license=('GPL') -depends=('dbus-glib' 'ghostscript' 'c++-gtk-utils') -makedepends=('pkg-config') -optdepends=('heirloom-mailx: to use the mail_fax script') -backup=('etc/efax-gtkrc') -install=efax-gtk.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.src.tgz") -md5sums=('57fac8815c8f49fc7415d3558eb3f842') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-spooldir=/usr/bin - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - install -m 755 mail_fax print_fax "${pkgdir}/usr/bin" -} diff --git a/community-testing/efax-gtk/efax-gtk.install b/community-testing/efax-gtk/efax-gtk.install deleted file mode 100644 index 69e30acd6..000000000 --- a/community-testing/efax-gtk/efax-gtk.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/emerald/PKGBUILD b/community-testing/emerald/PKGBUILD deleted file mode 100644 index 787963c17..000000000 --- a/community-testing/emerald/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 63080 2012-01-30 18:54:39Z 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=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' \ - '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') -install=emerald.install -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('a5deb2ae135d1c4dac7b57b2a0415f320ae7c0aa') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - LIBS+="-lm -ldl" ./configure --prefix=/usr - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/emerald/deprecated_symbols.patch b/community-testing/emerald/deprecated_symbols.patch deleted file mode 100644 index b32ce154a..000000000 --- a/community-testing/emerald/deprecated_symbols.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 30e3d45437b4285818ec016905151390c9604441 Mon Sep 17 00:00:00 2001 -From: ShadowKyogre <shadowkyogre@aim.com> -Date: Fri, 05 Nov 2010 01:53:24 +0000 -Subject: Fix deprecated symbols and incorrect decoration property setting - ---- -diff --git a/src/main.c b/src/main.c -index 5f0ec35..150da99 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -27,8 +27,8 @@ - #include <emerald.h> - #include <engine.h> - --#define BASE_PROP_SIZE 12 --#define QUAD_PROP_SIZE 9 -+//#define BASE_PROP_SIZE 12 -+//#define QUAD_PROP_SIZE 9 - - #ifndef DECOR_INTERFACE_VERSION - #define DECOR_INTERFACE_VERSION 0 -@@ -2457,7 +2457,7 @@ static gboolean get_window_prop(Window xwindow, Atom atom, Window * val) - gdk_error_trap_push(); - - type = None; -- result = XGetWindowProperty(gdk_display, -+ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), - xwindow, - atom, - 0, G_MAXLONG, -@@ -4246,10 +4246,10 @@ static void force_quit_dialog_realize(GtkWidget * dialog, void *data) - WnckWindow *win = data; - - gdk_error_trap_push(); -- XSetTransientForHint(gdk_display, -+ XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), - GDK_WINDOW_XID(dialog->window), - wnck_window_get_xid(win)); -- XSync(gdk_display, FALSE); -+ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE); - gdk_error_trap_pop(); - } - -@@ -4262,11 +4262,11 @@ static char *get_client_machine(Window xwindow) - int format, result; - char *retval; - -- atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE); -+ atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE); - - gdk_error_trap_push(); - -- result = XGetWindowProperty(gdk_display, -+ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), - xwindow, atom, - 0, G_MAXLONG, - FALSE, XA_STRING, &type, &format, &nitems, -@@ -4318,8 +4318,8 @@ static void kill_window(WnckWindow * win) - } - - gdk_error_trap_push(); -- XKillClient(gdk_display, wnck_window_get_xid(win)); -- XSync(gdk_display, FALSE); -+ XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid(win)); -+ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE); - gdk_error_trap_pop(); - } - -@@ -4739,7 +4739,7 @@ static XFixed *create_gaussian_kernel(double radius, - - static int update_shadow(frame_settings * fs) - { -- Display *xdisplay = gdk_display; -+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); - XRenderPictFormat *format; - GdkPixmap *pixmap; - Picture src, dst, tmp; --- -cgit v0.8.3.1-30-gff3a - ---- a/src/main.c.old 2010-12-07 19:56:08.633333370 +0100 -+++ a/src/main.c 2010-12-07 19:56:39.273333379 +0100 -@@ -3757,7 +3757,7 @@ - - static void hide_tooltip(void) - { -- if (GTK_WIDGET_VISIBLE(tip_window)) -+ if (gtk_widget_get_visible (tip_window)) - g_get_current_time(&tooltip_last_popdown); - - gtk_widget_hide(tip_window); - ---- emerald-0.8.4/libengine/themer.c 2009-10-13 20:56:23.000000000 -0400 -+++ emerald-0.8.4.new/libengine/themer.c 2010-03-10 -01:20:03.046827674 -0500 -@@ -461,7 +461,7 @@ - } - gdouble get_float(SettingItem * item) - { -- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { -+ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { - return gtk_spin_button_get_value((GtkSpinButton *)item->widget); - } - else { -@@ -647,7 +647,7 @@ - } - void set_float(SettingItem * item, gdouble f) - { -- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { -+ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { - gtk_spin_button_set_value((GtkSpinButton *)item->widget, f); - } - else { - diff --git a/community-testing/emerald/emerald.install b/community-testing/emerald/emerald.install deleted file mode 100644 index c2fa624ae..000000000 --- a/community-testing/emerald/emerald.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/evas-svn/PKGBUILD b/community-testing/evas-svn/PKGBUILD deleted file mode 100644 index 829c2adaa..000000000 --- a/community-testing/evas-svn/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 63082 2012-01-30 18:54:45Z ibiru $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Ronald van Haren <ronald.archlinux.org> - -pkgname=evas-svn -pkgver=66901 -pkgrel=2 -pkgdesc="A hardware-accelerated canvas API for X-Windows" -arch=('i686' 'x86_64') -groups=('e17-libs-svn' 'e17-svn') -url="http://www.enlightenment.org" -license=('BSD') -depends=('giflib' 'librsvg' 'eet-svn' 'cairo' 'libjpeg' 'libxrender' 'mesa' - 'fribidi' 'fontconfig') -makedepends=('subversion') -conflicts=('evas') -provides=('evas') -options=('!libtool' '!emptydirs') -md5sums=() - -_svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas" -_svnmod="evas" - -build() { - cd "$srcdir" - -msg "Connecting to $_svntrunk SVN server...." - if [ -d $_svnmod/.svn ]; then - (cd $_svnmod && svn up -r $pkgver) - else - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - fi - - msg "SVN checkout done or server timeout" - msg "Starting make..." - - cp -r $_svnmod $_svnmod-build - cd $_svnmod-build - - ./autogen.sh --prefix=/usr --enable-fb --enable-xrender-x11 \ - --enable-gl-x11 --enable-fontconfig --enable-async-preload \ - --enable-async-events --enable-pipe-render --enable-async-render - make -} - -package() { - cd "$srcdir/$_svnmod-build" - make DESTDIR="$pkgdir" install - -# install license files - install -Dm644 "$srcdir/$_svnmod-build/COPYING" \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" - - rm -r "$srcdir/$_svnmod-build" - -} diff --git a/community-testing/exim/ChangeLog b/community-testing/exim/ChangeLog deleted file mode 100644 index 80a101472..000000000 --- a/community-testing/exim/ChangeLog +++ /dev/null @@ -1,29 +0,0 @@ -2011-10-10 Angel Velasquez <angvp@archlinux.org> - * Updated to 4.77 - -2011-07-15 Angel Velasquez <angvp@archlinux.org> - * Rebuilt without tcp_wrappers - * Fixing logrotate issue FS#25094 - * ChangeLog file changed name from exim.changelog to ChangeLog - -2011-06-16 Angel Velasquez <angvp@archlinux.org> - * Rebuilt against db 5.2.28 - -2010-05-09 Angel Velasquez <angvp@archlinux.org> - * Updated to 4.76 - * Removed previous patch since is no longer needed - * Removed newaliases script FS#22744 - * Removed sudo dependency - -2010-05-07 Angel Velasquez <angvp@archlinux.org> - * Adding patch for security issue see: http://goo.gl/QBict - -2010-05-06 Angel Velasquez <angvp@archlinux.org> - * Setting sticky id to deliver mail. Closes FS#24109 - -2010-04-30 Angel Velasquez <angvp@archlinux.org> - * exim 4.75 - * Config updated with the aliases path. Closes FS#22743 - * Removed sed hackings and added a exim.Makefile . Closes FS#22744 - * Replaced creation of the user at build time. Closes FS#22745 - diff --git a/community-testing/exim/PKGBUILD b/community-testing/exim/PKGBUILD deleted file mode 100644 index 31ad9632f..000000000 --- a/community-testing/exim/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 61874 2012-01-09 18:49:46Z stephane $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: judd <jvinet@zeroflux.org> -pkgname=exim -pkgver=4.77 -pkgrel=2 -pkgdesc="Message Transfer Agent" -arch=('x86_64' 'i686') -url="http://www.exim.org/" -license=('GPL') -backup=(etc/mail/aliases etc/mail/exim.conf \ - etc/logrotate.d/exim etc/conf.d/exim) -install=exim.install -changelog=ChangeLog -depends=('db' 'pcre' 'pam' 'openssl' 'libldap') -provides=('smtp-server') -conflicts=('smtp-server') -options=('!makeflags') -source=("ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-$pkgver.tar.bz2" - aliases - exim - exim.logrotate - exim.conf.d - exim.Makefile) -sha256sums=('0ccc13cf2f052b1163fcdf71c55a3578765050848ba413a6473d3ab5d20b1475' - '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a' - '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6' - '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b' - '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01' - '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - cp "$srcdir/$pkgname.Makefile" Local/Makefile - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -Dm644 ../exim.logrotate ${pkgdir}/etc/logrotate.d/exim - install -Dm644 ../exim.conf.d ${pkgdir}/etc/conf.d/exim - install -Dm644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8 - install -Dm755 ../exim ${pkgdir}/etc/rc.d/exim - mkdir -p ${pkgdir}/var/spool/exim/db ${pkgdir}/etc/mail \ - ${pkgdir}/var/log/exim ${pkgdir}/usr/{lib,sbin} - chmod 770 ${pkgdir}/var/spool/exim ${pkgdir}/var/spool/exim/db ${pkgdir}/var/log/exim - cd build-Linux-* - for i in exicyclog exim_checkaccess exim_dumpdb exim_lock\ - exim_tidydb exipick exiqsumm exigrep exim_dbmbuild exim\ - exim_fixdb eximstats exinext exiqgrep exiwhat; do - install -m 0755 "$i" "$pkgdir/usr/sbin" - done - - cd "$srcdir/exim-$pkgver/src" - sed -e "s|/etc/aliases|/etc/mail/aliases|g" \ - -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" configure.default \ - >"$pkgdir/etc/mail/exim.conf" - - cp "$srcdir/aliases" "$pkgdir/etc/mail" - cd "$pkgdir/usr/sbin" - for i in mailq rmail rsmtp runq sendmail; do - ln -s exim "$i" - done - # fhs compliancy - ln -s ../sbin/exim ../lib/sendmail - - mkdir -p "$pkgdir/etc/rc.d" - cp "$srcdir/exim" "$pkgdir/etc/rc.d" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/exim/aliases b/community-testing/exim/aliases deleted file mode 100644 index 5a76ff7d5..000000000 --- a/community-testing/exim/aliases +++ /dev/null @@ -1,35 +0,0 @@ -# -# /etc/mail/aliases -# -# NOTE: Make sure you run 'newaliases' after modifying this file -# - -# Basic system aliases -- these MUST be present. -MAILER-DAEMON: postmaster -postmaster: root -hostmaster: root -webmaster: hostmaster -ftpmaster: hostmaster -admin: hostmaster -administrator: hostmaster - -# General redirections for pseudo accounts. -bin: root -daemon: root -games: root -ingres: root -nobody: root -system: root -toor: root -uucp: root - -# Well-known aliases. -manager: root -dumper: root -operator: root - -# trap decode to catch security attacks -decode: root - -# Person who should get root's mail -#root: diff --git a/community-testing/exim/exim b/community-testing/exim/exim deleted file mode 100644 index 8e9640b32..000000000 --- a/community-testing/exim/exim +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/exim ] && . /etc/conf.d/exim - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/exim` - -case "$1" in - start) - stat_busy "Starting Exim" - [ -z "$PID" ] && /usr/sbin/exim $EXIM_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon exim - stat_done - fi - ;; - stop) - stat_busy "Stopping Exim" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/exim.pid - rm_daemon exim - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/exim/exim.Makefile b/community-testing/exim/exim.Makefile deleted file mode 100644 index a304ce829..000000000 --- a/community-testing/exim/exim.Makefile +++ /dev/null @@ -1,1227 +0,0 @@ -# $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $ - -################################################## -# The Exim mail transport agent # -################################################## - -# This is the template for Exim's main build-time configuration file. It -# contains settings that are independent of any operating system. These are -# things that are mostly sysadmin choices. The items below are divided into -# those you must specify, those you probably want to specify, those you might -# often want to specify, and those that you almost never need to mention. - -# Edit this file and save the result to a file called Local/Makefile within the -# Exim distribution directory before running the "make" command. - -# Things that depend on the operating system have default settings in -# OS/Makefile-Default, but these are overridden for some OS by files called -# called OS/Makefile-<osname>. You can further override these by creating files -# called Local/Makefile-<osname>, where "<osname>" stands for the name of your -# operating system - look at the names in the OS directory to see which names -# are recognized. - -# However, if you are building Exim for a single OS only, you don't need to -# worry about setting up Local/Makefile-<osname>. Any build-time configuration -# settings you require can in fact be placed in the one file called -# Local/Makefile. It is only if you are building for several OS from the same -# source files that you need to worry about splitting off your own OS-dependent -# settings into separate files. (There's more explanation about how this all -# works in the toplevel README file, under "Modifying the building process", as -# well as in the Exim specification.) - -# One OS-specific thing that may need to be changed is the command for running -# the C compiler; the overall default is gcc, but some OS Makefiles specify cc. -# You can override anything that is set by putting CC=whatever in your -# Local/Makefile. - -# NOTE: You should never need to edit any of the distributed Makefiles; all -# overriding can be done in your Local/Makefile(s). This will make it easier -# for you when the next release comes along. - -# The location of the X11 libraries is something else that is quite variable -# even between different versions of the same operating system (and indeed -# there are different versions of X11 as well, of course). The four settings -# concerned here are X11, XINCLUDE, XLFLAGS (linking flags) and X11_LD_LIB -# (dynamic run-time library). You need not worry about X11 unless you want to -# compile the Exim monitor utility. Exim itself does not use X11. - -# Another area of variability between systems is the type and location of the -# DBM library package. Exim has support for ndbm, gdbm, tdb, and Berkeley DB. -# By default the code assumes ndbm; this often works with gdbm or DB, provided -# they are correctly installed, via their compatibility interfaces. However, -# Exim can also be configured to use the native calls for Berkeley DB (obsolete -# versions 1.85, 2.x, 3.x, or the current 4.x version) and also for gdbm. - -# For some operating systems, a default DBM library (other than ndbm) is -# selected by a setting in the OS-specific Makefile. Most modern OS now have -# a DBM library installed as standard, and in many cases this will be selected -# for you by the OS-specific configuration. If Exim compiles without any -# problems, you probably do not have to worry about the DBM library. If you -# do want or need to change it, you should first read the discussion in the -# file doc/dbm.discuss.txt, which also contains instructions for testing Exim's -# interface to the DBM library. - -# In Local/Makefiles blank lines and lines starting with # are ignored. It is -# also permitted to use the # character to add a comment to a setting, for -# example -# -# EXIM_GID=42 # the "mail" group -# -# However, with some versions of "make" this works only if there is no white -# space between the end of the setting and the #, so perhaps it is best -# avoided. A consequence of this facility is that it is not possible to have -# the # character present in any setting, but I can't think of any cases where -# this would be wanted. -############################################################################### - - - -############################################################################### -# THESE ARE THINGS YOU MUST SPECIFY # -############################################################################### - -# Exim will not build unless you specify BIN_DIRECTORY, CONFIGURE_FILE, and -# EXIM_USER. You also need EXIM_GROUP if EXIM_USER specifies a uid by number. - -# If you don't specify SPOOL_DIRECTORY, Exim won't fail to build. However, it -# really is a very good idea to specify it here rather than at run time. This -# is particularly true if you let the logs go to their default location in the -# spool directory, because it means that the location of the logs is known -# before Exim has read the run time configuration file. - -#------------------------------------------------------------------------------ -# BIN_DIRECTORY defines where the exim binary will be installed by "make -# install". The path is also used internally by Exim when it needs to re-invoke -# itself, either to send an error message, or to recover root privilege. Exim's -# utility binaries and scripts are also installed in this directory. There is -# no "standard" place for the binary directory. Some people like to keep all -# the Exim files under one directory such as /usr/exim; others just let the -# Exim binaries go into an existing directory such as /usr/sbin or -# /usr/local/sbin. The installation script will try to create this directory, -# and any superior directories, if they do not exist. - -BIN_DIRECTORY=/usr/sbin - - -#------------------------------------------------------------------------------ -# CONFIGURE_FILE defines where Exim's run time configuration file is to be -# found. It is the complete pathname for the file, not just a directory. The -# location of all other run time files and directories can be changed in the -# run time configuration file. There is a lot of variety in the choice of -# location in different OS, and in the preferences of different sysadmins. Some -# common locations are in /etc or /etc/mail or /usr/local/etc or -# /usr/local/etc/mail. Another possibility is to keep all the Exim files under -# a single directory such as /usr/exim. Whatever you choose, the installation -# script will try to make the directory and any superior directories if they -# don't exist. It will also install a default runtime configuration if this -# file does not exist. - -CONFIGURE_FILE=/etc/mail/exim.conf - -# It is possible to specify a colon-separated list of files for CONFIGURE_FILE. -# In this case, Exim will use the first of them that exists when it is run. -# However, if a list is specified, the installation script no longer tries to -# make superior directories or to install a default runtime configuration. - - -#------------------------------------------------------------------------------ -# The Exim binary must normally be setuid root, so that it starts executing as -# root, but (depending on the options with which it is called) it does not -# always need to retain the root privilege. These settings define the user and -# group that is used for Exim processes when they no longer need to be root. In -# particular, this applies when receiving messages and when doing remote -# deliveries. (Local deliveries run as various non-root users, typically as the -# owner of a local mailbox.) Specifying these values as root is not supported. - -EXIM_USER=ref:exim - -# If you specify EXIM_USER as a name, this is looked up at build time, and the -# uid number is built into the binary. However, you can specify that this -# lookup is deferred until runtime. In this case, it is the name that is built -# into the binary. You can do this by a setting of the form: - -# EXIM_USER=ref:exim - -# In other words, put "ref:" in front of the user name. If you set EXIM_USER -# like this, any value specified for EXIM_GROUP is also passed "by reference". -# Although this costs a bit of resource at runtime, it is convenient to use -# this feature when building binaries that are to be run on multiple systems -# where the name may refer to different uids. It also allows you to build Exim -# on a system where there is no Exim user defined. - -# If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must -# also be a setting of EXIM_GROUP. If, on the other hand, you use a name -# for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless -# you want to use a group other than the default group for the given user. - -# EXIM_GROUP= - -# Many sites define a user called "exim", with an appropriate default group, -# and use -# -# EXIM_USER=exim -# -# while leaving EXIM_GROUP unspecified (commented out). - - -#------------------------------------------------------------------------------ -# SPOOL_DIRECTORY defines the directory where all the data for messages in -# transit is kept. It is strongly recommended that you define it here, though -# it is possible to leave this till the run time configuration. - -# Exim creates the spool directory if it does not exist. The owner and group -# will be those defined by EXIM_USER and EXIM_GROUP, and this also applies to -# all the files and directories that are created in the spool directory. - -# Almost all installations choose this: - -SPOOL_DIRECTORY=/var/spool/exim - - - -############################################################################### -# THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY # -############################################################################### - -# If you need extra header file search paths on all compiles, put the -I -# options in INCLUDE. If you want the extra searches only for certain -# parts of the build, see more specific xxx_INCLUDE variables below. - -# INCLUDE=-I/example/include - -# You need to specify some routers and transports if you want the Exim that you -# are building to be capable of delivering mail. You almost certainly need at -# least one type of lookup. You should consider whether you want to build -# the Exim monitor or not. - - -#------------------------------------------------------------------------------ -# These settings determine which individual router drivers are included in the -# Exim binary. There are no defaults in the code; those routers that are wanted -# must be defined here by setting the appropriate variables to the value "yes". -# Including a router in the binary does not cause it to be used automatically. -# It has also to be configured in the run time configuration file. By -# commenting out those you know you don't want to use, you can make the binary -# a bit smaller. If you are unsure, leave all of these included for now. - -ROUTER_ACCEPT=yes -ROUTER_DNSLOOKUP=yes -ROUTER_IPLITERAL=yes -ROUTER_MANUALROUTE=yes -ROUTER_QUERYPROGRAM=yes -ROUTER_REDIRECT=yes - -# This one is very special-purpose, so is not included by default. - -# ROUTER_IPLOOKUP=yes - - -#------------------------------------------------------------------------------ -# These settings determine which individual transport drivers are included in -# the Exim binary. There are no defaults; those transports that are wanted must -# be defined here by setting the appropriate variables to the value "yes". -# Including a transport in the binary does not cause it to be used -# automatically. It has also to be configured in the run time configuration -# file. By commenting out those you know you don't want to use, you can make -# the binary a bit smaller. If you are unsure, leave all of these included for -# now. - -TRANSPORT_APPENDFILE=yes -TRANSPORT_AUTOREPLY=yes -TRANSPORT_PIPE=yes -TRANSPORT_SMTP=yes - -# This one is special-purpose, and commonly not required, so it is not -# included by default. - -TRANSPORT_LMTP=yes - - -#------------------------------------------------------------------------------ -# The appendfile transport can write messages to local mailboxes in a number -# of formats. The code for three specialist formats, maildir, mailstore, and -# MBX, is included only when requested. If you do not know what this is about, -# leave these settings commented out. - -SUPPORT_MAILDIR=yes -# SUPPORT_MAILSTORE=yes -# SUPPORT_MBX=yes - - -#------------------------------------------------------------------------------ -# See below for dynamic lookup modules. -# LOOKUP_MODULE_DIR=/usr/lib/exim/lookups/ -# If not using package management but using this anyway, then think about how -# you perform upgrades and revert them. You should consider the benefit of -# embedding the Exim version number into LOOKUP_MODULE_DIR, so that you can -# maintain two concurrent sets of modules. - -# To build a module dynamically, you'll need to define CFLAGS_DYNAMIC for -# your platform. Eg: -# CFLAGS_DYNAMIC=-shared -rdynamic -# CFLAGS_DYNAMIC=-shared -rdynamic -fPIC - -#------------------------------------------------------------------------------ -# These settings determine which file and database lookup methods are included -# in the binary. See the manual chapter entitled "File and database lookups" -# for discussion. DBM and lsearch (linear search) are included by default. If -# you are unsure about the others, leave them commented out for now. -# LOOKUP_DNSDB does *not* refer to general mail routing using the DNS. It is -# for the specialist case of using the DNS as a general database facility (not -# common). -# If set to "2" instead of "yes" then the corresponding lookup will be -# built as a module and must be installed into LOOKUP_MODULE_DIR. You need to -# add -export-dynamic -rdynamic to EXTRALIBS. You may also need to add -ldl to -# EXTRALIBS so that dlopen() is available to Exim. You need to define -# LOOKUP_MODULE_DIR above so the exim binary actually loads dynamic lookup -# modules. -# Also, instead of adding all the libraries/includes to LOOKUP_INCLUDE and -# LOOKUP_LIBS, add them to the respective LOOKUP_*_INCLUDE and LOOKUP_*_LIBS -# (where * is the name as given here in this list). That ensures that only -# the dynamic library and not the exim binary will be linked against the -# library. -# NOTE: LDAP cannot be built as a module! - -LOOKUP_DBM=yes -LOOKUP_LSEARCH=yes -LOOKUP_DNSDB=yes - -# LOOKUP_CDB=yes -LOOKUP_DSEARCH=yes -# LOOKUP_IBASE=yes -LOOKUP_LDAP=yes -# LOOKUP_MYSQL=yes -# LOOKUP_NIS=yes -# LOOKUP_NISPLUS=yes -# LOOKUP_ORACLE=yes -# LOOKUP_PASSWD=yes -# LOOKUP_PGSQL=yes -# LOOKUP_SQLITE=yes -# LOOKUP_WHOSON=yes - -# These two settings are obsolete; all three lookups are compiled when -# LOOKUP_LSEARCH is enabled. However, we retain these for backward -# compatibility. Setting one forces LOOKUP_LSEARCH if it is not set. - -# LOOKUP_WILDLSEARCH=yes -# LOOKUP_NWILDLSEARCH=yes - - -#------------------------------------------------------------------------------ -# If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate -# which LDAP library you have. Unfortunately, though most of their functions -# are the same, there are minor differences. Currently Exim knows about four -# LDAP libraries: the one from the University of Michigan (also known as -# OpenLDAP 1), OpenLDAP 2, the Netscape SDK library, and the library that comes -# with Solaris 7 onwards. Uncomment whichever of these you are using. - -# LDAP_LIB_TYPE=OPENLDAP1 -LDAP_LIB_TYPE=OPENLDAP2 -# LDAP_LIB_TYPE=NETSCAPE -# LDAP_LIB_TYPE=SOLARIS - -# If you don't set any of these, Exim assumes the original University of -# Michigan (OpenLDAP 1) library. - - -#------------------------------------------------------------------------------ -# The PCRE library is required for exim. There is no longer an embedded -# version of the PCRE library included with the source code, instead you -# must use a system library or build your own copy of PCRE. -# In either case you must specify the library link info here. If the -# PCRE header files are not in the standard search path you must also -# modify the INCLUDE path (above) -# The default setting of PCRE_LIBS should work on the vast majority of -# systems - -PCRE_LIBS=-lpcre - - -#------------------------------------------------------------------------------ -# Additional libraries and include directories may be required for some -# lookup styles (e.g. LDAP, MYSQL or PGSQL). LOOKUP_LIBS is included only on -# the command for linking Exim itself, not on any auxiliary programs. You -# don't need to set LOOKUP_INCLUDE if the relevant directories are already -# specified in INCLUDE. The settings below are just examples; -lpq is for -# PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite. - -# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include -# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 - - -#------------------------------------------------------------------------------ -# Compiling the Exim monitor: If you want to compile the Exim monitor, a -# program that requires an X11 display, then EXIM_MONITOR should be set to the -# value "eximon.bin". Comment out this setting to disable compilation of the -# monitor. The locations of various X11 directories for libraries and include -# files are defaulted in the OS/Makefile-Default file, but can be overridden in -# local OS-specific make files. - - - - -#------------------------------------------------------------------------------ -# Compiling Exim with content scanning support: If you want to compile Exim -# with support for message body content scanning, set WITH_CONTENT_SCAN to -# the value "yes". This will give you malware and spam scanning in the DATA ACL, -# and the MIME ACL. Please read the documentation to learn more about these -# features. - -WITH_CONTENT_SCAN=yes - -# If you want to use the deprecated "demime" condition in the DATA ACL, -# uncomment the line below. Doing so will also explicitly turn on the -# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of -# the "demime" condition. - -WITH_OLD_DEMIME=yes - -# If you're using ClamAV and are backporting fixes to an old version, instead -# of staying current (which is the more usual approach) then you may need to -# use an older API which uses a STREAM command, now deprecated, instead of -# zINSTREAM. If you need to set this, please let the Exim developers know, as -# if nobody reports a need for it, we'll remove this option and clean up the -# code. zINSTREAM was introduced with ClamAV 0.95. -# -# WITH_OLD_CLAMAV_STREAM=yes - -#------------------------------------------------------------------------------ -# By default Exim includes code to support DKIM (DomainKeys Identified -# Mail, RFC4871) signing and verification. Verification of signatures is -# turned on by default. See the spec for information on conditionally -# disabling it. To disable the inclusion of the entire feature, set -# DISABLE_DKIM to "yes" - -# DISABLE_DKIM=yes - - -#------------------------------------------------------------------------------ -# Compiling Exim with experimental features. These are documented in -# experimental-spec.txt. "Experimental" means that the way these features are -# implemented may still change. Backward compatibility is not guaranteed. - -# Uncomment the following lines to add SPF support. You need to have libspf2 -# installed on your system (www.libspf2.org). Depending on where it is installed -# you may have to edit the CFLAGS and LDFLAGS lines. - -# EXPERIMENTAL_SPF=yes -# CFLAGS += -I/usr/local/include -# LDFLAGS += -lspf2 - -# Uncomment the following lines to add SRS (Sender rewriting scheme) support. -# You need to have libsrs_alt installed on your system (srs.mirtol.com). -# Depending on where it is installed you may have to edit the CFLAGS and -# LDFLAGS lines. - -# EXPERIMENTAL_SRS=yes -# CFLAGS += -I/usr/local/include -# LDFLAGS += -lsrs_alt - -# Uncomment the following lines to add Brightmail AntiSpam support. You need -# to have the Brightmail client SDK installed. Please check the experimental -# documentation for implementation details. You need to edit the CFLAGS and -# LDFLAGS lines. - -# EXPERIMENTAL_BRIGHTMAIL=yes -# CFLAGS += -I/opt/brightmail/bsdk-6.0/include -# LDFLAGS += -lxml2_single -lbmiclient_single -L/opt/brightmail/bsdk-6.0/lib - - - -############################################################################### -# THESE ARE THINGS YOU MIGHT WANT TO SPECIFY # -############################################################################### - -# The items in this section are those that are commonly changed according to -# the sysadmin's preferences, but whose defaults are often acceptable. The -# first five are concerned with security issues, where differing levels of -# paranoia are appropriate in different environments. Sysadmins also vary in -# their views on appropriate levels of defence in these areas. If you do not -# understand these issues, go with the defaults, which are used by many sites. - - -#------------------------------------------------------------------------------ -# Although Exim is normally a setuid program, owned by root, it refuses to run -# local deliveries as root by default. There is a runtime option called -# "never_users" which lists the users that must never be used for local -# deliveries. There is also the setting below, which provides a list that -# cannot be overridden at runtime. This guards against problems caused by -# unauthorized changes to the runtime configuration. You are advised not to -# remove "root" from this option, but you can add other users if you want. The -# list is colon-separated. It must NOT contain any spaces. - -# FIXED_NEVER_USERS=root:bin:daemon -FIXED_NEVER_USERS=root - - -#------------------------------------------------------------------------------ -# By default, Exim insists that its configuration file be owned by root. You -# can specify one additional permitted owner here. - -# CONFIGURE_OWNER= - -# If the configuration file is group-writeable, Exim insists by default that it -# is owned by root. You can specify one additional permitted group owner here. - -# CONFIGURE_GROUP= - -# If you specify CONFIGURE_OWNER or CONFIGURE_GROUP as a name, this is looked -# up at build time, and the uid or gid number is built into the binary. -# However, you can specify that the lookup is deferred until runtime. In this -# case, it is the name that is built into the binary. You can do this by a -# setting of the form: - -# CONFIGURE_OWNER=ref:mail -# CONFIGURE_GROUP=ref:sysadmin - -# In other words, put "ref:" in front of the user or group name. Although this -# costs a bit of resource at runtime, it is convenient to use this feature when -# building binaries that are to be run on multiple systems where the names may -# refer to different uids or gids. It also allows you to build Exim on a system -# where the relevant user or group is not defined. - - -#------------------------------------------------------------------------------ -# The -C option allows Exim to be run with an alternate runtime configuration -# file. When this is used by root, root privilege is retained by the binary -# (for any other caller including the Exim user, it is dropped). You can -# restrict the location of alternate configurations by defining a prefix below. -# Any file used with -C must then start with this prefix (except that /dev/null -# is also permitted if the caller is root, because that is used in the install -# script). If the prefix specifies a directory that is owned by root, a -# compromise of the Exim account does not permit arbitrary alternate -# configurations to be used. The prefix can be more restrictive than just a -# directory (the second example). - -# ALT_CONFIG_PREFIX=/some/directory/ -# ALT_CONFIG_PREFIX=/some/directory/exim.conf- - - -#------------------------------------------------------------------------------ -# When a user other than root uses the -C option to override the configuration -# file (including the Exim user when re-executing Exim to regain root -# privileges for local message delivery), this will normally cause Exim to -# drop root privileges. The TRUSTED_CONFIG_LIST option, specifies a file which -# contains a list of trusted configuration filenames, one per line. If the -C -# option is used by the Exim user or by the user specified in the -# CONFIGURE_OWNER setting, to specify a configuration file which is listed in -# the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim. - -# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs - - -#------------------------------------------------------------------------------ -# Uncommenting this option disables the use of the -D command line option, -# which changes the values of macros in the runtime configuration file. -# This is another protection against somebody breaking into the Exim account. - -# DISABLE_D_OPTION=yes - - -#------------------------------------------------------------------------------ -# By contrast, you might be maintaining a system which relies upon the ability -# to override values with -D and assumes that these will be passed through to -# the delivery processes. As of Exim 4.73, this is no longer the case by -# default. Going forward, we strongly recommend that you use a shim Exim -# configuration file owned by root stored under TRUSTED_CONFIG_LIST. -# That shim can set macros before .include'ing your main configuration file. -# -# As a strictly transient measure to ease migration to 4.73, the -# WHITELIST_D_MACROS value definies a colon-separated list of macro-names -# which are permitted to be overridden from the command-line which will be -# honoured by the Exim user. So these are macros that can persist to delivery -# time. -# Examples might be -DTLS or -DSPOOL=/some/dir. The values on the -# command-line are filtered to only permit: [A-Za-z0-9_/.-]* -# -# This option is highly likely to be removed in a future release. It exists -# only to make 4.73 as easy as possible to migrate to. If you use it, we -# encourage you to schedule time to rework your configuration to not depend -# upon it. Most people should not need to use this. -# -# By default, no macros are whitelisted for -D usage. - -# WHITELIST_D_MACROS=TLS:SPOOL - -#------------------------------------------------------------------------------ -# Exim has support for the AUTH (authentication) extension of the SMTP -# protocol, as defined by RFC 2554. If you don't know what SMTP authentication -# is, you probably won't want to include this code, so you should leave these -# settings commented out. If you do want to make use of SMTP authentication, -# you must uncomment at least one of the following, so that appropriate code is -# included in the Exim binary. You will then need to set up the run time -# configuration to make use of the mechanism(s) selected. - -AUTH_CRAM_MD5=yes -# AUTH_CYRUS_SASL=yes -AUTH_DOVECOT=yes -AUTH_PLAINTEXT=yes -AUTH_SPA=yes - - -#------------------------------------------------------------------------------ -# If you specified AUTH_CYRUS_SASL above, you should ensure that you have the -# Cyrus SASL library installed before trying to build Exim, and you probably -# want to uncomment the following line: - -# AUTH_LIBS=-lsasl2 - - -#------------------------------------------------------------------------------ -# When Exim is decoding MIME "words" in header lines, most commonly for use -# in the $header_xxx expansion, it converts any foreign character sets to the -# one that is set in the headers_charset option. The default setting is -# defined by this setting: - -HEADERS_CHARSET="ISO-8859-1" - -# If you are going to make use of $header_xxx expansions in your configuration -# file, or if your users are going to use them in filter files, and the normal -# character set on your host is something other than ISO-8859-1, you might -# like to specify a different default here. This value can be overridden in -# the runtime configuration, and it can also be overridden in individual filter -# files. -# -# IMPORTANT NOTE: The iconv() function is needed for character code -# conversions. Please see the next item... - - -#------------------------------------------------------------------------------ -# Character code conversions are possible only if the iconv() function is -# installed on your operating system. There are two places in Exim where this -# is relevant: (a) The $header_xxx expansion (see the previous item), and (b) -# the Sieve filter support. For those OS where iconv() is known to be installed -# as standard, the file in OS/Makefile-xxxx contains -# -# HAVE_ICONV=yes -# -# If you are not using one of those systems, but have installed iconv(), you -# need to uncomment that line above. In some cases, you may find that iconv() -# and its header file are not in the default places. You might need to use -# something like this: -# -# HAVE_ICONV=yes -# CFLAGS=-O -I/usr/local/include -# EXTRALIBS_EXIM=-L/usr/local/lib -liconv -# -# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM -# as well. - - -#------------------------------------------------------------------------------ -# The passwords for user accounts are normally encrypted with the crypt() -# function. Comparisons with encrypted passwords can be done using Exim's -# "crypteq" expansion operator. (This is commonly used as part of the -# configuration of an authenticator for use with SMTP AUTH.) At least one -# operating system has an extended function called crypt16(), which uses up to -# 16 characters of a password (the normal crypt() uses only the first 8). Exim -# supports the use of crypt16() as well as crypt() but note the warning below. - -# You can always indicate a crypt16-encrypted password by preceding it with -# "{crypt16}". If you want the default handling (without any preceding -# indicator) to use crypt16(), uncomment the following line: - -# DEFAULT_CRYPT=crypt16 - -# If you do that, you can still access the basic crypt() function by preceding -# an encrypted password with "{crypt}". For more details, see the description -# of the "crypteq" condition in the manual chapter on string expansions. - -# Some operating systems do not include a crypt16() function, so Exim has one -# of its own, which it uses unless HAVE_CRYPT16 is defined. Normally, that will -# be set in an OS-specific Makefile for the OS that have such a function, so -# you should not need to bother with it. - -# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** -# It turns out that the above is not entirely accurate. As well as crypt16() -# there is a function called bigcrypt() that some operating systems have. This -# may or may not use the same algorithm, and both of them may be different to -# Exim's built-in crypt16() that is used unless HAVE_CRYPT16 is defined. -# -# However, since there is now a move away from the traditional crypt() -# functions towards using SHA1 and other algorithms, tidying up this area of -# Exim is seen as very low priority. In practice, if you need to, you can -# define DEFAULT_CRYPT to the name of any function that has the same interface -# as the traditional crypt() function. -# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** - - -#------------------------------------------------------------------------------ -# Exim can be built to support the SMTP STARTTLS command, which implements -# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you -# must install the OpenSSL library package or the GnuTLS library. Exim contains -# no cryptographic code of its own. Uncomment the following lines if you want -# to build Exim with TLS support. If you don't know what this is all about, -# leave these settings commented out. - -# This setting is required for any TLS support (either OpenSSL or GnuTLS) -SUPPORT_TLS=yes - -# Uncomment this setting if you are using OpenSSL -TLS_LIBS=-lssl -lcrypto - -# Uncomment these settings if you are using GnuTLS -# USE_GNUTLS=yes -# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt - -# If you are running Exim as a server, note that just building it with TLS -# support is not all you need to do. You also need to set up a suitable -# certificate, and tell Exim about it by means of the tls_certificate -# and tls_privatekey run time options. You also need to set tls_advertise_hosts -# to specify the hosts to which Exim advertises TLS support. On the other hand, -# if you are running Exim only as a client, building it with TLS support -# is all you need to do. - -# Additional libraries and include files are required for both OpenSSL and -# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed -# with all your other libraries. If they are in a special directory, you may -# need something like - -# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto -# or -# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt - -# TLS_LIBS is included only on the command for linking Exim itself, not on any -# auxiliary programs. If the include files are not in a standard place, you can -# set TLS_INCLUDE to specify where they are, for example: - -# TLS_INCLUDE=-I/usr/local/openssl/include/ -# or -# TLS_INCLUDE=-I/opt/gnu/include - -# You don't need to set TLS_INCLUDE if the relevant directories are already -# specified in INCLUDE. - - -#------------------------------------------------------------------------------ -# The default distribution of Exim contains only the plain text form of the -# documentation. Other forms are available separately. If you want to install -# the documentation in "info" format, first fetch the Texinfo documentation -# sources from the ftp directory and unpack them, which should create files -# with the extension "texinfo" in the doc directory. You may find that the -# version number of the texinfo files is different to your Exim version number, -# because the main documentation isn't updated as often as the code. For -# example, if you have Exim version 4.43, the source tarball upacks into a -# directory called exim-4.43, but the texinfo tarball unpacks into exim-4.40. -# In this case, move the contents of exim-4.40/doc into exim-4.43/doc after you -# have unpacked them. Then set INFO_DIRECTORY to the location of your info -# directory. This varies from system to system, but is often /usr/share/info. -# Once you have done this, "make install" will build the info files and -# install them in the directory you have defined. - -# INFO_DIRECTORY=/usr/share/info - - -#------------------------------------------------------------------------------ -# Exim log directory and files: Exim creates several log files inside a -# single log directory. You can define the directory and the form of the -# log file name here. If you do not set anything, Exim creates a directory -# called "log" inside its spool directory (see SPOOL_DIRECTORY above) and uses -# the filenames "mainlog", "paniclog", and "rejectlog". If you want to change -# this, you can set LOG_FILE_PATH to a path name containing one occurrence of -# %s. This will be replaced by one of the strings "main", "panic", or "reject" -# to form the final file names. Some installations may want something like this: - -LOG_FILE_PATH=/var/log/exim/%slog - -# which results in files with names /var/log/exim_mainlog, etc. The directory -# in which the log files are placed must exist; Exim does not try to create -# it for itself. It is also your responsibility to ensure that Exim is capable -# of writing files using this path name. The Exim user (see EXIM_USER above) -# must be able to create and update files in the directory you have specified. - -# You can also configure Exim to use syslog, instead of or as well as log -# files, by settings such as these - -# LOG_FILE_PATH=syslog -# LOG_FILE_PATH=syslog:/var/log/exim_%slog - -# The first of these uses only syslog; the second uses syslog and also writes -# to log files. Do not include white space in such a setting as it messes up -# the building process. - - -#------------------------------------------------------------------------------ -# When logging to syslog, the following option caters for syslog replacements -# that are able to accept log entries longer than the 1024 characters allowed -# by RFC 3164. It is up to you to make sure your syslog daemon can handle this. -# Non-printable characters are usually unacceptable regardless, so log entries -# are still split on newline characters. - -# SYSLOG_LONG_LINES=yes - -# If you are not interested in the process identifier (pid) of the Exim that is -# making the call to syslog, then comment out the following line. - -SYSLOG_LOG_PID=yes - - -#------------------------------------------------------------------------------ -# Cycling log files: this variable specifies the maximum number of old -# log files that are kept by the exicyclog log-cycling script. You don't have -# to use exicyclog. If your operating system has other ways of cycling log -# files, you can use them instead. The exicyclog script isn't run by default; -# you have to set up a cron job for it if you want it. - -EXICYCLOG_MAX=10 - - -#------------------------------------------------------------------------------ -# The compress command is used by the exicyclog script to compress old log -# files. Both the name of the command and the suffix that it adds to files -# need to be defined here. See also the EXICYCLOG_MAX configuration. - -COMPRESS_COMMAND=/bin/gzip -COMPRESS_SUFFIX=gz - - -#------------------------------------------------------------------------------ -# If the exigrep utility is fed compressed log files, it tries to uncompress -# them using this command. - -ZCAT_COMMAND=/bin/zcat - - -#------------------------------------------------------------------------------ -# Compiling in support for embedded Perl: If you want to be able to -# use Perl code in Exim's string manipulation language and you have Perl -# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded -# Perl costs quite a lot of resources. Only do this if you really need it. - -# EXIM_PERL=perl.o - - -#------------------------------------------------------------------------------ -# Support for dynamically-loaded string expansion functions via ${dlfunc. If -# you are using gcc the dynamically-loaded object must be compiled with the -# -shared option, and you will need to add -export-dynamic to EXTRALIBS so -# that the local_scan API is made available by the linker. You may also need -# to add -ldl to EXTRALIBS so that dlopen() is available to Exim. - -# EXPAND_DLFUNC=yes - - -#------------------------------------------------------------------------------ -# Exim has support for PAM (Pluggable Authentication Modules), a facility -# which is available in the latest releases of Solaris and in some GNU/Linux -# distributions (see http://ftp.kernel.org/pub/linux/libs/pam/). The Exim -# support, which is intended for use in conjunction with the SMTP AUTH -# facilities, is included only when requested by the following setting: - -SUPPORT_PAM=yes - -# You probably need to add -lpam to EXTRALIBS, and in some releases of -# GNU/Linux -ldl is also needed. - - -#------------------------------------------------------------------------------ -# Support for authentication via Radius is also available. The Exim support, -# which is intended for use in conjunction with the SMTP AUTH facilities, -# is included only when requested by setting the following parameter to the -# location of your Radius configuration file: - -# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf -# RADIUS_CONFIG_FILE=/etc/radius.conf - -# If you have set RADIUS_CONFIG_FILE, you should also set one of these to -# indicate which RADIUS library is used: - -# RADIUS_LIB_TYPE=RADIUSCLIENT -# RADIUS_LIB_TYPE=RADIUSCLIENTNEW -# RADIUS_LIB_TYPE=RADLIB - -# RADIUSCLIENT is the radiusclient library; you probably need to add -# -lradiusclient to EXTRALIBS. -# -# The API for the radiusclient library was changed at release 0.4.0. -# Unfortunately, the header file does not define a version number that clients -# can use to support both the old and new APIs. If you are using version 0.4.0 -# or later of the radiusclient library, you should use RADIUSCLIENTNEW. -# -# RADLIB is the Radius library that comes with FreeBSD (the header file is -# called radlib.h); you probably need to add -lradius to EXTRALIBS. -# -# If you do not set RADIUS_LIB_TYPE, Exim assumes the radiusclient library, -# using the original API. - - -#------------------------------------------------------------------------------ -# Support for authentication via the Cyrus SASL pwcheck daemon is available. -# Note, however, that pwcheck is now deprecated in favour of saslauthd (see -# next item). The Exim support for pwcheck, which is intented for use in -# conjunction with the SMTP AUTH facilities, is included only when requested by -# setting the following parameter to the location of the pwcheck daemon's -# socket. -# -# There is no need to install all of SASL on your system. You just need to run -# ./configure --with-pwcheck, cd to the pwcheck directory within the sources, -# make and make install. You must create the socket directory (default -# /var/pwcheck) and chown it to exim's user and group. Once you have installed -# pwcheck, you should arrange for it to be started by root at boot time. - -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck - - -#------------------------------------------------------------------------------ -# Support for authentication via the Cyrus SASL saslauthd daemon is available. -# The Exim support, which is intented for use in conjunction with the SMTP AUTH -# facilities, is included only when requested by setting the following -# parameter to the location of the saslauthd daemon's socket. -# -# There is no need to install all of SASL on your system. You just need to run -# ./configure --with-saslauthd (and any other options you need, for example, to -# select or deselect authentication mechanisms), cd to the saslauthd directory -# within the sources, make and make install. You must create the socket -# directory (default /var/state/saslauthd) and chown it to exim's user and -# group. Once you have installed saslauthd, you should arrange for it to be -# started by root at boot time. - -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux - - -#------------------------------------------------------------------------------ -# TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment -# this setting. See the manual section entitled "Use of tcpwrappers" in the -# chapter on building and installing Exim. -# -# USE_TCP_WRAPPERS=yes -# -# You may well also have to specify a local "include" file and an additional -# library for TCP wrappers, so you probably need something like this: -# -# USE_TCP_WRAPPERS=yes -# CFLAGS=-O -I/usr/local/include -# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap -# -# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM -# as well. -# -# To use a name other than exim in the tcpwrappers config file, -# e.g. if you're running multiple daemons with different access lists, -# or multiple MTAs with the same access list, define -# TCP_WRAPPERS_DAEMON_NAME accordingly -# -# TCP_WRAPPERS_DAEMON_NAME="exim" - - -#------------------------------------------------------------------------------ -# The default action of the exim_install script (which is run by "make -# install") is to install the Exim binary with a unique name such as -# exim-4.43-1, and then set up a symbolic link called "exim" to reference it, -# moving the symbolic link from any previous version. If you define NO_SYMLINK -# (the value doesn't matter), the symbolic link is not created or moved. You -# will then have to "turn Exim on" by setting up the link manually. - -# NO_SYMLINK=yes - - -#------------------------------------------------------------------------------ -# Another default action of the install script is to install a default runtime -# configuration file if one does not exist. This configuration has a router for -# expanding system aliases. The default assumes that these aliases are kept -# in the traditional file called /etc/aliases. If such a file does not exist, -# the installation script creates one that contains just comments (no actual -# aliases). The following setting can be changed to specify a different -# location for the system alias file. - -SYSTEM_ALIASES_FILE=/etc/mail/aliases - - -#------------------------------------------------------------------------------ -# There are some testing options (-be, -bt, -bv) that read data from the -# standard input when no arguments are supplied. By default, the input lines -# are read using the standard fgets() function. This does not support line -# editing during interactive input (though the terminal's "erase" character -# works as normal). If your operating system has the readline() function, and -# in addition supports dynamic loading of library functions, you can cause -# Exim to use readline() for the -be testing option (only) by uncommenting the -# following setting. Dynamic loading is used so that the library is loaded only -# when the -be testing option is given; by the time the loading occurs, -# Exim has given up its root privilege and is running as the calling user. This -# is the reason why readline() is NOT supported for -bt and -bv, because Exim -# runs as root or as exim, respectively, for those options. When USE_READLINE -# is "yes", as well as supporting line editing, a history of input lines in the -# current run is maintained. - -# USE_READLINE=yes - -# You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes. -# Note that this option adds to the size of the Exim binary, because the -# dynamic loading library is not otherwise included. - - - -############################################################################### -# THINGS YOU ALMOST NEVER NEED TO MENTION # -############################################################################### - -# The settings in this section are available for use in special circumstances. -# In the vast majority of installations you need not change anything below. - - -#------------------------------------------------------------------------------ -# The following commands live in different places in some OS. Either the -# ultimate default settings, or the OS-specific files should already point to -# the right place, but they can be overridden here if necessary. These settings -# are used when building various scripts to ensure that the correct paths are -# used when the scripts are run. They are not used in the Makefile itself. Perl -# is not necessary for running Exim unless you set EXIM_PERL (see above) to get -# it embedded, but there are some utilities that are Perl scripts. If you -# haven't got Perl, Exim will still build and run; you just won't be able to -# use those utilities. - -# CHOWN_COMMAND=/usr/bin/chown -# CHGRP_COMMAND=/usr/bin/chgrp -# CHMOD_COMMAND=/usr/bin/chmod -# MV_COMMAND=/bin/mv -# RM_COMMAND=/bin/rm -# TOUCH_COMMAND=/usr/bin/touch -# PERL_COMMAND=/usr/bin/perl - - -#------------------------------------------------------------------------------ -# The following macro can be used to change the command for building a library -# of functions. By default the "ar" command is used, with options "cq". -# Only in rare circumstances should you need to change this. - -# AR=ar cq - - -#------------------------------------------------------------------------------ -# In some operating systems, the value of the TMPDIR environment variable -# controls where temporary files are created. Exim does not make use of -# temporary files, except when delivering to MBX mailboxes. However, if Exim -# calls any external libraries (e.g. DBM libraries), they may use temporary -# files, and thus be influenced by the value of TMPDIR. For this reason, when -# Exim starts, it checks the environment for TMPDIR, and if it finds it is set, -# it replaces the value with what is defined here. Commenting this setting -# suppresses the check altogether. - -TMPDIR="/tmp" - - -#------------------------------------------------------------------------------ -# The following macros can be used to change the default modes that are used -# by the appendfile transport. In most installations the defaults are just -# fine, and in any case, you can change particular instances of the transport -# at run time if you want. - -# APPENDFILE_MODE=0600 -# APPENDFILE_DIRECTORY_MODE=0700 -# APPENDFILE_LOCKFILE_MODE=0600 - - -#------------------------------------------------------------------------------ -# In some installations there may be multiple machines sharing file systems, -# where a different configuration file is required for Exim on the different -# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look -# for a configuration file whose name is that defined by CONFIGURE_FILE, -# with the node name obtained by uname() tacked on the end, separated by a -# period (for example, /usr/exim/configure.host.in.some.domain). If this file -# does not exist, then the bare configuration file name is tried. - -# CONFIGURE_FILE_USE_NODE=yes - - -#------------------------------------------------------------------------------ -# In some esoteric configurations two different versions of Exim are run, -# with different setuid values, and different configuration files are required -# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then -# Exim will first look for a configuration file whose name is that defined -# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by -# a period (for eximple, /usr/exim/configure.0). If this file does not exist, -# then the bare configuration file name is tried. In the case when both -# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files -# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>. - -# CONFIGURE_FILE_USE_EUID=yes - - -#------------------------------------------------------------------------------ -# The size of the delivery buffers: These specify the sizes (in bytes) of -# the buffers that are used when copying a message from the spool to a -# destination. There is rarely any need to change these values. - -# DELIVER_IN_BUFFER_SIZE=8192 -# DELIVER_OUT_BUFFER_SIZE=8192 - - -#------------------------------------------------------------------------------ -# The mode of the database directory: Exim creates a directory called "db" -# in its spool directory, to hold its databases of hints. This variable -# determines the mode of the created directory. The default value in the -# source is 0750. - -# EXIMDB_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# Database file mode: The mode of files created in the "db" directory defaults -# to 0640 in the source, and can be changed here. - -# EXIMDB_MODE=0640 - - -#------------------------------------------------------------------------------ -# Database lock file mode: The mode of zero-length files created in the "db" -# directory to use for locking purposes defaults to 0640 in the source, and -# can be changed here. - -# EXIMDB_LOCKFILE_MODE=0640 - - -#------------------------------------------------------------------------------ -# This parameter sets the maximum length of the header portion of a message -# that Exim is prepared to process. The default setting is one megabyte. The -# limit exists in order to catch rogue mailers that might connect to your SMTP -# port, start off a header line, and then just pump junk at it for ever. The -# message_size_limit option would also catch this, but it may not be set. -# The value set here is the default; it can be changed at runtime. - -# HEADER_MAXSIZE="(1024*1024)" - - -#------------------------------------------------------------------------------ -# The mode of the input directory: The input directory is where messages are -# kept while awaiting delivery. Exim creates it if necessary, using a mode -# which can be defined here (default 0750). - -# INPUT_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# The mode of Exim's log directory, when it is created by Exim inside the spool -# directory, defaults to 0750 but can be changed here. - -# LOG_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# The log files themselves are created as required, with a mode that defaults -# to 0640, but which can be changed here. - -# LOG_MODE=0640 - - -#------------------------------------------------------------------------------ -# The TESTDB lookup is for performing tests on the handling of lookup results, -# and is not useful for general running. It should be included only when -# debugging the code of Exim. - -# LOOKUP_TESTDB=yes - - -#------------------------------------------------------------------------------ -# /bin/sh is used by default as the shell in which to run commands that are -# defined in the makefiles. This can be changed if necessary, by uncommenting -# this line and specifying another shell, but note that a Bourne-compatible -# shell is expected. - -# MAKE_SHELL=/bin/sh - - -#------------------------------------------------------------------------------ -# The maximum number of named lists of each type (address, domain, host, and -# local part) can be increased by changing this value. It should be set to -# a multiple of 16. - -MAX_NAMED_LIST=16 - - -#------------------------------------------------------------------------------ -# Network interfaces: Unless you set the local_interfaces option in the runtime -# configuration file to restrict Exim to certain interfaces only, it will run -# code to find all the interfaces there are on your host. Unfortunately, -# the call to the OS that does this requires a buffer large enough to hold -# data for all the interfaces - it was designed in the days when a host rarely -# had more than three or four interfaces. Nowadays hosts can have very many -# virtual interfaces running on the same hardware. If you have more than 250 -# virtual interfaces, you will need to uncomment this setting and increase the -# value. - -# MAXINTERFACES=250 - - -#------------------------------------------------------------------------------ -# Per-message logs: While a message is in the process of being delivered, -# comments on its progress are written to a message log, for the benefit of -# human administrators. These logs are held in a directory called "msglog" -# in the spool directory. Its mode defaults to 0750, but can be changed here. -# The message log directory is also used for storing files that are used by -# transports for returning data to a message's sender (see the "return_output" -# option for transports). - -# MSGLOG_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# There are three options which are used when compiling the Perl interface and -# when linking with Perl. The default values for these are placed automatically -# at the head of the Makefile by the script which builds it. However, if you -# want to override them, you can do so here. - -# PERL_CC= -# PERL_CCOPTS= -# PERL_LIBS= - - -#------------------------------------------------------------------------------ -# Identifying the daemon: When an Exim daemon starts up, it writes its pid -# (process id) to a file so that it can easily be identified. The path of the -# file can be specified here. Some installations may want something like this: - -PID_FILE_PATH=/var/run/exim.pid - -# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory -# using the name "exim-daemon.pid". - -# If you start up a daemon without the -bd option (for example, with just -# the -q15m option), a pid file is not written. Also, if you override the -# configuration file with the -oX option, no pid file is written. In other -# words, the pid file is written only for a "standard" daemon. - - -#------------------------------------------------------------------------------ -# If Exim creates the spool directory, it is given this mode, defaulting in the -# source to 0750. - -# SPOOL_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# The mode of files on the input spool which hold the contents of messages can -# be changed here. The default is 0640 so that information from the spool is -# available to anyone who is a member of the Exim group. - -# SPOOL_MODE=0640 - - -#------------------------------------------------------------------------------ -# Moving frozen messages: If the following is uncommented, Exim is compiled -# with support for automatically moving frozen messages out of the main spool -# directory, a facility that is found useful by some large installations. A -# run time option is required to cause the moving actually to occur. Such -# messages become "invisible" to the normal management tools. - -# SUPPORT_MOVE_FROZEN_MESSAGES=yes - - -#------------------------------------------------------------------------------ -# Disabling the use of fsync(): DO NOT UNCOMMENT THE FOLLOWING LINE unless you -# really, really, really know what you are doing. And even then, think again. -# You should never uncomment this when compiling a binary for distribution. -# Use it only when compiling Exim for your own use. -# -# Uncommenting this line enables the use of a runtime option called -# disable_fsync, which can be used to stop Exim using fsync() to ensure that -# files are written to disc before proceeding. When this is disabled, crashes -# and hardware problems such as power outages can cause data to be lost. This -# feature should only be used in very exceptional circumstances. YOU HAVE BEEN -# WARNED. - -# ENABLE_DISABLE_FSYNC=yes - -HAVE_IPV6=YES -LOOKUP_LIBS=-lldap -llber -EXTRALIBS_EXIM=-lpam -# End of EDITME for Exim 4. diff --git a/community-testing/exim/exim.conf.d b/community-testing/exim/exim.conf.d deleted file mode 100644 index b9bec4335..000000000 --- a/community-testing/exim/exim.conf.d +++ /dev/null @@ -1 +0,0 @@ -EXIM_ARGS="-bd -q15m" diff --git a/community-testing/exim/exim.install b/community-testing/exim/exim.install deleted file mode 100644 index 8ed329559..000000000 --- a/community-testing/exim/exim.install +++ /dev/null @@ -1,25 +0,0 @@ -# arg 1: the new package version -post_install() { - getent group exim >/dev/null 2>&1 || groupadd -g 79 exim - if getent passwd exim > /dev/null 2>&1; then - usr/sbin/usermod -d /var/spool/exim -c 'Exim MTA' -s /sbin/nologin exim > /dev/null 2>&1 - else - usr/sbin/useradd -c 'Exim MTA' -u 79 -g exim -d /var/spool/exim -s /sbin/nologin exim - fi - passwd -l exim > /dev/null - chown root.exim /var/spool/exim /var/log/exim - chown exim.exim /var/spool/exim/db - chmod u+s /usr/sbin/exim -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - getent passwd exim >/dev/null 2>&1 && userdel exim -} - diff --git a/community-testing/exim/exim.logrotate b/community-testing/exim/exim.logrotate deleted file mode 100644 index 070ba4747..000000000 --- a/community-testing/exim/exim.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/exim/*log { - su exim exim - missingok - notifempty - delaycompress -} diff --git a/community-testing/expac/PKGBUILD b/community-testing/expac/PKGBUILD deleted file mode 100644 index ff83247d7..000000000 --- a/community-testing/expac/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 56821 2011-10-13 19:47:47Z dreisner $ -# Maintainer: Dave Reisner <d@falconindy.com> - -pkgname=expac -pkgver=0.07 -pkgrel=1 -pkgdesc="pacman database extraction utility" -arch=('i686' 'x86_64') -url="http://github.com/falconindy/expac" -license=('GPL') -depends=('pacman') -makedepends=('perl') -source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('1bc637b733051827982db12db84643f2') - -build() { - cd "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX=/usr DESTDIR="$pkgdir" install -} - -# vim: ft=sh syn=sh diff --git a/community-testing/extremetuxracer/PKGBUILD b/community-testing/extremetuxracer/PKGBUILD deleted file mode 100644 index 19139aede..000000000 --- a/community-testing/extremetuxracer/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 63084 2012-01-30 18:54:55Z 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=3 -pkgdesc="Downhill racing game starring Tux" -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" - "libpng15.patch") -sha256sums=('5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d' - 'ec1426171fc80b07b702e373bf9528244a3b224e887ab24b52f90740691e92fb' - '349448e8be522bbbe9fd896e875a4add7e02c35d0fafa46c5b10582562da3ca8' - '2b693eaf421d56887615fc02d40f742e9b8bf817ae36be1f1f9e33a52719eea8') - -build() { - cd "$srcdir/extremetuxracer-$pkgver" - - patch -Np1 -i ${srcdir}/libpng15.patch - sed -i -e 's/libpng12/libpng15/g' configure - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/extremetuxracer-$pkgver" - make DESTDIR="$pkgdir" install - - # Install icon and desktop file - 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-testing/extremetuxracer/extremetuxracer.desktop b/community-testing/extremetuxracer/extremetuxracer.desktop deleted file mode 100644 index 6593607b8..000000000 --- a/community-testing/extremetuxracer/extremetuxracer.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Encoding=UTF-8 -Name=Extreme Tux Racer -Comment=Open source racing game featuring Tux the Linux Penguin. -Icon=/usr/share/pixmaps/extremetuxracer.png -Exec=etracer -Terminal=false -StartupNotify=true -Categories=Application;Game;ArcadeGame - diff --git a/community-testing/extremetuxracer/extremetuxracer.png b/community-testing/extremetuxracer/extremetuxracer.png Binary files differdeleted file mode 100644 index 6c4aec00b..000000000 --- a/community-testing/extremetuxracer/extremetuxracer.png +++ /dev/null diff --git a/community-testing/extremetuxracer/libpng15.patch b/community-testing/extremetuxracer/libpng15.patch deleted file mode 100644 index 5c9999857..000000000 --- a/community-testing/extremetuxracer/libpng15.patch +++ /dev/null @@ -1,57 +0,0 @@ -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-testing/fbgrab/PKGBUILD b/community-testing/fbgrab/PKGBUILD deleted file mode 100644 index 4201a7b31..000000000 --- a/community-testing/fbgrab/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 63086 2012-01-30 18:55:03Z ibiru $ -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org - -pkgname=fbgrab -pkgver=1.0 -pkgrel=6 -pkgdesc="A framebuffer screenshot grabber" -arch=(i686 x86_64) -url="http://hem.bredband.net/gmogmo/fbgrab/" -license=("GPL") -depends=('libpng') -makedepends=('libpng') -source=(http://hem.bredband.net/gmogmo/fbgrab/fbgrab-1.0.tar.gz) -md5sums=('7af4d8774684182ed690d5da82d6d234') - -build() { - cd $startdir/src/$pkgname-$pkgver - sed -i '1,1i#include <zlib.h>' fbgrab.c - gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab - strip fbgrab - install -D -m755 $startdir/src/$pkgname-$pkgver/fbgrab $startdir/pkg/usr/bin/fbgrab - install -D -m644 $startdir/src/$pkgname-$pkgver/fbgrab.1.man $startdir/pkg/usr/share/man/man1/fbgrab.1 -} diff --git a/community-testing/fbreader/PKGBUILD b/community-testing/fbreader/PKGBUILD deleted file mode 100644 index c5880cbe0..000000000 --- a/community-testing/fbreader/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 63088 2012-01-30 18:55:12Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=fbreader -pkgver=0.12.10 -pkgrel=3 -pkgdesc="An e-book reader for Linux" -arch=('i686' 'x86_64') -url="http://www.fbreader.org/" -license=('GPL') -depends=('fribidi' 'bzip2' 'curl' 'gtk2' 'liblinebreak' 'sqlite3') -source=(http://www.fbreader.org/files/sources/fbreader-sources-$pkgver.tgz - build-fix.patch) -md5sums=('da9ec4721efdb0ec0aaa182bff16ad82' - '66ac17d8640625b6d2a806de4aa4e76c') - -build() { - export CPPFLAGS="-I/usr/include/cairo" - export TARGET_ARCH=desktop - export UI_TYPE=gtk - export TARGET_STATUS=release - export srcdir - - cd $srcdir/fbreader-$pkgver - patch -p0 makefiles/config.mk <$srcdir/build-fix.patch - sed -i 's#Library::Library &Library::Instance()#Library \&Library::Instance()#' fbreader/src/library/Library.cpp - make INSTALLDIR=/usr - make INSTALLDIR=/usr DESTDIR=$pkgdir install -} diff --git a/community-testing/fbreader/build-fix.patch b/community-testing/fbreader/build-fix.patch deleted file mode 100644 index 7316464b8..000000000 --- a/community-testing/fbreader/build-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- config.mk.orig 2010-02-23 18:22:10.000000000 +0000 -+++ config.mk 2010-02-28 13:55:11.000000000 +0000 -@@ -21,7 +21,7 @@ - ARCHIVER_LIBS ?= -lz -lbz2 - NETWORK_LIBS ?= -lcurl - --CFLAGS += -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\" -+CFLAGS += -I$(srcdir)/liblinebreak-20080321 -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\" - ifeq "$(ZLSHARED)" "yes" - CFLAGS += -fPIC -DZLSHARED - endif -@@ -38,6 +38,8 @@ - LDFLAGS += -pg - endif - -+LDFLAGS += -L$(srcdir)/liblinebreak-20080321/DebugDir -+ - ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include - - ZLSHARED ?= yes diff --git a/community-testing/fbshot/PKGBUILD b/community-testing/fbshot/PKGBUILD deleted file mode 100644 index d68dec0af..000000000 --- a/community-testing/fbshot/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 63090 2012-01-30 18:55:17Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: sp42b <sp42b|a_t|gmx.net> - -pkgname=fbshot -pkgver=0.3 -pkgrel=4 -pkgdesc="Takes screenshots (PNG) from your framebuffer device (e.g. console)." -arch=('i686' 'x86_64') -url="http://www.sfires.net/fbshot/" -license=('GPL') -depends=('libpng') -source=(http://www.sfires.net/stuff/fbshot/$pkgname-$pkgver.tar.gz) -md5sums=('2cc6cc25cdc4cd447a8b0a9662907635') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i '1,1i#include <zlib.h>' fbshot.c - make - install -Dm755 fbshot $pkgdir/usr/bin/fbshot - install -Dm644 fbshot.1.man $pkgdir/usr/share/man/man1/fbshot.1 -} diff --git a/community-testing/fbv/ChangeLog b/community-testing/fbv/ChangeLog deleted file mode 100644 index 7fd5bbf99..000000000 --- a/community-testing/fbv/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-26 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 diff --git a/community-testing/fbv/PKGBUILD b/community-testing/fbv/PKGBUILD deleted file mode 100644 index fe4d2cfb7..000000000 --- a/community-testing/fbv/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 63092 2012-01-30 18:55:24Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Aectann <aectann@infoline.su> - -pkgname=fbv -pkgver=1.0b -pkgrel=5 -pkgdesc="FrameBuffer image viewer" -arch=('i686' 'x86_64') -url="http://s-tech.elsat.net.pl/fbv/" -license=('GPL') -depends=('libpng' 'libungif' 'libjpeg') -source=(http://s-tech.elsat.net.pl/fbv/$pkgname-$pkgver.tar.gz) -md5sums=('3e466375b930ec22be44f1041e77b55d') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man - sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lungif -lgif|' Make.conf - sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c - make - mkdir -p $pkgdir/usr/bin - mkdir -p $pkgdir/usr/share/man/man1 - make DESTDIR=$pkgdir install -} diff --git a/community-testing/fcron/PKGBUILD b/community-testing/fcron/PKGBUILD deleted file mode 100644 index 2efb43d1e..000000000 --- a/community-testing/fcron/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 61839 2012-01-08 19:56:09Z ttopper $ -# Contributor: Giorgio Lando <lando at imap dot cc> -# Contributor: Sergej Pupykin -# Contributor: Thomas Bächler -# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> - -pkgname=fcron -pkgver=3.0.6 -pkgrel=5 -pkgdesc="feature-rich cron implementation" -arch=(i686 x86_64) -url="http://fcron.free.fr" -license=('GPL') -depends=('pam') -makedepends=('smtp-server') -optdepends=('smtp-server: to receive mails from cron jobs') -provides=('cron') -conflicts=('dcron') -backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \ - var/spool/fcron/systab var/spool/fcron/systab.orig) -options=('emptydirs' '!makeflags') -source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz fcron.rc \ - systab systab.orig run-cron) -md5sums=('69ebcb41921e2a282f41ebecb3a27053' - 'e0c3f0bdc3c98fbbe46eff19001c18f2' - '938722c6654ef7b07f4aa10001905ba1' - 'bfb7daa22ebe22b9917e455c1ca4a382' - '5ff0cdcb9ec99778938ac6ef26800327') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc/fcron \ - --with-answer-all=no \ - --with-boot-install=no \ - --with-username=root \ - --with-groupname=root \ - --datarootdir=/usr/share \ - --datadir=/usr/share \ - --with-docdir=/usr/share/doc \ - --localstatedir=/var \ - --with-editor=/usr/bin/vi \ - --with-sendmail=/usr/sbin/sendmail - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - install -D -m755 "$srcdir/fcron.rc" "$pkgdir/etc/rc.d/fcron" - install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron" - - install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab" - # Install default fcrontab so that fcron can completely replace dcron - - install -D -m600 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab" - # In order to preserve the systab crontab in any case it is better to have - # it in non-binary form too - install -D -m600 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig" - - # Add cron.* directories - install -d -m755 "$pkgdir/etc/cron.daily" - install -d -m755 "$pkgdir/etc/cron.hourly" - install -d -m755 "$pkgdir/etc/cron.monthly" - install -d -m755 "$pkgdir/etc/cron.weekly" - - # Install run-cron script to make fcron run without dcron - install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/fcron/fcron.rc b/community-testing/fcron/fcron.rc deleted file mode 100644 index 880439a1d..000000000 --- a/community-testing/fcron/fcron.rc +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/fcron` -case "$1" in - start) - stat_busy "Starting Fcron Daemon" - [ -z "$PID" ] && /usr/sbin/fcron -b - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon fcron - stat_done - fi - ;; - stop) - stat_busy "Stopping Fcron Daemon" - [ -n "$PID" ] && kill $PID >/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fcron - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/fcron/run-cron b/community-testing/fcron/run-cron deleted file mode 100644 index 51007a15a..000000000 --- a/community-testing/fcron/run-cron +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - - -if [ -z $1 ]; then - echo "Usage: $0 crondir" - exit 1 -fi - -for cron in $1/* ; do - if [ -x $cron ]; then - $cron - fi -done -unset cron diff --git a/community-testing/fcron/systab b/community-testing/fcron/systab Binary files differdeleted file mode 100644 index 11c7e2fd0..000000000 --- a/community-testing/fcron/systab +++ /dev/null diff --git a/community-testing/fcron/systab.orig b/community-testing/fcron/systab.orig deleted file mode 100644 index 5b0045626..000000000 --- a/community-testing/fcron/systab.orig +++ /dev/null @@ -1,4 +0,0 @@ -&bootrun 01 * * * * /usr/sbin/run-cron /etc/cron.hourly -&bootrun 02 00 * * * /usr/sbin/run-cron /etc/cron.daily -&bootrun 22 00 * * 0 /usr/sbin/run-cron /etc/cron.weekly -&bootrun 42 00 1 * * /usr/sbin/run-cron /etc/cron.monthly diff --git a/community-testing/fityk/PKGBUILD b/community-testing/fityk/PKGBUILD deleted file mode 100644 index 9c95247c7..000000000 --- a/community-testing/fityk/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Anton Bazhenov <anton.bazhenov at gmail> -# Contributor: Cuneyt Unlu <unlucu AT gmail.com> - -pkgname=fityk -pkgver=1.1.1 -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' 'desktop-file-utils') # wxgtk supplied by statically linked wxWidgets -makedepends=('boost' 'git' 'python-sphinx' 'swig' 'subversion') -options=('!libtool') -install='fityk.install' - -build() { - # daily snapshot because fityk requires a version that hasn't been released yet... - svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets - - cd wxWidgets - ./configure --prefix=${srcdir}/usr --disable-shared --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys - make - make install - - cd ${srcdir} - git clone git://github.com/wojdyr/fityk.git - cd fityk - git checkout v${pkgver} - #cd ${pkgname}-${pkgver} - - # disable xyconvert because wxwidgets>=2.9 is needed (dev version) and it isn't standard with arch yet - #--disable-xyconvert \ - ./autogen.sh \ - --prefix=/usr \ - --without-doc \ - --with-wx-prefix=${srcdir}/usr - #./configure \ - - make -} - -package() { - cd fityk - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/fityk/fityk.install b/community-testing/fityk/fityk.install deleted file mode 100644 index df476d572..000000000 --- a/community-testing/fityk/fityk.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-mime-database /usr/share/mime - update-desktop-database -q -} - -post_upgrade() { - update-mime-database /usr/share/mime - update-desktop-database -q -} - -post_remove() { - update-mime-database /usr/share/mime - update-desktop-database -q -} diff --git a/community-testing/flam3/PKGBUILD b/community-testing/flam3/PKGBUILD deleted file mode 100644 index 27f5b00e1..000000000 --- a/community-testing/flam3/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 63096 2012-01-30 18:55:40Z ibiru $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=flam3 -pkgver=3.0.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 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 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/src" - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/flam3/flam3-3.0.1-libpng15.patch b/community-testing/flam3/flam3-3.0.1-libpng15.patch deleted file mode 100644 index 61f905589..000000000 --- a/community-testing/flam3/flam3-3.0.1-libpng15.patch +++ /dev/null @@ -1,76 +0,0 @@ -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-testing/flowcanvas/PKGBUILD b/community-testing/flowcanvas/PKGBUILD deleted file mode 100644 index a4e71b144..000000000 --- a/community-testing/flowcanvas/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 63098 2012-01-30 18:55:46Z 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=3 -pkgdesc="Gtkmm/Gnomecanvasmm widget for boxes-and-lines style environments" -arch=('i686' 'x86_64') -url="http://drobilla.net/software/flowcanvas/" -depends=('libgnomecanvasmm' 'graphviz') -makedepends=('boost' 'python2') -license=('GPL') -install=$pkgname.install -source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2) -md5sums=('a4908f6385ce9fd2ce97c8caa823f053') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - python2 waf configure --prefix=/usr - python2 waf build $MAKEFLAGS -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - python2 waf install --destdir="$pkgdir" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/flowcanvas/flowcanvas.install b/community-testing/flowcanvas/flowcanvas.install deleted file mode 100644 index dbd9898d3..000000000 --- a/community-testing/flowcanvas/flowcanvas.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - \ldconfig -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/fltk2/PKGBUILD b/community-testing/fltk2/PKGBUILD deleted file mode 100644 index 782982bac..000000000 --- a/community-testing/fltk2/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 63100 2012-01-30 18:55:51Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=fltk2 -pkgver=2.0 -_pkgver=2.0.x-alpha-r9166 -pkgrel=8 -pkgdesc="Graphical user interface toolkit for X" -arch=(i686 x86_64) -license=('LGPL') -url="http://www.fltk.org/" -depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext' 'libxi' 'libxinerama') -makedepends=('mesa') -source=(http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/fltk-${_pkgver}.tar.bz2) -md5sums=('d5e7cd859d2aeb9bb6e13ee298e8b2aa') - -build() { - cd $srcdir/fltk-${_pkgver} - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared - patch -p0 src/filename_list.cxx <<EOF -66c66 -< int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort); ---- -> int n = scandir(d, list, 0, (int(*)(const dirent64**,const dirent64**))sort); -EOF - make - make DESTDIR=$pkgdir install -} diff --git a/community-testing/fox/PKGBUILD b/community-testing/fox/PKGBUILD deleted file mode 100644 index ee80bf061..000000000 --- a/community-testing/fox/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 63102 2012-01-30 18:55:55Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Ben <ben@benmazer.net> - -pkgname=fox -pkgver=1.6.44 -pkgrel=2 -pkgdesc="Free Objects for X: GUI Toolkit for C++" -arch=('i686' 'x86_64') -url="http://www.fox-toolkit.org/" -license=('LGPL' 'custom') -depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libtiff') -optdepends=('perl') -options=('!libtool') -source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz) -md5sums=('6ccc8cbcfa6e4c8b6e4deeeb39c36434') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - export CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" - ./configure --prefix=/usr \ - --enable-release \ - --with-xft=yes \ - --with-opengl=yes \ - --with-xim \ - --with-xshm \ - --with-shape \ - --with-xcursor \ - --with-xrender \ - --with-xrandr \ - --with-xfixes \ - --with-xinput - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - cd ${srcdir}/${pkgname}-${pkgver}/tests - make ControlPanel - install -m755 ${srcdir}/${pkgname}-${pkgver}/tests/.libs/ControlPanel ${pkgdir}/usr/bin/ - install -Dm644 ../LICENSE_ADDENDUM ${pkgdir}/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community-testing/freedroidrpg/PKGBUILD b/community-testing/freedroidrpg/PKGBUILD deleted file mode 100644 index f149f3537..000000000 --- a/community-testing/freedroidrpg/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 63104 2012-01-30 18:56:05Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: nut543 <kfs1@online.no> - -#pkgbase=freedroidrpg -#pkgname=('freedroidrpg' 'freedroidrpg-data') -pkgname='freedroidrpg' -pkgver=0.15 -pkgrel=2 -arch=('i686' 'x86_64') -# depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data') -depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa') -optdepends=('python2' 'espeak') -pkgdesc="a mature science fiction role playing game set in the future" -url="http://freedroid.sourceforge.net" -license=("GPL") -source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidrpg-$pkgver.tar.gz - freedroidrpg.jpg - freedroidrpg.desktop) -md5sums=('003a3f34619cfaa87add2030fea5d120' - 'b73d9dac44c7e83a6c80fbe4eb96ba79' - '9a10c2a2064439cdcff5b945dfb1c3ac') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir/ install - install -D -m644 $srcdir/freedroidrpg.jpg $pkgdir/usr/share/icons/freedroidrpg.jpg - install -D -m644 $srcdir/freedroidrpg.desktop $pkgdir/usr/share/applications/freedroidrpg.desktop -} diff --git a/community-testing/freedroidrpg/freedroidrpg.desktop b/community-testing/freedroidrpg/freedroidrpg.desktop deleted file mode 100644 index 33ee2f5b8..000000000 --- a/community-testing/freedroidrpg/freedroidrpg.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=freedroidrpg -Comment=Extension/modification of the classical Freedroid game(based on paradroid) into an RPG -Exec=freedroidRPG -Encoding=UTF-8 -Icon=/usr/share/icons/freedroidrpg.jpg -Categories=Game;RolePlaying; -Terminal=false -StartupNotify=false diff --git a/community-testing/freedroidrpg/freedroidrpg.jpg b/community-testing/freedroidrpg/freedroidrpg.jpg Binary files differdeleted file mode 100644 index 4daa89313..000000000 --- a/community-testing/freedroidrpg/freedroidrpg.jpg +++ /dev/null diff --git a/community-testing/freewrl/PKGBUILD b/community-testing/freewrl/PKGBUILD deleted file mode 100644 index 2e425d26b..000000000 --- a/community-testing/freewrl/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 63106 2012-01-30 18:56:16Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=freewrl -pkgver=1.22.10 -pkgrel=8 -pkgdesc="VRML viewer" -arch=('i686' 'x86_64') -url="http://freewrl.sourceforge.net/" -license=('GPL') -depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox' - 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js') -makedepends=('java-environment') -options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 - build-fix.patch) -md5sums=('07fd8f193d14799ffb95a59a4887fc88' - '52e4b6aacebcaf18cbec8975e0eb7fd8') - -build() { - . /etc/profile.d/jre.sh - . /etc/profile.d/jdk.sh - cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/build-fix.patch - export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)" - export JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) -lmozjs185" - ./configure \ - --prefix=/usr --with-fontsdir=/usr/share/fonts/TTF --enable-libeai \ - --enable-libcurl --with-expat=/usr --with-target=x11 --disable-plugin \ - --disable-mozilla-js --disable-xulrunner-js --disable-firefox-js \ - --disable-seamonkey-js - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/community-testing/freewrl/build-fix.patch b/community-testing/freewrl/build-fix.patch deleted file mode 100644 index c0de71d07..000000000 --- a/community-testing/freewrl/build-fix.patch +++ /dev/null @@ -1,1201 +0,0 @@ -diff -wbBur freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c ---- freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c 2010-08-19 06:20:36.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c 2011-07-04 01:19:07.000000000 +0400 -@@ -54,7 +54,7 @@ - #include "ColladaParser.h" - - #if HAVE_EXPAT_H --# include <expat.h> -+# include </usr/include/expat.h> - #endif - - #define PROTOINSTANCE_MAX_LEVELS 10 -diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldGet.c freewrl-1.22.10.my/src/lib/world_script/fieldGet.c ---- freewrl-1.22.10/src/lib/world_script/fieldGet.c 2010-10-13 23:45:26.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/fieldGet.c 2011-07-04 20:21:21.000000000 +0400 -@@ -412,7 +412,7 @@ - /* create a new SFFloat object */ - - fp = (float *)fp_in; -- newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp)); -+ newjsval = JS_NewJSVal(cx,(double)*fp); - fp_in = offsetPointer_deref(float *,fp_in,elementlen); - - /* put this object into the MF class */ -@@ -449,7 +449,7 @@ - /* create a new SFTime object */ - - fp = (float *)fp_in; -- newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp)); -+ newjsval = JS_NewJSVal(cx,(double)*fp); - fp_in = offsetPointer_deref(float *,fp_in,elementlen); - - /* put this object into the MF class */ -diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldSet.c freewrl-1.22.10.my/src/lib/world_script/fieldSet.c ---- freewrl-1.22.10/src/lib/world_script/fieldSet.c 2010-09-22 00:00:25.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/fieldSet.c 2011-07-04 20:03:53.000000000 +0400 -@@ -748,7 +748,7 @@ - - #ifdef SETFIELDVERBOSE - strval = JS_ValueToString(scriptContext, JSglobal_return_val); -- strp = JS_GetStringBytes(strval); -+ strp = JS_EncodeString(scriptContext, strval); - printf ("start of setField_javascriptEventOut, to %ld:%d = %p, fieldtype %d string %s\n",(long)tn, tptr, memptr, fieldType, strp); - #endif - -@@ -813,7 +813,7 @@ - case FIELDTYPE_SFImage: { - /* the string should be saved as an SFImage */ - strval = JS_ValueToString(scriptContext, JSglobal_return_val); -- strp = JS_GetStringBytes(strval); -+ strp = JS_EncodeString(scriptContext, strval); - - Parser_scanStringValueToMem(tn, tptr, FIELDTYPE_SFImage, strp, FALSE); - break; -@@ -824,7 +824,7 @@ - uintptr_t *newptr; - - strval = JS_ValueToString(scriptContext, JSglobal_return_val); -- strp = JS_GetStringBytes(strval); -+ strp = JS_EncodeString(scriptContext, strval); - - /* copy the string over, delete the old one, if need be */ - /* printf ("fieldSet SFString, tn %d tptr %d offset from struct %d\n", -@@ -844,7 +844,7 @@ - struct X3D_Node *mynode; - - strval = JS_ValueToString(scriptContext, JSglobal_return_val); -- strp = JS_GetStringBytes(strval); -+ strp = JS_EncodeString(scriptContext, strval); - - /* we will have at least one node here, in an ascii string */ - while ((*strp > '\0') && (*strp <= ' ')) strp ++; -@@ -1227,7 +1227,7 @@ - JSString *_tmpStr; - - _tmpStr = JS_ValueToString(cx, mainElement); -- strp = JS_GetStringBytes(_tmpStr); -+ strp = JS_EncodeString(scriptContext, _tmpStr); - printf ("sub element %d is \"%s\" \n",i,strp); - - if (JSVAL_IS_OBJECT(mainElement)) printf ("sub element %d is an OBJECT\n",i); -@@ -1329,7 +1329,7 @@ - JSString *strval; - - strval = JS_ValueToString(cx, mainElement); -- strp = JS_GetStringBytes(strval); -+ strp = JS_EncodeString(cx, strval); - - #ifdef SETFIELDVERBOSE - printf ("getJSMultiNumType, got string %s\n",strp); -@@ -1441,7 +1441,7 @@ - return; - } - strval = JS_ValueToString(cx, _v); -- valStr = JS_GetStringBytes(strval); -+ valStr = JS_EncodeString(cx, strval); - - /* printf ("new string %d is %s\n",i,valStr); */ - -diff -wbBur freewrl-1.22.10/src/lib/world_script/jsUtils.c freewrl-1.22.10.my/src/lib/world_script/jsUtils.c ---- freewrl-1.22.10/src/lib/world_script/jsUtils.c 2010-06-03 23:38:37.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/jsUtils.c 2011-07-04 20:21:44.000000000 +0400 -@@ -134,7 +134,7 @@ - nf = OBJECT_TO_JSVAL(me); - - #ifdef JSVRMLCLASSESVERBOSE -- printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf))); -+ printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf))); - #endif - - if (!setSFNodeField (cx, par, pf, &nf)) { -@@ -197,7 +197,7 @@ - char *_id_c; - - _idStr = JS_ValueToString(cx, *newval); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - oldS = (struct Uni_String *) *((uintptr_t *)Data); - -@@ -305,12 +305,12 @@ - - case FIELDTYPE_SFFloat: { - memcpy ((void *) &fl, Data, datalen); -- *newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)fl)); -+ *newval = JS_NewJSVal(cx,(double)fl); - break; - } - case FIELDTYPE_SFTime: { - memcpy ((void *) &dl, Data, datalen); -- *newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,dl)); -+ *newval = JS_NewJSVal(cx,dl); - break; - } - case FIELDTYPE_SFBool: -@@ -824,7 +824,7 @@ - struct X3D_Node *node; - - _idStr = JS_ValueToString(context, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(context, _idStr); - - #ifdef JSVRMLCLASSESVERBOSE - printf ("\ngetSFNodeField called on name %s object %u\n",_id_c, obj); -@@ -912,7 +912,7 @@ - - /* get the id field... */ - -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - - #ifdef JSVRMLCLASSESVERBOSE - printf ("\nsetSFNodeField called on name %s object %u, jsval %u\n",_id_c, obj, *vp); -@@ -1131,10 +1131,10 @@ - char *_id_c = "(no value in string)"; - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); - /* printf ("hmmm...js_SetPropertyCheck called on string \"%s\" object %u, jsval %u\n",_id_c, obj, *vp); */ - } else if (JSVAL_IS_DOUBLE(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyCheck called on double %s object %u, jsval %u\n",_id_c, obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1192,7 +1192,7 @@ - /* get the id field... */ - - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); - printf ("\n...js_GetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1211,7 +1211,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1229,7 +1229,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug1 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1247,7 +1247,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); - printf ("...js_SetPropertyDebug2 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1265,7 +1265,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug3 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1283,7 +1283,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug4 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1301,7 +1301,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug5 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1319,7 +1319,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug6 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1337,7 +1337,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug7 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1355,7 +1355,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug8 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1373,7 +1373,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug9 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c ---- freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c 2010-08-02 23:55:57.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c 2011-07-04 20:06:25.000000000 +0400 -@@ -336,7 +336,7 @@ - return JS_FALSE; - } - _str = JS_ValueToString(context, argv[0]); -- _costr = JS_GetStringBytes(_str); -+ _costr = JS_EncodeString(context, _str); - - /* sanitize string, for the EAI_RW call (see EAI_RW code) */ - tptr = _costr; -@@ -385,10 +385,10 @@ - return JS_FALSE; - } - _str[0] = JS_ValueToString(context, argv[0]); -- _costr[0] = JS_GetStringBytes(_str[0]); -+ _costr[0] = JS_EncodeString(context, _str[0]); - - _str[1] = JS_ValueToString(context, argv[1]); -- _costr[1] = JS_GetStringBytes(_str[1]); -+ _costr[1] = JS_EncodeString(context, _str[1]); - - /* we use the EAI code for this - so reformat this for the EAI format */ - { -@@ -575,7 +575,7 @@ - /* third parameter should be a string */ - if (JSVAL_IS_STRING(argv[2])) { - _str[1] = JSVAL_TO_STRING(argv[2]); -- fieldStr = JS_GetStringBytes(_str[1]); -+ fieldStr = JS_EncodeString(context, _str[1]); - #ifdef JSVERBOSE - printf ("field string is :%s:\n",fieldStr); - #endif -@@ -590,7 +590,7 @@ - - /* get the URL listing as a string */ - _str[0] = JS_ValueToString(context, argv[0]); -- _costr0 = JS_GetStringBytes(_str[0]); -+ _costr0 = JS_EncodeString(context, _str[0]); - - - #ifdef JSVERBOSE -@@ -690,7 +690,7 @@ - for (count=0; count < argc; count++) { - if (JSVAL_IS_STRING(argv[count])) { - _str = JSVAL_TO_STRING(argv[count]); -- _id_c = JS_GetStringBytes(_str); -+ _id_c = JS_EncodeString(context, _str); - #if defined(AQUA) || defined(_MSC_VER) - BrowserPrintConsoleMessage(_id_c); /* statusbar hud */ - consMsgCount = 0; /* reset the "Maximum" count */ -@@ -850,7 +850,7 @@ - - /* parameter should be a string */ - if (JSVAL_IS_STRING(argv[0])) { -- target = JS_GetStringBytes( JSVAL_TO_STRING(argv[0])); -+ target = JS_EncodeString(context, JSVAL_TO_STRING(argv[0])); - #ifdef JSVERBOSE - printf ("field string is %s\n",target); - #endif -@@ -930,7 +930,7 @@ - - /* parameters should be a string */ - if (JSVAL_IS_STRING(argv[0])) { -- targetDevice = JS_GetStringBytes( JSVAL_TO_STRING(argv[0])); -+ targetDevice = JS_EncodeString(cx, JSVAL_TO_STRING(argv[0])); - #ifdef JSVERBOSE - printf ("field string is %s\n",targetDevice); - #endif -@@ -939,7 +939,7 @@ - return -1; - } - if (JSVAL_IS_STRING(argv[1])) { -- targetController = JS_GetStringBytes( JSVAL_TO_STRING(argv[1])); -+ targetController = JS_EncodeString(cx, JSVAL_TO_STRING(argv[1])); - #ifdef JSVERBOSE - printf ("field string is %s\n",targetController); - #endif -diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c ---- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c 2010-09-22 23:40:48.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c 2011-07-04 20:08:03.000000000 +0400 -@@ -935,7 +935,7 @@ - printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd); - return JS_FALSE; - } -- val = DOUBLE_TO_JSVAL(dp); -+ val = DOUBLE_TO_JSVAL(*dp); - - } - } -@@ -1108,7 +1108,7 @@ - - printf ("HAVE STRING HERE!\n"); - _str = JS_ValueToString(cx, id); -- asciiStr = JS_GetStringBytes(_str); -+ asciiStr = JS_EncodeString(context, _str); - printf ("we have as a parameter :%s:\n",asciiStr); - #endif - -@@ -1185,7 +1185,7 @@ - if (_tmpStr==NULL) { - _tmp_valStr = "NULL"; - } else { -- _tmp_valStr = JS_GetStringBytes(_tmpStr); -+ _tmp_valStr = JS_EncodeString(cx, _tmpStr); - } - } - -@@ -1281,7 +1281,7 @@ - #endif - - str = JS_ValueToString(cx, id); -- p = JS_GetStringBytes(str); -+ p = JS_EncodeString(cx, str); - #ifdef JSVRMLCLASSESVERBOSE - printf("\tid string %s\n ",p); - #endif -@@ -1368,12 +1368,12 @@ - char * _c; - printf ("doMFSetProperty, for object %u, vp %u\n", obj,*vp); - _str = JS_ValueToString(cx, id); -- _c = JS_GetStringBytes(_str); -+ _c = JS_EncodeString(cx, _str); - printf ("id is %s\n",_c); - - _sstr = JS_ValueToString(cx, *vp); - printf ("looking up value for %d %x object %p\n",*vp,*vp,obj); -- _cc = JS_GetStringBytes(_sstr); -+ _cc = JS_EncodeString(cx, _sstr); - printf("\tdoMFSetProperty:%d: obj = %p, id = %s, vp = %s\n",type, - obj, _c, _cc); - if (JSVAL_IS_OBJECT(*vp)) { printf ("doMFSet, vp is an OBJECT\n"); } -@@ -1397,7 +1397,7 @@ - - if (!JS_ValueToInt32(cx, *vp, &i)) { - _sstr = JS_ValueToString(cx, *vp); -- _cc = JS_GetStringBytes(_sstr); -+ _cc = JS_EncodeString(cx, _sstr); - printf ("can not convert %s to an integer in doMFAddProperty for type %d\n",_cc,type); - return JS_FALSE; - } -@@ -1408,7 +1408,7 @@ - #ifdef JSVRMLCLASSESVERBOSE - printf ("doMFSetProperty - ensure that this is a DOUBLE "); - _sstr = JS_ValueToString(cx, *vp); -- _cc = JS_GetStringBytes(_sstr); -+ _cc = JS_EncodeString(cx, _sstr); - printf ("value is %s \n",_cc); - #endif - -@@ -1420,7 +1420,7 @@ - printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - - } - } -@@ -1511,7 +1511,7 @@ - nf = OBJECT_TO_JSVAL(me); - - #ifdef JSVRMLCLASSESVERBOSE -- printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf))); -+ printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf))); - #endif - - if (!setSFNodeField (cx, par, pf, &nf)) { -@@ -1535,7 +1535,7 @@ - unsigned int i, j = 0; - - _str = JS_ValueToString(cx, *vp); -- _buff = JS_GetStringBytes(_str); -+ _buff = JS_EncodeString(cx, _str); - _buff_len = strlen(_buff) + 1; - - #ifdef JSVRMLCLASSESVERBOSE -@@ -1719,14 +1719,14 @@ - size_t len = 0; - - _idStr = JS_ValueToString(context, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(context, _idStr); - - /* "register" this ECMA value for routing changed flag stuff */ - setInECMATable(context, _id_c); - - if (JSVAL_IS_STRING(*vp)) { - _vpStr = JS_ValueToString(context, *vp); -- _vp_c = JS_GetStringBytes(_vpStr); -+ _vp_c = JS_EncodeString(context, _vpStr); - - len = strlen(_vp_c); - -@@ -1752,7 +1752,7 @@ - } else { - #ifdef JSVRMLCLASSESVERBOSE - _vpStr = JS_ValueToString(context, *vp); -- _vp_c = JS_GetStringBytes(_vpStr); -+ _vp_c = JS_EncodeString(cx, _vpStr); - printf("setECMANative: obj = %p, id = \"%s\", vp = %s\n", - obj, _id_c, _vp_c); - #endif -@@ -1770,9 +1770,9 @@ - JSString *_idStr, *_vpStr; - char *_id_c, *_vp_c; - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - _vpStr = JS_ValueToString(cx, *vp); -- _vp_c = JS_GetStringBytes(_vpStr); -+ _vp_c = JS_EncodeString(cx, _vpStr); - printf("getAssignProperty: obj = %p, id = \"%s\", vp = %s\n", - obj, _id_c, _vp_c); - printf ("what is vp? \n"); -@@ -1803,7 +1803,7 @@ - - if (JSVAL_IS_STRING(id)) { - _str = JSVAL_TO_STRING(id); -- _id_c = JS_GetStringBytes(_str); -+ _id_c = JS_EncodeString(cx, _str); - if (!JS_ConvertValue(cx, *vp, JSTYPE_OBJECT, &newVal)) { - printf( "JS_ConvertValue failed in setAssignProperty.\n"); - return JS_FALSE; -@@ -1834,9 +1834,9 @@ - if (JSVAL_IS_DOUBLE(id)) printf ("id is an DOUBLE\n"); - if (JSVAL_IS_INT(id)) printf ("id is an INT\n"); - -- printf ("id is %s\n",JS_GetStringBytes(JS_ValueToString(cx,id))); -- printf ("initVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,initVal))); -- printf ("newVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,newVal))); -+ printf ("id is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,id))); -+ printf ("initVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,initVal))); -+ printf ("newVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,newVal))); - - #endif - -@@ -1859,7 +1859,7 @@ - } else { - #ifdef JSVRMLCLASSESVERBOSE - _str = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_str); -+ _id_c = JS_EncodeString(cx, _str); - printf("setAssignProperty: obj = %p, id = \"%s\"\n", - obj, _id_c); - #endif -diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h ---- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h 2010-10-13 23:45:26.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h 2011-07-04 20:24:53.000000000 +0400 -@@ -30,6 +30,21 @@ - #ifndef __FREEWRL_JS_VRML_CLASSES_H__ - #define __FREEWRL_JS_VRML_CLASSES_H__ - -+static inline jsval JS_NewJSVal(JSContext *cx, jsdouble d) -+{ -+ jsval ret; -+ JS_NewNumberValue(cx, d, &ret); -+ return ret; -+} -+ -+static inline jsdouble * JS_NewDouble(JSContext *cx, jsdouble d) -+{ -+ static jsdouble ret; -+ jsval rv; -+ JS_NewNumberValue(cx, d, &rv); -+ ret = JSVAL_TO_DOUBLE(rv); -+ return &ret; -+} - - #ifndef UNUSED - #define UNUSED(v) ((void) v) -@@ -80,14 +95,14 @@ - - - #define SET_JS_TICKTIME_FALSE(possibleRetVal) { jsval zimbo; \ -- zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime)); \ -+ zimbo = JS_NewJSVal(cx, TickTime); \ - if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) { \ - printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \ - return possibleRetVal; \ - }} - - #define SET_JS_TICKTIME() { jsval zimbo; \ -- zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime)); \ -+ zimbo = JS_NewJSVal(cx, TickTime); \ - if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) { \ - printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \ - return FALSE; \ -diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c ---- freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c 2010-09-22 23:40:48.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c 2011-07-04 20:08:44.000000000 +0400 -@@ -596,7 +596,7 @@ - return; - } - -- val = DOUBLE_TO_JSVAL(dp); -+ val = DOUBLE_TO_JSVAL(*dp); - - if (!JS_SetElement(cx, obj, (jsint) i, &val)) { - printf( "JS_DefineElement failed for arg %u in VrmlMatrixSetTransform.\n", i); -@@ -1212,7 +1212,7 @@ - /* - if (JSVAL_IS_STRING(id)==TRUE) { - printf(" is a common string :%s:\n", -- JS_GetStringBytes(JS_ValueToString(cx, id))); -+ JS_EncodeString(cx, JS_ValueToString(cx, id))); - } - if (JSVAL_IS_OBJECT(id)==TRUE) { - printf (" parameter is an object\n"); -@@ -1231,7 +1231,7 @@ - _index = JSVAL_TO_INT(id); - - if (_index >= _length) { -- *vp = DOUBLE_TO_JSVAL(&zerojsdouble); -+ *vp = DOUBLE_TO_JSVAL(zerojsdouble); - if (!JS_DefineElement(cx, obj, (jsint) _index, *vp, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) { - printf( "JS_DefineElement failed in VrmlMatrixGetProperty.\n"); - return JS_FALSE; -@@ -1331,7 +1331,7 @@ - printf("MFStringAddProperty: vp = %p\n", obj); - if (JSVAL_IS_STRING(*vp)==TRUE) { - printf(" is a common string :%s:\n", -- JS_GetStringBytes(JS_ValueToString(cx, *vp))); -+ JS_EncodeString(cx, JS_ValueToString(cx, *vp))); - } - if (JSVAL_IS_OBJECT(*vp)==TRUE) { - printf (" parameter is an object\n"); -@@ -1345,7 +1345,7 @@ - printf("MFStringAddProperty: id = %p\n", obj); - if (JSVAL_IS_STRING(id)==TRUE) { - printf(" is a common string :%s:\n", -- JS_GetStringBytes(JS_ValueToString(cx, id))); -+ JS_EncodeString(cx, JS_ValueToString(cx, id))); - } - if (JSVAL_IS_OBJECT(id)==TRUE) { - printf (" parameter is an object\n"); -@@ -1494,7 +1494,7 @@ - if (JSVAL_IS_STRING(argv[i])==TRUE) { - printf (" Common String, is"); - _str = JS_ValueToString(cx, argv[i]); -- printf (JS_GetStringBytes(_str)); -+ printf (JS_EncodeString(cx, _str)); - printf (".."); - - } -diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c ---- freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c 2010-09-25 00:22:05.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c 2011-07-04 20:09:01.000000000 +0400 -@@ -161,7 +161,7 @@ - printf( "JS_NewDouble failed for %f in SFColorGetHSV.\n", xp[i]); - return JS_FALSE; - } -- _v = DOUBLE_TO_JSVAL(dp); -+ _v = DOUBLE_TO_JSVAL(*dp); - JS_SetElement(cx, result, (jsint)i, &_v); - } - -@@ -336,7 +336,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -346,7 +346,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -356,7 +356,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } -@@ -387,13 +387,13 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val); - break; - - } -@@ -422,18 +422,18 @@ - *rval = OBJECT_TO_JSVAL(_arrayObj); - - /* construct new double before conversion? */ -- _v = DOUBLE_TO_JSVAL(&hue); -+ _v = DOUBLE_TO_JSVAL(hue); - if (!JS_SetElement(cx, _arrayObj, 0, &_v)) { - printf( "JS_SetElement failed for hue in SFColorRGBAGetHSV.\n"); - return JS_FALSE; - } -- _v = DOUBLE_TO_JSVAL(&saturation); -+ _v = DOUBLE_TO_JSVAL(saturation); - if (!JS_SetElement(cx, _arrayObj, 1, &_v)) { - printf( "JS_SetElement failed for saturation in SFColorRGBAGetHSV.\n"); - return JS_FALSE; - } - -- _v = DOUBLE_TO_JSVAL(&value); -+ _v = DOUBLE_TO_JSVAL(value); - if (!JS_SetElement(cx, _arrayObj, 2, &_v)) { - printf( "JS_SetElement failed for value in SFColorRGBAGetHSV.\n"); - return JS_FALSE; -@@ -601,7 +601,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -611,7 +611,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -621,7 +621,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 3: - d = (ptr->v).c[3]; -@@ -631,7 +631,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } -@@ -662,16 +662,16 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val); - break; - case 3: -- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(_val); - break; - - } -@@ -983,7 +983,7 @@ - } else if (argc == 1) { - /* is this a string, or a number indicating a node? */ - myStr = JS_ValueToString(cx, argv[0]); -- cString = JS_GetStringBytes(myStr); -+ cString = JS_EncodeString(cx, myStr); - #ifdef JSVRMLCLASSESVERBOSE - printf ("SFNodeConstr, argc =1l string %s\n",cString); - #endif -@@ -1067,13 +1067,13 @@ - char *_id_c; - - _idStr = JS_ValueToString(cx, argv[0]); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - /* printf ("first string :%s:\n",_id_c); */ - - cString = STRDUP(_id_c); - - _idStr = JS_ValueToString(cx, argv[1]); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - /* printf ("second string :%s:\n",_id_c); */ - - if (sscanf (_id_c,"%p",&newHandle) != 1) { -@@ -1190,7 +1190,7 @@ - jsval rval; - - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - #ifdef JSVRMLCLASSESVERBOSE - printf ("start of SFNodeGetProperty... id is %s\n",_id_c); -@@ -1264,10 +1264,10 @@ - - - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - _valStr = JS_ValueToString(cx, *vp); -- _val_c = JS_GetStringBytes(_valStr); -+ _val_c = JS_EncodeString(cx, _valStr); - - #ifdef JSVRMLCLASSESVERBOSE - printf("SFNodeSetProperty: obj = %p, id = %s, vp = %s\n", -@@ -1904,7 +1904,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -1914,7 +1914,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -1924,7 +1924,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 3: - d = (ptr->v).c[3]; -@@ -1934,7 +1934,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } -@@ -1969,16 +1969,16 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 3: -- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv); - break; - } - } -@@ -2051,7 +2051,7 @@ - * it get created in javascript? */ - if (param_isString) { - _str = JS_ValueToString(cx, *argv); -- charString = JS_GetStringBytes(_str); -+ charString = JS_EncodeString(cx, _str); - - if (sscanf(charString, "%lf %lf", - &(pars[0]), &(pars[1])) != 2) { -@@ -2143,7 +2143,7 @@ - printf( "JS_NewDouble failed for %f in SFVec2f.\n",d); - return JS_FALSE; - } -- *rval = DOUBLE_TO_JSVAL(dp); -+ *rval = DOUBLE_TO_JSVAL(*dp); - } - - #ifdef JSVRMLCLASSESVERBOSE -@@ -2332,7 +2332,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -2342,7 +2342,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } -@@ -2373,13 +2373,13 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); - break; - } - } -@@ -2458,7 +2458,7 @@ - * it get created in javascript? */ - if (param_isString) { - _str = JS_ValueToString(cx, *argv); -- charString = JS_GetStringBytes(_str); -+ charString = JS_EncodeString(cx, _str); - - if (sscanf(charString, "%lf %lf %lf", - &(pars[0]), &(pars[1]), &(pars[2])) != 3) { -@@ -2580,7 +2580,7 @@ - printf( "JS_NewDouble failed for %f in SFVec3f.\n",d); - return JS_FALSE; - } -- *rval = DOUBLE_TO_JSVAL(dp); -+ *rval = DOUBLE_TO_JSVAL(*dp); - } - #ifdef JSVRMLCLASSESVERBOSE - if (retSFVec3f){ -@@ -2792,9 +2792,9 @@ - char *_id_c; - - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - _idStr = JS_ValueToString(cx, *vp); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - #endif - -@@ -2813,7 +2813,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -2823,7 +2823,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -2833,7 +2833,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } else { -@@ -2869,13 +2869,13 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); - break; - } - } -@@ -2949,7 +2949,7 @@ - * it get created in javascript? */ - if (param_isString) { - _str = JS_ValueToString(cx, *argv); -- charString = JS_GetStringBytes(_str); -+ charString = JS_EncodeString(cx, _str); - - if (sscanf(charString, "%lf %lf %lf", - &(pars[0]), &(pars[1]), &(pars[2])) != 3) { -@@ -3071,7 +3071,7 @@ - printf( "JS_NewDouble failed for %f in SFVec3d.\n",d); - return JS_FALSE; - } -- *rval = DOUBLE_TO_JSVAL(dp); -+ *rval = DOUBLE_TO_JSVAL(*dp); - } - #ifdef JSVRMLCLASSESVERBOSE - if (retSFVec3d){ -@@ -3282,9 +3282,9 @@ - char *_id_c; - - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - _idStr = JS_ValueToString(cx, *vp); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - #endif - -@@ -3303,7 +3303,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -3313,7 +3313,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -3323,7 +3323,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } else { -@@ -3359,13 +3359,13 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[0] = JSVAL_TO_DOUBLE(myv); - break; - case 1: -- (ptr->v).c[1] = *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[1] = JSVAL_TO_DOUBLE(myv); - break; - case 2: -- (ptr->v).c[2] = *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[2] = JSVAL_TO_DOUBLE(myv); - break; - } - } -@@ -3513,9 +3513,9 @@ - char *_id_c; - - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - _idStr = JS_ValueToString(cx, *vp); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - #endif - -@@ -3534,7 +3534,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -3544,7 +3544,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -3554,7 +3554,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 3: - d = (ptr->v).c[3]; -@@ -3564,7 +3564,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } else { -@@ -3600,16 +3600,16 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 3: -- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv); - break; - } - } -@@ -3758,9 +3758,9 @@ - char *_id_c; - - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - _idStr = JS_ValueToString(cx, *vp); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - #endif - -@@ -3779,7 +3779,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -3789,7 +3789,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -3799,7 +3799,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 3: - d = (ptr->v).c[3]; -@@ -3809,7 +3809,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } else { -@@ -3845,16 +3845,16 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 3: -- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv); - break; - } - } -diff -wbBur freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c ---- freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c 2010-09-22 20:54:59.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c 2011-07-04 01:19:07.000000000 +0400 -@@ -54,7 +54,7 @@ - #include "X3DProtoScript.h" - - #if HAVE_EXPAT_H --# include <expat.h> -+# include </usr/include/expat.h> - #endif - //#define X3DPARSERVERBOSE 1 - diff --git a/community-testing/fxdesktop/PKGBUILD b/community-testing/fxdesktop/PKGBUILD deleted file mode 100644 index 95c24fd1b..000000000 --- a/community-testing/fxdesktop/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 63110 2012-01-30 18:56:31Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sander Jansen <sander@knology.net> - -pkgname=fxdesktop -pkgver=0.1.12 -pkgrel=5 -pkgdesc="Lightweight Desktop Environment" -arch=('i686' 'x86_64') -url="http://code.google.com/p/fxdesktop/" -license=('GPL') -depends=('fox>=1.6.0' ) -source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -md5sums=('9489e7369b5e052e0b6836a3b0670832') - -build() { - cd $srcdir/$pkgname-$pkgver - # Override default flags - export CFLAGS="-Wall -O2 -pipe" - export CXXFLAGS="-Wall -O2 -pipe" - [ "$CARCH" = "x86_64" ] && (sed -i -e 's|lib64|lib|g' build/config.linux_x86_64) - # Compile - ./gb --prefix=/usr - ./gb --package-root=$pkgdir/usr install -} diff --git a/community-testing/fxprocessview/PKGBUILD b/community-testing/fxprocessview/PKGBUILD deleted file mode 100644 index 65b1228b9..000000000 --- a/community-testing/fxprocessview/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 63112 2012-01-30 18:56:37Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sander Jansen <sander@knology.net> - -pkgname=fxprocessview -pkgver=0.5.0 -pkgrel=4 -pkgdesc="Process Viewer" -arch=('i686' 'x86_64') -license=('GPL') -depends=('fox>=1.4.0') -url="http://code.google.com/p/fxdesktop/" -source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.gz \ - build-fix.patch) -md5sums=('5d3cc8d7aec770997c281a743ddfda5a' - '2d2c3d54dcd2404149955f12cccb21a5') - -build() { - cd $srcdir/$pkgname-$pkgver - # Override default flags - export CFLAGS="-Wall -O2 -pipe" - export CXXFLAGS="-Wall -O2 -pipe" - # Compile - patch -Np1 <../build-fix.patch - ./gb - # gb does not return valid error code - [ -f src/fxprocessview ] - # make sure destination exists - mkdir -p $pkgdir/usr/bin - # Install - ./gb install --package-root=$pkgdir/usr -} diff --git a/community-testing/fxprocessview/build-fix.patch b/community-testing/fxprocessview/build-fix.patch deleted file mode 100644 index 7c883454c..000000000 --- a/community-testing/fxprocessview/build-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -wbBur fxprocessview-0.5.0/src/processlist.cpp fxprocessview-0.5.0.my/src/processlist.cpp ---- fxprocessview-0.5.0/src/processlist.cpp 2005-07-15 06:39:17.000000000 +0400 -+++ fxprocessview-0.5.0.my/src/processlist.cpp 2007-03-07 19:21:34.000000000 +0300 -@@ -696,7 +696,7 @@ - - long FXProcessList::onCmdUserMode(FXObject* sender,FXSelector,void* ){ - if (userfilter.empty()){ -- userfilter=FXFile::getCurrentUserName(); -+ userfilter=FXSystem::currentUserName(); - } - else { - userfilter=""; -@@ -942,12 +942,17 @@ - - - -- FXint num_processes = FXFile::listFiles(dirlist,"/proc","[0123456789]*",LIST_MATCH_ALL|LIST_NO_FILES|LIST_NO_PARENT); -+ FXint num_processes = FXDir::listFiles(dirlist,"/proc","[0123456789]*",FXDir::MatchAll | FXDir::NoFiles | FXDir::NoParent); - task_total=num_processes; - for (FXint i=0;i<num_processes;i++){ - - /// Check the Owner -- owner = FXFile::owner("/proc/" + dirlist[i]); -+ FXStat stat; -+ FXStat::statFile("/proc/" + dirlist[i], stat); -+ owner = FXSystem::userName(stat.user()); -+ -+// owner = FXSystem::userName(FXStat::user("/proc/" + dirlist[i])); -+ - if (!userfilter.empty() && (owner!=userfilter)) continue; - - /// Read in Process Stat -@@ -1027,7 +1032,7 @@ - } - - filename = "/proc/" + dirlist[i] + "/cmdline"; -- if (FXFile::exists(filename)) { -+ if (FXStat::exists(filename)) { - fp = fopen(filename.text(),"r"); - if (fp) { - if (fgets(buffer,80,fp)!=NULL){ diff --git a/community-testing/gambas2/PKGBUILD b/community-testing/gambas2/PKGBUILD deleted file mode 100644 index a5b71d07a..000000000 --- a/community-testing/gambas2/PKGBUILD +++ /dev/null @@ -1,950 +0,0 @@ -# $Id: PKGBUILD 63114 2012-01-30 18:56:53Z ibiru $ -# Maintainer : Laurent Carlier <lordheavym@gmail.com> -# Contributor: Biru Ionut <ionut@archlinux.ro> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> -# Contributor: Toni Foerster <stonerl@skeps.de> - -pkgbase="gambas2" -pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help' - 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' - 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' - 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' - 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' - 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' - 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' - 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' - 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' - '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=7 -pkgdesc="A free development environment based on a Basic interpreter." -arch=('i686' 'x86_64') -url="http://gambas.sourceforge.net" -depends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils' - 'postgresql-libs>=8.4.1' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' - 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft' - 'libxcursor' 'libsm') -makedepends=('intltool' 'mysql' 'postgresql') -license=('GPL2') -options=('!emptydirs' '!makeflags') -groups=('gambas2') -replaces=('gambas2') -conflicts=('gambas2') -source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2 - 'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch' - 'poppler-0.18.patch' - 'gambas2-script.install' 'gambas2-runtime.install') -md5sums=('ff8d2c1f310222c150b114e7ce247dfd' - '9dda03a1bbfb7e7ba8b6a4ae91b6752b' - 'ac9703b390502ed3242c8d34485c9236' - 'a551b4b216bbdb3489f3c264bf73ee66' - '870ff5b4b33cd75aa9c290539e6fdd5d' - 'ab5667175c4945282d2f40a35d0e9e5b') -_gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc" - -_buildgbcomp() { - cd ${srcdir}/${pkgbase}-${pkgver}/comp/src/$1 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - install $1.gambas ${pkgdir}/usr/lib/gambas2/ - install .component ${pkgdir}/usr/lib/gambas2/$1.component - chmod a-x ${pkgdir}/usr/lib/gambas2/$1.component - install .info ${pkgdir}/usr/share/gambas2/info/$1.info - chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.info - install .list ${pkgdir}/usr/share/gambas2/info/$1.list - chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.list - if test -d control; then - install -d ${pkgdir}/usr/share/gambas2/control/$1 - install control/*.png ${pkgdir}/usr/share/gambas2/control/$1 - chmod a-x ${pkgdir}/usr/share/gambas2/control/$1/*.png - fi -} - -build() { - cd "${srcdir}/$pkgbase-$pkgver" - - ## workaround to allow package splitting - msg "Applying patches ..." - patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch" - # merged upstream - patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch" - patch -Np2 -i "${srcdir}/poppler-0.18.patch" - ./reconf-all - ## - - . /etc/profile.d/kde3.sh - . /etc/profile.d/qt3.sh - - ./configure -C --disable-qte --prefix=/usr - make bindir=${pkgdir}/usr/bin -} - -package_gambas2-meta() { - depends=('gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help' - 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' - 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' - 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' - 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' - 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' - 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' - 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' - 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' - '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') - pkgdesc="Gambas2 meta package" -} - -package_gambas2-runtime() { - depends=('libffi' 'xdg-utils') - pkgdesc="Gambas2 runtime environment" - install=gambas2-runtime.install - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/lib/gb.component \ - ${pkgdir}/usr/lib/gambas2 - ln -s gbx2 ${pkgdir}/usr/bin/gbr2 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - - ## needed for postinst with xdg-utils - install -d -m755 ${pkgdir}/usr/share/gambas2/mime - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \ - ${pkgdir}/usr/share/gambas2/mime/ - install -d -m755 ${pkgdir}/usr/share/gambas2/icons - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/application-x-gambas.png \ - ${pkgdir}/usr/share/gambas2/icons/application-x-gambas.png -} - -package_gambas2-devel() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 development environment" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-ide() { - depends=('gambas2-gb-qt-ext' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' 'gambas2-gb-settings' - 'gambas2-gb-db' 'gambas2-gb-desktop' 'gambas2-devel') - pkgdesc="Gambas2 Integrated Development Environment" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - _buildgbcomp gb.form - _buildgbcomp gb.form.dialog - _buildgbcomp gb.form.mdi - _buildgbcomp gb.settings - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2-database-manager - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/ - - ## cleanup the workaround - rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib - rm ${pkgdir}/usr/bin/gbx2 - ## - - install -m755 gambas2/gambas2.gambas ${pkgdir}/usr/bin - install -m755 gambas2-database-manager/gambas2-database-manager.gambas ${pkgdir}/usr/bin - ln -s gambas2.gambas ${pkgdir}/usr/bin/gambas2 - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.desktop \ - ${pkgdir}/usr/share/applications/gambas2.desktop - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.png \ - ${pkgdir}/usr/share/pixmaps/gambas2.png -} - -package_gambas2-examples() { - depends=('gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' - 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' - 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' - 'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' - 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' - 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' - 'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' - 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' - 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' - 'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') - pkgdesc="Gambas2 examples" -# arch=('any') - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - rm -r ${pkgdir}/usr/bin ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas2/{help,info} -} - -package_gambas2-help() { - depends=() - pkgdesc="Gambas2 help files" -# arch=('any') - - cd ${srcdir}/${pkgbase}-${pkgver}/help - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - #fix help - chown root:root -R ${pkgdir}/usr/share/gambas2/help/help -} - -package_gambas2-script() { - depends=('gambas2-devel') - pkgdesc="Gambas2 scripter and server programs support" - install=gambas2-script.install -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gbs2 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - install -m755 gbs2.gambas ${pkgdir}/usr/bin - - ln -s gbs2.gambas ${pkgdir}/usr/bin/gbs2 - ln -s gbs2.gambas ${pkgdir}/usr/bin/gbw2 - - ## cleanup the workaround - rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib - rm ${pkgdir}/usr/bin/gbx2 - ## - - ## needed for postinst with xdg-utils - cd ${srcdir}/${pkgbase}-${pkgver}/app/mime - install -d -m755 ${pkgdir}/usr/share/gambas2/mime - install -D -m644 *.xml ${pkgdir}/usr/share/gambas2/mime/ - install -D -m644 *.png ${pkgdir}/usr/share/gambas2/mime/ - ## -} - -package_gambas2-gb-chart() { - depends=('gambas2-gb-form') - pkgdesc="Gambas2 chart component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.chart - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.form*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.form*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-compress() { - depends=('gambas2-runtime' 'bzip2' 'zlib') - pkgdesc="Gambas2 compression support component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/compress - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-corba() { - depends=('gambas2-runtime' 'omniorb') - pkgdesc="Gambas2 corba component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.corba - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-crypt() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 MD5/DES crypting component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-firebird() { - depends=('gambas2-gb-db' 'libfbclient') - pkgdesc="Gambas2 Firebird database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.firebird - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-form() { - depends=('gambas2-gb-db' 'gambas2-gb-form') - pkgdesc="Gambas2 database form component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.db.form - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.db.{info,list}} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.db.{so*,la,component}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-db-mysql() { - depends=('gambas2-gb-db' 'libmysqlclient') - pkgdesc="Gambas2 MySQL database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-odbc() { - depends=('gambas2-gb-db' 'unixodbc') - pkgdesc="Gambas2 ODBC database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-postgresql() { - depends=('gambas2-gb-db' 'postgresql-libs>=8.4.1') - pkgdesc="Gambas2 PostgreSQL database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-sqlite2() { - depends=('gambas2-gb-db' 'sqlite2') - pkgdesc="Gambas2 Sqlite2 database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-sqlite3() { - depends=('gambas2-gb-db' 'sqlite3') - pkgdesc="Gambas2 Sqlite3 database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-desktop() { - depends=('gambas2-runtime' 'libsm' 'libxtst') - pkgdesc="Gambas2 desktop component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*} - rm ${pkgdir}/usr/lib/gambas2/{gb.{so*,la},gb.qt*,gb.draw*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-form() { - depends=('gambas2-gb-gui') - pkgdesc="Gambas2 form component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-form-dialog() { - depends=('gambas2-gb-form') - pkgdesc="Gambas2 form dialog component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.form.dialog - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-form-mdi() { - depends=('gambas2-gb-form') - pkgdesc="Gambas2 form MDI component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.form.mdi - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gtk() { - depends=('gambas2-runtime' 'gtk2') - pkgdesc="Gambas2 graphical GTK+ toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.gtk.ext*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.gtk.ext*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gtk-ext() { - depends=('gambas2-gb-gtk') - pkgdesc="Gambas2 graphical GTK+ toolkit extension component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/ext - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gtk-svg() { - depends=('gambas2-gb-gtk' 'librsvg') - pkgdesc="Gambas2 graphical GTK+ toolkit svg component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk.svg - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gui() { - depends=('gambas2-gb-qt' 'gambas2-gb-gtk') - pkgdesc="Gambas2 automatic gui toolkit chooser" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-image() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 image processing component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-info() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 info component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - _buildgbcomp gb.info - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-net() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 networking component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-net-curl() { - depends=('gambas2-runtime' 'curl') - pkgdesc="Gambas2 advanced networking component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-net-smtp() { - depends=('gambas2-runtime' 'glib2') - pkgdesc="Gambas2 SMTP component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-opengl() { - depends=('gambas2-runtime' 'libgl' 'mesa') - pkgdesc="Gambas2 OpenGL component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-option() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 command-line options component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/option - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-pcre() { - depends=('gambas2-runtime' 'pcre') - pkgdesc="Gambas2 PCRE component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-pdf() { - depends=('gambas2-runtime' 'poppler-glib') - pkgdesc="Gambas2 PDF component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-qt() { - depends=('gambas2-runtime' 'qt3') - pkgdesc="Gambas2 graphical QT toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt.ext*,gb.qt.opengl*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt.ext*,gb.qt.opengl*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-qt-ext() { - depends=('gambas2-gb-qt') - pkgdesc="Gambas2 graphical QT toolkit extension component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/ext - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-qt-opengl() { - depends=('gambas2-gb-qt' 'libgl') - pkgdesc="Gambas2 graphical QT toolkit OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/opengl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-qt-kde() { - depends=('gambas2-gb-qt' 'kdelibs3') - pkgdesc="Gambas2 KDE component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - rm ${pkgdir}/usr/share/gambas2/info/gb.qt.kde.html* - rm ${pkgdir}/usr/lib/gambas2/gb.qt.kde.html* -} - -package_gambas2-gb-qt-kde-html() { - depends=('gambas2-gb-qt-kde') - pkgdesc="Gambas2 KHTML component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde/src/html - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-report() { - depends=('gambas2-runtime' 'gambas2-gb-form') - pkgdesc="Gambas2 report component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.report - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*,gb.db*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*,gb.db*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-sdl() { - depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'libgl') - pkgdesc="Gambas2 SDL component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-sdl-sound() { - depends=('gambas2-runtime' 'sdl_mixer') - pkgdesc="Gambas2 SDL sound component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-settings() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 settings management component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - _buildgbcomp gb.settings - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-v4l() { - depends=('gambas2-runtime' 'libjpeg' 'libpng') - pkgdesc="Gambas2 V4L component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-vb() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 VB transitional component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/vb - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-web() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 CGI component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - _buildgbcomp gb.web - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-xml() { - depends=('gambas2-runtime' 'libxml2') - pkgdesc="Gambas2 xml component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.xml.{xslt*,rpc*},gb.{info,list},gb.net*} - rm ${pkgdir}/usr/lib/gambas2/{gb.xml.{xslt*,rpc*},gb.{so*,la},gb.net*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-xml-rpc() { - depends=('gambas2-gb-xml' 'gambas2-gb-net' 'gambas2-gb-net-curl') - pkgdesc="Gambas2 xml-rpc component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{{info,list},xml.{info,list},xml.xslt.{info,list},net.*} - rm ${pkgdir}/usr/lib/gambas2/gb.{{so*,la},xml.{so*,la,component},xml.xslt.*,net.*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-xml-xslt() { - depends=('gambas2-gb-xml' 'libxslt') - pkgdesc="Gambas2 xml-xslt component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} diff --git a/community-testing/gambas2/db.firebird.gcc-4.6.0-fix.patch b/community-testing/gambas2/db.firebird.gcc-4.6.0-fix.patch deleted file mode 100644 index 0b6e68df3..000000000 --- a/community-testing/gambas2/db.firebird.gcc-4.6.0-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:01:54 3864 -+++ gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:26:41 3865 -@@ -1216,7 +1216,8 @@ - GB.StoreVariant(&fantom, &buffer[i]); - } - else{ -- GB.StoreVariant(&res->GetData(pos,i), &buffer[i]); -+ GB_VARIANT val = res->GetData(pos,i); -+ GB.StoreVariant(&val , &buffer[i]); - } - } - } -@@ -1874,6 +1875,8 @@ - static char query[SQLMAXLEN]; - int type; - std::string str1,str2; -+ GB_VARIANT varval; -+ char* charval; - snprintf(query,SQLMAXLEN-1,"select b.RDB$field_name,a.RDB$field_type,b.rdb$null_flag,b.rdb$default_source,a.RDB$field_length from RDB$fields a,RDB$relation_fields b where a.RDB$field_name=b.RDB$field_source and b.RDB$relation_name=upper('%s') and b.rdb$field_name=upper('%s')",table,field); - if (do_query(db, query, &res, "Unable to get the field from the table")){ - delete res; -@@ -1900,9 +1903,11 @@ - str1=res->GetData(0,3).value.value._string; - if(str1!="") - str2=str1.assign(str1,8,str1.length()-8); -- GB.FreeString(&res->GetData(0,3).value.value._string); -+ charval = res->GetData(0,3).value.value._string; -+ GB.FreeString(&charval); - res->SetData(0,3,str2); -- GB.StoreVariant(&res->GetData(0,3), &info->def); -+ varval = res->GetData(0,3); -+ GB.StoreVariant(&varval, &info->def); - } - delete res; - return FALSE; diff --git a/community-testing/gambas2/fix-gbi-gba-path.patch b/community-testing/gambas2/fix-gbi-gba-path.patch deleted file mode 100644 index 9be8e921e..000000000 --- a/community-testing/gambas2/fix-gbi-gba-path.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- component.am 2010-03-15 20:54:43.000000000 +0100 -+++ ../component.am 2010-04-30 15:00:47.218700833 +0200 -@@ -6,17 +6,17 @@ - @if test -d $(COMPONENT); then \ - echo "Compiling the $(COMPONENT) project..."; \ - ( \ -- $(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \ -+ $(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \ - cd $(COMPONENT); \ -- $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ -- $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ -+ $(GBFILES)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ -+ $(GBFILES)/gba$(GAMBAS_VERSION); \ - rm -rf .gambas; \ - $(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \ - ) \ - fi - @echo - @echo "Creating the information files for $(COMPONENT) component..." -- @$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT) -+ @$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT) - @echo - - uninstall-hook: diff --git a/community-testing/gambas2/gambas2-runtime.install b/community-testing/gambas2/gambas2-runtime.install deleted file mode 100644 index 4729f7ef6..000000000 --- a/community-testing/gambas2/gambas2-runtime.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas - xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/gambas2/gambas2-script.install b/community-testing/gambas2/gambas2-script.install deleted file mode 100644 index 86558e434..000000000 --- a/community-testing/gambas2/gambas2-script.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambasscript.png application-x-gambasscript - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambasserverpage.png application-x-gambasserverpage - xdg-mime install /usr/share/gambas2/mime/application-x-gambasscript.xml - xdg-mime install /usr/share/gambas2/mime/application-x-gambasserverpage.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasscript.xml - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasserverpage.xml -} diff --git a/community-testing/gambas2/gambas2.install b/community-testing/gambas2/gambas2.install deleted file mode 100644 index 4729f7ef6..000000000 --- a/community-testing/gambas2/gambas2.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas - xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/gambas2/poppler-0.18.patch b/community-testing/gambas2/poppler-0.18.patch deleted file mode 100644 index fbcc430bf..000000000 --- a/community-testing/gambas2/poppler-0.18.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- gambas/trunk/gb.pdf/configure.ac 2010/07/14 01:50:18 3038 -+++ gambas/trunk/gb.pdf/configure.ac 2011/08/09 10:43:30 3997 -@@ -22,6 +22,8 @@ - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_8, $((1-$?)), Poppler version >= 0.8) - pkg-config --atleast-version=0.11.3 poppler - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) -+ pkg-config --atleast-version=0.17.0 poppler -+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) - fi - - AC_OUTPUT( \ - ---- gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/06/03 00:51:09 3870 -+++ gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/08/09 10:43:30 3997 -@@ -44,6 +44,7 @@ - #include <Outline.h> - #include <Link.h> - #include <Gfx.h> -+#include <glib/poppler-features.h> - - /***************************************************************************** - -@@ -956,12 +957,17 @@ - Bookmarks of a PDF page - - ******************************************************************************/ -+ - void aux_fill_links(void *_object) - { -+ #if POPPLER_VERSION_0_17 -+ THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); -+ #else - Object obj; - - THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ()); - obj.free(); -+ #endif - } - - BEGIN_PROPERTY (PDFPAGELINKS_count) diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD deleted file mode 100644 index 140269d01..000000000 --- a/community-testing/gambas3/PKGBUILD +++ /dev/null @@ -1,1104 +0,0 @@ -# $Id: PKGBUILD 63116 2012-01-30 18:57:01Z ibiru $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> - -pkgbase=gambas3 -pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' - 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' - 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' - 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' - 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' - 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' - 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' - 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' - '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=3 -pkgdesc="A free development environment based on a Basic interpreter." -arch=('i686' 'x86_64') -url="http://gambas.sourceforge.net/" -license=('GPL') -groups=('gambas3') -makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' - 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' - 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' - 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') -options=('!emptydirs' '!makeflags') -source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('f2c51e18b67ae6b21065ea0aed9b588e' - 'b284be39d147ec799f1116a6abc068b4' - 'b5cc403990f31b8ea1c5cf37366d3d29') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - - ./reconf-all - ./configure --prefix=/usr -C - - make bindir=${pkgdir}/usr/bin -} - -package_gambas3-runtime() { - depends=('libffi' 'xdg-utils') - pkgdesc="Runtime environment" - install=gambas3-runtime.install - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install - - cd ../gbx - make DESTDIR="${pkgdir}" install - cd ../lib/debug - make DESTDIR="${pkgdir}" install - cd ../eval - make DESTDIR="${pkgdir}" install - cd ../draw - make DESTDIR="${pkgdir}" install - install -D -m644 ../gb.component \ - ${pkgdir}/usr/lib/gambas3 - - cd ${srcdir}/${pkgbase}-${pkgver}/main - ln -s gbx3 ${pkgdir}/usr/bin/gbr3 - gbc/gbi3 -r ${pkgdir}/usr gb - rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la} - - ## needed for postinst with xdg-utils - install -d -m755 ${pkgdir}/usr/share/gambas3/mime - install -D -m644 mime/* \ - ${pkgdir}/usr/share/gambas3/mime/ - install -d -m755 ${pkgdir}/usr/share/gambas3/icons - install -D -m644 mime/application-x-gambas3.png \ - ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png - - cd gbc - make DESTDIR="${pkgdir}" uninstall -} - -package_gambas3-devel() { - depends=('gambas3-runtime') - pkgdesc="Development environment" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install -} - -package_gambas3-ide() { - depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' - 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect' - 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit') - pkgdesc="Integrated Development Environment" - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - -#!! with the ide !! - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \ - ${pkgdir}/usr/share/applications/gambas3.desktop - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \ - ${pkgdir}/usr/share/pixmaps/gambas3.png - - rm -r ${pkgdir}/usr/bin/gb* - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas3 -} - -package_gambas3-script() { - depends=('gambas3-devel') - pkgdesc="Scripter and server programs support" - install=gambas3-script.install - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## needed for postinst with xdg-utils - cd ${srcdir}/${pkgbase}-${pkgver}/app/mime - install -d -m755 ${pkgdir}/usr/share/gambas3/mime - install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/ - install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/ - ## - - rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}} - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas3/[c-i]* -} - -package_gambas3-examples() { - depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' - 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' - 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' - 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' - 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' - 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' - 'gambas3-gb-qt4-webkit' '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') - pkgdesc="Applications examples" - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - rm -r ${pkgdir}/usr/{bin,lib} - rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl} -} - -package_gambas3-gb-cairo() { - depends=('gambas3-runtime' 'cairo') - pkgdesc="Cairo component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-chart() { - depends=('gambas3-gb-form') - pkgdesc="Chart component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]* - ## -} - -package_gambas3-gb-compress() { - depends=('gambas3-runtime' 'bzip2' 'zlib') - pkgdesc="Compression support component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 - make DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]* - ## -} - -package_gambas3-gb-crypt() { - depends=('gambas3-runtime') - pkgdesc="MD5/DES crypting component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db() { - depends=('gambas3-runtime') - pkgdesc="Database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*} - ## -} - -package_gambas3-gb-db-form() { - depends=('gambas3-gb-db' 'gambas3-gb-form') - pkgdesc="Database form component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*} - ## -} - -package_gambas3-gb-db-mysql() { - depends=('gambas3-gb-db' 'libmysqlclient') - pkgdesc="MySQL database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-odbc() { - depends=('gambas3-gb-db' 'unixodbc') - pkgdesc="ODBC database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-postgresql() { - depends=('gambas3-gb-db' 'postgresql-libs') - pkgdesc="PostgreSQL database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-sqlite2() { - depends=('gambas3-gb-db' 'sqlite2') - pkgdesc="Sqlite2 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-sqlite3() { - depends=('gambas3-gb-db' 'sqlite3') - pkgdesc="Sqlite3 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-desktop() { - depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring') - pkgdesc="Desktop component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop - make DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-dbus() { - depends=('gambas3-runtime' 'dbus-core') - pkgdesc="DBUS component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-eval-highlight() { - depends=('gambas3-runtime') - pkgdesc="Expression evaluator highlight component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-d]*,[f-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-d]*,[f-z]*} - rm -r ${pkgdir}/usr/share/gambas3/control - ## -} - -package_gambas3-gb-form() { - depends=('gambas3-gb-gui') - pkgdesc="Form component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - ## -} - -package_gambas3-gb-form-dialog() { - depends=('gambas3-gb-form') - pkgdesc="Form dialog component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}} - ## -} - -package_gambas3-gb-form-mdi() { - depends=('gambas3-gb-form') - pkgdesc="Form MDI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}} - ## -} - -package_gambas3-gb-form-stock() { - depends=('gambas3-runtime') - pkgdesc="Default stock icons component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - # rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*} - # rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*} - rm -r ${pkgdir}/usr/lib/gambas3/gb.[m-w]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[m-w]* - ## -} - -package_gambas3-gb-gtk() { - depends=('gambas3-gb-image' 'gtk2' 'librsvg') - pkgdesc="GTK+ toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-gui() { - depends=('gambas3-gb-qt4' 'gambas3-gb-gtk') - pkgdesc="Automatic gui toolkit chooser" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*} - ## -} - -package_gambas3-gb-image() { - depends=('gambas3-runtime') - pkgdesc="Image component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*} - ## -} - -package_gambas3-gb-image-effect() { - depends=('gambas3-gb-image') - pkgdesc="Image effect component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*} - ## -} - -package_gambas3-gb-image-imlib() { - depends=('gambas3-gb-image' 'imlib2') - pkgdesc="Imlib component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-image-io() { - depends=('gambas3-gb-image' 'gdk-pixbuf2') - pkgdesc="Input/Output component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net() { - depends=('gambas3-runtime') - pkgdesc="Network component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net-curl() { - depends=('gambas3-gb-net' 'curl') - pkgdesc="Curl component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net-smtp() { - depends=('gambas3-runtime' 'glib2') - pkgdesc="SMTP component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl() { - depends=('gambas3-runtime' 'libgl' 'glew') - pkgdesc="OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl-glu() { - depends=('gambas3-gb-opengl') - pkgdesc="GL Utility component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl-glsl() { - depends=('gambas3-gb-opengl') - pkgdesc="GLSL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-option() { - depends=('gambas3-runtime') - pkgdesc="Getopt component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*} - ## -} - -package_gambas3-gb-pcre() { - depends=('gambas3-runtime' 'pcre') - pkgdesc="PCRE component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-pdf() { - depends=('gambas3-runtime' 'poppler') - pkgdesc="PDF component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4() { - depends=('gambas3-gb-image' 'qt') - pkgdesc="Qt4 toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-ext() { - depends=('gambas3-gb-qt4') - pkgdesc="Qt4 toolkit extended component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-opengl() { - depends=('gambas3-gb-qt4' 'libgl') - pkgdesc="Qt4 toolkit OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-webkit() { - depends=('gambas3-gb-qt4' 'qtwebkit') - pkgdesc="Qt4 toolkit webkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-report() { - depends=('gambas3-gb-form' 'gambas3-gb-image-io') - pkgdesc="Report component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]* - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*} - ## -} - -package_gambas3-gb-sdl() { - depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl') - pkgdesc="SDL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-sdl-sound() { - depends=('gambas3-runtime' 'sdl_mixer') - pkgdesc="SDL sound component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-settings() { - depends=('gambas3-runtime') - pkgdesc="Setting component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*} - ## -} - -package_gambas3-gb-signal() { - depends=('gambas3-runtime') - pkgdesc="Signal component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*} - ## -} - -package_gambas3-gb-v4l() { - depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng') - pkgdesc="Video4linux component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-vb() { - depends=('gambas3-runtime') - pkgdesc="VB transitional component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]* - ## -} - -package_gambas3-gb-xml() { - depends=('gambas3-runtime' 'libxml2') - pkgdesc="XML component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-xml-rpc() { - depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl') - pkgdesc="XML-RPC component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*} - ## -} - -package_gambas3-gb-xml-xslt() { - depends=('gambas3-gb-xml' 'libxslt') - pkgdesc="XML-XSLT component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-web() { - depends=('gambas3-runtime') - pkgdesc="CGI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* - ## -} diff --git a/community-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install deleted file mode 100644 index 6c8201a6a..000000000 --- a/community-testing/gambas3/gambas3-runtime.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3 - xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3 - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml -} diff --git a/community-testing/gambas3/gambas3-script.install b/community-testing/gambas3/gambas3-script.install deleted file mode 100644 index 77c1aa52f..000000000 --- a/community-testing/gambas3/gambas3-script.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage - xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml - xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml -} diff --git a/community-testing/gdal/PKGBUILD b/community-testing/gdal/PKGBUILD deleted file mode 100644 index a8d88a8bb..000000000 --- a/community-testing/gdal/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 63118 2012-01-30 18:57:09Z 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.9.0 -pkgrel=1 -pkgdesc="A translator library for raster geospatial data formats" -arch=('i686' 'x86_64') -url="http://www.gdal.org/" -license=('custom') -depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf' 'python2' 'python2-numpy' 'cfitsio' 'sqlite3' 'libmysqlclient' 'postgresql-libs') -makedepends=('perl' 'swig') -optdepends=('postgresql: postgresql database support' - 'mysql: mysql database support' - 'perl: perl binding support' - 'swig: perl binding support') -options=('!libtool') -changelog=$pkgname.changelog -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" - - # bug 23654 - export LDFLAGS="$LDFLAGS -Wl,--as-needed" - - cd ${srcdir}/$pkgname-$pkgver - patch -Np0 -i ${srcdir}/gdal-1.5.1-python-install.patch - -# python2 fixes - sed -i 's_python python1.5_python2 python python1.5_' configure - for file in swig/python/{,osgeo/,samples/,scripts/}*.py; do - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file - done - - ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 \ - --with-geotiff --with-mysql --with-python --without-libtool --with-curl \ - --with-hdf5 --with-perl --with-geos --with-png - -# workaround for bug #13646 - sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt - sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile - install -d ${pkgdir}/usr/lib/python2.7/site-packages/ - - make -} - -package () { - cd ${srcdir}/$pkgname-$pkgver - - make DESTDIR=${pkgdir} install - -# install license - install -D -m644 LICENSE.TXT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - -#FS15477 clean up junks - rm -f ${pkgdir}/usr/bin/*.dox -} diff --git a/community-testing/gdal/gdal-1.5.1-python-install.patch b/community-testing/gdal/gdal-1.5.1-python-install.patch deleted file mode 100644 index 8ec414d37..000000000 --- a/community-testing/gdal/gdal-1.5.1-python-install.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- swig/python/GNUmakefile.orig 2010-04-24 01:22:07.000000000 +0200 -+++ swig/python/GNUmakefile 2010-05-05 19:14:58.000000000 +0200 -@@ -72,5 +72,5 @@ - ifeq ($(PY_HAVE_SETUPTOOLS),1) -- $(PYTHON) setup.py install -+ $(PYTHON) setup.py install --root=$(DESTDIR) - else -- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) -+ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix) - endif diff --git a/community-testing/gdal/gdal.changelog b/community-testing/gdal/gdal.changelog deleted file mode 100644 index c31121e1d..000000000 --- a/community-testing/gdal/gdal.changelog +++ /dev/null @@ -1,11 +0,0 @@ -2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * gdal 1.8.0-1 - -2010-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 1.7.3 - -2010-06-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * FS#19946 fixed in 1.7.2-2 - -2010-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 1.7.2 diff --git a/community-testing/gdk-pixbuf/PKGBUILD b/community-testing/gdk-pixbuf/PKGBUILD deleted file mode 100644 index 47a8987c3..000000000 --- a/community-testing/gdk-pixbuf/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 63120 2012-01-30 18:57:23Z 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=9 -pkgdesc="Image loading and manipulation library" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -license=('GPL' 'LGPL') -depends=('gtk' 'libtiff' 'libpng') -makedepends=('libxt') -options=('!libtool') -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 - libpng15.patch) -md5sums=('05fcb68ceaa338614ab650c775efc2f2' - '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 - 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-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch b/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch deleted file mode 100644 index ffb4378aa..000000000 --- a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c 2002-09-27 23:12:40.000000000 +0200 -+++ gdk-pixbuf-0.22.0.patched/gdk-pixbuf/io-bmp.c 2005-03-30 01:33:06.000000000 +0200 -@@ -31,8 +31,6 @@ - #include "gdk-pixbuf-private.h" - #include "gdk-pixbuf-io.h" - -- -- - #if 0 - /* If these structures were unpacked, they would define the two headers of the - * BMP file. After them comes the palette, and then the image data. -@@ -206,7 +204,7 @@ - - if (State == NULL) - return NULL; -- -+ - while (feof(f) == 0) { - length = fread(membuf, 1, sizeof (membuf), f); - if (length > 0) -@@ -245,11 +243,26 @@ - static gboolean - grow_buffer (struct bmp_progressive_state *State) - { -- guchar *tmp = realloc (State->buff, State->BufferSize); -+ guchar *tmp; -+ -+ if (State->BufferSize == 0) { -+#if 0 -+ g_set_error (error, -+ GDK_PIXBUF_ERROR, -+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE, -+ _("BMP image has bogus header data")); -+#endif -+ State->read_state = READ_STATE_ERROR; -+ return FALSE; -+ } -+ -+ tmp = realloc (State->buff, State->BufferSize); -+ - if (!tmp) { - State->read_state = READ_STATE_ERROR; - return FALSE; - } -+ - State->buff = tmp; - return TRUE; - } diff --git a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch b/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch deleted file mode 100644 index 29471f147..000000000 --- a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: io-bmp.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-bmp.c,v -retrieving revision 1.41 -diff -u -p -r1.41 io-bmp.c ---- gdk-pixbuf/io-bmp.c 13 Aug 2004 02:26:57 -0000 1.41 -+++ gdk-pixbuf/io-bmp.c 20 Aug 2004 00:18:14 -0000 -@@ -876,8 +876,10 @@ DoCompressed(struct bmp_progressive_stat - guchar c; - gint idx; - -- if (context->compr.y >= context->Header.height) -+ if (context->compr.y >= context->Header.height) { -+ context->BufferDone = 0; - return TRUE; -+ } - - y = context->compr.y; - diff --git a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch b/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch deleted file mode 100644 index 068653808..000000000 --- a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c ---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c 2002-09-27 17:19:15.000000000 -0500 -+++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c 2005-10-27 11:28:23.000000000 -0500 -@@ -330,6 +330,9 @@ - - State->HeaderSize+=I; - -+ if (State->HeaderSize < 0) -+ return FALSE; -+ - if (State->HeaderSize>State->BytesInHeaderBuf) { - guchar *tmp=realloc(State->HeaderBuf,State->HeaderSize); - if (!tmp) -diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c ---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c 2001-03-01 15:16:28.000000000 -0500 -+++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c 2005-10-27 11:29:14.000000000 -0500 -@@ -243,8 +243,8 @@ - break; - else { - if (numnames > 0) { -- space -= 1; -- strcat (color, " "); -+ strncat (color, " ", space); -+ space -= MIN (space, 1); - } - - strncat (color, temp, space); -@@ -281,7 +281,8 @@ - /* Fall through to the xpm_read_string. */ - - case op_body: -- xpm_read_string (h->infile, &h->buffer, &h->buffer_size); -+ if(!xpm_read_string (h->infile, &h->buffer, &h->buffer_size)) -+ return NULL; - return h->buffer; - - default: -@@ -317,13 +318,6 @@ - return NULL; - } - --/* Destroy notification function for the pixbuf */ --static void --free_buffer (guchar *pixels, gpointer data) --{ -- free (pixels); --} -- - static gboolean - xpm_color_parse (const char *spec, XColor *color) - { -@@ -342,7 +336,8 @@ - gchar pixel_str[32]; - GHashTable *color_hash; - _XPMColor *colors, *color, *fallbackcolor; -- guchar *pixels, *pixtmp; -+ guchar *pixtmp; -+ GdkPixbuf* pixbuf; - - fallbackcolor = NULL; - -@@ -352,16 +347,33 @@ - return NULL; - } - sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp); -- if (cpp >= 32) { -- g_warning ("XPM has more than 31 chars per pixel."); -+ if (cpp <= 0 || cpp >= 32) { -+ g_warning ("XPM has invalid number of chars per pixel."); - return NULL; - } -+ if (n_col <= 0 || -+ n_col >= G_MAXINT / (cpp + 1) || -+ n_col >= G_MAXINT / sizeof (_XPMColor)) { -+ g_warning ("XPM file has invalid number of colors"); -+ return NULL; -+ } - - /* The hash is used for fast lookups of color from chars */ - color_hash = g_hash_table_new (g_str_hash, g_str_equal); - -- name_buf = g_new (gchar, n_col * (cpp + 1)); -- colors = g_new (_XPMColor, n_col); -+ name_buf = g_new (gchar, n_col * (cpp + 1)); -+ if (!name_buf) { -+ g_warning ("Cannot allocate memory for loading XPM image"); -+ g_hash_table_destroy (color_hash); -+ return NULL; -+ } -+ colors = g_new (_XPMColor, n_col); -+ if (!colors) { -+ g_warning ("Cannot allocate memory for loading XPM image"); -+ g_hash_table_destroy (color_hash); -+ g_free (name_buf); -+ return NULL; -+ } - - for (cnt = 0; cnt < n_col; cnt++) { - gchar *color_name; -@@ -397,12 +409,8 @@ - fallbackcolor = color; - } - -- if (is_trans) -- pixels = malloc (w * h * 4); -- else -- pixels = malloc (w * h * 3); -- -- if (!pixels) { -+ pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, is_trans, 8, w, h); -+ if (!pixbuf) { - g_hash_table_destroy (color_hash); - g_free (colors); - g_free (name_buf); -@@ -410,7 +418,7 @@ - } - - wbytes = w * cpp; -- pixtmp = pixels; -+ pixtmp = pixbuf->pixels; - - for (ycnt = 0; ycnt < h; ycnt++) { - buffer = (*get_buf) (op_body, handle); -@@ -443,9 +451,7 @@ - g_free (colors); - g_free (name_buf); - -- return gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, is_trans, 8, -- w, h, is_trans ? (w * 4) : (w * 3), -- free_buffer, NULL); -+ return pixbuf; - } - - /* Shared library entry point for file loading */ diff --git a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0.patch b/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0.patch deleted file mode 100644 index 8e0f55680..000000000 --- a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0.patch +++ /dev/null @@ -1,129 +0,0 @@ ---- configure.in -+++ configure.in -@@ -21,6 +21,7 @@ - AC_PROG_CC - AC_ISC_POSIX - AM_PROG_CC_STDC -+AM_PROG_AS - AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET -@@ -147,18 +148,18 @@ - dnl Test for libtiff - if test -z "$LIBTIFF"; then - AC_CHECK_LIB(tiff, TIFFReadScanline, -- AC_CHECK_HEADER(tiffio.h, -+ [AC_CHECK_HEADER(tiffio.h, - TIFF='tiff'; LIBTIFF='-ltiff', -- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)), -- AC_CHECK_LIB(tiff, TIFFWriteScanline, -- AC_CHECK_HEADER(tiffio.h, -+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], -+ [AC_CHECK_LIB(tiff, TIFFWriteScanline, -+ [AC_CHECK_HEADER(tiffio.h, - TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz', -- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)), -- AC_CHECK_LIB(tiff34, TIFFFlushData, -- AC_CHECK_HEADER(tiffio.h, -+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], -+ [AC_CHECK_LIB(tiff34, TIFFFlushData, -+ [AC_CHECK_HEADER(tiffio.h, - TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz', -- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)), -- AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm) -+ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], -+ AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm) - fi - - dnl Test for libjpeg -@@ -191,9 +192,9 @@ - dnl Test for libpng - if test -z "$LIBPNG"; then - AC_CHECK_LIB(png, png_read_info, -- AC_CHECK_HEADER(png.h, -+ [AC_CHECK_HEADER(png.h, - png_ok=yes, -- png_ok=no), -+ png_ok=no)], - AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm) - if test "$png_ok" = yes; then - AC_MSG_CHECKING([for png_structp in png.h]) ---- doc/Makefile.am -+++ doc/Makefile.am -@@ -156,7 +156,7 @@ - done; \ - fi) - # echo '-- Installing $(srcdir)/html/index.sgml' ; \ --# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ -+# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); - - # - # Require gtk-doc when making dist ---- gdk-pixbuf.m4 -+++ gdk-pixbuf.m4 -@@ -9,7 +9,7 @@ - dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) - dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS - dnl --AC_DEFUN(AM_PATH_GDK_PIXBUF, -+AC_DEFUN([AM_PATH_GDK_PIXBUF], - [dnl - dnl Get the cflags and libraries from the gdk-pixbuf-config script - dnl ---- gdk-pixbuf/Makefile.am -+++ gdk-pixbuf/Makefile.am -@@ -18,7 +18,7 @@ - - libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS) - --libexecdir = $(libdir)/gdk-pixbuf/loaders -+loaderdir = $(libdir)/gdk-pixbuf/loaders - - # - # The PNG plugin. -@@ -118,7 +118,7 @@ - - if BUILD_DYNAMIC_MODULES - --libexec_LTLIBRARIES = \ -+loader_LTLIBRARIES = \ - $(PNG_LIB) \ - $(JPEG_LIB) \ - $(GIF_LIB) \ -@@ -134,7 +134,7 @@ - extra_sources = - - else --libexec_LTLIBRARIES = -+loader_LTLIBRARIES = - - extra_sources = $(libpixbufloader_png_la_SOURCES) \ - $(libpixbufloader_jpeg_la_SOURCES) \ -@@ -159,7 +159,7 @@ - -I$(top_builddir)/gdk-pixbuf \ - $(X11_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) - --AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\"" -+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" - - LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS) - -@@ -211,7 +211,7 @@ - gdk-pixbuf-parse-color.c \ - $(extra_sources) - --libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS) -+libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) - libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS) - - ---- gdk-pixbuf/io-bmp.c -+++ gdk-pixbuf/io-bmp.c -@@ -28,6 +28,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <string.h> -+#include <stdlib.h> - #include "gdk-pixbuf-private.h" - #include "gdk-pixbuf-io.h" - diff --git a/community-testing/gdk-pixbuf/libpng15.patch b/community-testing/gdk-pixbuf/libpng15.patch deleted file mode 100644 index e667288f8..000000000 --- a/community-testing/gdk-pixbuf/libpng15.patch +++ /dev/null @@ -1,30 +0,0 @@ -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-testing/geda-gaf/ChangeLog b/community-testing/geda-gaf/ChangeLog deleted file mode 100644 index c8b902cc5..000000000 --- a/community-testing/geda-gaf/ChangeLog +++ /dev/null @@ -1,53 +0,0 @@ -2012-01-19 Kyle Keen <keenerd@gmail.com> - * 1.6.2-2 - - libpng15 rebuild - -2010-12-26 Stefan Husmann <stefan-husmann@t-online.de> - * 1.6.1-2 - - adopted, moved to [community] - - added some optional dependencies - - added some sed-commands for python2 compatibility - -2010-02-14 Jared Casper <jaredcasper@gmail.com> - * 1.6.1-1 - - Version bump - -2009-10-10 Jared Casper <jaredcasper@gmail.com> - * 1.6.0-2 - - Fixed a bug causing icon problems - -2009-10-05 Jared Casper <jaredcasper@gmail.com> - * 1.6.0-1 - - Merged with geda-libs and renamed to geda-gaf to match up with - the release tarball name - -2009-05-03 Jared Casper <jaredcasper@gmail.com> - * 1.4.3-2 - - Added gettext dep (noted by sergej) - - Added '|| return 1's to configure and make commands - - A bit of other random cleanup of deps - -2009-01-03 Jared Casper <jaredcasper@gmail.com> - * 1.4.3-1 - - Version bump - - Fix dependencies (s/=>/>=/) - -2008-12-20 Jared Casper <jaredcasper@gmail.com> - * 1.4.2-1 - - Version bump - - Update from comments - -2008-09-28 Jared Casper <jaredcasper@gmail.com> - * 1.4.1-1 - - Version bump - - Added icon cache update - - Added icon cache and desktop update to post_update - -2008-05-07 Jared Casper <jaredcasper@gmail.com> - - * 1.4.0-1 - - adopted by Jared Casper - - Update PKGBUILD to current standards and latest version (1.4.0) - - add configure options and install script to handle desktop issues - - added ChangeLog - diff --git a/community-testing/geda-gaf/PKGBUILD b/community-testing/geda-gaf/PKGBUILD deleted file mode 100644 index b3e6278b9..000000000 --- a/community-testing/geda-gaf/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Kyle Keen <keenerd@gmail.com> -# Contributor: Jared Casper <jaredcasper@gmail.com> -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> - -pkgname=geda-gaf -pkgver=1.6.2 -pkgrel=2 -pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project" -arch=('i686' 'x86_64') -url="http://www.gpleda.org" -license=('GPL') -depends=('gtk2' 'guile' 'libstroke' 'shared-mime-info' 'hicolor-icon-theme') -makedepends=('pkgconfig' 'perlxml' 'flex' 'gawk') -optdepends=('python2: for two of the commands (garchive, tragesym)' - 'gawk: for sw2asc') -replaces=('geda-suite' 'geda-libs') -install=geda-gaf.install -source=(http://geda.seul.org/release/v1.6/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('35ae86aebc174ec1fc03863fde4c843c') - -build () -{ - cd "$srcdir/$pkgname-$pkgver/" - ./configure --prefix=/usr --disable-update-xdg-database - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver/" - make DESTDIR="$pkgdir/" install - sed -i 's+/usr/bin/env python+/usr/bin/env python2+' \ - "$pkgdir/usr/bin/garchive" - sed -i 's+/usr/bin/python+/usr/bin/python2+' \ - "$pkgdir/usr/bin/tragesym" - sed -i 's+/usr/bin/python+/usr/bin/python2+' \ - "$pkgdir/usr/share/doc/$pkgname/examples/lightning_detector/bom" -} - diff --git a/community-testing/geda-gaf/geda-gaf.install b/community-testing/geda-gaf/geda-gaf.install deleted file mode 100644 index ad5e587cc..000000000 --- a/community-testing/geda-gaf/geda-gaf.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { -if [ -x /usr/bin/gtk-update-icon-cache ]; then - echo Updating icon cache... - /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor -fi -if [ -x /usr/bin/update-desktop-database ]; then - echo Updating desktop database.. - /usr/bin/update-desktop-database /usr/share/applications -fi -update-mime-database usr/share/mime -} - -post_upgrade() { -post_install -} - -post_remove() { -post_install -}
\ No newline at end of file diff --git a/community-testing/gimp-plugin-mathmap/PKGBUILD b/community-testing/gimp-plugin-mathmap/PKGBUILD deleted file mode 100644 index 68505f070..000000000 --- a/community-testing/gimp-plugin-mathmap/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 63124 2012-01-30 18:57:39Z 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=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/" -license=('GPL') -depends=('gimp' 'gsl' 'gtksourceview2' 'fftw' 'giflib') -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 libpng15.patch) -md5sums=('6ff66d070ea410dee1a27283d05b8beb' - '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 -} - -package() { - cd "$srcdir/mathmap-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/gimp-plugin-mathmap/fix_libnoise_build.patch b/community-testing/gimp-plugin-mathmap/fix_libnoise_build.patch deleted file mode 100644 index fc81ba0d8..000000000 --- a/community-testing/gimp-plugin-mathmap/fix_libnoise_build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup mathmap-1.3.5/Makefile mathmap-1.3.5-fix//Makefile ---- mathmap-1.3.5/Makefile 2009-08-23 13:56:14.000000000 +0200 -+++ mathmap-1.3.5-fix//Makefile 2010-11-11 16:48:13.308941852 +0100 -@@ -178,7 +178,7 @@ backends/lazy_creator.o : backends/lazy_ - $(CXX) $(MATHMAP_CXXFLAGS) $(FORMATDEFS) -o $@ -c backends/lazy_creator.cpp - - builtins/libnoise.o : builtins/libnoise.cpp builtins/libnoise.h -- $(CXX) $(MATHMAP_CXXFLAGS) -Ilibnoise/noise/include -o $@ -c builtins/libnoise.cpp -+ $(CXX) $(MATHMAP_CXXFLAGS) -Ilibnoise/noise/include -Ilibnoise/noise/src -o $@ -c builtins/libnoise.cpp - - new_builtins.c opdefs.h opfuncs.h compiler_types.h llvm-ops.h : builtins.lisp ops.lisp - clisp builtins.lisp diff --git a/community-testing/gimp-plugin-mathmap/libpng15.patch b/community-testing/gimp-plugin-mathmap/libpng15.patch deleted file mode 100644 index 3cf95387c..000000000 --- a/community-testing/gimp-plugin-mathmap/libpng15.patch +++ /dev/null @@ -1,170 +0,0 @@ -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-testing/gimp-plugin-wavelet-decompose/PKGBUILD b/community-testing/gimp-plugin-wavelet-decompose/PKGBUILD deleted file mode 100644 index 0cf0fc7f6..000000000 --- a/community-testing/gimp-plugin-wavelet-decompose/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 63126 2012-01-30 18:57:47Z 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=2 -pkgdesc="Wavelet decompose plugin for Gimp" -arch=('i686' 'x86_64') -url="http://registry.gimp.org/node/11742" -license=('GPL') -depends=('gimp') -source=(http://registry.gimp.org/files/wavelet-decompose-$pkgver.tar.gz \ - po_install.diff) -md5sums=('e0cb8670a1c5506d08f57f2300caac24' - '4de9e41a535f200c2502f0dd8458c43e') - -build() { - 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 -} diff --git a/community-testing/gimp-plugin-wavelet-decompose/po_install.diff b/community-testing/gimp-plugin-wavelet-decompose/po_install.diff deleted file mode 100644 index 4b6d1a9fe..000000000 --- a/community-testing/gimp-plugin-wavelet-decompose/po_install.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -c -r wavelet-denoise-0.3/po/Makefile wavelet-denoise-0.3-new/po/Makefile -*** wavelet-denoise-0.3/po/Makefile 2008-12-14 12:19:22.000000000 +0100 ---- wavelet-denoise-0.3-new/po/Makefile 2008-12-20 14:57:51.000000000 +0100 -*************** -*** 24,30 **** - - install: $(LANGUAGES) - for L in $(LANGUAGES); \ -! do install -v -m 0644 $$L.mo "$(LOCALEDIR)/$$L/LC_MESSAGES/gimp20-$(PLUGIN)-plug-in.mo"; \ - done - - uninstall: $(LANGUAGES) ---- 24,31 ---- - - install: $(LANGUAGES) - for L in $(LANGUAGES); \ -! do mkdir -p "$(LOCALEDIR)/$$L/LC_MESSAGES"; \ -! install -v -m 0644 $$L.mo "$(LOCALEDIR)/$$L/LC_MESSAGES/gimp20-$(PLUGIN)-plug-in.mo"; \ - done - - uninstall: $(LANGUAGES) diff --git a/community-testing/gliv/PKGBUILD b/community-testing/gliv/PKGBUILD deleted file mode 100644 index 157adabfb..000000000 --- a/community-testing/gliv/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> -# Contributor: Ewoud Nuyts <ewoud.nuyts@gmail.com> - -pkgname=gliv -pkgver=1.9.7 -pkgrel=2 -pkgdesc="OpenGL image viewer" -arch=('i686' 'x86_64') -url="http://guichaz.free.fr/gliv/" -license=('GPL') -depends=('gtkglext') -changelog=$pkgname.changelog -source=(http://guichaz.free.fr/gliv/files/${pkgname}-${pkgver}.tar.bz2) -md5sums=('5f0fafaf41651da8882e88b3df062d02') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr --mandir=/usr/share/man - sed -i 's:pixmaps |:pixmaps $(datadir)/applications |:;s:vendor=gnome:vendor=gnome --dir=$(datadir)/applications:' Makefile - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/gliv/gliv.changelog b/community-testing/gliv/gliv.changelog deleted file mode 100644 index 9b37dd5a9..000000000 --- a/community-testing/gliv/gliv.changelog +++ /dev/null @@ -1,5 +0,0 @@ -2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * gliv-1.9.7-1 - -2010-11-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * FS#21710 fixed in gliv-1.9.6-3 diff --git a/community-testing/glpng/Makefile b/community-testing/glpng/Makefile deleted file mode 100644 index d6772798f..000000000 --- a/community-testing/glpng/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -CFLAGS+=-fPIC -Iinclude -LDFLAGS+=-lpng -lGL -SHAREDLIBFLAGS=-shared -DESTDIR=/usr/local -LIB=lib - -all: libglpng.a libglpng.so.1.45 - -libglpng.a: glpng.o - ar rv $@ $< - -libglpng.so.1.45: glpng.o - gcc $(CFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname=libglpng.so.1 -Wl,--whole-archive $< -Wl,--no-whole-archive $(LDFLAGS) -o $@ - -glpng.o: src/glpng.c - gcc $(CFLAGS) -c $< - -clean: - rm glpng.o libglpng.* - -install: - for i in include include/GL $(LIB); do \ - install -m 755 -d $(DESTDIR)/$$i; \ - done - install -p -m 644 include/GL/glpng.h $(DESTDIR)/include/GL - install -m 755 libglpng.* $(DESTDIR)/$(LIB) - ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so.1 - ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so - -.PHONY: clean install diff --git a/community-testing/glpng/PKGBUILD b/community-testing/glpng/PKGBUILD deleted file mode 100644 index a460a1860..000000000 --- a/community-testing/glpng/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 63130 2012-01-30 18:58:08Z ibiru $ -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=glpng -pkgver=1.45 -pkgrel=5 -pkgdesc="Toolkit for loading PNG images as OpenGL textures" -arch=('i686' 'x86_64') -url="http://www.fifi.org/doc/libglpng-dev/glpng.html" -license=('custom') -depends=('libpng' 'libgl') -makedepends=('mesa') -source=(http://ftp.de.debian.org/debian/pool/main/libg/libglpng/libglpng_${pkgver}.orig.tar.gz - Makefile - libpng15.patch - license) -build() { - cd "$srcdir/libglpng-1.45.orig" - - patch -Np1 -i "$srcdir/libpng15.patch" - - cp "$srcdir/Makefile" . - make libglpng.so.1.45 -} - -package() { - cd "$srcdir/libglpng-1.45.orig" - make DESTDIR="$pkgdir/usr" install - install -Dm644 "$srcdir/license" \ - "$pkgdir/usr/share/licenses/glpng/license" -} -md5sums=('9e0daad8e39fbf3179c73c0d3f74f104' - '0b24e9cb527d4ed1c43dd743d49d2b54' - 'f3f0c0a3f867c5856d922c18677ef2a2' - 'cd066652a6e5dbd7c1fc303b8e03417a') diff --git a/community-testing/glpng/libpng15.patch b/community-testing/glpng/libpng15.patch deleted file mode 100644 index 89e9bf67e..000000000 --- a/community-testing/glpng/libpng15.patch +++ /dev/null @@ -1,83 +0,0 @@ -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-testing/glpng/license b/community-testing/glpng/license deleted file mode 100644 index a526262b5..000000000 --- a/community-testing/glpng/license +++ /dev/null @@ -1,21 +0,0 @@ -/* - * PNG loader library for OpenGL v1.45 (10/07/00) - * by Ben Wyatt ben@wyatt100.freeserve.co.uk - * Using LibPNG 1.0.2 and ZLib 1.1.3 - * - * This software is provided 'as-is', without any express or implied warranty. - * In no event will the author be held liable for any damages arising from the - * use of this software. - * - * Permission is hereby granted to use, copy, modify, and distribute this - * source code, or portions hereof, for any purpose, without fee, subject to - * the following restrictions: - * - * 1. The origin of this source code must not be misrepresented. You must not - * claim that you wrote the original software. If you use this software in - * a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered versions must be plainly marked as such and must not be - * misrepresented as being the original source. - * 3. This notice must not be removed or altered from any source distribution. - */ diff --git a/community-testing/gmerlin-avdecoder/PKGBUILD b/community-testing/gmerlin-avdecoder/PKGBUILD deleted file mode 100644 index 8363d2d2e..000000000 --- a/community-testing/gmerlin-avdecoder/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 63134 2012-01-30 18:58:22Z ibiru $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> - -pkgname=gmerlin-avdecoder -pkgver=1.1.0 -pkgrel=4 -pkgdesc="Media decoding library" -arch=('i686' 'x86_64') -url="http://gmerlin.sourceforge.net/avdec_frame.html" -license=('GPL') -depends=('gmerlin' 'openjpeg' 'flac' 'smbclient' 'libmad' 'libmpcdec' 'speex' - 'libdca' 'libmpeg2' 'a52dec') -source=(http://downloads.sourceforge.net/sourceforge/gmerlin/gmerlin-avdecoder-$pkgver.tar.gz) -md5sums=('c1ea663e9da631453eec4ac79138b6c5') - -build() { - cd "$srcdir/$pkgname-$pkgver" - rm -f cpuinfo.sh - ./configure --prefix=/usr --without-doxygen - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/gmerlin/PKGBUILD b/community-testing/gmerlin/PKGBUILD deleted file mode 100644 index 7ae8fb0d4..000000000 --- a/community-testing/gmerlin/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 63132 2012-01-30 18:58:16Z ibiru $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> - -pkgname=gmerlin -pkgver=1.0.0 -pkgrel=5 -pkgdesc="Multimedia architecture for Linux" -arch=('i686' 'x86_64') -url="http://openmovieeditor.sourceforge.net/HomePage" -license=('GPL') -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' '!makeflags') -install=gmerlin.install -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - libpng.patch) -md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6' - 'c262023434246705296d97bc7337a212') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - rm -rf cpuinfo.sh - - 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 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/gmerlin/gmerlin.install b/community-testing/gmerlin/gmerlin.install deleted file mode 100644 index c7625c2f1..000000000 --- a/community-testing/gmerlin/gmerlin.install +++ /dev/null @@ -1,25 +0,0 @@ -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-testing/gmerlin/libpng.patch b/community-testing/gmerlin/libpng.patch deleted file mode 100644 index c01105e63..000000000 --- a/community-testing/gmerlin/libpng.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -wbBur gmerlin-1.0.0/plugins/png/ir_png.c gmerlin-1.0.0.my/plugins/png/ir_png.c ---- gmerlin-1.0.0/plugins/png/ir_png.c 2011-01-07 18:37:06.000000000 +0300 -+++ gmerlin-1.0.0.my/plugins/png/ir_png.c 2011-11-07 14:46:25.000000000 +0400 -@@ -127,13 +127,8 @@ - bits = 16; - } - if(bit_depth < 8) --#if BG_MAKE_BUILD(PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE) < BG_MAKE_BUILD(1,2,9) -- png_set_gray_1_2_4_to_8(png->png_ptr); --#else - png_set_expand_gray_1_2_4_to_8(png->png_ptr); --#endif - -- png_set_gray_1_2_4_to_8(png->png_ptr); - if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS)) - { - png_set_tRNS_to_alpha(png->png_ptr); diff --git a/community-testing/gmic/PKGBUILD b/community-testing/gmic/PKGBUILD deleted file mode 100644 index e127da742..000000000 --- a/community-testing/gmic/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 63136 2012-01-30 18:58:28Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: farid <farid at archlinuc-br.org> -# Contributor: Archie <Mymaud@gmail.com> - -pkgbase=gmic -pkgname=('gmic' 'gimp-plugin-gmic') -pkgver=1.5.0.8 -pkgrel=2 -pkgdesc="image procession framework" -arch=('i686' 'x86_64') -license=('custom:CeCILL') -url="http://gmic.sourceforge.net" -makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick') -options=('docs' '!emptydirs') -source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz" - opencv-buildfix.patch) -md5sums=('530e733b81e3c1cca7f17bfad4a56821' - 'f135182ced743c296e08ddd560fa6be9') - -build() { - cd "$srcdir/gmic-$pkgver" - CFLAGS+=" -Dcimg_use_lapack" - LDFLAGS="-llapack" - sed -i "s#-lhighgui#-lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann#" configure - sed -i "s#-lcv#-lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann#" configure - ./configure --prefix=/usr - 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 -} - -package_gmic() { - depends=('fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr') - replaces=('greycstoration') - - cd "$srcdir/gmic-$pkgver" - make -C src install DESTDIR="$pkgdir" USR=/usr - install -Dm644 COPYING "$pkgdir/usr/share/licenses/gmic/LICENSE" -} - -package_gimp-plugin-gmic() { - pkgdesc="Gimp plugin for the GMIC image procession framework" - depends=('gimp' 'fftw' 'lapack') - replaces=('gimp-plugin-greycstoration' 'gimp-plugin-gmic4gimp') - - cd "$srcdir/gmic-$pkgver" - install -Dm755 src/gmic_gimp "$pkgdir/usr/lib/gimp/2.0/plug-ins/gmic_gimp" - install -Dm644 COPYING "$pkgdir/usr/share/licenses/gimp-plugin-gmic/LICENSE" -} diff --git a/community-testing/gmic/opencv-buildfix.patch b/community-testing/gmic/opencv-buildfix.patch deleted file mode 100644 index 7fda2ea54..000000000 --- a/community-testing/gmic/opencv-buildfix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -wbBur gmic-1.5.0.3.org/src/CImg.h gmic-1.5.0.3/src/CImg.h ---- gmic-1.5.0.3.org/src/CImg.h 2011-09-22 18:37:54.000000000 +0400 -+++ gmic-1.5.0.3/src/CImg.h 2011-10-05 18:03:25.000000000 +0400 -@@ -234,7 +234,11 @@ - // Using OpenCV is not mandatory. - #ifdef cimg_use_opencv - #include <cstddef> -+#undef True -+#undef False - #include "cv.h" -+#define True 1 -+#define False 0 - #include "highgui.h" - #endif - diff --git a/community-testing/gnash/PKGBUILD b/community-testing/gnash/PKGBUILD deleted file mode 100644 index 348db3561..000000000 --- a/community-testing/gnash/PKGBUILD +++ /dev/null @@ -1,89 +0,0 @@ -# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgbase=gnash -pkgname=(gnash-common gnash-gtk) -pkgver=0.8.9 -pkgrel=9 -arch=(i686 x86_64) -url="http://www.gnu.org/software/gnash/" -license=(GPL3) -makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool - speex fontconfig libva ffmpeg libxinerama - gstreamer0.10-base gstreamer0.10-ffmpeg - gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils - pkgconfig boost) -options=(!libtool !emptydirs) -source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 - gentoo-ffmpeg-0.8.patch xul8.patch nodebug.patch) -sha256sums=('f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd' - '5e6b9c2ccb0f6dda70745712dddf302d2b42895feda850f2ed126bf53d8815ca' - 'd484f1c21ef71847a2d4b3dd254d1fa93a58719d45bc9df8b8deabee388ce4e9' - '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551') - -build() { - cd "$srcdir/gnash-$pkgver" - - # Consolidated gentoo patches for ffmpeg compatibility - # as of 2011-10-31 - patch -Np1 -i "$srcdir/gentoo-ffmpeg-0.8.patch" - - # Patch for compatibility with newer xulrunner headers - patch -Np1 -i "$srcdir/xul8.patch" - - # Disable very, very verbose debugging (gigabytes of logs) - patch -Np1 -i "$srcdir/nodebug.patch" - - ./autogen.sh - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-plugins-install=system \ - --with-npapi-plugindir=/usr/lib/mozilla/plugins \ - --enable-gui=sdl,gtk \ - --enable-renderer=agg \ - --enable-media=gst,ffmpeg \ - --enable-hwaccel=vaapi - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package_gnash-common() { - pkgdesc="A GNU Flash movie player" - depends=(curl giflib libldap sdl agg libjpeg libpng libtool - speex fontconfig libva ffmpeg libxinerama - gstreamer0.10-base gstreamer0.10-ffmpeg - boost-libs) - backup=(etc/gnashrc) - - cd "$srcdir/gnash-$pkgver" - - make DESTDIR="$pkgdir" install - - # Split gnash-gtk - mkdir -p "$srcdir"/gtk/{bin,man1,share} - mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} "$srcdir/gtk/bin/" - mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 "$srcdir/gtk/man1/" - mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/share/" - mv "$pkgdir/etc/gnashpluginrc" "$srcdir/gtk/" -} - -package_gnash-gtk() { - pkgdesc="A GNU Flash movie player" - depends=("gnash-common=$pkgver" - gtk2 libldap hicolor-icon-theme desktop-file-utils) - install=gnash-gtk.install - backup=(etc/gnashpluginrc) - - cd "$srcdir/gnash-$pkgver" - - make DESTDIR="$pkgdir" install-plugin - - install -d "$pkgdir"/{etc,usr/{bin,share/man/man1}} - mv "$srcdir"/gtk/bin/* "$pkgdir/usr/bin/" - mv "$srcdir"/gtk/man1/* "$pkgdir/usr/share/man/man1/" - mv "$srcdir"/gtk/share/* "$pkgdir/usr/share/" - mv "$srcdir/gtk/gnashpluginrc" "$pkgdir/etc/" -} diff --git a/community-testing/gnash/gentoo-ffmpeg-0.8.patch b/community-testing/gnash/gentoo-ffmpeg-0.8.patch deleted file mode 100644 index d74bcc8e0..000000000 --- a/community-testing/gnash/gentoo-ffmpeg-0.8.patch +++ /dev/null @@ -1,204 +0,0 @@ -diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp ---- gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 -+++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-10-31 17:25:56.057379760 +0100 -@@ -29,7 +29,7 @@ - - //#define GNASH_DEBUG_AUDIO_DECODING - --#define AVCODEC_DECODE_AUDIO avcodec_decode_audio2 -+#define AVCODEC_DECODE_AUDIO avcodec_decode_audio3 - - namespace gnash { - namespace media { -@@ -549,8 +549,12 @@ - #endif - - // older ffmpeg versions didn't accept a const input.. -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = (uint8_t*) input; -+ pkt.size = inputSize; - int tmp = AVCODEC_DECODE_AUDIO(_audioCodecCtx, outPtr, &outSize, -- input, inputSize); -+ &pkt); - - #ifdef GNASH_DEBUG_AUDIO_DECODING - log_debug(" avcodec_decode_audio[2](ctx, bufptr, %d, input, %d) " -@@ -658,13 +662,13 @@ - { - if ( _needsParsing ) - { -- return av_parser_parse(_parser, _audioCodecCtx, -+ return av_parser_parse2(_parser, _audioCodecCtx, - // as of 2008-10-28 SVN, ffmpeg doesn't - // accept a pointer to pointer to const.. - const_cast<boost::uint8_t**>(outFrame), - outFrameSize, - input, inputSize, -- 0, 0); // pts & dts -+ 0, 0, AV_NOPTS_VALUE); // pts & dts - } - else - { -diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp ---- gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 -+++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-10-31 17:25:51.210668136 +0100 -@@ -46,8 +46,10 @@ - { - if ( (ctx->sample_rate != 44100) || (ctx->channels != 2) ) { - if ( ! _context ) { -- _context = audio_resample_init( -- 2, ctx->channels, 44100, ctx->sample_rate -+ _context = av_audio_resample_init( -+ 2, ctx->channels, 44100, ctx->sample_rate, -+ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, -+ 16, 10, 0, 0.8 - ); - } - -diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp ---- gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 -+++ gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-10-31 17:25:57.720728522 +0100 -@@ -387,7 +387,7 @@ - - log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d", - _inputFmt->name, _formatCtx->nb_streams); -- -+ /* - if ( _formatCtx->title[0] ) - log_debug(_(" Title:'%s'"), _formatCtx->title); - if ( _formatCtx->author[0] ) -@@ -398,7 +398,7 @@ - log_debug(_(" Comment:'%s'"), _formatCtx->comment); - if ( _formatCtx->album[0] ) - log_debug(_(" Album:'%s'"), _formatCtx->album); -- -+ */ - // Find first audio and video stream - for (unsigned int i = 0; i < static_cast<unsigned int>(_formatCtx->nb_streams); i++) - { -@@ -415,7 +415,7 @@ - } - - switch (enc->codec_type) { -- case CODEC_TYPE_AUDIO: -+ case AVMEDIA_TYPE_AUDIO: - if (_audioStreamIndex < 0) { - _audioStreamIndex = i; - _audioStream = _formatCtx->streams[i]; -@@ -425,7 +425,7 @@ - } - break; - -- case CODEC_TYPE_VIDEO: -+ case AVMEDIA_TYPE_VIDEO: - if (_videoStreamIndex < 0) { - _videoStreamIndex = i; - _videoStream = _formatCtx->streams[i]; -diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp ---- gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 -+++ gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-10-31 17:25:54.590699488 +0100 -@@ -356,8 +356,12 @@ - - int bytes = 0; - // no idea why avcodec_decode_video wants a non-const input... -- avcodec_decode_video(_videoCodecCtx->getContext(), frame, &bytes, -- input, input_size); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = (uint8_t*) input; -+ pkt.size = input_size; -+ avcodec_decode_video2(_videoCodecCtx->getContext(), frame, &bytes, -+ &pkt); - - if (!bytes) { - log_error("Decoding of a video frame failed"); -diff -u -Nr gnash-0.8.9/macros/ffmpeg.m4 gnash-0.8.9-ff/macros/ffmpeg.m4 ---- gnash-0.8.9/macros/ffmpeg.m4 2011-02-26 19:11:08.000000000 +0100 -+++ gnash-0.8.9-ff/macros/ffmpeg.m4 2011-10-31 17:25:49.700654130 +0100 -@@ -22,6 +22,7 @@ - backupLIBS="$LIBS" - backupCFLAGS="$CFLAGS" - avcodec_h="" -+ avcodec_version_h="" - ffmpeg_top_incl="" - - dnl If the user specify an path to include headers from, we assume it's the full -@@ -46,6 +47,9 @@ - else - AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the avcodec.h header]) - fi -+ if test -f ${with_ffmpeg_incl}/version.h; then -+ avcodec_version_h=${with_ffmpeg_incl}/version.h -+ fi - fi - ]) - -@@ -66,6 +70,9 @@ - if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then - ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`" - avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h" -+ if test -f ${ffmpeg_top_incl}/${i}/version.h; then -+ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h -+ fi - break - fi - done -@@ -83,6 +90,9 @@ - if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then - ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}/${i}; pwd)`" - avcodec_h=${ffmpeg_top_incl}/${i}/avcodec.h -+ if test -f ${ffmpeg_top_incl}/${i}/version.h; then -+ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h -+ fi - break - fi - done -@@ -182,14 +192,24 @@ - dnl a modified form of grepping may be better, making sure all old kinds of - dnl version numbering fail gracefully. - -+ versionfile="" -+ - dnl Check avcodec version number, if it was found -- if test x"${avcodec_h}" != x; then -+ if test x"${avcodec_version_h}" != x; then -+ versionfile=${avcodec_version_h} -+ else -+ if test x"${avcodec_h}" != x; then -+ versionfile=${avcodec_h} -+ fi -+ fi -+ -+ if test x"${versionfile}" != x; then - - AC_MSG_CHECKING([ffmpeg version]) - -- ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` -- ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` -- ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` -+ ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` -+ ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` -+ ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${versionfile} | sed -e "s%[[^0-9]]%%g"` - - if test x"${ffmpeg_major_version}" != x ; then - -@@ -198,15 +218,15 @@ - else - - dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1 -- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%,%.%g"` -+ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"` - - if test x"${ffmpeg_version}" = x ; then - - dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix -- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` -+ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` - - if test x"${ffmpeg_version}" = x ; then -- ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk '{print $'3'}'` -+ ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | awk '{print $'3'}'` - fi - fi - diff --git a/community-testing/gnash/gnash-gtk.install b/community-testing/gnash/gnash-gtk.install deleted file mode 100644 index c317fbaca..000000000 --- a/community-testing/gnash/gnash-gtk.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/gnash/nodebug.patch b/community-testing/gnash/nodebug.patch deleted file mode 100644 index ca160b898..000000000 --- a/community-testing/gnash/nodebug.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -u -r gnash-0.8.9/libbase/log.h gnash-0.8.9-nodebug/libbase/log.h ---- gnash-0.8.9/libbase/log.h 2011-02-26 19:11:08.000000000 +0100 -+++ gnash-0.8.9-nodebug/libbase/log.h 2012-01-18 09:39:02.004103494 +0100 -@@ -331,27 +331,27 @@ - - // Define to 0 to completely remove parse debugging at compile-time - #ifndef VERBOSE_PARSE --#define VERBOSE_PARSE 1 -+#define VERBOSE_PARSE 0 - #endif - - // Define to 0 to completely remove action debugging at compile-time - #ifndef VERBOSE_ACTION --#define VERBOSE_ACTION 1 -+#define VERBOSE_ACTION 0 - #endif - - // Define to 0 to remove ActionScript errors verbosity at compile-time - #ifndef VERBOSE_ASCODING_ERRORS --#define VERBOSE_ASCODING_ERRORS 1 -+#define VERBOSE_ASCODING_ERRORS 0 - #endif - - // Define to 0 this to remove invalid SWF verbosity at compile-time - #ifndef VERBOSE_MALFORMED_SWF --#define VERBOSE_MALFORMED_SWF 1 -+#define VERBOSE_MALFORMED_SWF 0 - #endif - - // Define to 0 this to remove Networking verbosity at compile-time - #ifndef VERBOSE_NETWORKING --#define VERBOSE_NETWORKING 1 -+#define VERBOSE_NETWORKING 0 - #endif - - #if VERBOSE_PARSE -diff -u -r gnash-0.8.9/libcore/vm/ActionExec.cpp gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp ---- gnash-0.8.9/libcore/vm/ActionExec.cpp 2011-03-13 17:47:36.000000000 +0100 -+++ gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp 2012-01-18 09:40:25.653458508 +0100 -@@ -46,7 +46,7 @@ - // too much information for my tastes. I really want just - // to see how stack changes while executing actions... - // --strk Fri Jun 30 02:28:46 CEST 2006 --# define DEBUG_STACK 1 -+//# define DEBUG_STACK 1 - - // Max number of stack item to dump. 0 for unlimited. - # define STACK_DUMP_LIMIT 32 diff --git a/community-testing/gnash/xul8.patch b/community-testing/gnash/xul8.patch deleted file mode 100644 index 7bd708b2d..000000000 --- a/community-testing/gnash/xul8.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -u -r gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp ---- gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-03-13 17:47:36.000000000 +0100 -+++ gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-11-18 16:25:55.198007371 +0100 -@@ -238,7 +238,7 @@ - return NS_PluginInitialize(); - } - --char * -+const char * - NP_GetMIMEDescription(void) - { - return NPP_GetMIMEDescription(); -diff -u -r gnash-0.8.9/plugin/npapi/plugin.cpp gnash-0.8.9-xul/plugin/npapi/plugin.cpp ---- gnash-0.8.9/plugin/npapi/plugin.cpp 2011-03-18 14:44:30.000000000 +0100 -+++ gnash-0.8.9-xul/plugin/npapi/plugin.cpp 2011-11-18 16:35:42.496794816 +0100 -@@ -128,10 +128,10 @@ - } - - /// \brief Return the MIME Type description for this plugin. --char* -+const char* - NPP_GetMIMEDescription(void) - { -- return const_cast<char *>(MIME_TYPES_DESCRIPTION); -+ return MIME_TYPES_DESCRIPTION; - } - - static bool waitforgdb = false; -diff -u -r gnash-0.8.9/plugin/npapi/test.cpp gnash-0.8.9-xul/plugin/npapi/test.cpp ---- gnash-0.8.9/plugin/npapi/test.cpp 2011-03-13 17:47:36.000000000 +0100 -+++ gnash-0.8.9-xul/plugin/npapi/test.cpp 2011-11-18 16:37:06.997539299 +0100 -@@ -408,10 +408,10 @@ - { - } - --char* -+const char* - NPP_GetMIMEDescription(void) - { -- char *x = 0; -+ const char *x = 0; - return x; - } - diff --git a/community-testing/gnubiff-gtk/PKGBUILD b/community-testing/gnubiff-gtk/PKGBUILD deleted file mode 100644 index 4ec2ed6c2..000000000 --- a/community-testing/gnubiff-gtk/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 63140 2012-01-30 18:58:46Z 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.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' 'gtk3' 'openssl' 'popt') -makedepends=('intltool') -conflicts=('gnubiff') -source=(http://downloads.sourceforge.net/sourceforge/gnubiff/gnubiff-$pkgver.tar.gz - build.patch) -md5sums=('f2a2c3485d2f3f0adff1b7665c2f3b24' - '96fde605eb69e300f6014546d4339beb') - -build() { - cd $srcdir/gnubiff-$pkgver -# patch -p1 <../build.patch - export LDFLAGS=-lX11 - ./configure --prefix=/usr --disable-gnome --disable-fam --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" - make - make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/lib - rm -rf $pkgdir/usr/share/gnome-2.0 - rm -rf ${pkgdir}/usr/share/info/dir -} diff --git a/community-testing/gnubiff-gtk/build.patch b/community-testing/gnubiff-gtk/build.patch deleted file mode 100644 index 523b0557e..000000000 --- a/community-testing/gnubiff-gtk/build.patch +++ /dev/null @@ -1,23 +0,0 @@ -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; - } diff --git a/community-testing/gnubiff/PKGBUILD b/community-testing/gnubiff/PKGBUILD deleted file mode 100644 index cf964e9c7..000000000 --- a/community-testing/gnubiff/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 63401 2012-02-01 22:53:12Z 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.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' 'gtk3' 'popt') -makedepends=('perlxml' 'intltool') -conflicts=(gnubiff-gtk) -source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz) -md5sums=('f2a2c3485d2f3f0adff1b7665c2f3b24') - -build() { - [ "$GNOMEDIR" = "" ] && GNOMEDIR=/usr - cd $srcdir/gnubiff-$pkgver - - ./configure --prefix=/usr --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" \ - --disable-fam --disable-gnome - make - make DESTDIR=$pkgdir install - - rm -rf ${pkgdir}/usr/share/info/dir -} diff --git a/community-testing/gnustep-gui/ChangeLog b/community-testing/gnustep-gui/ChangeLog deleted file mode 100644 index 15622ab88..000000000 --- a/community-testing/gnustep-gui/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-27 tardo <tardo@nagi-fanboi.net> -* version upgrade diff --git a/community-testing/gnustep-gui/PKGBUILD b/community-testing/gnustep-gui/PKGBUILD deleted file mode 100644 index 21716cd72..000000000 --- a/community-testing/gnustep-gui/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 63142 2012-01-30 18:58:52Z 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=3 -pkgdesc="The GNUstep GUI class library" -arch=('i686' 'x86_64') -url="http://www.gnustep.org/" -license=('LGPL') -depends=('gnustep-base' 'libungif' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao') -makedepends=('gcc-objc') -conflicts=('gnustep-gui-svn') -groups=('gnustep-core') -options=('!makeflags') -source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('0d3765aa97db1dd20bdbd0690f4aca6b') - -build() { - cd $srcdir/$pkgname-$pkgver - . /etc/profile.d/GNUstep.sh - ./configure --prefix=/usr --sysconfdir=/etc/GNUstep - sed -i 's|#include "GNUstepBase/preface.h"|//#include "GNUstepBase/preface.h" |' Source/GSGuiPrivate.h - make - make DESTDIR=$pkgdir install -} diff --git a/community-testing/gogglesmm/PKGBUILD b/community-testing/gogglesmm/PKGBUILD deleted file mode 100644 index 1ba275a25..000000000 --- a/community-testing/gogglesmm/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 61833 2012-01-08 19:51:55Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sander Jansen <sander@knology.net> - -pkgname=gogglesmm -pkgver=0.12.6 -pkgrel=1 -pkgdesc="Music Manager and Player" -arch=('i686' 'x86_64') -url="http://code.google.com/p/gogglesmm/" -license=('GPL3') -install=gogglesmm.install -depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite3>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt') -makedepends=('pkgconfig' 'glproto' 'dri2proto') -replaces=('musicmanager') -conflicts=('musicmanager') -source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2) -md5sums=('19505ee514690fe3372621685666db4c') - -build() { - cd $srcdir/gogglesmm-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/gogglesmm-$pkgver - mkdir -p $pkgdir/usr/bin - make DESTDIR=$pkgdir install -} diff --git a/community-testing/gogglesmm/gogglesmm.install b/community-testing/gogglesmm/gogglesmm.install deleted file mode 100644 index 04c026840..000000000 --- a/community-testing/gogglesmm/gogglesmm.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/gpac/PKGBUILD b/community-testing/gpac/PKGBUILD deleted file mode 100644 index c206a7ece..000000000 --- a/community-testing/gpac/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 63144 2012-01-30 18:58:57Z ibiru $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=gpac -pkgver=3824 -pkgrel=2 -pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" -arch=('i686' 'x86_64') -url="http://gpac.sourceforge.net" -license=('LGPL') -depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa') -makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad') -optdepends=('jack: for jack support' 'a52dec: for A52 support' - 'faad2: for AAC support' 'libmad: for mp3 support') -options=('!makeflags') -source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('bf7039c2585d539475babc7996851627efd7ec59') - -# source PKGBUILD && mksource -mksource() { - [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) - _svnver=$pkgver - _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac" - _svnmod="$pkgname-$pkgver" - mkdir ${pkgname}-$pkgver - pushd ${pkgname}-$pkgver - svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod - echo "#define GPAC_SVN_REVISION \"$_svnver\"" > ${pkgname}-$pkgver/include/gpac/version.h - find . -depth -type d -name .svn -exec rm -rf {} \; - tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* - popd -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install install-lib -} diff --git a/community-testing/gpsim/PKGBUILD b/community-testing/gpsim/PKGBUILD deleted file mode 100644 index 9fff64acd..000000000 --- a/community-testing/gpsim/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 63146 2012-01-30 18:59:04Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: mickael9 <mickael9 at gmail dot com> - -pkgname=gpsim -pkgver=0.26.1 -pkgrel=2 -pkgdesc="A full-featured software simulator for Microchip PIC microcontrollers" -arch=(i686 x86_64) -url="http://gpsim.sourceforge.net/" -license=(GPL) -depends=('gtk2+extra' 'popt') -makedepends=('gtk2+extra') -options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('c994c23d2d75056dbefcf5d1d63596d7') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/grace/PKGBUILD b/community-testing/grace/PKGBUILD deleted file mode 100644 index 6ea657640..000000000 --- a/community-testing/grace/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 63148 2012-01-30 18:59:09Z 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=6 -pkgdesc="2D plotting tool" -arch=(i686 x86_64) -url="http://plasma-gate.weizmann.ac.il/Grace/" -depends=('libjpeg' 'libpng' 'lesstif' 't1lib' 'netcdf') -makedepends=('netcdf' 'fftw') -license=('GPL') -source=(ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/$pkgname-$pkgver.tar.gz) -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 \ - -with-helpviewer="firefox %s" - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - cd $pkgdir/usr/share/grace && mv bin lib include ../../ -} diff --git a/community-testing/grafx2/PKGBUILD b/community-testing/grafx2/PKGBUILD deleted file mode 100644 index b1f2083dd..000000000 --- a/community-testing/grafx2/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 63150 2012-01-30 18:59:19Z ibiru $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Simon Parzer <simon.parzer@gmail.com> -pkgname=grafx2 -pkgver=2.3 -pkgrel=3 -pkgdesc="Pixelart-oriented painting program" -arch=('x86_64' 'i686') -url="http://code.google.com/p/grafx2/" -license=('GPL2') -install=grafx2.install -depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils') -source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.1781-src.tgz" - "grafx2.desktop") -md5sums=('916a35c4762e85b4210a1041fbbfd830' - '9b3ecb5c2d44b987d65257184f46e6c4') - -build() { - cd "$srcdir/$pkgname/src" - - msg2 "Compiling..." - make -} - -package() { - cd "$srcdir/$pkgname/src" - - msg2 "Packaging files..." - make prefix="/usr" DESTDIR="$pkgdir" install - msg2 "Packaging shortcut..." - install -Dm644 "$srcdir/$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" - msg2 "Packaging documentation..." - install -Dm644 "$srcdir/$pkgname/doc/README.txt" \ - "$pkgdir/usr/share/doc/$pkgname/readme.txt" - msg2 "Packaging license..." - install -Dm644 "$srcdir/$pkgname/doc/gpl-2.0.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - msg2 "Cleaning up..." - rmdir "$pkgdir/usr/share/grafx2/scripts/libs" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/grafx2/grafx2.desktop b/community-testing/grafx2/grafx2.desktop deleted file mode 100644 index d58bc5ed3..000000000 --- a/community-testing/grafx2/grafx2.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -GenericName=GrafX2 -Name=GrafX2 -Comment=Pixelart-oriented painting program -Exec=grafx2 %U -TryExec=grafx2 -Icon=grafx2 -Terminal=false -Type=Application -Categories=Graphics;2DGraphics;RasterGraphics -MimeType=image/bmp;image/gif;image/png;image/x-tga;image/tiff diff --git a/community-testing/grafx2/grafx2.install b/community-testing/grafx2/grafx2.install deleted file mode 100644 index 12589796c..000000000 --- a/community-testing/grafx2/grafx2.install +++ /dev/null @@ -1,16 +0,0 @@ -pkgname=grafx2 - -post_upgrade() { - gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor - update-desktop-database -q -} - -post_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/gsql/PKGBUILD b/community-testing/gsql/PKGBUILD deleted file mode 100644 index e5cc0b0eb..000000000 --- a/community-testing/gsql/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 63152 2012-01-30 18:59:26Z ibiru $ -# Contributor: Michael Kanis <mkanis@gmx.de> - -pkgname=gsql -pkgver=0.2.2 -pkgrel=4 -pkgdesc="Integrated database development tool for GNOME" -url="http://gsql.org/" -license=('GPL') -arch=('i686' 'x86_64') -depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf' - 'desktop-file-utils' 'libnotify') -makedepends=('libmysqlclient' 'postgresql-libs' 'libssh') -optdepends=('libmysqlclient' 'postgresql-libs' 'libssh') -install=gsql.install -options=(!libtool) -source=(http://gsql.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) -md5sums=('8f3322a75390584729e84a8570e08bea') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's/notify_notification_new (subj, message, NULL, NULL);/notify_notification_new (subj, message, NULL);/' libgsql/notify.c - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas -} diff --git a/community-testing/gsql/gsql.install b/community-testing/gsql/gsql.install deleted file mode 100644 index e069ea8fc..000000000 --- a/community-testing/gsql/gsql.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=gsql - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community-testing/gtk-chtheme/PKGBUILD b/community-testing/gtk-chtheme/PKGBUILD deleted file mode 100644 index e7901bf97..000000000 --- a/community-testing/gtk-chtheme/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 63154 2012-01-30 18:59:32Z ibiru $ -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=gtk-chtheme -pkgver=0.3.1 -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") -md5sums=('f688053bf26dd6c4f1cd0bf2ee33de2a') - -build() { - 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 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - install -Dm755 gtk-chtheme ${pkgdir}/usr/bin/gtk-chtheme -} diff --git a/community-testing/gtk-engine-murrine/PKGBUILD b/community-testing/gtk-engine-murrine/PKGBUILD deleted file mode 100644 index 8a6a6afcd..000000000 --- a/community-testing/gtk-engine-murrine/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 63156 2012-01-30 18:59:40Z 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> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=gtk-engine-murrine -pkgver=0.98.1.1 -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" -license=('LGPL3') -depends=('gtk2') -makedepends=('intltool') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/murrine/0.98/murrine-${pkgver}.tar.bz2) -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-testing/guake/0001-Retrieve-port-as-int.2.patch b/community-testing/guake/0001-Retrieve-port-as-int.2.patch deleted file mode 100644 index 3fde26dc2..000000000 --- a/community-testing/guake/0001-Retrieve-port-as-int.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -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-testing/guake/PKGBUILD b/community-testing/guake/PKGBUILD deleted file mode 100644 index a7d4d7117..000000000 --- a/community-testing/guake/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 63158 2012-01-30 18:59:52Z ibiru $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org> -pkgname=guake -pkgver=0.4.2 -pkgrel=5 -pkgdesc='is a drop-down terminal for Gnome Desktop Environment' -arch=('i686' 'x86_64') -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://guake.org/files/guake-$pkgver.tar.gz - http://guake.org/raw-attachment/ticket/246/0001-Retrieve-port-as-int.2.patch) -md5sums=('1f0feff3bfc15c998147dbf07d9d8a8e' - '9aca6ba8e46ae1b69958cda0e03320ff') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Point Python scripts to the python2 binary - sed -i 's|bin/python"|bin/python2"|' src/guake{,-prefs}.in - - # Patch to import proxy port setting as int (http://guake.org/ticket/246) - patch -Np1 -i "$srcdir/0001-Retrieve-port-as-int.2.patch" - - ./configure --sysconfdir=/usr/share --prefix=/usr --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/guake/guake.install b/community-testing/guake/guake.install deleted file mode 100644 index 1e828c86b..000000000 --- a/community-testing/guake/guake.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=guake - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/community-testing/hatari/PKGBUILD b/community-testing/hatari/PKGBUILD deleted file mode 100644 index c9de15c29..000000000 --- a/community-testing/hatari/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 63164 2012-01-30 19:00:24Z ibiru $ -# Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw> - -pkgname=hatari -pkgver=1.5.0 -pkgrel=2 -pkgdesc='An Atari ST and STE emulator' -arch=('i686' 'x86_64') -url='http://hatari.sourceforge.net/' -license=('GPL') -depends=('sdl' 'libpng') -makedepends=('cmake') -source=("http://download.berlios.de/hatari/${pkgname}-${pkgver}.tar.bz2") -md5sums=('16277cff73ec3a342b87b7b7ea3932f4') - -build() { - cd ${pkgname}-${pkgver} - - ./configure --prefix=/usr - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/htmldoc/PKGBUILD b/community-testing/htmldoc/PKGBUILD deleted file mode 100644 index 6130d34ff..000000000 --- a/community-testing/htmldoc/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 63166 2012-01-30 19:00:30Z 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=7 -pkgdesc="Produce PDF or Postscript from HTML documents including TOCs and Indices" -arch=(i686 x86_64) -url="http://www.htmldoc.org" -license=('GPL') -depends=('libjpeg' 'libpng' 'openssl' 'fltk' 'gcc-libs' 'libxft' 'libxpm') -source=(ftp://ftp.easysw.com/pub/${pkgname}/${pkgver}/${pkgname}-$pkgver-source.tar.bz2) -md5sums=('35589e7b8fe9c54e11be87cd5aec4dcc') - -build() { - cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/${pkgname}-${pkgver} - - make install \ - prefix=${pkgdir}/usr \ - bindir=$pkgdir/usr/bin \ - datadir=$pkgdir/usr/share \ - datarootdir=$pkgdir/usr/share \ - docdir=$pkgdir/usr/share/doc/htmldoc \ - exec_prefix=$pkgdir/usr \ - mandir=$pkgdir/usr/share/man \ - prefix=$pkgdir/usr \ - sysconfdir=$pkgdir/etc - - # freedesktop stuff - install -Dm 644 desktop/htmldoc-128.png \ - $pkgdir/usr/share/pixmaps/htmldoc.png - echo "MimeType=application/vnd.htmldoc-book;" >> desktop/htmldoc.desktop - sed -i 's|X-Red-Hat.*$||' desktop/htmldoc.desktop - install -Dm 644 desktop/htmldoc.desktop \ - $pkgdir/usr/share/applications/htmldoc.desktop -} diff --git a/community-testing/icoutils/PKGBUILD b/community-testing/icoutils/PKGBUILD deleted file mode 100644 index 8f8813cbd..000000000 --- a/community-testing/icoutils/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> -# Contributor: neodreams <yanbrodeur@videotron.ca> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=icoutils -pkgver=0.29.1 -pkgrel=2 -pkgdesc='Extracts and converts images in MS Windows(R) icon and cursor files.' -arch=('i686' 'x86_64') -license=('GPL') -url='http://www.nongnu.org/icoutils/' -depends=('libpng>=1.0.0' 'perl-libwww>=5.64') -source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b58f375e0f8731595e8d0ecdc3a0acb9') - -build() { - cd ${pkgname}-${pkgver} - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/irrlicht/PKGBUILD b/community-testing/irrlicht/PKGBUILD deleted file mode 100644 index f03341c87..000000000 --- a/community-testing/irrlicht/PKGBUILD +++ /dev/null @@ -1,94 +0,0 @@ -# $Id: PKGBUILD 63170 2012-01-30 19:00:42Z 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> -# Contributor: Paolo Fagni <paolo.fagni AT mail DOT com> -# Contributor: Lukas Kropatschek <lukas.krop AT gmail DOT com> - -pkgname=irrlicht -pkgver=1.7.2 -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' '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' \ - -e '/^#.*NON_SYSTEM_BZLIB/d' \ - include/IrrCompileConfig.h - - cd source/Irrlicht - sed -i -e '/^CXXFLAGS/s:-g.*::' \ - -e '/^CXXFLAGS/s:-Wall::' \ - -e '/^CFLAGS/s/:= -O3 -fexpensive-optimizations/+=/' \ - -e '/^CXXINCS/s:-Izlib -Ijpeglib -Ilibpng::' \ - -e '/^ZLIBOBJ/d' \ - -e '/^JPEGLIBOBJ/d' \ - -e '/^BZIP2OBJ/d' \ - -e '/^LIBPNGOBJ/d' \ - -e '/.o=.d/d' \ - -e '/^staticlib sharedlib: LDFLAGS/s:+=.*:+= -lGL -lXxf86vm -lpng -ljpeg -lbz2 -lz:' \ - -e "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" \ - -e 's/0-SVN/1/' \ - -e 's/.$(VERSION_MINOR) -o/ -o/' \ - Makefile - - sed -i "s/png_set_gray_1_2_4_to_8/png_set_expand_gray_1_2_4_to_8/" \ - CImageLoaderPNG.cpp - - make sharedlib - - make - - install -d $pkgdir/usr/lib \ - $pkgdir/usr/share/licenses/$pkgname \ - $pkgdir/usr/share/$pkgname/examples/bin \ - $pkgdir/usr/share/doc/$pkgname - - make install - - cd $srcdir/$pkgname-$pkgver/ - install -m644 readme.txt $pkgdir/usr/share/licenses/$pkgname - - # Install static library and fix headers permissions - install -m644 lib/Linux/libIrrlicht.a $pkgdir/usr/lib - chmod 644 $pkgdir/usr/include/$pkgname/* - - # Install media files for examples - cp -r media $pkgdir/usr/share/$pkgname - - # Install documentation - cp -r doc/* $pkgdir/usr/share/doc/$pkgname - rm -f $pkgdir/usr/share/doc/$pkgname/*.txt - - cd $pkgdir/usr/lib - ln -s libIrrlicht.so.$pkgver libIrrlicht.so.1 - - # Just a helper for examples compilation - ln -s libIrrlicht.so.$pkgver $srcdir/$pkgname-$pkgver/lib/Linux/libIrrlicht.so - - # Edit, build and install the examples - cd $srcdir/$pkgname-$pkgver/examples - sed -i '/define USE_IRRKLANG/s:.*://&:' ./Demo/CDemo.h - sed -i '/^CXXFLAGS/d' $(grep -Rl "^CXXFLAGS =" *) - - make - - install -m755 ../bin/Linux/* /$pkgdir/usr/share/$pkgname/examples/bin/ -} diff --git a/community-testing/irrlicht/irrlicht-1.7.2-libpng15.patch b/community-testing/irrlicht/irrlicht-1.7.2-libpng15.patch deleted file mode 100644 index a1426bf29..000000000 --- a/community-testing/irrlicht/irrlicht-1.7.2-libpng15.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- 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-testing/jwm/PKGBUILD b/community-testing/jwm/PKGBUILD deleted file mode 100644 index d994cdd01..000000000 --- a/community-testing/jwm/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 63172 2012-01-30 19:00:48Z ibiru $ -# Maintainer: Kyle Keen <keenerd@gmail.com> -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=jwm -pkgver=2.1.0 -pkgrel=2 -pkgdesc="A lightweight window manager for the X11 Window System" -arch=('i686' 'x86_64') -url="http://joewing.net/programs/jwm/" -license=('GPL2') -depends=('libx11' 'libxft' 'libjpeg>=7' 'libxpm' 'libxinerama' 'libpng') -backup=('etc/system.jwmrc') -source=(http://joewing.net/programs/jwm/releases/jwm-$pkgver.tar.bz2) -md5sums=('e8fab21b2410eb82032b7c3472af642c') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --disable-fribidi - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make BINDIR="$pkgdir/usr/bin" MANDIR="$pkgdir/usr/share/man" \ - SYSCONF="$pkgdir/etc" install -} diff --git a/community-testing/kovpn/ChangeLog b/community-testing/kovpn/ChangeLog deleted file mode 100644 index d8e35c402..000000000 --- a/community-testing/kovpn/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-25 Georg Grabler (STiAT) <ggrabler@gmail.com> -* Added libtool option diff --git a/community-testing/kovpn/PKGBUILD b/community-testing/kovpn/PKGBUILD deleted file mode 100644 index 7730837b0..000000000 --- a/community-testing/kovpn/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 63174 2012-01-30 19:01:01Z 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=6 -pkgdesc="An OpenVPN client management interface for KDE" -arch=('i686' 'x86_64') -url="http://www.kde-apps.org/content/show.php?content=37043" -license=('GPL') -depends=('openvpn' 'kdelibs3' 'xdg-utils') -makedepends=('automake' 'autoconf') -options=('libtool') -install=kovpn.install -DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' - 'http::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' - 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') -source=("https://projects.fslab.de/projects/kovpn/chrome/site/kovpn-${_pkgver}.tar.bz2" - "kovpn-disable-dcop.patch::https://bugs.archlinux.org/task/15464?getfile=4173") -md5sums=('19b61cf9f84088baffbd5bb0a287422c' - '21171b74f76289daea1cc61eedaa4dba') - -build() { - cd $srcdir/$pkgname-$_pkgver - - unset LDFLAGS - . /etc/profile.d/qt3.sh - export PATH=$QTDIR/bin:$PATH - export QMAKESPEC=$QTDIR/mkspecs/linux-g++ - - patch -Np1 -i ../kovpn-disable-dcop.patch - sed -i 's#automake\*1.10\*#automake*1.10* | automake*1.11*#' admin/cvs.sh - make -f admin/Makefile.common cvs - ./configure --prefix=/opt/kde --without-arts --with-qt-dir=/opt/qt - make - make prefix=$pkgdir/usr install -} diff --git a/community-testing/kovpn/kovpn.install b/community-testing/kovpn/kovpn.install deleted file mode 100644 index b4ee8556f..000000000 --- a/community-testing/kovpn/kovpn.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - diff --git a/community-testing/leptonica/PKGBUILD b/community-testing/leptonica/PKGBUILD deleted file mode 100644 index b82c8369d..000000000 --- a/community-testing/leptonica/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 63176 2012-01-30 19:01:05Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Christoph Drexler <chrdr at gmx dot at> - -pkgname=leptonica -pkgver=1.68 -pkgrel=3 -pkgdesc="Software that is broadly useful for image processing and image analysis applications" -arch=('i686' 'x86_64') -url="http://www.leptonica.com/" -license=('custom') -depends=('glibc') -makedepends=('giflib' 'gnuplot' 'libjpeg' 'libpng' 'libtiff' 'zlib') -# 'webp' -optdepends=('giflib: for supporting gif files' - 'gnuplot: gnuplot support' - 'libjpeg: for supporting jpeg files' - 'libpng: for supporting png files' - 'libtiff: for supporting tiff files' - 'zlib: for supporting compressed files') -# 'webp: for supporting webp files' -source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz) -md5sums=('5cd7092f9ff2ca7e3f3e73bfcd556403') - -build() { - cd ${srcdir}/leptonica-${pkgver} - sed -i '1,1i#include <zlib.h>' src/pngio.c - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/leptonica-${pkgver} - make DESTDIR=${pkgdir} install - install -D leptonica-license.txt ${pkgdir}/usr/share/licenses/leptonica/leptonica-license.txt -} diff --git a/community-testing/libgda3/PKGBUILD b/community-testing/libgda3/PKGBUILD deleted file mode 100644 index 8505681d0..000000000 --- a/community-testing/libgda3/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 61876 2012-01-09 18:49:52Z stephane $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=libgda3 -pkgver=3.1.5 -pkgrel=11 -pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers" -arch=('i686' 'x86_64') -url="http://www.gnome-db.org/Download" -license=('GPL') -depends=('glib2' 'libxslt' 'popt' 'rarian' 'db' 'gnome-vfs' - 'libmysqlclient' 'postgresql-libs>=8.4.1' 'libldap' 'unixodbc' 'sqlite3') -makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'util-linux-ng') -options=('!libtool' '!distcc') -source=(http://ftp.acc.umu.se/pub/GNOME/sources/libgda/3.1/libgda-$pkgver.tar.bz2) -md5sums=('eb7da5286a112e7cff3111c89fba4456') - -build() { - cd "$srcdir/libgda-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package(){ - cd "$srcdir/libgda-$pkgver" - make DESTDIR=$pkgdir install - cd "$pkgdir" && find -name \*..so -exec rename '..so' '.a' {} \; -} diff --git a/community-testing/libgeotiff/PKGBUILD b/community-testing/libgeotiff/PKGBUILD deleted file mode 100644 index a5a7ef4b8..000000000 --- a/community-testing/libgeotiff/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 63178 2012-01-30 19:01:12Z 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=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' '!libtool') -source=(ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/$pkgname-$pkgver.tar.gz) -md5sums=('6ac3c22e44711e9a3add9044e40b9527') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -D -m644 LICENSE "$pkgdir/usr/share/licenses/libgeotiff/LICENSE" -} diff --git a/community-testing/libgtksourceviewmm2/PKGBUILD b/community-testing/libgtksourceviewmm2/PKGBUILD deleted file mode 100644 index 78db5843c..000000000 --- a/community-testing/libgtksourceviewmm2/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 63180 2012-01-30 19:01:20Z ibiru $ -# Maintainer: Roman Kyrylych <roman@archlinux.org> -# Contributor: Roman Kyrylych <roman@archlinux.org> - -pkgname=libgtksourceviewmm2 -pkgver=2.10.1 -pkgrel=2 -pkgdesc='A C++ API for gtksourceview2' -arch=('i686' 'x86_64') -url='http://projects.gnome.org/gtksourceviewmm/' -license=('LGPL') -depends=('gtkmm' 'gtksourceview2') -makedepends=('doxygen' 'glibmm-docs') -options=('!libtool' '!emptydirs') -source=("http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/2.10/gtksourceviewmm-$pkgver.tar.bz2") -md5sums=('83d1b3dc061f02f4ff1766b37302058e') - -build() { - cd gtksourceviewmm-${pkgver} - - ./configure \ - --prefix=/usr - - make -} - -package() { - cd gtksourceviewmm-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/libharu/PKGBUILD b/community-testing/libharu/PKGBUILD deleted file mode 100644 index 336bfb3f0..000000000 --- a/community-testing/libharu/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 63182 2012-01-30 19:01:29Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer : SpepS <dreamspepser at yahoo dot it> -# Contributor: Auguste <auguste@gmail.com> -# Contributor: Jose Negron <josenj.arch@mailnull.com> - -pkgname=libharu -pkgver=2.2.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" - libpng15.patch) -md5sums=('63da8e087744f1d6cf16f9501b1cb766' - '3793dd30017474bcd277af3b419bc0f6') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 <$srcdir/libpng15.patch - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install - # license - install -d "$pkgdir/usr/share/licenses/$pkgname" - sed -n '102,120p' README > "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community-testing/libharu/libpng15.patch b/community-testing/libharu/libpng15.patch deleted file mode 100644 index 05a8d39fc..000000000 --- a/community-testing/libharu/libpng15.patch +++ /dev/null @@ -1,302 +0,0 @@ -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-testing/libinfinity/PKGBUILD b/community-testing/libinfinity/PKGBUILD deleted file mode 100644 index 2d645fb70..000000000 --- a/community-testing/libinfinity/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 63184 2012-01-30 19:01:33Z 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=3 -pkgdesc="An implementation of the Infininote protocol written in GObject-based C" -arch=('i686' 'x86_64') -url="http://gobby.0x539.de" -license=('GPL') -depends=('gnutls>=1.7.2' 'gsasl>=0.2.21' 'glib2>=2.16' 'libxml2>=2.0' 'gtk2') -makedepends=('gtk-doc' 'pkgconfig') -optdepends=('avahi: zeroconf support' - 'gtk2: gtk support') -options=('!libtool') -source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('85e6d75e101fe25503653d2202054eff') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --localstatedir=/var - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - rm -rf $pkgdir/var -} diff --git a/community-testing/libmatchbox/PKGBUILD b/community-testing/libmatchbox/PKGBUILD deleted file mode 100644 index 3add96f1e..000000000 --- a/community-testing/libmatchbox/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 63186 2012-01-30 19:01:39Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> - -pkgname=libmatchbox -pkgver=1.9 -pkgrel=5 -pkgdesc="Base library for Matchbox WM" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('pango' 'libpng' 'libjpeg>=7' 'xsettings-client' 'libxext') -options=('!libtool') -url="http://matchbox-project.org/" -source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 - libpng15.patch) -md5sums=('9f73e7515cc4679171a5db180dc1343b' - '09f782c76fe313efd0e87fabb276e2fe') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's|png_check_sig( header, 8 )|png_sig_cmp( header, 0, 8 ) == 0|' libmb/mbpixbuf.c - patch -Rp1 <$srcdir/libpng15.patch - LDFLAGS="-lX11" ./configure --prefix=/usr --enable-pango --enable-jpeg --enable-xsettings - make - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/libmatchbox/libpng15.patch b/community-testing/libmatchbox/libpng15.patch deleted file mode 100644 index 6c4ddef4d..000000000 --- a/community-testing/libmatchbox/libpng15.patch +++ /dev/null @@ -1,23 +0,0 @@ -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-testing/librcc/PKGBUILD b/community-testing/librcc/PKGBUILD deleted file mode 100644 index 121323dd8..000000000 --- a/community-testing/librcc/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 61878 2012-01-09 18:50:01Z stephane $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=librcc -pkgver=0.2.6 -pkgrel=5 -pkgdesc="Charset Conversion Library" -arch=(i686 x86_64) -url="http://rusxmms.sourceforge.net/" -license=('GPL') -depends=(aspell enca libxml2 db librcd) -makedepends=(patch gtk gtk2) -install=librcc.install -options=('!libtool') -source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2 - librcc-strnlen.patch) -md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1' - '040313d1d8f166ccf2b128cea4c05f21') - -build() { - cd ${startdir}/src/$pkgname-${pkgver} - ./configure --prefix=/usr - patch -p1 <$srcdir/librcc-strnlen.patch - make -} - -package() { - cd ${startdir}/src/$pkgname-${pkgver} - mkdir -p $startdir/pkg/etc/rcc - mkdir -p $startdir/pkg/usr/lib/rcc/engines - mkdir -p $startdir/pkg/usr/bin - - make DESTDIR=$startdir/pkg install - - make -C examples - make -C examples install DESTDIR=$startdir/pkg - rm -f $startdir/pkg/usr/bin/example* - - install -m 644 examples/rcc.xml $startdir/pkg/etc - - if [ -f $startdir/pkg/usr/bin/rcc-gtk2-config ]; then - ln -s rcc-gtk2-config $startdir/pkg/usr/bin/rcc-config - elif [ -f $startdir/pkg/usr/bin/rcc-gtk-config ]; then - ln -s rcc-gtk-config $startdir/pkg/usr/bin/rcc-config - else - echo "#!/bin/bash" > $startdir/pkg/usr/bin/rcc-config - echo "echo \"Configuration UI is not available!\"" >> $startdir/pkg/usr/bin/rcc-config - fi -} diff --git a/community-testing/librcc/librcc-strnlen.patch b/community-testing/librcc/librcc-strnlen.patch deleted file mode 100644 index 9fc0e8b0b..000000000 --- a/community-testing/librcc/librcc-strnlen.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -wbBur librcc-0.2.6/src/rccstring.h librcc-0.2.6.qwe/src/rccstring.h ---- librcc-0.2.6/src/rccstring.h 2006-01-08 15:42:59.000000000 +0000 -+++ librcc-0.2.6.qwe/src/rccstring.h 2009-09-28 08:45:37.000000000 +0000 -@@ -18,13 +18,6 @@ - int rccStringFixID(rcc_string string, rcc_context ctx); - int rccStringChangeID(rcc_string string, rcc_language_id language_id); - --#ifdef HAVE_STRNLEN --# ifndef strnlen --int strnlen(const char *str, size_t size); --# endif /* !strnlen */ --#else --int rccStrnlen(const char *str, size_t size); --#endif /* HAVE_STRNLEN */ - int rccIsASCII(const char *str); - size_t rccStringSizedGetChars(const char *str, size_t size); - diff --git a/community-testing/librcc/librcc.install b/community-testing/librcc/librcc.install deleted file mode 100644 index 53b1d7ce7..000000000 --- a/community-testing/librcc/librcc.install +++ /dev/null @@ -1,6 +0,0 @@ -post_install() { - echo "-- Don't forget to install gtk or/and gtk2 packages to enable librcc" - echo " gui features" - echo "-- Also you may change /usr/bin/rcc-config symlink to switch between" - echo " gtk and gtk2 (rcc-gtk-config and rcc-gtk2-config)" -} diff --git a/community-testing/libzdb/PKGBUILD b/community-testing/libzdb/PKGBUILD deleted file mode 100644 index 9e03c87cf..000000000 --- a/community-testing/libzdb/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 62082 2012-01-15 19:15:26Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=libzdb -pkgver=2.10 -pkgrel=1 -pkgdesc="Zild Database Library" -arch=(i686 x86_64) -url="http://www.tildeslash.com/libzdb/" -license=('GPL') -depends=('postgresql-libs' 'sqlite3' 'libmysqlclient') -options=(!libtool) -source=(http://www.tildeslash.com/libzdb/dist/libzdb-$pkgver.tar.gz) -md5sums=('fdc04b4b7f33cdcdfc6b559ba9965825') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make - make DESTDIR="$pkgdir/" install -} diff --git a/community-testing/lilypond/PKGBUILD b/community-testing/lilypond/PKGBUILD deleted file mode 100644 index 5742b97cd..000000000 --- a/community-testing/lilypond/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 62073 2012-01-15 17:13:34Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Robert Emil Berge <filoktetes@linuxophic.org> - -pkgname=lilypond -pkgver=2.14.2 -pkgrel=4 -pkgdesc="An automated music engraving system" -arch=('i686' 'x86_64') -url="http://lilypond.org" -license=('GPL') -depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig') -makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' - 'gsfonts' 'texi2html') -options=('emptydirs') -install=lilypond.install -source=(http://download.linuxaudio.org/lilypond/sources/v2.14/$pkgname-$pkgver.tar.gz - texlive-workaround.patch) -md5sums=('4053a19e03181021893981280feb9aaa' - 'ff32863f3eed67ac744e50bc4fc67a87') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - - rm -rf python/out/ - patch -p1 <$srcdir/texlive-workaround.patch - - PYTHON=/usr/bin/python2 ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/lilypond/lilypond.install b/community-testing/lilypond/lilypond.install deleted file mode 100644 index 934e7b435..000000000 --- a/community-testing/lilypond/lilypond.install +++ /dev/null @@ -1,48 +0,0 @@ -infodir=usr/share/info -filelist=(music-glossary.info - lilypond-web.info - lilypond-contributor.info - lilypond-contributor.info-1 - lilypond-contributor.info-2 - lilypond-internals.info-1 - lilypond-internals.info-2 - lilypond-internals.info-3 - lilypond-internals.info-4 - lilypond-internals.info-5 - lilypond-notation.info-1 - lilypond-notation.info-2 - lilypond-notation.info-3 - lilypond-notation.info-4 - lilypond-notation.info-5 - lilypond-notation.info-6 - lilypond-usage.info - lilypond-learning.info - lilypond-web.info-1 - lilypond-web.info-2 - lilypond-internals.info - lilypond-essay.info - lilypond-notation.info - lilypond-learning.info-1 - lilypond-learning.info-2 - lilypond-extending.info - lilypond-changes.info) - -post_install() { - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} - -post_upgrade() { - post_install "$1" -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/lilypond/texlive-workaround.patch b/community-testing/lilypond/texlive-workaround.patch deleted file mode 100644 index 1eb262863..000000000 --- a/community-testing/lilypond/texlive-workaround.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf -index d5cbb7f..b25c4bc 100644 ---- a/mf/feta-autometric.mf -+++ b/mf/feta-autometric.mf -@@ -149,7 +149,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) = - & to_bp (w) & " " - & to_bp (h); - special "% MF2PT1: font_size " & decimal designsize; -- special "% MF2PT1: font_slant " & decimal font_slant_; - - for fvar = "font_identifier", - "font_coding_scheme", -@@ -175,9 +174,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) = - fi; - endfor; - -- special "% MF2PT1: font_fixed_pitch " -- & (if font_fixed_pitch_: "1" else: "0" fi); -- - % this must come after the `font_size' special - special "% MF2PT1: charwd " & decimal charwd; - fi; -diff --git a/mf/mf2pt1.mp b/mf/mf2pt1.mp -index a8b45aa..c935628 100644 ---- a/mf/mf2pt1.mp -+++ b/mf/mf2pt1.mp -@@ -61,7 +61,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) = - def to_bp (expr num) = decimal (ceiling (num*bp_per_pixel)) enddef; - special "% MF2PT1: glyph_dimensions 0 " & to_bp (-d) & " " & to_bp(w) & " " & to_bp(h); - special "% MF2PT1: font_size " & decimal designsize; -- special "% MF2PT1: font_slant " & decimal font_slant_; - special "% MF2PT1: charwd " & decimal charwd; % Must come after the |font_size| |special| - for fvar = "font_identifier", "font_coding_scheme", "font_version", - "font_comment", "font_family", "font_weight", "font_unique_id", -@@ -76,8 +75,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) = - scantokens ("decimal " & fvar & "_"); - fi; - endfor; -- special "% MF2PT1: font_fixed_pitch " & -- (if font_fixed_pitch_: "1" else: "0" fi); - enddef; - - -@@ -91,19 +88,6 @@ enddef; - - - %% \begin{explaincode} --%% Store the value of \mfcomment --% |font_slant_|, so we can recall it at each |beginchar|. --%% \end{explaincode} -- --font_slant_ := 0; -- --def font_slant expr x = -- font_slant_ := x; -- fontdimen 1: x --enddef; -- -- --%% \begin{explaincode} - %% Redefine \mfcomment - % |bpppix_|, the number of ``big'' points per pixel. \mfcomment - % This in turn redefines |mm|, |in|, |pt|, and other derived units. -@@ -141,11 +125,6 @@ forsuffixes fvar = font_underline_position, font_underline_thickness: - scantokens ("def " & str fvar & " expr x = " & str fvar & "_ := x enddef;"); - endfor; - --boolean font_fixed_pitch_; --font_fixed_pitch_ := false; --def font_fixed_pitch expr x = font_fixed_pitch_ := x enddef; -- -- - %% \begin{explaincode} - %% We'd like to be able to use calligraphic pens. Normally, MetaPost's - %% output routine does all the work for us of converting these to filled -diff --git a/scripts/build/mf2pt1.pl b/scripts/build/mf2pt1.pl -index 95df0f8..20f410b 100644 ---- a/scripts/build/mf2pt1.pl -+++ b/scripts/build/mf2pt1.pl -@@ -427,7 +427,7 @@ ENDHEADER - sub get_bboxes ($) - { - execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost", -- "\\mode:=localfont; mag:=$mag; bpppix $bpppix; input $mffile"); -+ "\\mode:=localfont; mag:=$mag; bpppix:=$bpppix; input $mffile"); - opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n"; - @charfiles = sort - { ($a=~ /\.(\d+)$/)[0] <=> ($b=~ /\.(\d+)$/)[0] } diff --git a/community-testing/luakit/PKGBUILD b/community-testing/luakit/PKGBUILD deleted file mode 100644 index e92f5a99f..000000000 --- a/community-testing/luakit/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com> - -pkgname=luakit -pkgver=2011.07.22 -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' -license=('GPL3') -depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils') -makedepends=('git' 'help2man') -options=(!makeflags) -conflicts=('luakit-git' 'luakit-develop-git') -install='luakit.install' -source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}-r1") -md5sums=('4937deb6bc81416e2deb037f4a5763e4') - -build() { - cd mason-larobina-luakit-* - - # Add missing library to PKGS in config.mk - sed -i 's|PKGS := .*|& javascriptcoregtk-1.0|' config.mk - - make PREFIX=/usr DESTDIR=${pkgdir} all -} - -package() { - cd mason-larobina-luakit-* - - make PREFIX=/usr DESTDIR=${pkgdir} install -} diff --git a/community-testing/luakit/luakit.install b/community-testing/luakit/luakit.install deleted file mode 100644 index 2c37d0597..000000000 --- a/community-testing/luakit/luakit.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - echo 'Configs are located in /etc/xdg/luakit/*.lua' - echo 'Copy to ~/.config/luakit/ (this folder is created on 1st start of Luakit) for local config.' - echo 'Or edit in place for global changes.' - echo 'You NEED to replace local configs after each update' -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - post_upgrade -} diff --git a/community-testing/luminancehdr/PKGBUILD b/community-testing/luminancehdr/PKGBUILD deleted file mode 100644 index 97c4e0e07..000000000 --- a/community-testing/luminancehdr/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 63192 2012-01-30 19:02:01Z 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=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/' -license=('GPL') -depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit') -optdepends=('hugin: align image stack functionality') -install=$pkgname.install -changelog=$pkgname.changelog -options=('!emptydirs') -source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz - luminance-hdr-2.1.0-libraw.patch) -sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac' - 'd3be7458713693382b64a6a1fa766c14bc16be2ff9c5a06567c0e5335581151c') - -build() { - cd "${srcdir}/luminance-hdr-${pkgver}" - - # stolen from gentoo - patch -Np1 -i ../luminance-hdr-2.1.0-libraw.patch - - if [ ${CARCH} = i686 ]; then - sed -i 's/ -msse2//' project.pro - fi - - lrelease project.pro - qmake PREFIX=/usr - make -} - -package() { - cd "${srcdir}/luminance-hdr-${pkgver}" - - make INSTALL_ROOT="${pkgdir}" install -} diff --git a/community-testing/luminancehdr/luminance-hdr-2.1.0-libraw.patch b/community-testing/luminancehdr/luminance-hdr-2.1.0-libraw.patch deleted file mode 100644 index 8472a7422..000000000 --- a/community-testing/luminancehdr/luminance-hdr-2.1.0-libraw.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp.orig -+++ luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp -@@ -94,7 +94,6 @@ - RawProcessor.set_progress_handler(cb, callback_data); - int ret; - -- OUT.filtering_mode = LIBRAW_FILTERING_AUTOMATIC; - OUT.output_bps = 16; - - //OUT.gamm[0] = 1/2.4; //sRGB diff --git a/community-testing/luminancehdr/luminancehdr.changelog b/community-testing/luminancehdr/luminancehdr.changelog deleted file mode 100644 index 807541292..000000000 --- a/community-testing/luminancehdr/luminancehdr.changelog +++ /dev/null @@ -1,36 +0,0 @@ -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 - -2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * luminancehdr 2.0.2-1 - -2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * exiv2 0.20 rebuild - -2010-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 2.0.1 - -2010-06-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Package renamed to LuminanceHDR - * Update to major release 2.0.0 - -2010-03-09 Andrea Scarpino <andrea@archlinux.org> - * exiv2 0.19 rebuild - -2009-11-02 Biru Ionut <ionut@archlinux.ro> - * add translation and fix segfault on old i686 procesors - -2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v1.9.3 - -2009-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Minor version (v1.9.2-3) update caused by exiv2 upgrade. - -2008-11-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Minor version (v1.9.2-2) update caused by openexr upgrade. - -2008-09-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Package moved to [community] diff --git a/community-testing/luminancehdr/luminancehdr.install b/community-testing/luminancehdr/luminancehdr.install deleted file mode 100644 index 279762804..000000000 --- a/community-testing/luminancehdr/luminancehdr.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/luxrender/PKGBUILD b/community-testing/luxrender/PKGBUILD deleted file mode 100644 index 092d96156..000000000 --- a/community-testing/luxrender/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 63194 2012-01-30 19:02:05Z 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=12 -pkgdesc="Rendering system for physically correct, unbiased image synthesis" -arch=('i686' 'x86_64') -url="http://www.luxrender.net/" -license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr' 'libcl') -optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ - 'python: Python interface (pylux)' - 'nvidia-utils: OpenCL support for nVidia GPUs' \ - 'amdstream: OpenCL support for AMD GPUs' \ - 'intel-opencl-sdk: OpenCL support for Intel CPUs') -makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python' 'opencl-headers') -source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2) -md5sums=('0f2d856385db72131f51e44a7ee527fa') - -build() { - cd "$srcdir"/luxrender-lux-$_pkgver - - sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt - - export CXXFLAGS="$CXXFLAGS -lpthread" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DLUXRAYS_DISABLE_OPENCL=OFF \ - -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \ - . - make -} - -package() { - cd "$srcdir"/luxrender-lux-$_pkgver - make DESTDIR="$pkgdir" install - - # fix library path on x86_64 - [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib - - #install pylux - install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/mapnik/PKGBUILD b/community-testing/mapnik/PKGBUILD deleted file mode 100644 index acda29554..000000000 --- a/community-testing/mapnik/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 63196 2012-01-30 19:02:11Z 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=13 -pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." -arch=('i686' 'x86_64') -url="http://mapnik.org/" -license=('LGPL') -depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' - 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo' - 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool') - # already in core ('zlib' 'sqlite3') -optdepends=('libxslt: Web Map Service' - 'python-lxml: Web Map Service' - 'python-imaging: Web Map Service' - 'python-nose: Web Map Service' - 'apache: Web Map Service' - 'mod_fastcgi: Web Map Service - or:' - 'mod_fcgid: Web Map Service - or:' - 'mod_wsgi: Web Map Service' - ) -makedepends=('scons' 'boost') # already in core ('pkg-config') -conflicts=('mapnik-svn') -install="mapnik.install" -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8f65fda2a792518d6f6be8a85f62fc73') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - #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 \ - PREFIX="/usr" \ - INPUT_PLUGINS=all \ - DESTDIR="$pkgdir" - scons -} -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-testing/mapnik/mapnik.install b/community-testing/mapnik/mapnik.install deleted file mode 100644 index 46f265d5b..000000000 --- a/community-testing/mapnik/mapnik.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - /sbin/ldconfig -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/me-tv/PKGBUILD b/community-testing/me-tv/PKGBUILD deleted file mode 100644 index 4a97fb410..000000000 --- a/community-testing/me-tv/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -#Maintainer: jakob gruber <jakob.gruber@gmail.com> -#Contributor: gborzi -#Previous Contributor: Vinzenz Vietzke <vinz@archlinux.us> -#Previous Contributor: Heiko Baums <heiko@baums-on-web.de> -#Previous Contributor: Jeff Bailes <thepizzaking@gmail.com> - -pkgname=me-tv -pkgver=2.0.1 -pkgrel=3 -pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard" -arch=('i686' 'x86_64') -url="https://launchpad.net/me-tv" -license=('GPL') -depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite3' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base') -makedepends=('intltool') -install='me-tv.install' -source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") -options=('!emptydirs') -md5sums=('7cda820b795f2fea522ba3de5e312483') - -build() { - - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure CXXFLAGS="$CXXFLAGS -D__KERNEL_STRICT_NAMES" --prefix=/usr - make - -} - -package() { - - cd "${srcdir}/${pkgname}-${pkgver}" - - make -j1 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 me-tv "${pkgdir}/usr/etc/gconf/schemas/${pkgname}.schemas" - - rm -rf "${pkgdir}/usr/etc/" - -} diff --git a/community-testing/me-tv/me-tv.install b/community-testing/me-tv/me-tv.install deleted file mode 100644 index f701b4754..000000000 --- a/community-testing/me-tv/me-tv.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=me-tv - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/community-testing/megaglest/PKGBUILD b/community-testing/megaglest/PKGBUILD deleted file mode 100644 index b0c5226ed..000000000 --- a/community-testing/megaglest/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 63198 2012-01-30 19:02:17Z ibiru $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> - -pkgname=megaglest -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/" -license=('GPL3') -depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew' - 'libircclient' 'miniupnpc' 'wxgtk') -makedepends=('ftjam' 'cmake' 'mesa') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz") -md5sums=('9d840a04b41aef2cba503de7bf433b8d') - -build() { - cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ - - [[ -d build ]] && rm -r build - mkdir build && cd build - cmake .. \ - -DWANT_SVN_STAMP=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version - make -} - -package() { - cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ - - cd build - make DESTDIR="$pkgdir" install -} - -# vim: sw=2:ts=2 et: diff --git a/community-testing/megaglest/megaglest.sh b/community-testing/megaglest/megaglest.sh deleted file mode 100644 index 571a01be7..000000000 --- a/community-testing/megaglest/megaglest.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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-testing/metapixel/PKGBUILD b/community-testing/metapixel/PKGBUILD deleted file mode 100644 index a0bc182cc..000000000 --- a/community-testing/metapixel/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 63200 2012-01-30 19:02:23Z 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=3 -pkgdesc='A program for generating photomosaics.' -arch=('i686' 'x86_64') -url='http://www.complang.tuwien.ac.at/schani/metapixel/' -license=('GPL') -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' - '1832a79790b07402735bfeb9f71f36e9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../metapixel-1.0.2-libpng-1.5.patch - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - install -dm0755 "${pkgdir}/usr/share/man/man1" - - make PREFIX="${pkgdir}/usr" install -} diff --git a/community-testing/metapixel/metapixel-1.0.2-libpng-1.5.patch b/community-testing/metapixel/metapixel-1.0.2-libpng-1.5.patch deleted file mode 100644 index ed787452f..000000000 --- a/community-testing/metapixel/metapixel-1.0.2-libpng-1.5.patch +++ /dev/null @@ -1,174 +0,0 @@ ---- metapixel-1.0.2.orig/rwimg/rwpng.c -+++ metapixel-1.0.2/rwimg/rwpng.c -@@ -57,19 +57,39 @@ - data->end_info = png_create_info_struct(data->png_ptr); - assert(data->end_info != 0); - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((data->png_ptr)))) -+#else - if (setjmp(data->png_ptr->jmpbuf)) -+#endif - assert(0); - -- png_init_io(data->png_ptr, data->file); -- -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ png_init_io(data->png_ptr, data->file); -+ png_read_info(data->png_ptr, data->info_ptr); -+#else -+ png_init_io(data->png_ptr, data->file); - png_read_info(data->png_ptr, data->info_ptr); -+#endif - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ *width = png_get_image_width(data->png_ptr, data->info_ptr); -+ *height = png_get_image_height(data->png_ptr, data->info_ptr); -+ { -+ png_byte value = png_get_bit_depth(data->png_ptr, data->info_ptr); -+ assert(value == 8 || value == 16); -+ value = png_get_color_type(data->png_ptr, data->info_ptr); -+ assert(value == PNG_COLOR_TYPE_RGB || value == PNG_COLOR_TYPE_RGB_ALPHA); -+ value = png_get_interlace_type(data->png_ptr, data->info_ptr); -+ assert(value == PNG_INTERLACE_NONE); -+ } -+#else - *width = data->info_ptr->width; - *height = data->info_ptr->height; -- - assert(data->info_ptr->bit_depth == 8 || data->info_ptr->bit_depth == 16); - assert(data->info_ptr->color_type == PNG_COLOR_TYPE_RGB || data->info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA); - assert(data->info_ptr->interlace_type == PNG_INTERLACE_NONE); -+#endif - - data->have_read = 0; - -@@ -81,32 +101,51 @@ - { - png_data_t *data = (png_data_t*)_data; - int i; -- int bps, spp; -+ int bps, spp, width; - unsigned char *row; - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ -+ if (setjmp(png_jmpbuf((data->png_ptr)))) -+#else - if (setjmp(data->png_ptr->jmpbuf)) -+#endif - assert(0); - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if(png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB) -+#else - if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB) -+#endif - spp = 3; - else - spp = 4; - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if(png_get_bit_depth(data->png_ptr, data->info_ptr) == 16) -+#else - if (data->info_ptr->bit_depth == 16) -+#endif - bps = 2; - else - bps = 1; - -- row = (unsigned char*)malloc(data->info_ptr->width * spp * bps); -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ width = png_get_image_width(data->png_ptr, data->info_ptr); -+#else -+ width = data->info_ptr->width: -+#endif -+ -+ row = (unsigned char*)malloc(width * spp * bps); - - for (i = 0; i < num_lines; ++i) - { - int j, channel; - - png_read_row(data->png_ptr, (png_bytep)row, 0); -- for (j = 0; j < data->info_ptr->width; ++j) -+ for (j = 0; j < width; ++j) - for (channel = 0; channel < 3; ++channel) -- lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps]; -+ lines[i * width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps]; - } - - free(row); -@@ -119,7 +158,11 @@ - { - png_data_t *data = (png_data_t*)_data; - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((data->png_ptr)))) -+#else - if (setjmp(data->png_ptr->jmpbuf)) -+#endif - assert(0); - - if (data->have_read) -@@ -148,7 +191,11 @@ - data->info_ptr = png_create_info_struct(data->png_ptr); - assert(data->info_ptr != 0); - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((data->png_ptr)))) -+#else - if (setjmp(data->png_ptr->jmpbuf)) -+#endif - assert(0); - - if (pixel_stride == 4) -@@ -156,6 +203,16 @@ - - png_init_io(data->png_ptr, data->file); - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ 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); -+ -+ /* Maybe does not need following. */ -+ png_set_tRNS(data->png_ptr, data->info_ptr, NULL, 0, NULL); -+ png_set_PLTE(data->png_ptr, data->info_ptr, NULL, 0); -+ png_set_invalid(data->png_ptr, data->info_ptr, 0); -+#else - data->info_ptr->width = width; - data->info_ptr->height = height; - data->info_ptr->valid = 0; -@@ -168,6 +225,7 @@ - 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; -+#endif - - png_write_info(data->png_ptr, data->info_ptr); - -@@ -182,7 +240,11 @@ - png_data_t *data = (png_data_t*)_data; - int i; - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((data->png_ptr)))) -+#else - if (setjmp(data->png_ptr->jmpbuf)) -+#endif - assert(0); - - for (i = 0; i < num_lines; ++i) -@@ -194,7 +256,11 @@ - { - png_data_t *data = (png_data_t*)_data; - -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((data->png_ptr)))) -+#else - if (setjmp(data->png_ptr->jmpbuf)) -+#endif - assert(0); - - png_write_end(data->png_ptr, data->info_ptr); diff --git a/community-testing/mldonkey/PKGBUILD b/community-testing/mldonkey/PKGBUILD deleted file mode 100644 index 3a5104927..000000000 --- a/community-testing/mldonkey/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 63202 2012-01-30 19:02: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=2 -pkgdesc="A multi-network P2P client" -arch=('i686' 'x86_64') -url="http://mldonkey.sourceforge.net/" -license=('GPL') -depends=('desktop-file-utils' 'file' 'gd' 'bzip2') -makedepends=('lablgtk2' 'librsvg' 'ocaml') -optdepends=('librsvg: GUI support' - 'libx11: GUI support') -backup=('etc/conf.d/mldonkey') -install=mldonkey.install -source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2 - mldonkeyd - mldonkey.conf - mldonkey.desktop) - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --enable-gui=newgui2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/$pkgname-$pkgver/icons/rsvg/type_source_normal.svg" \ - "$pkgdir/usr/share/icons/mldonkey.svg" - install -Dm644 "$srcdir/mldonkey.desktop" \ - "$pkgdir/usr/share/applications/mldonkey.desktop" - - install -Dm755 "$srcdir/mldonkeyd" "$pkgdir/etc/rc.d/mldonkey" - install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey" -} -md5sums=('072726d158ba1e936c554be341e7ceff' - '75e4b6c7fb282f7de15a8d5478f3bd70' - '1f86d92db51c62cded0e6f3833057dee' - '1de3266caa49f82bee73ba891eea12cf') diff --git a/community-testing/mldonkey/mldonkey.conf b/community-testing/mldonkey/mldonkey.conf deleted file mode 100644 index 24a25af74..000000000 --- a/community-testing/mldonkey/mldonkey.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Username under which the daemon will run (mandatory) -MLDUSER="" - -# Parameters to be passed to the daemon (default is empty) -PARAMS="" diff --git a/community-testing/mldonkey/mldonkey.desktop b/community-testing/mldonkey/mldonkey.desktop deleted file mode 100644 index b307261e1..000000000 --- a/community-testing/mldonkey/mldonkey.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=MLDonkey GUI -Comment=multi-protocol P2P program -Exec=mldonkey_gui -Icon=mldonkey -Terminal=false -Type=Application -Categories=Network;P2P; diff --git a/community-testing/mldonkey/mldonkey.install b/community-testing/mldonkey/mldonkey.install deleted file mode 100644 index dd8ea0407..000000000 --- a/community-testing/mldonkey/mldonkey.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - if [ -f /etc/mldonkey.conf ]; then - mv /etc/mldonkey.conf /etc/conf.d/mldonkey - cat << EOM - -==> mldonkey post upgrade message: -==> /etc/mldonkey.conf has been moved in /etc/conf.d/mldonkey - -EOM - fi -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/mldonkey/mldonkeyd b/community-testing/mldonkey/mldonkeyd deleted file mode 100644 index 6a458d68e..000000000 --- a/community-testing/mldonkey/mldonkeyd +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/conf.d/mldonkey -. /etc/rc.d/functions - -if [ -z $MLDUSER ] ; then - echo "Unable to run MLDonkey. You must set a user in /etc/conf.d/mldonkey ." - exit 2 -fi - -if [ -z "$(getent passwd "$MLDUSER")" ]; then - # Perhaps we should create the account for the user? - echo "You must create the account $MLDUSER in order to run mldonkey." - echo "Please create the account manually, and try again." - exit 2 -fi - -MLDGROUPID=$(getent passwd "$MLDUSER" |cut -d':' -f4) -MLDGROUP=$(getent group $MLDGROUPID |cut -d':' -f1) -USERDIR=$(getent passwd $MLDUSER | cut -d: -f6) - -if [ ! -d $USERDIR ]; then - echo "Unable to run MLDonkey. Home directory for ${MLDUSER} does not exist." - exit 2 -fi - -PIDDIR="/var/run/mldonkey" -PIDFILE="$PIDDIR/mlnet.pid" -PID=$(cat $PIDFILE 2>/dev/null) - -case "$1" in - start) - stat_busy "Starting MLDonkey" - if [ ! -d $PIDDIR ]; then - install -d -m755 -o "$MLDUSER" -g "$MLDGROUP" $PIDDIR - fi - if [ "$(stat -c %U $PIDDIR)" != "$MLDUSER" ]; then - chown -R "$MLDUSER:$MLDGROUP" $PIDDIR - fi - [ -z $PID ] && su $MLDUSER -s /bin/sh -c "/usr/bin/mlnet -pid $PIDDIR $PARAMS -log_to_syslog true &> /tmp/mldonkey.log &" - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon mldonkey - stat_done - fi - ;; - stop) - stat_busy "Stopping MLDonkey" - [ ! -z $PID ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mldonkey - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/mtpaint/PKGBUILD b/community-testing/mtpaint/PKGBUILD deleted file mode 100644 index de75fbc17..000000000 --- a/community-testing/mtpaint/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 63382 2012-01-31 23:18:34Z 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-testing/mtpaint/libpng15.patch b/community-testing/mtpaint/libpng15.patch deleted file mode 100644 index 7df3b2127..000000000 --- a/community-testing/mtpaint/libpng15.patch +++ /dev/null @@ -1,21 +0,0 @@ -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-testing/mtpaint/mtpaint.install b/community-testing/mtpaint/mtpaint.install deleted file mode 100644 index 99a538dea..000000000 --- a/community-testing/mtpaint/mtpaint.install +++ /dev/null @@ -1,13 +0,0 @@ -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-testing/mypaint/PKGBUILD b/community-testing/mypaint/PKGBUILD deleted file mode 100644 index 8c955c594..000000000 --- a/community-testing/mypaint/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 63210 2012-01-30 19:03:06Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jon Nordby <jononor@gmail.com> - -pkgname=mypaint -pkgver=1.0.0 -pkgrel=2 -pkgdesc="A fast and easy painting application for digital painters, with brush dynamics" -arch=('i686' 'x86_64') -url="http://mypaint.intilinux.com/" -license=('GPL' 'LGPL') -depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2') -makedepends=('scons>=0.97' 'swig>=1.3.39') -install=mypaint.install -source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('dcd43933746a4579e7994f506e097823') - -build() { - cd $srcdir/$pkgname-$pkgver - # python2 fix - sed -i 's_python generate.py_python2 generate.py_' brushlib/SConscript - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - scons -} - -package() { - cd $srcdir/$pkgname-$pkgver - scons prefix="$pkgdir"/usr install -} diff --git a/community-testing/mypaint/mypaint.install b/community-testing/mypaint/mypaint.install deleted file mode 100644 index 5f0358791..000000000 --- a/community-testing/mypaint/mypaint.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - [ -x `which update-mime-database` ] && update-mime-database usr/share/mime - [ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - /bin/true -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/naev/PKGBUILD b/community-testing/naev/PKGBUILD deleted file mode 100644 index c4d753cf9..000000000 --- a/community-testing/naev/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 63212 2012-01-30 19:03:10Z ibiru $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Johan Rehnberg <cleanrock@gmail.com> - -pkgname=naev -pkgver=0.5.0 -pkgrel=2 -pkgdesc='2D action/rpg space game' -arch=('i686' 'x86_64') -url="http://code.google.com/p/naev/" -license=('GPL3') -depends=('openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data') -makedepends=('freeglut') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -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 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community-testing/nestopia/ChangeLog b/community-testing/nestopia/ChangeLog deleted file mode 100644 index 5077d00b2..000000000 --- a/community-testing/nestopia/ChangeLog +++ /dev/null @@ -1,12 +0,0 @@ -2008-12-16 Tiago Pierezan Camargo <tcamargo@gmail.com> - - * PKGBUILD: Minor corrections. - -2008-12-04 Tiago Pierezan Camargo <tcamargo@gmail.com> - - * PKGBUILD (source): Package adopted. - Variable/version cleanup. - Patch to remove bogus error messages on program exit. - New dependency: mesa. - Renamed executable to nestopia. - diff --git a/community-testing/nestopia/PKGBUILD b/community-testing/nestopia/PKGBUILD deleted file mode 100644 index 11e7db6a3..000000000 --- a/community-testing/nestopia/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 63214 2012-01-30 19:03:20Z 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=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') -arch=('i686' 'x86_64') -depends=('sdl>=1.2.12' 'alsa-lib' 'gtk2>=2.4' 'mesa') -makedepends=('unzip') -# rbelmont.mameworld.info blocks some user-agents -DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --user-agent=Mozilla/5.0 -O %o %u' - 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') -source=("https://downloads.sourceforge.net/project/nestopia/Nestopia/v${pkgver//[a-z]/}/Nestopia${pkgver//[.a-z]/}src.zip" - "http://rbelmont.mameworld.info/nst${pkgver//[a.a-z]/}_lnx_release_${pkgver:${#pkgver}-1:1}.zip" - "nestopia" - "nestopia_bogus_error_on_save_settings.patch") -md5sums=('526c99a06d2b257135e7047b0ed95ae0' - 'f9a9a905bada67e11dac1364612d0b35' - 'abc2f030dd291f58d65c9095ef024225' - '0160078c9afcbb1a6ac389c3989929f7') - -build() { - cd ${srcdir} - # remove a bogus error message on exit - patch -p0 < nestopia_bogus_error_on_save_settings.patch - make -j1 - - # Install the nestopia script that copies required files to ~/.nestopia - install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/usr/bin/${pkgname} - - # Older releases used a .sh file. Make a symlink to make everyone happy - cd ${pkgdir}/usr/bin - ln -s ${pkgname} ${pkgname}.sh - - # Install the required files and executable in /usr/share - cd ${srcdir} - install -Dm755 nst ${pkgdir}/usr/bin/${pkgname}-bin - install -dm775 ${pkgdir}/usr/share/${pkgname}/ - install -m644 nstcontrols ${pkgdir}/usr/share/${pkgname}/ - install -m644 NstDatabase.xml ${pkgdir}/usr/share/${pkgname}/ -} diff --git a/community-testing/nestopia/nestopia b/community-testing/nestopia/nestopia deleted file mode 100644 index 52bd2b2b3..000000000 --- a/community-testing/nestopia/nestopia +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -if [ ! -e $HOME/.nestopia ]; then - echo "Running NEStopia for the first time..." - echo "Copying required files to ~/.nestopia..." - mkdir $HOME/.nestopia - cp /usr/share/nestopia/{nstcontrols,NstDatabase.xml} $HOME/.nestopia/ -fi - -nestopia-bin "$@" diff --git a/community-testing/nestopia/nestopia_bogus_error_on_save_settings.patch b/community-testing/nestopia/nestopia_bogus_error_on_save_settings.patch deleted file mode 100644 index 63f33bc72..000000000 --- a/community-testing/nestopia/nestopia_bogus_error_on_save_settings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- source/linux/settings.cpp.old 2008-10-23 05:45:58.000000000 +0200 -+++ source/linux/settings.cpp 2008-12-04 23:17:59.000000000 +0100 -@@ -16,7 +16,7 @@ - using namespace LinuxNst; - - #define READ_SETTING(x) fread(&x, sizeof(x), 1, f) --#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != sizeof(x)) std::cout << "Error writing setting!\n" -+#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != 1) std::cout << "Error writing setting!\n" - - static int rates[4] = { 11025, 22050, 44100, 48000 }; - diff --git a/community-testing/netsurf/PKGBUILD b/community-testing/netsurf/PKGBUILD deleted file mode 100644 index a6e14560b..000000000 --- a/community-testing/netsurf/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 63216 2012-01-30 19:03:31Z 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=3 -pkgdesc="Lightweight and fast web browser" -arch=('x86_64' 'i686') -url="http://www.netsurf-browser.org/" -license=('GPL') -depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub') -makedepends=('re2c' 'lcms') -provides=('netsurf') -conflicts=('netsurf') -install=netsurf.install -source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" - "http://www.netsurf-browser.org/downloads/releases/$pkgname-$pkgver-src.tar.gz" - "$pkgname.desktop") -md5sums=('4f28912e5df4b826b819e175265bcc9c' - '49c41f281f3e9ca28a24da505fad2e3a' - '85e0af265e77607596fd90db9ac707ad') - -build() { - cd "$srcdir/$pkgname" - - sed 's:libpng:libpng15:' -i gtk/Makefile.target - sed 's:libpng:libpng15:' -i monkey/Makefile.target - make PREFIX=/usr TARGET=gtk -} - -package() { - cd "$srcdir/$pkgname" - - make install PREFIX=/usr DESTDIR="$pkgdir" - install -Dm644 "../$pkgname.png" \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -Dm644 "../$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/netsurf/PKGBUILD.wip b/community-testing/netsurf/PKGBUILD.wip deleted file mode 100644 index 592ca0268..000000000 --- a/community-testing/netsurf/PKGBUILD.wip +++ /dev/null @@ -1,59 +0,0 @@ -# $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-testing/netsurf/netsurf.desktop b/community-testing/netsurf/netsurf.desktop deleted file mode 100644 index aca4deefc..000000000 --- a/community-testing/netsurf/netsurf.desktop +++ /dev/null @@ -1,127 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Netsurf -Name[ar]=صافي تصفح -Name[ast]=Netsurf -Name[ca]=Netsurf -Name[cs]=Netsurf -Name[da]=Netsurf -Name[de]=Netsurf -Name[el]=καθαρού σερφ -Name[en_GB]=Netsurf -Name[es]=Netsurf -Name[et]=Netsurf -Name[fi]=Netsurf -Name[fr]=Netsurf -Name[gl]=Netsurf -Name[he]=Netsurf -Name[hr]=Netsurf -Name[hu]=Netsurf -Name[id]=Netsurf -Name[it]=Netsurf -Name[ja]=Netsurf -Name[ko]=인터넷 서핑 -Name[lt]=Netsurf -Name[nl]=Netsurf -Name[no]=Netsurf -Name[pl]=Netsurf -Name[pt]=Netsurf -Name[pt_BR]=Netsurf -Name[ro]=Netsurf -Name[ru]=Netsurf -Name[sk]=Netsurf -Name[sr]=нетсурф -Name[sr@latin]=Netsurf -Name[sv]=Netsurf -Name[tr]=Netsurf -Name[ug]=Netsurf -Name[uk]=Інтернет серфінгу -Name[zh_CN]=Netsurf 网冲浪 -Name[zh_TW]=Netsurf 網衝浪 -GenericName=Web Browser -GenericName[ar]=متصفح الوب -GenericName[ast]=Restolador -GenericName[ca]=Navegador web -GenericName[cs]=Internetový prohlížeč -GenericName[da]=Webbrowser -GenericName[de]=Internetbetrachter -GenericName[el]=Περιηγητής Ιστού -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebibrauser -GenericName[fi]=Verkkoselain -GenericName[fr]=Navigateur Internet -GenericName[gl]=Navegador web -GenericName[he]=דפדפן -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[id]=Peramban Web -GenericName[it]=Browser web -GenericName[ja]=ウェブブラウザ -GenericName[ko]=웹 브라우저 -GenericName[lt]=Interneto naršyklė -GenericName[nl]=Webbrowser -GenericName[no]=Nettleser -GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ -GenericName[pl]=Przeglądarka internetowa -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador web -GenericName[ro]=Navigator web -GenericName[ru]=Интернет-обозреватель -GenericName[sk]=Internetový prehliadač -GenericName[sr]=Интернет прегледник -GenericName[sr@latin]=Internet preglednik -GenericName[sv]=Webbläsare -GenericName[tr]=Web Tarayıcı -GenericName[ug]=توركۆرگۈ -GenericName[uk]=Переглядач Веб -GenericName[zh_CN]=网页浏览器 -GenericName[zh_TW]=網頁瀏覽器 -Comment=Lightweight web browser -Comment[ar]=منصفح الوب الخفيف -Comment[ast]=Restolador llixeru -Comment[ca]=Navegador web lleuger -Comment[cs]=Odlehčený prohlížeč -Comment[da]=Letvægtig webbrowser -Comment[de]=Schlanker Internetbetrachter -Comment[el]=Ελαφρύς περιηγητής ιστού -Comment[en_GB]=Lightweight web browser -Comment[es]=Navegador web ligero -Comment[et]=Kergekaaluline veebibrauser -Comment[fi]=Kevyt verkkoselain -Comment[fr]=Navigateur Internet léger -Comment[gl]=Navegador web lixeiro -Comment[he]=דפדפן קל משקל -Comment[hr]=Lagani web preglednik -Comment[hu]=Könnyűsúlyú webböngésző -Comment[id]=Peramban web ringan -Comment[it]=Browser web leggero -Comment[ja]=軽量級ウェブブラウザ -Comment[ko]=가벼운 웹 브라우저 -Comment[lt]=Paprasta interneto naršyklė -Comment[nl]=Lichtgewicht webbrowser -Comment[no]=Lettvektig nettleser -Comment[pa]=ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ -Comment[pl]=Umożliwia przeglądanie zawartości sieci internetowej -Comment[pt]=Navegador Web rápido -Comment[pt_BR]=Navegador web leve -Comment[ro]=Mic navigator web -Comment[ru]=Легковесный Интернет-обозреватель -Comment[sk]=Ľahký internetový prehliadač -Comment[sr]=Једноставан Интернет прегледник -Comment[sr@latin]=Jednostavan Internet preglednik -Comment[sv]=Resurssnål webbläsare -Comment[tr]=Hafif web tarayıcı -Comment[ug]=يېنىك توركۆرگۈ -Comment[uk]=Легкий переглядач Веб -Comment[zh_CN]=轻量级网页浏览器 -Comment[zh_TW]=輕量級網頁瀏覽器 -Categories=GTK;Network;WebBrowser; -MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo; -Exec=netsurf %U -Icon=netsurf -Terminal=false -StartupNotify=true -X-Osso-Type=application/x-executable -X-Osso-Service=netsurf diff --git a/community-testing/netsurf/netsurf.install b/community-testing/netsurf/netsurf.install deleted file mode 100644 index 966f361ea..000000000 --- a/community-testing/netsurf/netsurf.install +++ /dev/null @@ -1,15 +0,0 @@ -post_upgrade() { - echo "Updating icon cache" - gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor - echo "Updating mime entries" - update-desktop-database -q -} -post_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/nvclock/PKGBUILD b/community-testing/nvclock/PKGBUILD deleted file mode 100644 index 28cde7638..000000000 --- a/community-testing/nvclock/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 63218 2012-01-30 19:03:47Z 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=3 -pkgdesc='A small utility which allows users to overclock NVIDIA based video cards.' -arch=('i686' 'x86_64') -url='http://www.linuxhardware.org/nvclock/' -license=('GPL') -depends=('gtk2') -optdepends=('gksu: to start nvclock via the desktop menu entry') -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 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" - - sed -i 's:${prefix}/man:${prefix}\/share\/man:' "${srcdir}/${pkgname}${pkgver}/Makefile.in" - - ./configure --prefix=/usr --bindir=/usr/bin - make -} - -package() { - cd "${srcdir}/${pkgname}${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/nvclock/nvclock-0.8b4-buildfix.patch b/community-testing/nvclock/nvclock-0.8b4-buildfix.patch deleted file mode 100644 index cdc9f5c88..000000000 --- a/community-testing/nvclock/nvclock-0.8b4-buildfix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -upNr nvclock0.8b4.orign/src/Makefile.in nvclock0.8b4/src/Makefile.in ---- nvclock0.8b4.orign/src/Makefile.in 2009-01-03 18:02:54.000000000 +0100 -+++ nvclock0.8b4/src/Makefile.in 2009-01-07 11:37:39.000000000 +0100 -@@ -50,8 +50,8 @@ distclean: distclean-recursive clean-app - install: install-recursive install-app - install-app: - mkdir -p $(bindir) -- $(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock -- $(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer -+ $(INSTALL) -c nvclock $(bindir)/nvclock -+ $(INSTALL) -c smartdimmer $(bindir)/smartdimmer - - - uninstall: uninstall-recursive uninstall-app - - diff --git a/community-testing/nvclock/nvclock-0.8b4-linkfix.patch b/community-testing/nvclock/nvclock-0.8b4-linkfix.patch deleted file mode 100644 index 0029d1c74..000000000 --- a/community-testing/nvclock/nvclock-0.8b4-linkfix.patch +++ /dev/null @@ -1,18 +0,0 @@ -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-testing/nvclock/nvclock.desktop-use-gksu.patch b/community-testing/nvclock/nvclock.desktop-use-gksu.patch deleted file mode 100644 index a372f5de8..000000000 --- a/community-testing/nvclock/nvclock.desktop-use-gksu.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nvclock.desktop.orig 2011-01-16 15:15:55.764977836 +0100 -+++ nvclock.desktop 2011-01-16 15:16:07.827408839 +0100 -@@ -2,7 +2,7 @@ - Encoding=UTF-8 - Name=NVCLOCK - Comment=Overclock and Monitor NVIDIA cards --Exec=nvclock_gtk -+Exec=gksu nvclock_gtk - Icon=nvclock.png - Terminal=false - Type=Application diff --git a/community-testing/nvclock/nvclock.install b/community-testing/nvclock/nvclock.install deleted file mode 100644 index d59dca6e8..000000000 --- a/community-testing/nvclock/nvclock.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/ogmrip/PKGBUILD b/community-testing/ogmrip/PKGBUILD deleted file mode 100644 index 05e8095a8..000000000 --- a/community-testing/ogmrip/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 63220 2012-01-30 19:03:56Z ibiru $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Daenyth -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de - -pkgname=ogmrip -pkgver=0.13.7 -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' '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' - 'mkvtoolnix: create, alter, and inspect Matroska files' - 'libtheora: decode and encode Ogg Theora files' - 'ogmtools: support for the Ogg Media container' - 'gpac: support for the MP4 container' - 'vorbis-tools: support for the Ogg Vorbis audio codec' - 'gocr: support for the SRT subtitle format' - 'ocrad: support for the SRT subtitle format' - '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}" - - ./configure --prefix=/usr --sysconfdir=/usr/share - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/ogmrip/ogmrip.changelog b/community-testing/ogmrip/ogmrip.changelog deleted file mode 100644 index 1bd5c70ae..000000000 --- a/community-testing/ogmrip/ogmrip.changelog +++ /dev/null @@ -1,21 +0,0 @@ -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 - -2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * ogmrip O.13.6-1 - -2010-06-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release O.13.5 - -2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release O.13.4 - -2010-01-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * FS#17517 fixed in minor release O.13.3-2 - -2010-01-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release O.13.3 diff --git a/community-testing/ogmrip/ogmrip.install b/community-testing/ogmrip/ogmrip.install deleted file mode 100644 index 660593cf5..000000000 --- a/community-testing/ogmrip/ogmrip.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/openimageio/PKGBUILD b/community-testing/openimageio/PKGBUILD deleted file mode 100644 index dd91ef261..000000000 --- a/community-testing/openimageio/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Contributor: SpepS <dreamspepser at yahoo dot it> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -_pkg=OpenImageIO -pkgname=openimageio -pkgver=0.10.4 -pkgrel=5 -pkgdesc="A library for reading and writing images, including classes, utilities, and applications." -arch=(i686 x86_64) -url="http://www.openimageio.org/" -license=('custom') -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/_/-}" - "openimageio-0.10.2-libpng15.patch") -md5sums=('08a1bc2b82862ad5547bba569f4f633f' - 'd12829808610a54b6bc3350dc5419db3') - -build() { - cd "$srcdir"/$_pkg* - - # remove insecure rpath - sed -i "/RPATH/d" src/CMakeLists.txt - - 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() { - cd "$srcdir"/$_pkg*/dist/* - - # prepare dirs - install -d "$pkgdir"/usr/{share/doc/$_pkg,lib/python2.7/site-packages} - - # bin - cp -r bin include lib "$pkgdir/usr" - - # docs - cp -r doc/* "$pkgdir/usr/share/doc/$_pkg" - - # python module - cp -r python/* "$pkgdir/usr/lib/python2.7/site-packages" - - # license - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community-testing/openimageio/openimageio-0.10.2-libpng15.patch b/community-testing/openimageio/openimageio-0.10.2-libpng15.patch deleted file mode 100644 index 97375d5fb..000000000 --- a/community-testing/openimageio/openimageio-0.10.2-libpng15.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-testing/openmotif/PKGBUILD b/community-testing/openmotif/PKGBUILD deleted file mode 100644 index 7dc75a085..000000000 --- a/community-testing/openmotif/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 63224 2012-01-30 19:04:08Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Enrico Morelli <morelli@cerm.unifi.it> - -pkgname=openmotif -pkgver=2.3.3 -pkgrel=2 -pkgdesc="Open Motif" -arch=('i686' 'x86_64') -url="http://www.motifzone.org/" -license=('GPL') -depends=(libxext libxp libxft libxt libxmu libpng libjpeg) -makedepends=(xbitmaps xproto printproto xextproto automake) -conflicts=(lesstif) -options=('!libtool') -source=(http://www.motifzone.org/files/public_downloads/openmotif/2.3/$pkgver/openmotif-$pkgver.tar.gz) -md5sums=('fd27cd3369d6c7d5ef79eccba524f7be') - -build() { - _automakever=1.11 - - cd $srcdir/openmotif-$pkgver - - 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 - ln -s -f /usr/share/libtool/config/config.guess config.guess - ln -s -f /usr/share/libtool/config/config.sub config.sub - ln -s -f /usr/share/automake-${_automakever}/depcomp depcomp - ln -s -f /usr/share/automake-${_automakever}/install-sh install-sh - ln -s -f /usr/share/automake-${_automakever}/missing missing - ln -s -f /usr/share/libtool/config/ltmain.sh ltmain.sh - touch NEWS AUTHORS - - [ $NOEXTRACT -eq 1 ] || autoreconf -i - [ $CARCH == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" - [ $NOEXTRACT -eq 1 ] || ./configure --with-x --prefix=/usr - make -j1 - - make DESTDIR=$pkgdir install - # cleanup - (cd $pkgdir/usr/share/man/man3/ && mv Shell.3 OpenMotif-Shell.3) -} diff --git a/community-testing/openscenegraph/PKGBUILD b/community-testing/openscenegraph/PKGBUILD deleted file mode 100644 index 43c0144be..000000000 --- a/community-testing/openscenegraph/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 63226 2012-01-30 19:04:15Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Hans Janssen <janserv@gmail.com> -# Contributor: my64 <packages@obordes.com> -# Contributor: Colin Pitrat <colin.pitrat@gmail.com> - -pkgname=openscenegraph -pkgver=3.0.1 -pkgrel=4 -pkgdesc="An Open Source, high performance real-time graphics toolkit" -arch=('i686' 'x86_64') -license=('custom:OSGPL') -url="http://www.openscenegraph.org" -depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') -makedepends=('cmake' 'libvncserver') -optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib') -conflicts=('openthreads') -provides=('openthreads') -source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip - osg-xine-1.2.patch) -#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip") -md5sums=('c43a25d023e635c3566b2083d8e6d956' - 'b05a486fdc2aaf06b29efb5e0714672e') - -build() { - cd OpenSceneGraph-$pkgver - [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release - sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp - patch -p1 <$srcdir/osg-xine-1.2.patch - make -} - -package() { - cd OpenSceneGraph-$pkgver - make DESTDIR="$pkgdir" install - install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true -} diff --git a/community-testing/openscenegraph/osg-xine-1.2.patch b/community-testing/openscenegraph/osg-xine-1.2.patch deleted file mode 100644 index c73b588dc..000000000 --- a/community-testing/openscenegraph/osg-xine-1.2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c ---- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20 14:46:20.000000000 +0300 -+++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c 2012-01-05 02:15:38.000000000 +0400 -@@ -2769,8 +2769,8 @@ - clear(rgb_class, sizeof(rgbout_class_t)); - - rgb_class->driver_class.open_plugin = open_plugin; -- rgb_class->driver_class.get_identifier = get_identifier; -- rgb_class->driver_class.get_description = get_description; -+ rgb_class->driver_class.identifier = get_identifier(NULL); -+ rgb_class->driver_class.description = get_description(NULL); - rgb_class->driver_class.dispose = dispose_class; - - return(rgb_class); diff --git a/community-testing/openttd/PKGBUILD b/community-testing/openttd/PKGBUILD deleted file mode 100644 index f9a440522..000000000 --- a/community-testing/openttd/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 63228 2012-01-30 19:04:23Z ibiru $ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> - -pkgname=openttd -pkgver=1.1.5 -pkgrel=1 -pkgdesc='An engine for running Transport Tycoon Deluxe.' -arch=('i686' 'x86_64') -url='http://www.openttd.org' -license=('GPL') -depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo2' 'hicolor-icon-theme' 'desktop-file-utils') -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=('aea731c9f87c53955269446d580ee19e') - -build() { - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix-dir=/usr \ - --binary-name=${pkgname} \ - --binary-dir=bin \ - --data-dir=share/${pkgname} \ - --install-dir=${pkgdir} \ - --doc-dir=share/doc/${pkgname} \ - --menu-name="OpenTTD" \ - --personal-dir=.${pkgname} - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make install -} diff --git a/community-testing/openttd/openttd.install b/community-testing/openttd/openttd.install deleted file mode 100644 index 85b22a1c5..000000000 --- a/community-testing/openttd/openttd.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1 - update-desktop-database > /dev/null 2>&1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - update-desktop-database > /dev/null 2>&1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1 - update-desktop-database > /dev/null 2>&1 -} diff --git a/community-testing/packagekit/PKGBUILD b/community-testing/packagekit/PKGBUILD deleted file mode 100644 index a4b82edcd..000000000 --- a/community-testing/packagekit/PKGBUILD +++ /dev/null @@ -1,107 +0,0 @@ -# $Id: PKGBUILD 61812 2012-01-08 10:29:29Z jconder $ -# Maintainer: Jonathan Conder <jonno.conder@gmail.com> -pkgbase='packagekit' -pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python') -pkgver=0.6.19 -pkgrel=5 -pkgdesc="A system designed to make installation and updates of packages easier." -arch=('i686' 'x86_64') -url="http://www.packagekit.org" -license=('GPL') -makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool' - 'networkmanager' 'pacman' 'pm-utils' 'polkit' 'python2' 'qt' - 'shared-mime-info' 'sqlite3' 'udev') -options=('!libtool') -source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz" - 'alpm.patch') -sha256sums=('961c6408de08ebaf15c09e74afd06918d699be8974b5c35c2c9663e5b12b5223' - '5ae3330f28d98c2369fad2a1fb6f8c1edd95c096b8fb4f1b170de6e8b2b134d8') - -build() { - cd "$srcdir/PackageKit-$pkgver" - - patch -Np1 -i "$srcdir/alpm.patch" - - # TODO: remove when this is fixed upstream - find -name '*.moc' -print0 | xargs -0 rm - - sed -i 's@SUBDIRS = test@SUBDIRS =@' 'backends/Makefile.in' - sed -i 's@python @python2 @' 'lib/python/packagekit/Makefile.in' - sed -i 's@bin/python@bin/python2@' 'lib/python/packagekit/'*.py - - export PYTHON=/usr/bin/python2 - # TODO: remove when upstream is patched - autoreconf - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/PackageKit \ - --disable-static \ - --disable-gtk-doc \ - --disable-tests \ - --disable-local \ - --disable-browser-plugin \ - --disable-gstreamer-plugin \ - --disable-gtk-module \ - --disable-command-not-found \ - --disable-cron \ - --disable-debuginfo-install \ - --enable-pm-utils \ - --disable-dummy \ - --enable-alpm \ - --with-default-backend=alpm - make -s -} - -package_packagekit() { - backup=('var/lib/PackageKit/transactions.db' - 'etc/PackageKit/alpm.d/pacman.conf' - 'etc/PackageKit/alpm.d/repos.list') - depends=('dbus-glib' 'pacman>=4.0.0' 'pacman<4.1.0' 'polkit' - 'shared-mime-info' 'sqlite3' 'udev') - optdepends=('networkmanager') - install='packagekit.install' - - cd "$srcdir/PackageKit-$pkgver" - - make DESTDIR="$pkgdir" install - - rm -rf "$pkgdir/usr/include/PackageKit/packagekit-qt"* - rm -rf "$pkgdir/usr/lib/libpackagekit-qt"* - rm -rf "$pkgdir/usr/lib/pkgconfig/packagekit-qt"* - rm -rf "$pkgdir/usr/share/cmake" - - rm -rf "$pkgdir/usr/lib/python"* - rm -rf "$pkgdir/usr/share/PackageKit/website" - - mv "$pkgdir/etc/bash_completion.d/pk-completion.bash" \ - "$pkgdir/etc/bash_completion.d/pkcon" - touch "$pkgdir/var/log/PackageKit" -} - -package_packagekit-qt() { - depends=('packagekit' 'qt') - pkgdesc=('Qt bindings for PackageKit') - - cd "$srcdir/PackageKit-$pkgver/lib/packagekit-qt" - - make DESTDIR="$pkgdir" install -} - -package_packagekit-qt2() { - depends=('packagekit' 'qt') - pkgdesc=('Qt bindings for PackageKit') - - cd "$srcdir/PackageKit-$pkgver/lib/packagekit-qt2" - - make DESTDIR="$pkgdir" install -} - -package_packagekit-python() { - depends=('packagekit' 'python2') - pkgdesc=('Python bindings for PackageKit') - - cd "$srcdir/PackageKit-$pkgver/lib/python" - - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/packagekit/alpm.patch b/community-testing/packagekit/alpm.patch deleted file mode 100644 index a6a6fcc0a..000000000 --- a/community-testing/packagekit/alpm.patch +++ /dev/null @@ -1,2991 +0,0 @@ -diff --git a/backends/alpm/Makefile.am b/backends/alpm/Makefile.am -index 5a5468a..d8c3dfc 100644 ---- a/backends/alpm/Makefile.am -+++ b/backends/alpm/Makefile.am -@@ -5,6 +5,7 @@ PK_BACKEND_REPO_FILE = $(confdir)/repos.list - PK_BACKEND_DEFAULT_PATH = "/bin:/usr/bin:/sbin:/usr/sbin" - PK_BACKEND_DEFAULT_ROOT = "/" - PK_BACKEND_DEFAULT_DBPATH = $(localstatedir)/lib/pacman/ -+PK_BACKEND_DEFAULT_GPGDIR = $(sysconfdir)/pacman.d/gnupg/ - PK_BACKEND_DEFAULT_CACHEDIR = $(localstatedir)/cache/pacman/pkg/ - PK_BACKEND_DEFAULT_LOGFILE = $(localstatedir)/log/pacman.log - -@@ -17,6 +18,7 @@ DEFS = -DPK_BACKEND_CONFIG_FILE=\"$(PK_BACKEND_CONFIG_FILE)\" \ - -DPK_BACKEND_DEFAULT_PATH=\"$(PK_BACKEND_DEFAULT_PATH)\" \ - -DPK_BACKEND_DEFAULT_ROOT=\"$(PK_BACKEND_DEFAULT_ROOT)\" \ - -DPK_BACKEND_DEFAULT_DBPATH=\"$(PK_BACKEND_DEFAULT_DBPATH)\" \ -+ -DPK_BACKEND_DEFAULT_GPGDIR=\"$(PK_BACKEND_DEFAULT_GPGDIR)\" \ - -DPK_BACKEND_DEFAULT_CACHEDIR=\"$(PK_BACKEND_DEFAULT_CACHEDIR)\" \ - -DPK_BACKEND_DEFAULT_LOGFILE=\"$(PK_BACKEND_DEFAULT_LOGFILE)\" \ - -DALPM_CACHE_PATH=\"$(ALPM_CACHE_PATH)\" \ -diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c -index ba993f0..417714c 100644 ---- a/backends/alpm/pk-backend-alpm.c -+++ b/backends/alpm/pk-backend-alpm.c -@@ -26,6 +26,7 @@ - #include <sys/utsname.h> - - #include "pk-backend-alpm.h" -+#include "pk-backend-config.h" - #include "pk-backend-databases.h" - #include "pk-backend-error.h" - #include "pk-backend-groups.h" -@@ -35,7 +36,8 @@ PkBackend *backend = NULL; - GCancellable *cancellable = NULL; - static GStaticMutex mutex = G_STATIC_MUTEX_INIT; - --pmdb_t *localdb = NULL; -+alpm_handle_t *alpm = NULL; -+alpm_db_t *localdb = NULL; - - gchar *xfercmd = NULL; - alpm_list_t *holdpkgs = NULL; -@@ -162,7 +164,7 @@ out: - } - - static void --pk_backend_logcb (pmloglevel_t level, const gchar *format, va_list args) -+pk_backend_logcb (alpm_loglevel_t level, const gchar *format, va_list args) - { - gchar *output; - -@@ -176,12 +178,12 @@ pk_backend_logcb (pmloglevel_t level, const gchar *format, va_list args) - - /* report important output to PackageKit */ - switch (level) { -- case PM_LOG_DEBUG: -- case PM_LOG_FUNCTION: -+ case ALPM_LOG_DEBUG: -+ case ALPM_LOG_FUNCTION: - g_debug ("%s", output); - break; - -- case PM_LOG_WARNING: -+ case ALPM_LOG_WARNING: - g_warning ("%s", output); - pk_backend_output (backend, output); - break; -@@ -212,26 +214,21 @@ pk_backend_initialize_alpm (PkBackend *self, GError **error) - g_setenv ("HTTP_USER_AGENT", user_agent, FALSE); - g_free (user_agent); - -- g_debug ("initializing"); -- if (alpm_initialize () < 0) { -- g_set_error_literal (error, ALPM_ERROR, pm_errno, -- alpm_strerrorlast ()); -+ alpm = pk_backend_configure (PK_BACKEND_CONFIG_FILE, error); -+ if (alpm == NULL) { - return FALSE; - } - - backend = self; -- localdb = alpm_option_get_localdb (); -+ alpm_option_set_logcb (alpm, pk_backend_logcb); -+ -+ localdb = alpm_option_get_localdb (alpm); - if (localdb == NULL) { -- g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s", "local", -- alpm_strerrorlast ()); -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "[%s]: %s", "local", -+ alpm_strerror (errno)); - } - -- /* set some sane defaults */ -- alpm_option_set_logcb (pk_backend_logcb); -- alpm_option_set_root (PK_BACKEND_DEFAULT_ROOT); -- alpm_option_set_dbpath (PK_BACKEND_DEFAULT_DBPATH); -- alpm_option_set_logfile (PK_BACKEND_DEFAULT_LOGFILE); -- - return TRUE; - } - -@@ -240,17 +237,20 @@ pk_backend_destroy_alpm (PkBackend *self) - { - g_return_if_fail (self != NULL); - -- if (backend != NULL) { -- if (alpm_trans_get_flags () != -1) { -- alpm_trans_release (); -+ if (alpm != NULL) { -+ if (alpm_trans_get_flags (alpm) < 0) { -+ alpm_trans_release (alpm); - } -- alpm_release (); -+ alpm_release (alpm); -+ -+ alpm = NULL; - backend = NULL; - } - - FREELIST (syncfirsts); - FREELIST (holdpkgs); - g_free (xfercmd); -+ xfercmd = NULL; - } - - void -diff --git a/backends/alpm/pk-backend-alpm.h b/backends/alpm/pk-backend-alpm.h -index 23a2724..ecd6d0f 100644 ---- a/backends/alpm/pk-backend-alpm.h -+++ b/backends/alpm/pk-backend-alpm.h -@@ -28,7 +28,8 @@ - extern PkBackend *backend; - extern GCancellable *cancellable; - --extern pmdb_t *localdb; -+extern alpm_handle_t *alpm; -+extern alpm_db_t *localdb; - - extern gchar *xfercmd; - extern alpm_list_t *holdpkgs; -diff --git a/backends/alpm/pk-backend-config.c b/backends/alpm/pk-backend-config.c -index 21a4c54..a51a984 100644 ---- a/backends/alpm/pk-backend-config.c -+++ b/backends/alpm/pk-backend-config.c -@@ -28,29 +28,44 @@ - - #include "pk-backend-alpm.h" - #include "pk-backend-config.h" -+#include "pk-backend-databases.h" - #include "pk-backend-error.h" - --typedef struct { -- gboolean checkspace, ilovecandy, showsize, totaldl, usedelta, usesyslog; -+typedef struct -+{ -+ gboolean checkspace, ilovecandy, totaldl, usedelta, usesyslog, -+ verbosepkglists; - -- gchar *arch, *cleanmethod, *dbpath, *logfile, *root, *xfercmd; -+ gchar *arch, *cleanmethod, *dbpath, *gpgdir, *logfile, *root, -+ *xfercmd; - -- alpm_list_t *cachedirs, *holdpkgs, *ignoregrps, *ignorepkgs, -- *noextracts, *noupgrades, *syncfirsts; -+ alpm_list_t *cachedirs, *holdpkgs, *ignoregroups, *ignorepkgs, -+ *noextracts, *noupgrades, *syncfirsts; - -- alpm_list_t *repos; -- GHashTable *servers; -- GRegex *xrepo, *xarch; -+ alpm_list_t *repos; -+ GHashTable *servers; -+ GHashTable *levels; -+ GRegex *xrepo, *xarch; - } PkBackendConfig; - - static PkBackendConfig * - pk_backend_config_new (void) - { - PkBackendConfig *config = g_new0 (PkBackendConfig, 1); -+ alpm_siglevel_t *level = g_new0 (alpm_siglevel_t, 1); -+ - config->servers = g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, NULL); -+ config->levels = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, -+ g_free); -+ -+ *level |= ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL; -+ *level |= ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; -+ g_hash_table_insert (config->levels, g_strdup ("options"), level); -+ - config->xrepo = g_regex_new ("\\$repo", 0, 0, NULL); - config->xarch = g_regex_new ("\\$arch", 0, 0, NULL); -+ - return config; - } - -@@ -76,13 +91,14 @@ pk_backend_config_free (PkBackendConfig *config) - g_free (config->arch); - g_free (config->cleanmethod); - g_free (config->dbpath); -+ g_free (config->gpgdir); - g_free (config->logfile); - g_free (config->root); - g_free (config->xfercmd); - - FREELIST (config->cachedirs); - FREELIST (config->holdpkgs); -- FREELIST (config->ignoregrps); -+ FREELIST (config->ignoregroups); - FREELIST (config->ignorepkgs); - FREELIST (config->noextracts); - FREELIST (config->noupgrades); -@@ -92,6 +108,8 @@ pk_backend_config_free (PkBackendConfig *config) - g_hash_table_foreach_remove (config->servers, - pk_backend_config_servers_free, NULL); - g_hash_table_unref (config->servers); -+ g_hash_table_unref (config->levels); -+ - g_regex_unref (config->xrepo); - g_regex_unref (config->xarch); - } -@@ -113,14 +131,6 @@ pk_backend_config_set_ilovecandy (PkBackendConfig *config) - } - - static void --pk_backend_config_set_showsize (PkBackendConfig *config) --{ -- g_return_if_fail (config != NULL); -- -- config->showsize = TRUE; --} -- --static void - pk_backend_config_set_totaldl (PkBackendConfig *config) - { - g_return_if_fail (config != NULL); -@@ -144,19 +154,28 @@ pk_backend_config_set_usesyslog (PkBackendConfig *config) - config->usesyslog = TRUE; - } - --typedef struct { -- const gchar *name; -- void (*func) (PkBackendConfig *config); -+static void -+pk_backend_config_set_verbosepkglists (PkBackendConfig *config) -+{ -+ g_return_if_fail (config != NULL); -+ -+ config->verbosepkglists = TRUE; -+} -+ -+typedef struct -+{ -+ const gchar *name; -+ void (*func) (PkBackendConfig *config); - } PkBackendConfigBoolean; - - /* keep this in alphabetical order */ - static const PkBackendConfigBoolean pk_backend_config_boolean_options[] = { - { "CheckSpace", pk_backend_config_set_checkspace }, - { "ILoveCandy", pk_backend_config_set_ilovecandy }, -- { "ShowSize", pk_backend_config_set_showsize }, - { "TotalDownload", pk_backend_config_set_totaldl }, - { "UseDelta", pk_backend_config_set_usedelta }, - { "UseSyslog", pk_backend_config_set_usesyslog }, -+ { "VerbosePkgLists", pk_backend_config_set_verbosepkglists }, - { NULL, NULL } - }; - -@@ -234,6 +253,17 @@ pk_backend_config_set_dbpath (PkBackendConfig *config, const gchar *path) - } - - static void -+pk_backend_config_set_gpgdir (PkBackendConfig *config, const gchar *path) -+{ -+ g_return_if_fail (config != NULL); -+ g_return_if_fail (path != NULL); -+ -+ g_free (config->gpgdir); -+ config->gpgdir = g_strdup (path); -+} -+ -+ -+static void - pk_backend_config_set_logfile (PkBackendConfig *config, const gchar *filename) - { - g_return_if_fail (config != NULL); -@@ -263,9 +293,10 @@ pk_backend_config_set_xfercmd (PkBackendConfig *config, const gchar *command) - config->xfercmd = g_strdup (command); - } - --typedef struct { -- const gchar *name; -- void (*func) (PkBackendConfig *config, const gchar *s); -+typedef struct -+{ -+ const gchar *name; -+ void (*func) (PkBackendConfig *config, const gchar *s); - } PkBackendConfigString; - - /* keep this in alphabetical order */ -@@ -274,6 +305,7 @@ static const PkBackendConfigString pk_backend_config_string_options[] = { - { "CacheDir", pk_backend_config_add_cachedir }, - { "CleanMethod", pk_backend_config_set_cleanmethod }, - { "DBPath", pk_backend_config_set_dbpath }, -+ { "GPGDir", pk_backend_config_set_gpgdir }, - { "LogFile", pk_backend_config_set_logfile }, - { "RootDir", pk_backend_config_set_root }, - { "XferCommand", pk_backend_config_set_xfercmd }, -@@ -313,12 +345,12 @@ pk_backend_config_add_holdpkg (PkBackendConfig *config, gchar *package) - } - - static void --pk_backend_config_add_ignoregrp (PkBackendConfig *config, gchar *group) -+pk_backend_config_add_ignoregroup (PkBackendConfig *config, gchar *group) - { - g_return_if_fail (config != NULL); - g_return_if_fail (group != NULL); - -- config->ignoregrps = alpm_list_add (config->ignoregrps, group); -+ config->ignoregroups = alpm_list_add (config->ignoregroups, group); - } - - static void -@@ -357,15 +389,16 @@ pk_backend_config_add_syncfirst (PkBackendConfig *config, gchar *package) - config->syncfirsts = alpm_list_add (config->syncfirsts, package); - } - --typedef struct { -- const gchar *name; -- void (*func) (PkBackendConfig *config, gchar *value); -+typedef struct -+{ -+ const gchar *name; -+ void (*func) (PkBackendConfig *config, gchar *value); - } PkBackendConfigList; - - /* keep this in alphabetical order */ - static const PkBackendConfigList pk_backend_config_list_options[] = { - { "HoldPkg", pk_backend_config_add_holdpkg }, -- { "IgnoreGroup", pk_backend_config_add_ignoregrp }, -+ { "IgnoreGroup", pk_backend_config_add_ignoregroup }, - { "IgnorePkg", pk_backend_config_add_ignorepkg }, - { "NoExtract", pk_backend_config_add_noextract }, - { "NoUpgrade", pk_backend_config_add_noupgrade }, -@@ -451,7 +484,7 @@ pk_backend_config_repo_add_server (PkBackendConfig *config, const gchar *repo, - return FALSE; - } - } else if (strstr (url, "$arch") != NULL) { -- g_set_error (e, ALPM_ERROR, PM_ERR_CONFIG_INVALID, -+ g_set_error (e, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID, - "url contained $arch, which is not set"); - } - -@@ -463,6 +496,95 @@ pk_backend_config_repo_add_server (PkBackendConfig *config, const gchar *repo, - } - - static gboolean -+pk_backend_config_set_siglevel (PkBackendConfig *config, const gchar *section, -+ const gchar *list, GError **error) -+{ -+ alpm_siglevel_t *level; -+ -+ g_return_val_if_fail (config != NULL, FALSE); -+ g_return_val_if_fail (section != NULL, FALSE); -+ g_return_val_if_fail (list != NULL, FALSE); -+ -+ level = g_hash_table_lookup (config->levels, section); -+ if (level == NULL) { -+ level = g_hash_table_lookup (config->levels, "options"); -+ level = g_memdup (level, sizeof (alpm_siglevel_t)); -+ g_hash_table_insert (config->levels, g_strdup (section), level); -+ } -+ -+ while (TRUE) { -+ gboolean package = TRUE, database = TRUE; -+ -+ if (g_str_has_prefix (list, "Package")) { -+ database = FALSE; -+ list += 7; -+ } else if (g_str_has_prefix (list, "Database")) { -+ package = FALSE; -+ list += 8; -+ } -+ -+ /* this also allows e.g. NeverEver, so put prefixes last */ -+ if (g_str_has_prefix (list, "Never") == 0) { -+ if (package) { -+ *level &= ~ALPM_SIG_PACKAGE; -+ } -+ if (database) { -+ *level &= ~ALPM_SIG_DATABASE; -+ } -+ } else if (g_str_has_prefix (list, "Optional") == 0) { -+ if (package) { -+ *level |= ALPM_SIG_PACKAGE; -+ *level |= ALPM_SIG_PACKAGE_OPTIONAL; -+ } -+ if (database) { -+ *level |= ALPM_SIG_DATABASE; -+ *level |= ALPM_SIG_DATABASE_OPTIONAL; -+ } -+ } else if (g_str_has_prefix (list, "Required") == 0) { -+ if (package) { -+ *level |= ALPM_SIG_PACKAGE; -+ *level &= ~ALPM_SIG_PACKAGE_OPTIONAL; -+ } -+ if (database) { -+ *level |= ALPM_SIG_DATABASE; -+ *level &= ~ALPM_SIG_DATABASE_OPTIONAL; -+ } -+ } else if (g_str_has_prefix (list, "TrustedOnly") == 0) { -+ if (package) { -+ *level &= ~ALPM_SIG_PACKAGE_MARGINAL_OK; -+ *level &= ~ALPM_SIG_PACKAGE_UNKNOWN_OK; -+ } -+ if (database) { -+ *level &= ~ALPM_SIG_DATABASE_MARGINAL_OK; -+ *level &= ~ALPM_SIG_DATABASE_UNKNOWN_OK; -+ } -+ } else if (g_str_has_prefix (list, "TrustAll") == 0) { -+ if (package) { -+ *level |= ALPM_SIG_PACKAGE_MARGINAL_OK; -+ *level |= ALPM_SIG_PACKAGE_UNKNOWN_OK; -+ } -+ if (database) { -+ *level |= ALPM_SIG_DATABASE_MARGINAL_OK; -+ *level |= ALPM_SIG_DATABASE_UNKNOWN_OK; -+ } -+ } else { -+ g_set_error (error, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID, -+ "invalid SigLevel value: %s", list); -+ return FALSE; -+ } -+ -+ list = strchr (list, ' '); -+ if (list == NULL) { -+ break; -+ } else { -+ ++list; -+ } -+ } -+ -+ return TRUE; -+} -+ -+static gboolean - pk_backend_config_parse (PkBackendConfig *config, const gchar *filename, - gchar *section, GError **error) - { -@@ -515,7 +637,7 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename, - - if (*str == '\0') { - g_set_error (&e, ALPM_ERROR, -- PM_ERR_CONFIG_INVALID, -+ ALPM_ERR_CONFIG_INVALID, - "empty section name"); - break; - } -@@ -532,7 +654,7 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename, - - /* parse a directive */ - if (section == NULL) { -- g_set_error (&e, ALPM_ERROR, PM_ERR_CONFIG_INVALID, -+ g_set_error (&e, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID, - "directive must belong to a section"); - break; - } -@@ -590,9 +712,18 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename, - continue; - } - } -+ -+ if (g_strcmp0 (key, "SigLevel") == 0 && str != NULL) { -+ if (!pk_backend_config_set_siglevel (config, section, -+ str, &e)) { -+ break; -+ } else { -+ continue; -+ } -+ } - - /* report errors from above */ -- g_set_error (&e, ALPM_ERROR, PM_ERR_CONFIG_INVALID, -+ g_set_error (&e, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID, - "unrecognised directive '%s'", key); - break; - } -@@ -611,107 +742,100 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename, - } - } - --static gboolean --pk_backend_config_configure_paths (PkBackendConfig *config, GError **error) -+static alpm_handle_t * -+pk_backend_config_initialize_alpm (PkBackendConfig *config, GError **error) - { -+ alpm_handle_t *handle; -+ enum _alpm_errno_t errno; -+ gsize dir = 1; -+ - g_return_val_if_fail (config != NULL, FALSE); - -- if (config->root == NULL) { -+ if (config->root == NULL || *config->root == '\0') { - config->root = g_strdup (PK_BACKEND_DEFAULT_ROOT); -+ } else if (!g_str_has_suffix (config->root, G_DIR_SEPARATOR_S)) { -+ dir = 0; - } - -- if (alpm_option_set_root (config->root) < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "RootDir: %s", -- alpm_strerrorlast ()); -- return FALSE; -+ if (config->dbpath == NULL) { -+ config->dbpath = g_strconcat (config->root, -+ PK_BACKEND_DEFAULT_DBPATH + dir, -+ NULL); - } - -- if (config->dbpath == NULL) { -- config->dbpath = g_strconcat (alpm_option_get_root (), -- PK_BACKEND_DEFAULT_DBPATH + 1, -+ g_debug ("initializing alpm"); -+ handle = alpm_initialize (config->root, config->dbpath, &errno); -+ if (handle == NULL) { -+ g_set_error_literal (error, ALPM_ERROR, errno, -+ alpm_strerror (errno)); -+ return handle; -+ } -+ -+ if (config->gpgdir == NULL) { -+ config->gpgdir = g_strconcat (config->root, -+ PK_BACKEND_DEFAULT_GPGDIR + dir, - NULL); - } - -- if (alpm_option_set_dbpath (config->dbpath) < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "DBPath: %s", -- alpm_strerrorlast ()); -- return FALSE; -+ if (alpm_option_set_gpgdir (handle, config->gpgdir) < 0) { -+ errno = alpm_errno (handle); -+ g_set_error (error, ALPM_ERROR, errno, "GPGDir: %s", -+ alpm_strerror (errno)); -+ return handle; - } - - if (config->logfile == NULL) { -- config->logfile = g_strconcat (alpm_option_get_root (), -- PK_BACKEND_DEFAULT_LOGFILE + 1, -+ config->logfile = g_strconcat (config->root, -+ PK_BACKEND_DEFAULT_LOGFILE + dir, - NULL); - } - -- alpm_option_set_logfile (config->logfile); -+ if (alpm_option_set_logfile (handle, config->logfile) < 0) { -+ errno = alpm_errno (handle); -+ g_set_error (error, ALPM_ERROR, errno, "LogFile: %s", -+ alpm_strerror (errno)); -+ return handle; -+ } - - if (config->cachedirs == NULL) { -- gchar *path = g_strconcat (alpm_option_get_root (), -- PK_BACKEND_DEFAULT_CACHEDIR + 1, -+ gchar *path = g_strconcat (config->root, -+ PK_BACKEND_DEFAULT_CACHEDIR + dir, - NULL); - config->cachedirs = alpm_list_add (NULL, path); - } - - /* alpm takes ownership */ -- alpm_option_set_cachedirs (config->cachedirs); -+ if (alpm_option_set_cachedirs (handle, config->cachedirs) < 0) { -+ errno = alpm_errno (handle); -+ g_set_error (error, ALPM_ERROR, errno, "CacheDir: %s", -+ alpm_strerror (errno)); -+ return handle; -+ } - config->cachedirs = NULL; - -- return TRUE; -+ return handle; - } - --static gboolean --pk_backend_config_configure_repos (PkBackendConfig *config, GError **error) -+static alpm_handle_t * -+pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error) - { -- const alpm_list_t *i; -+ alpm_handle_t *handle; -+ alpm_siglevel_t *level; - - g_return_val_if_fail (config != NULL, FALSE); - -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -- if (alpm_db_unregister (i->data) < 0) { -- g_set_error_literal (error, ALPM_ERROR, pm_errno, -- alpm_strerrorlast ()); -- return FALSE; -- } -- } -- -- for (i = config->repos; i != NULL; i = i->next) { -- const gchar *key; -- gpointer value; -- pmdb_t *db; -- alpm_list_t *j; -- -- key = (const gchar *) i->data; -- value = g_hash_table_lookup (config->servers, key); -- -- db = alpm_db_register_sync (key); -- if (db == NULL) { -- g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s", -- key, alpm_strerrorlast ()); -- return FALSE; -- } -- -- for (j = (alpm_list_t *) value; j != NULL; j = j->next) { -- alpm_db_setserver (db, (const gchar *) j->data); -- } -+ handle = pk_backend_config_initialize_alpm (config, error); -+ if (handle == NULL) { -+ return NULL; - } - -- return TRUE; --} -- --static gboolean --pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error) --{ -- g_return_val_if_fail (config != NULL, FALSE); -- -- if (!pk_backend_config_configure_paths (config, error)) { -- return FALSE; -- } -+ alpm_option_set_checkspace (handle, config->checkspace); -+ alpm_option_set_usedelta (handle, config->usedelta); -+ alpm_option_set_usesyslog (handle, config->usesyslog); -+ alpm_option_set_arch (handle, config->arch); - -- alpm_option_set_checkspace (config->checkspace); -- alpm_option_set_usedelta (config->usedelta); -- alpm_option_set_usesyslog (config->usesyslog); -- alpm_option_set_arch (config->arch); -+ level = g_hash_table_lookup (config->levels, "options"); -+ alpm_option_set_default_siglevel (handle, *level); - - /* backend takes ownership */ - g_free (xfercmd); -@@ -719,9 +843,9 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error) - config->xfercmd = NULL; - - if (xfercmd != NULL) { -- alpm_option_set_fetchcb (pk_backend_fetchcb); -+ alpm_option_set_fetchcb (handle, pk_backend_fetchcb); - } else { -- alpm_option_set_fetchcb (NULL); -+ alpm_option_set_fetchcb (handle, NULL); - } - - /* backend takes ownership */ -@@ -735,41 +859,53 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error) - config->syncfirsts = NULL; - - /* alpm takes ownership */ -- alpm_option_set_ignoregrps (config->ignoregrps); -- config->ignoregrps = NULL; -+ alpm_option_set_ignoregroups (handle, config->ignoregroups); -+ config->ignoregroups = NULL; - - /* alpm takes ownership */ -- alpm_option_set_ignorepkgs (config->ignorepkgs); -+ alpm_option_set_ignorepkgs (handle, config->ignorepkgs); - config->ignorepkgs = NULL; - - /* alpm takes ownership */ -- alpm_option_set_noextracts (config->noextracts); -+ alpm_option_set_noextracts (handle, config->noextracts); - config->noextracts = NULL; - - /* alpm takes ownership */ -- alpm_option_set_noupgrades (config->noupgrades); -+ alpm_option_set_noupgrades (handle, config->noupgrades); - config->noupgrades = NULL; - -- if (!pk_backend_config_configure_repos (config, error)) { -- return FALSE; -- } -+ pk_backend_configure_repos (config->repos, config->servers, -+ config->levels); - -- return TRUE; -+ return handle; - } - --gboolean -+alpm_handle_t * - pk_backend_configure (const gchar *filename, GError **error) - { - PkBackendConfig *config; -- gboolean result; -+ alpm_handle_t *handle; -+ GError *e = NULL; - - g_return_val_if_fail (filename != NULL, FALSE); - -+ g_debug ("reading config from %s", filename); - config = pk_backend_config_new (); - -- result = pk_backend_config_parse (config, filename, NULL, error) && -- pk_backend_config_configure_alpm (config, error); -+ if (pk_backend_config_parse (config, filename, NULL, &e)) { -+ handle = pk_backend_config_configure_alpm (config, &e); -+ } else { -+ handle = NULL; -+ } - - pk_backend_config_free (config); -- return result; -+ if (e != NULL) { -+ g_propagate_error (error, e); -+ if (handle != NULL) { -+ alpm_release (handle); -+ } -+ return NULL; -+ } else { -+ return handle; -+ } - } -diff --git a/backends/alpm/pk-backend-config.h b/backends/alpm/pk-backend-config.h -index cb8b8dc..412f59c 100644 ---- a/backends/alpm/pk-backend-config.h -+++ b/backends/alpm/pk-backend-config.h -@@ -21,6 +21,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#include <alpm.h> - #include <glib.h> - --gboolean pk_backend_configure (const gchar *filename, GError **error); -+alpm_handle_t *pk_backend_configure (const gchar *filename, GError **error); -diff --git a/backends/alpm/pk-backend-databases.c b/backends/alpm/pk-backend-databases.c -index f6ab06e..ac530c7 100644 ---- a/backends/alpm/pk-backend-databases.c -+++ b/backends/alpm/pk-backend-databases.c -@@ -26,7 +26,15 @@ - #include "pk-backend-databases.h" - #include "pk-backend-error.h" - -+typedef struct -+{ -+ gchar *name; -+ alpm_list_t *servers; -+ alpm_siglevel_t level; -+} PkBackendRepo; -+ - static GHashTable *disabled = NULL; -+static alpm_list_t *configured = NULL; - - static GHashTable * - disabled_repos_new (GError **error) -@@ -113,8 +121,8 @@ disabled_repos_free (GHashTable *table) - - /* write all disabled repos line by line */ - while (g_hash_table_iter_next (&iter, (gpointer *) &line, NULL) && -- g_data_output_stream_put_string (output, line, NULL, NULL) && -- g_data_output_stream_put_byte (output, '\n', NULL, NULL)); -+ g_data_output_stream_put_string (output, line, NULL, NULL) && -+ g_data_output_stream_put_byte (output, '\n', NULL, NULL)); - - g_object_unref (output); - g_object_unref (os); -@@ -128,37 +136,65 @@ disabled_repos_configure (GHashTable *table, GError **error) - { - const alpm_list_t *i; - -- g_debug ("reading config from %s", PK_BACKEND_CONFIG_FILE); -+ g_return_val_if_fail (table != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - -- /* read configuration from pacman.conf file */ -- if (!pk_backend_configure (PK_BACKEND_CONFIG_FILE, error)) { -+ if (alpm_db_unregister_all (alpm) < 0) { -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error_literal (error, ALPM_ERROR, errno, -+ alpm_strerror (errno)); - return FALSE; - } - -- /* disable disabled repos */ -- for (i = alpm_option_get_syncdbs (); i != NULL;) { -- pmdb_t *db = (pmdb_t *) i->data; -- const gchar *repo = alpm_db_get_name (db); -+ for (i = configured; i != NULL; i = i->next) { -+ PkBackendRepo *repo = (PkBackendRepo *) i->data; -+ alpm_db_t *db; - -- if (g_hash_table_lookup (table, repo) == NULL) { -- /* repo is not disabled */ -- i = i->next; -+ if (g_hash_table_lookup (table, repo->name) != NULL) { -+ /* repo is disabled */ - continue; - } - -- if (alpm_db_unregister (db) < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s", -- repo, alpm_strerrorlast ()); -+ db = alpm_db_register_sync (alpm, repo->name, repo->level); -+ if (db == NULL) { -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "[%s]: %s", -+ repo->name, alpm_strerror (errno)); - return FALSE; - } - -- /* start again because the list gets invalidated */ -- i = alpm_option_get_syncdbs (); -+ alpm_db_set_servers (db, alpm_list_strdup (repo->servers)); - } - - return TRUE; - } - -+void -+pk_backend_configure_repos (alpm_list_t *repos, GHashTable *servers, -+ GHashTable *levels) -+{ -+ alpm_list_t *i; -+ -+ g_return_if_fail (servers != NULL); -+ -+ for (i = repos; i != NULL; i = i->next) { -+ PkBackendRepo *repo = g_new (PkBackendRepo, 1); -+ gpointer value = g_hash_table_lookup (servers, i->data); -+ -+ repo->name = g_strdup ((const gchar *) i->data); -+ repo->servers = alpm_list_strdup ((alpm_list_t *) value); -+ -+ value = g_hash_table_lookup (levels, i->data); -+ if (value != NULL) { -+ repo->level = *(alpm_siglevel_t *)value; -+ } else { -+ repo->level = ALPM_SIG_USE_DEFAULT; -+ } -+ -+ configured = alpm_list_add (configured, repo); -+ } -+} -+ - gboolean - pk_backend_initialize_databases (PkBackend *self, GError **error) - { -@@ -179,11 +215,21 @@ pk_backend_initialize_databases (PkBackend *self, GError **error) - void - pk_backend_destroy_databases (PkBackend *self) - { -+ alpm_list_t *i; -+ - g_return_if_fail (self != NULL); - - if (disabled != NULL) { - disabled_repos_free (disabled); - } -+ -+ for (i = configured; i != NULL; i = i->next) { -+ PkBackendRepo *repo = (PkBackendRepo *) i->data; -+ g_free (repo->name); -+ FREELIST (repo->servers); -+ g_free (repo); -+ } -+ alpm_list_free (configured); - } - - static gboolean -@@ -210,11 +256,12 @@ pk_backend_get_repo_list_thread (PkBackend *self) - gpointer key, value; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (disabled != NULL, FALSE); - - /* emit enabled repos */ -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -- pmdb_t *db = (pmdb_t *) i->data; -+ for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) { -+ alpm_db_t *db = (alpm_db_t *) i->data; - const gchar *repo = alpm_db_get_name (db); - - if (pk_backend_cancelled (self)) { -@@ -269,7 +316,7 @@ pk_backend_repo_enable_thread (PkBackend *self) - pk_backend_repo_list_changed (self); - } - } else { -- int code = PM_ERR_DB_NOT_NULL; -+ int code = ALPM_ERR_DB_NOT_NULL; - g_set_error (&error, ALPM_ERROR, code, "[%s]: %s", - repo, alpm_strerror (code)); - } -@@ -292,21 +339,23 @@ pk_backend_repo_disable_thread (PkBackend *self) - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (disabled != NULL, FALSE); - - repo = pk_backend_get_string (self, "repo_id"); - - g_return_val_if_fail (repo != NULL, FALSE); - -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -- pmdb_t *db = (pmdb_t *) i->data; -+ for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) { -+ alpm_db_t *db = (alpm_db_t *) i->data; - const gchar *name = alpm_db_get_name (db); - - if (g_strcmp0 (repo, name) == 0) { - if (alpm_db_unregister (db) < 0) { -- g_set_error (&error, ALPM_ERROR, pm_errno, -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (&error, ALPM_ERROR, errno, - "[%s]: %s", repo, -- alpm_strerrorlast ()); -+ alpm_strerror (errno)); - } else { - g_hash_table_insert (disabled, g_strdup (repo), - GINT_TO_POINTER (1)); -@@ -316,7 +365,7 @@ pk_backend_repo_disable_thread (PkBackend *self) - } - - if (i == NULL) { -- int code = PM_ERR_DB_NULL; -+ int code = ALPM_ERR_DB_NULL; - g_set_error (&error, ALPM_ERROR, code, "[%s]: %s", repo, - alpm_strerror (code)); - } -diff --git a/backends/alpm/pk-backend-databases.h b/backends/alpm/pk-backend-databases.h -index f9eb2f9..2636cae 100644 ---- a/backends/alpm/pk-backend-databases.h -+++ b/backends/alpm/pk-backend-databases.h -@@ -24,6 +24,10 @@ - #include <alpm.h> - #include <pk-backend.h> - -+void pk_backend_configure_repos (alpm_list_t *repos, -+ GHashTable *servers, -+ GHashTable *levels); -+ - gboolean pk_backend_initialize_databases (PkBackend *self, - GError **error); - -diff --git a/backends/alpm/pk-backend-depends.c b/backends/alpm/pk-backend-depends.c -index 8bb8567..7c7b45a 100644 ---- a/backends/alpm/pk-backend-depends.c -+++ b/backends/alpm/pk-backend-depends.c -@@ -29,7 +29,7 @@ - #include "pk-backend-error.h" - #include "pk-backend-packages.h" - --static pmpkg_t * -+static alpm_pkg_t * - alpm_list_find_pkg (const alpm_list_t *pkgs, const gchar *name) - { - g_return_val_if_fail (name != NULL, NULL); -@@ -50,11 +50,12 @@ pk_backend_find_provider (PkBackend *self, alpm_list_t *pkgs, - PkBitfield filters; - gboolean recursive, skip_local, skip_remote; - -- pmpkg_t *provider; -+ alpm_pkg_t *provider; - alpm_list_t *pkgcache, *syncdbs; - - g_return_val_if_fail (self != NULL, pkgs); - g_return_val_if_fail (depend != NULL, pkgs); -+ g_return_val_if_fail (alpm != NULL, pkgs); - g_return_val_if_fail (localdb != NULL, pkgs); - - recursive = pk_backend_get_bool (self, "recursive"); -@@ -84,8 +85,8 @@ pk_backend_find_provider (PkBackend *self, alpm_list_t *pkgs, - } - - /* look for remote dependencies */ -- syncdbs = alpm_option_get_syncdbs (); -- provider = alpm_find_dbs_satisfier (syncdbs, depend); -+ syncdbs = alpm_option_get_syncdbs (alpm); -+ provider = alpm_find_dbs_satisfier (alpm, syncdbs, depend); - - if (provider != NULL) { - if (!skip_remote) { -@@ -96,7 +97,7 @@ pk_backend_find_provider (PkBackend *self, alpm_list_t *pkgs, - pkgs = alpm_list_add (pkgs, provider); - } - } else { -- int code = PM_ERR_UNSATISFIED_DEPS; -+ int code = ALPM_ERR_UNSATISFIED_DEPS; - g_set_error (error, ALPM_ERROR, code, "%s: %s", depend, - alpm_strerror (code)); - } -@@ -108,7 +109,7 @@ static alpm_list_t * - pk_backend_find_requirer (PkBackend *self, alpm_list_t *pkgs, const gchar *name, - GError **error) - { -- pmpkg_t *requirer; -+ alpm_pkg_t *requirer; - - g_return_val_if_fail (self != NULL, pkgs); - g_return_val_if_fail (name != NULL, pkgs); -@@ -127,7 +128,7 @@ pk_backend_find_requirer (PkBackend *self, alpm_list_t *pkgs, const gchar *name, - pkgs = alpm_list_add (pkgs, requirer); - } - } else { -- int code = PM_ERR_PKG_NOT_FOUND; -+ int code = ALPM_ERR_PKG_NOT_FOUND; - g_set_error (error, ALPM_ERROR, code, "%s: %s", name, - alpm_strerror (code)); - } -@@ -150,7 +151,7 @@ pk_backend_get_depends_thread (PkBackend *self) - - /* construct an initial package list */ - for (; *packages != NULL; ++packages) { -- pmpkg_t *pkg; -+ alpm_pkg_t *pkg; - - if (pk_backend_cancelled (self)) { - break; -@@ -206,7 +207,7 @@ pk_backend_get_requires_thread (PkBackend *self) - - /* construct an initial package list */ - for (; *packages != NULL; ++packages) { -- pmpkg_t *pkg; -+ alpm_pkg_t *pkg; - - if (pk_backend_cancelled (self)) { - break; -diff --git a/backends/alpm/pk-backend-error.c b/backends/alpm/pk-backend-error.c -index 255f1fb..57c4b4b 100644 ---- a/backends/alpm/pk-backend-error.c -+++ b/backends/alpm/pk-backend-error.c -@@ -33,140 +33,159 @@ pk_backend_error (PkBackend *self, GError *error) - g_return_if_fail (self != NULL); - g_return_if_fail (error != NULL); - -- if (error->domain == ALPM_ERROR) { -- switch (error->code) { -- case PM_ERR_MEMORY: -- case PM_ERR_SYSTEM: -- code = PK_ERROR_ENUM_OOM; -- break; -+ if (error->domain != ALPM_ERROR) { -+ pk_backend_error_code (self, code, "%s", error->message); -+ return; -+ } -+ -+ switch (error->code) { -+ case ALPM_ERR_MEMORY: -+ case ALPM_ERR_SYSTEM: -+ code = PK_ERROR_ENUM_OOM; -+ break; -+ -+ case ALPM_ERR_BADPERMS: -+ code = PK_ERROR_ENUM_NOT_AUTHORIZED; -+ break; -+ -+ case ALPM_ERR_NOT_A_FILE: -+ case ALPM_ERR_NOT_A_DIR: -+ code = PK_ERROR_ENUM_FILE_NOT_FOUND; -+ break; -+ -+ case ALPM_ERR_WRONG_ARGS: -+ case ALPM_ERR_HANDLE_NULL: -+ case ALPM_ERR_DB_NULL: -+ case ALPM_ERR_TRANS_NULL: -+ case ALPM_ERR_TRANS_NOT_INITIALIZED: -+ case ALPM_ERR_TRANS_NOT_PREPARED: -+ case ALPM_ERR_TRANS_NOT_LOCKED: -+ case ALPM_ERR_INVALID_REGEX: -+ code = PK_ERROR_ENUM_INTERNAL_ERROR; -+ break; - -- case PM_ERR_BADPERMS: -- code = PK_ERROR_ENUM_NOT_AUTHORIZED; -- break; -+ case ALPM_ERR_DISK_SPACE: -+ code = PK_ERROR_ENUM_NO_SPACE_ON_DEVICE; -+ break; - -- case PM_ERR_NOT_A_FILE: -- case PM_ERR_NOT_A_DIR: -- code = PK_ERROR_ENUM_FILE_NOT_FOUND; -- break; -+ case ALPM_ERR_HANDLE_NOT_NULL: -+ case ALPM_ERR_DB_NOT_NULL: -+ case ALPM_ERR_TRANS_NOT_NULL: -+ code = PK_ERROR_ENUM_FAILED_INITIALIZATION; -+ break; - -- case PM_ERR_WRONG_ARGS: -- case PM_ERR_HANDLE_NULL: -- case PM_ERR_DB_NULL: -- case PM_ERR_TRANS_NULL: -- case PM_ERR_TRANS_NOT_INITIALIZED: -- case PM_ERR_TRANS_NOT_PREPARED: -- case PM_ERR_TRANS_NOT_LOCKED: -- case PM_ERR_INVALID_REGEX: -- code = PK_ERROR_ENUM_INTERNAL_ERROR; -- break; -+ case ALPM_ERR_HANDLE_LOCK: -+ code = PK_ERROR_ENUM_CANNOT_GET_LOCK; -+ break; - -- case PM_ERR_DISK_SPACE: -- code = PK_ERROR_ENUM_NO_SPACE_ON_DEVICE; -- break; -+ case ALPM_ERR_DB_OPEN: -+ case ALPM_ERR_DB_NOT_FOUND: -+ case ALPM_ERR_PKG_REPO_NOT_FOUND: -+ code = PK_ERROR_ENUM_REPO_NOT_FOUND; -+ break; - -- case PM_ERR_HANDLE_NOT_NULL: -- case PM_ERR_DB_NOT_NULL: -- case PM_ERR_TRANS_NOT_NULL: -- code = PK_ERROR_ENUM_FAILED_INITIALIZATION; -- break; -+ case ALPM_ERR_DB_CREATE: -+ code = PK_ERROR_ENUM_CANNOT_WRITE_REPO_CONFIG; -+ break; - -- case PM_ERR_HANDLE_LOCK: -- code = PK_ERROR_ENUM_CANNOT_GET_LOCK; -- break; -+ case ALPM_ERR_DB_INVALID: -+ case ALPM_ERR_DB_VERSION: -+ case ALPM_ERR_DB_REMOVE: -+ case ALPM_ERR_SERVER_BAD_URL: -+ code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR; -+ break; - -- case PM_ERR_DB_OPEN: -- case PM_ERR_DB_NOT_FOUND: -- case PM_ERR_PKG_REPO_NOT_FOUND: -- code = PK_ERROR_ENUM_REPO_NOT_FOUND; -- break; -+ case ALPM_ERR_DB_INVALID_SIG: -+ case ALPM_ERR_PKG_INVALID_SIG: -+ case ALPM_ERR_SIG_INVALID: -+ code = PK_ERROR_ENUM_BAD_GPG_SIGNATURE; -+ break; - -- case PM_ERR_DB_CREATE: -- code = PK_ERROR_ENUM_CANNOT_WRITE_REPO_CONFIG; -- break; -+ case ALPM_ERR_DB_WRITE: -+ code = PK_ERROR_ENUM_REPO_NOT_AVAILABLE; -+ break; - -- case PM_ERR_DB_VERSION: -- case PM_ERR_DB_REMOVE: -- code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR; -- break; -+ case ALPM_ERR_SERVER_NONE: -+ code = PK_ERROR_ENUM_NO_MORE_MIRRORS_TO_TRY; -+ break; - -- case PM_ERR_DB_WRITE: -- code = PK_ERROR_ENUM_REPO_NOT_AVAILABLE; -- break; -+ case ALPM_ERR_TRANS_DUP_TARGET: -+ case ALPM_ERR_TRANS_ABORT: -+ code = PK_ERROR_ENUM_TRANSACTION_ERROR; -+ break; - -- case PM_ERR_SERVER_BAD_URL: -- code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR; -- break; -+ case ALPM_ERR_TRANS_TYPE: -+ code = PK_ERROR_ENUM_CANNOT_CANCEL; -+ break; - -- case PM_ERR_SERVER_NONE: -- code = PK_ERROR_ENUM_NO_MORE_MIRRORS_TO_TRY; -- break; -+ case ALPM_ERR_PKG_NOT_FOUND: -+ code = PK_ERROR_ENUM_PACKAGE_NOT_FOUND; -+ break; - -- case PM_ERR_TRANS_DUP_TARGET: -- case PM_ERR_TRANS_ABORT: -- code = PK_ERROR_ENUM_TRANSACTION_ERROR; -- break; -+ case ALPM_ERR_PKG_IGNORED: -+ code = PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED; -+ break; - -- case PM_ERR_TRANS_TYPE: -- code = PK_ERROR_ENUM_CANNOT_CANCEL; -- break; -+ case ALPM_ERR_PKG_INVALID: -+ case ALPM_ERR_PKG_OPEN: -+ case ALPM_ERR_PKG_INVALID_NAME: -+ case ALPM_ERR_DLT_INVALID: -+ code = PK_ERROR_ENUM_INVALID_PACKAGE_FILE; -+ break; - -- case PM_ERR_PKG_NOT_FOUND: -- code = PK_ERROR_ENUM_PACKAGE_NOT_FOUND; -- break; -+ case ALPM_ERR_PKG_INVALID_CHECKSUM: -+ code = PK_ERROR_ENUM_PACKAGE_CORRUPT; -+ break; - -- case PM_ERR_PKG_IGNORED: -- code = PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED; -- break; -+ case ALPM_ERR_PKG_CANT_REMOVE: -+ code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_REMOVE; -+ break; - -- case PM_ERR_PKG_INVALID: -- case PM_ERR_PKG_OPEN: -- case PM_ERR_PKG_INVALID_NAME: -- case PM_ERR_DLT_INVALID: -- code = PK_ERROR_ENUM_INVALID_PACKAGE_FILE; -- break; -+ case ALPM_ERR_PKG_INVALID_ARCH: -+ code = PK_ERROR_ENUM_INCOMPATIBLE_ARCHITECTURE; -+ break; - -- case PM_ERR_PKG_CANT_REMOVE: -- code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_REMOVE; -- break; -+ case ALPM_ERR_SIG_MISSING: -+ code = PK_ERROR_ENUM_MISSING_GPG_SIGNATURE; -+ break; - -- case PM_ERR_PKG_INVALID_ARCH: -- code = PK_ERROR_ENUM_INCOMPATIBLE_ARCHITECTURE; -- break; -+ case ALPM_ERR_DLT_PATCHFAILED: -+ code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_BUILD; -+ break; - -- case PM_ERR_DLT_PATCHFAILED: -- code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_BUILD; -- break; -+ case ALPM_ERR_UNSATISFIED_DEPS: -+ code = PK_ERROR_ENUM_DEP_RESOLUTION_FAILED; -+ break; - -- case PM_ERR_UNSATISFIED_DEPS: -- code = PK_ERROR_ENUM_DEP_RESOLUTION_FAILED; -- break; -+ case ALPM_ERR_CONFLICTING_DEPS: -+ code = PK_ERROR_ENUM_PACKAGE_CONFLICTS; -+ break; - -- case PM_ERR_CONFLICTING_DEPS: -- code = PK_ERROR_ENUM_PACKAGE_CONFLICTS; -- break; -+ case ALPM_ERR_FILE_CONFLICTS: -+ code = PK_ERROR_ENUM_FILE_CONFLICTS; -+ break; - -- case PM_ERR_FILE_CONFLICTS: -- code = PK_ERROR_ENUM_FILE_CONFLICTS; -- break; -+ case ALPM_ERR_RETRIEVE: -+ case ALPM_ERR_LIBCURL: -+ case ALPM_ERR_EXTERNAL_DOWNLOAD: -+ code = PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED; -+ break; - -- case PM_ERR_RETRIEVE: -- case PM_ERR_LIBFETCH: -- case PM_ERR_EXTERNAL_DOWNLOAD: -- code = PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED; -- break; -+ case ALPM_ERR_LIBARCHIVE: -+ code = PK_ERROR_ENUM_LOCAL_INSTALL_FAILED; -+ break; - -- case PM_ERR_LIBARCHIVE: -- code = PK_ERROR_ENUM_LOCAL_INSTALL_FAILED; -- break; -+ case ALPM_ERR_GPGME: -+ code = PK_ERROR_ENUM_GPG_FAILURE; -+ break; - -- case PM_ERR_CONFIG_INVALID: -- code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE; -- break; -+ case ALPM_ERR_CONFIG_INVALID: -+ code = PK_ERROR_ENUM_FAILED_CONFIG_PARSING; -+ break; - -- case PM_ERR_PKG_HELD: -- code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE; -- break; -- } -+ case ALPM_ERR_PKG_HELD: -+ code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE; -+ break; - } - - pk_backend_error_code (self, code, "%s", error->message); -diff --git a/backends/alpm/pk-backend-error.h b/backends/alpm/pk-backend-error.h -index 83fe4a5..0a029e4 100644 ---- a/backends/alpm/pk-backend-error.h -+++ b/backends/alpm/pk-backend-error.h -@@ -26,8 +26,8 @@ - #define ALPM_ERROR (alpm_error_quark ()) - - enum { -- PM_ERR_CONFIG_INVALID = 0x10000, -- PM_ERR_PKG_HELD -+ ALPM_ERR_CONFIG_INVALID = 0x10000, -+ ALPM_ERR_PKG_HELD - }; - - void pk_backend_error (PkBackend *self, GError *error); -diff --git a/backends/alpm/pk-backend-groups.c b/backends/alpm/pk-backend-groups.c -index 59e304d..6056c54 100644 ---- a/backends/alpm/pk-backend-groups.c -+++ b/backends/alpm/pk-backend-groups.c -@@ -125,7 +125,7 @@ pk_backend_destroy_groups (PkBackend *self) - } - - const gchar * --alpm_pkg_get_group (pmpkg_t *pkg) -+alpm_pkg_get_group (alpm_pkg_t *pkg) - { - const alpm_list_t *i; - -diff --git a/backends/alpm/pk-backend-groups.h b/backends/alpm/pk-backend-groups.h -index 28dcf65..d736e37 100644 ---- a/backends/alpm/pk-backend-groups.h -+++ b/backends/alpm/pk-backend-groups.h -@@ -29,4 +29,4 @@ gboolean pk_backend_initialize_groups (PkBackend *self, - - void pk_backend_destroy_groups (PkBackend *self); - --const gchar *alpm_pkg_get_group (pmpkg_t *pkg); -+const gchar *alpm_pkg_get_group (alpm_pkg_t *pkg); -diff --git a/backends/alpm/pk-backend-install.c b/backends/alpm/pk-backend-install.c -index 65a6c11..5b5e2b2 100644 ---- a/backends/alpm/pk-backend-install.c -+++ b/backends/alpm/pk-backend-install.c -@@ -32,15 +32,19 @@ - static gint - alpm_add_file (const gchar *filename) - { -- pmpkg_t *pkg; -+ alpm_pkg_t *pkg; -+ alpm_siglevel_t level; - - g_return_val_if_fail (filename != NULL, -1); -+ g_return_val_if_fail (alpm != NULL, -1); - -- if (alpm_pkg_load (filename, 1, &pkg) < 0) { -+ level = alpm_option_get_default_siglevel (alpm); -+ -+ if (alpm_pkg_load (alpm, filename, 1, level, &pkg) < 0) { - return -1; - } - -- if (alpm_add_pkg (pkg) < 0) { -+ if (alpm_add_pkg (alpm, pkg) < 0) { - alpm_pkg_free (pkg); - return -1; - } -@@ -61,8 +65,9 @@ pk_backend_transaction_add_targets (PkBackend *self, GError **error) - - for (; *paths != NULL; ++paths) { - if (alpm_add_file (*paths) < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s", -- *paths, alpm_strerrorlast ()); -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "%s: %s", -+ *paths, alpm_strerror (errno)); - return FALSE; - } - } -diff --git a/backends/alpm/pk-backend-packages.c b/backends/alpm/pk-backend-packages.c -index e9a7c94..2d057aa 100644 ---- a/backends/alpm/pk-backend-packages.c -+++ b/backends/alpm/pk-backend-packages.c -@@ -27,13 +27,11 @@ - #include "pk-backend-packages.h" - - gchar * --alpm_pkg_build_id (pmpkg_t *pkg) -+alpm_pkg_build_id (alpm_pkg_t *pkg) - { - const gchar *name, *version, *arch, *repo; -- pmdb_t *db; - - g_return_val_if_fail (pkg != NULL, NULL); -- g_return_val_if_fail (localdb != NULL, NULL); - - name = alpm_pkg_get_name (pkg); - version = alpm_pkg_get_version (pkg); -@@ -43,19 +41,18 @@ alpm_pkg_build_id (pmpkg_t *pkg) - arch = "any"; - } - -- db = alpm_pkg_get_db (pkg); -- /* TODO: check */ -- if (db == NULL || db == localdb) { -- repo = "installed"; -+ /* TODO: check correctness */ -+ if (alpm_pkg_get_origin (pkg) == PKG_FROM_SYNCDB) { -+ repo = alpm_db_get_name (alpm_pkg_get_db (pkg)); - } else { -- repo = alpm_db_get_name (db); -+ repo = "installed"; - } - - return pk_package_id_build (name, version, arch, repo); - } - - void --pk_backend_pkg (PkBackend *self, pmpkg_t *pkg, PkInfoEnum info) -+pk_backend_pkg (PkBackend *self, alpm_pkg_t *pkg, PkInfoEnum info) - { - gchar *package; - -@@ -67,16 +64,17 @@ pk_backend_pkg (PkBackend *self, pmpkg_t *pkg, PkInfoEnum info) - g_free (package); - } - --pmpkg_t * -+alpm_pkg_t * - pk_backend_find_pkg (PkBackend *self, const gchar *package_id, GError **error) - { - gchar **package; - const gchar *repo_id; -- pmdb_t *db = NULL; -- pmpkg_t *pkg; -+ alpm_db_t *db = NULL; -+ alpm_pkg_t *pkg; - - g_return_val_if_fail (self != NULL, NULL); - g_return_val_if_fail (package_id != NULL, NULL); -+ g_return_val_if_fail (alpm != NULL, NULL); - g_return_val_if_fail (localdb != NULL, NULL); - - package = pk_package_id_split (package_id); -@@ -86,8 +84,8 @@ pk_backend_find_pkg (PkBackend *self, const gchar *package_id, GError **error) - if (g_strcmp0 (repo_id, "installed") == 0) { - db = localdb; - } else { -- const alpm_list_t *i; -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -+ const alpm_list_t *i = alpm_option_get_syncdbs (alpm); -+ for (; i != NULL; i = i->next) { - const gchar *repo = alpm_db_get_name (i->data); - - if (g_strcmp0 (repo, repo_id) == 0) { -@@ -111,7 +109,7 @@ pk_backend_find_pkg (PkBackend *self, const gchar *package_id, GError **error) - } - - if (pkg == NULL) { -- int code = PM_ERR_PKG_NOT_FOUND; -+ int code = ALPM_ERR_PKG_NOT_FOUND; - g_set_error (error, ALPM_ERROR, code, "%s: %s", package_id, - alpm_strerror (code)); - } -@@ -123,7 +121,7 @@ static gboolean - pk_backend_resolve_package (PkBackend *self, const gchar *package, - GError **error) - { -- pmpkg_t *pkg; -+ alpm_pkg_t *pkg; - - PkBitfield filters; - gboolean skip_local, skip_remote; -@@ -142,7 +140,7 @@ pk_backend_resolve_package (PkBackend *self, const gchar *package, - PK_FILTER_ENUM_NOT_INSTALLED); - skip_remote = pk_bitfield_contain (filters, PK_FILTER_ENUM_INSTALLED); - -- if (alpm_pkg_get_db (pkg) == localdb) { -+ if (alpm_pkg_get_origin (pkg) == PKG_FROM_LOCALDB) { - if (!skip_local) { - pk_backend_pkg (self, pkg, PK_INFO_ENUM_INSTALLED); - } -@@ -158,7 +156,7 @@ pk_backend_resolve_package (PkBackend *self, const gchar *package, - static gboolean - pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error) - { -- pmpkg_t *pkg; -+ alpm_pkg_t *pkg; - int code; - - PkBitfield filters; -@@ -166,6 +164,7 @@ pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error) - - g_return_val_if_fail (self != NULL, FALSE); - g_return_val_if_fail (name != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (localdb != NULL, FALSE); - - filters = pk_backend_get_uint (self, "filters"); -@@ -180,8 +179,8 @@ pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error) - return TRUE; - } - } else if (!skip_remote) { -- const alpm_list_t *i; -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -+ const alpm_list_t *i = alpm_option_get_syncdbs (alpm); -+ for (; i != NULL; i = i->next) { - pkg = alpm_db_get_pkg (i->data, name); - if (pkg != NULL) { - pk_backend_pkg (self, pkg, -@@ -191,7 +190,7 @@ pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error) - } - } - -- code = PM_ERR_PKG_NOT_FOUND; -+ code = ALPM_ERR_PKG_NOT_FOUND; - g_set_error (error, ALPM_ERROR, code, "%s: %s", name, - alpm_strerror (code)); - return FALSE; -@@ -254,7 +253,7 @@ pk_backend_get_details_thread (PkBackend *self) - g_return_val_if_fail (packages != NULL, FALSE); - - for (; *packages != NULL; ++packages) { -- pmpkg_t *pkg; -+ alpm_pkg_t *pkg; - const alpm_list_t *i; - - GString *licenses; -@@ -286,7 +285,7 @@ pk_backend_get_details_thread (PkBackend *self) - desc = alpm_pkg_get_desc (pkg); - url = alpm_pkg_get_url (pkg); - -- if (alpm_pkg_get_db (pkg) == localdb) { -+ if (alpm_pkg_get_origin (pkg) == PKG_FROM_LOCALDB) { - size = alpm_pkg_get_isize (pkg); - } else { - size = alpm_pkg_download_size (pkg); -@@ -317,17 +316,19 @@ pk_backend_get_files_thread (PkBackend *self) - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - - packages = pk_backend_get_strv (self, "package_ids"); - - g_return_val_if_fail (packages != NULL, FALSE); - - for (; *packages != NULL; ++packages) { -- pmpkg_t *pkg; -- const alpm_list_t *i; -+ alpm_pkg_t *pkg; -+ const gchar *root; - - GString *files; -- const gchar *root; -+ alpm_filelist_t *filelist; -+ gsize i; - - if (pk_backend_cancelled (self)) { - break; -@@ -338,11 +339,13 @@ pk_backend_get_files_thread (PkBackend *self) - break; - } - -+ root = alpm_option_get_root (alpm); - files = g_string_new (""); -- root = alpm_option_get_root (); -- for (i = alpm_pkg_get_files (pkg); i != NULL; i = i->next) { -- g_string_append_printf (files, ";%s%s", root, -- (const gchar *) i->data); -+ -+ filelist = alpm_pkg_get_files (pkg); -+ for (i = 0; i < filelist->count; ++i) { -+ const gchar *file = filelist->files[i].name; -+ g_string_append_printf (files, ";%s%s", root, file); - } - - pk_backend_files (self, *packages, files->str + 1); -diff --git a/backends/alpm/pk-backend-packages.h b/backends/alpm/pk-backend-packages.h -index 4b2d7f8..2d54684 100644 ---- a/backends/alpm/pk-backend-packages.h -+++ b/backends/alpm/pk-backend-packages.h -@@ -24,10 +24,11 @@ - #include <alpm.h> - #include <pk-backend.h> - --gchar *alpm_pkg_build_id (pmpkg_t *pkg); -+gchar *alpm_pkg_build_id (alpm_pkg_t *pkg); - --void pk_backend_pkg (PkBackend *self, pmpkg_t *pkg, -- PkInfoEnum info); -+void pk_backend_pkg (PkBackend *self, alpm_pkg_t *pkg, -+ PkInfoEnum info); - --pmpkg_t *pk_backend_find_pkg (PkBackend *self, const gchar *package_id, -- GError **error); -+alpm_pkg_t *pk_backend_find_pkg (PkBackend *self, -+ const gchar *package_id, -+ GError **error); -diff --git a/backends/alpm/pk-backend-remove.c b/backends/alpm/pk-backend-remove.c -index 03329b1..1993061 100644 ---- a/backends/alpm/pk-backend-remove.c -+++ b/backends/alpm/pk-backend-remove.c -@@ -29,29 +29,14 @@ - #include "pk-backend-remove.h" - #include "pk-backend-transaction.h" - --static gint --alpm_remove_local (const gchar *name) --{ -- pmpkg_t *pkg; -- -- g_return_val_if_fail (name != NULL, -1); -- g_return_val_if_fail (localdb != NULL, -1); -- -- pkg = alpm_db_get_pkg (localdb, name); -- if (pkg == NULL) { -- pm_errno = PM_ERR_PKG_NOT_FOUND; -- return -1; -- } -- -- return alpm_remove_pkg (pkg); --} -- - static gboolean - pk_backend_transaction_remove_targets (PkBackend *self, GError **error) - { - gchar **packages; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); -+ g_return_val_if_fail (localdb != NULL, FALSE); - - packages = pk_backend_get_strv (self, "package_ids"); - -@@ -61,9 +46,11 @@ pk_backend_transaction_remove_targets (PkBackend *self, GError **error) - gchar **package = pk_package_id_split (*packages); - gchar *name = package[PK_PACKAGE_ID_NAME]; - -- if (alpm_remove_local (name) < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s", -- name, alpm_strerrorlast ()); -+ alpm_pkg_t *pkg = alpm_db_get_pkg (localdb, name); -+ if (pkg == NULL || alpm_remove_pkg (alpm, pkg) < 0) { -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "%s: %s", name, -+ alpm_strerror (errno)); - g_strfreev (package); - return FALSE; - } -@@ -79,14 +66,17 @@ pk_backend_transaction_remove_simulate (PkBackend *self, GError **error) - { - const alpm_list_t *i; - -+ g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); -+ - if (!pk_backend_transaction_simulate (self, error)) { - return FALSE; - } - -- for (i = alpm_trans_get_remove (); i != NULL; i = i->next) { -+ for (i = alpm_trans_get_remove (alpm); i != NULL; i = i->next) { - const gchar *name = alpm_pkg_get_name (i->data); - if (alpm_list_find_str (holdpkgs, name)) { -- g_set_error (error, ALPM_ERROR, PM_ERR_PKG_HELD, -+ g_set_error (error, ALPM_ERROR, ALPM_ERR_PKG_HELD, - "%s: %s", name, - "could not remove HoldPkg"); - return FALSE; -@@ -99,14 +89,14 @@ pk_backend_transaction_remove_simulate (PkBackend *self, GError **error) - static gboolean - pk_backend_simulate_remove_packages_thread (PkBackend *self) - { -- pmtransflag_t flags = PM_TRANS_FLAG_CASCADE; -+ alpm_transflag_t flags = ALPM_TRANS_FLAG_CASCADE; - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); - - /* remove unneeded packages that were required by those to be removed */ - if (pk_backend_get_bool (self, "autoremove")) { -- flags |= PM_TRANS_FLAG_RECURSE; -+ flags |= ALPM_TRANS_FLAG_RECURSE; - } - - if (pk_backend_transaction_initialize (self, flags, &error) && -@@ -121,18 +111,18 @@ pk_backend_simulate_remove_packages_thread (PkBackend *self) - static gboolean - pk_backend_remove_packages_thread (PkBackend *self) - { -- pmtransflag_t flags = 0; -+ alpm_transflag_t flags = 0; - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); - - /* remove packages that depend on those to be removed */ - if (pk_backend_get_bool (self, "allow_deps")) { -- flags |= PM_TRANS_FLAG_CASCADE; -+ flags |= ALPM_TRANS_FLAG_CASCADE; - } - /* remove unneeded packages that were required by those to be removed */ - if (pk_backend_get_bool (self, "autoremove")) { -- flags |= PM_TRANS_FLAG_RECURSE; -+ flags |= ALPM_TRANS_FLAG_RECURSE; - } - - if (pk_backend_transaction_initialize (self, flags, &error) && -diff --git a/backends/alpm/pk-backend-search.c b/backends/alpm/pk-backend-search.c -index 592472d..c4e80ae 100644 ---- a/backends/alpm/pk-backend-search.c -+++ b/backends/alpm/pk-backend-search.c -@@ -55,9 +55,10 @@ static gpointer - pk_backend_pattern_chroot (const gchar *needle, GError **error) - { - g_return_val_if_fail (needle != NULL, NULL); -+ g_return_val_if_fail (alpm != NULL, NULL); - - if (G_IS_DIR_SEPARATOR (*needle)) { -- const gchar *file = needle, *root = alpm_option_get_root (); -+ const gchar *file = needle, *root = alpm_option_get_root (alpm); - - /* adjust needle to the correct prefix */ - for (; *file == *root; ++file, ++root) { -@@ -74,7 +75,7 @@ pk_backend_pattern_chroot (const gchar *needle, GError **error) - } - - static gboolean --pk_backend_match_all (pmpkg_t *pkg, gpointer pattern) -+pk_backend_match_all (alpm_pkg_t *pkg, gpointer pattern) - { - g_return_val_if_fail (pkg != NULL, FALSE); - g_return_val_if_fail (pattern != NULL, FALSE); -@@ -84,10 +85,10 @@ pk_backend_match_all (pmpkg_t *pkg, gpointer pattern) - } - - static gboolean --pk_backend_match_details (pmpkg_t *pkg, GRegex *regex) -+pk_backend_match_details (alpm_pkg_t *pkg, GRegex *regex) - { - const gchar *desc; -- pmdb_t *db; -+ alpm_db_t *db; - const alpm_list_t *i; - - g_return_val_if_fail (pkg != NULL, FALSE); -@@ -123,32 +124,38 @@ pk_backend_match_details (pmpkg_t *pkg, GRegex *regex) - } - - static gboolean --pk_backend_match_file (pmpkg_t *pkg, const gchar *needle) -+pk_backend_match_file (alpm_pkg_t *pkg, const gchar *needle) - { -- const alpm_list_t *i; -+ alpm_filelist_t *files; -+ gsize i; - - g_return_val_if_fail (pkg != NULL, FALSE); - g_return_val_if_fail (needle != NULL, FALSE); - -+ files = alpm_pkg_get_files (pkg); -+ - /* match any file the package contains */ - if (G_IS_DIR_SEPARATOR (*needle)) { -- for (i = alpm_pkg_get_files (pkg); i != NULL; i = i->next) { -+ for (i = 0; i < files->count; ++i) { -+ const gchar *file = files->files[i].name; - /* match the full path of file */ -- if (g_strcmp0 (i->data, needle + 1) == 0) { -+ if (g_strcmp0 (file, needle + 1) == 0) { - return TRUE; - } - } - } else { -- for (i = alpm_pkg_get_files (pkg); i != NULL; i = i->next) { -- const gchar *file = strrchr (i->data, G_DIR_SEPARATOR); -- if (file == NULL) { -- file = i->data; -+ for (i = 0; i < files->count; ++i) { -+ const gchar *file = files->files[i].name; -+ const gchar *name = strrchr (file, G_DIR_SEPARATOR); -+ -+ if (name == NULL) { -+ name = file; - } else { -- ++file; -+ ++name; - } - - /* match the basename of file */ -- if (g_strcmp0 (file, needle) == 0) { -+ if (g_strcmp0 (name, needle) == 0) { - return TRUE; - } - } -@@ -158,7 +165,7 @@ pk_backend_match_file (pmpkg_t *pkg, const gchar *needle) - } - - static gboolean --pk_backend_match_group (pmpkg_t *pkg, const gchar *needle) -+pk_backend_match_group (alpm_pkg_t *pkg, const gchar *needle) - { - g_return_val_if_fail (pkg != NULL, FALSE); - g_return_val_if_fail (needle != NULL, FALSE); -@@ -168,7 +175,7 @@ pk_backend_match_group (pmpkg_t *pkg, const gchar *needle) - } - - static gboolean --pk_backend_match_name (pmpkg_t *pkg, GRegex *regex) -+pk_backend_match_name (alpm_pkg_t *pkg, GRegex *regex) - { - g_return_val_if_fail (pkg != NULL, FALSE); - g_return_val_if_fail (regex != NULL, FALSE); -@@ -178,7 +185,7 @@ pk_backend_match_name (pmpkg_t *pkg, GRegex *regex) - } - - static gboolean --pk_backend_match_provides (pmpkg_t *pkg, gpointer pattern) -+pk_backend_match_provides (alpm_pkg_t *pkg, gpointer pattern) - { - /* TODO: implement GStreamer codecs, Pango fonts, etc. */ - const alpm_list_t *i; -@@ -215,7 +222,7 @@ typedef enum { - } SearchType; - - typedef gpointer (*PatternFunc) (const gchar *needle, GError **error); --typedef gboolean (*MatchFunc) (pmpkg_t *pkg, gpointer pattern); -+typedef gboolean (*MatchFunc) (alpm_pkg_t *pkg, gpointer pattern); - - static PatternFunc pattern_funcs[] = { - pk_backend_pattern_needle, -@@ -245,9 +252,9 @@ static MatchFunc match_funcs[] = { - }; - - static gboolean --alpm_pkg_is_local (pmpkg_t *pkg) -+alpm_pkg_is_local (alpm_pkg_t *pkg) - { -- pmpkg_t *local; -+ alpm_pkg_t *local; - - g_return_val_if_fail (pkg != NULL, FALSE); - g_return_val_if_fail (localdb != NULL, FALSE); -@@ -274,7 +281,7 @@ alpm_pkg_is_local (pmpkg_t *pkg) - } - - static void --pk_backend_search_db (PkBackend *self, pmdb_t *db, MatchFunc match, -+pk_backend_search_db (PkBackend *self, alpm_db_t *db, MatchFunc match, - const alpm_list_t *patterns) - { - const alpm_list_t *i, *j; -@@ -326,6 +333,7 @@ pk_backend_search_thread (PkBackend *self) - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (localdb != NULL, FALSE); - - needles = pk_backend_get_strv (self, "search"); -@@ -366,7 +374,7 @@ pk_backend_search_thread (PkBackend *self) - goto out; - } - -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -+ for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) { - if (pk_backend_cancelled (self)) { - break; - } -diff --git a/backends/alpm/pk-backend-sync.c b/backends/alpm/pk-backend-sync.c -index 9e1e02b..c770159 100644 ---- a/backends/alpm/pk-backend-sync.c -+++ b/backends/alpm/pk-backend-sync.c -@@ -30,41 +30,13 @@ - #include "pk-backend-sync.h" - #include "pk-backend-transaction.h" - --static gint --alpm_add_dbtarget (const gchar *repo, const gchar *name) --{ -- const alpm_list_t *i; -- pmpkg_t *pkg; -- -- g_return_val_if_fail (repo != NULL, -1); -- g_return_val_if_fail (name != NULL, -1); -- -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -- if (g_strcmp0 (alpm_db_get_name (i->data), repo) == 0) { -- break; -- } -- } -- -- if (i == NULL) { -- pm_errno = PM_ERR_DB_NOT_FOUND; -- return -1; -- } -- -- pkg = alpm_db_get_pkg (i->data, name); -- if (pkg == NULL) { -- pm_errno = PM_ERR_PKG_NOT_FOUND; -- return -1; -- } -- -- return alpm_add_pkg (pkg); --} -- - static gboolean - pk_backend_transaction_sync_targets (PkBackend *self, GError **error) - { - gchar **packages; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - - packages = pk_backend_get_strv (self, "package_ids"); - -@@ -75,9 +47,28 @@ pk_backend_transaction_sync_targets (PkBackend *self, GError **error) - gchar *repo = package[PK_PACKAGE_ID_DATA]; - gchar *name = package[PK_PACKAGE_ID_NAME]; - -- if (alpm_add_dbtarget (repo, name) < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "%s/%s: %s", -- repo, name, alpm_strerrorlast ()); -+ const alpm_list_t *i = alpm_option_get_syncdbs (alpm); -+ alpm_pkg_t *pkg; -+ -+ for (; i != NULL; i = i->next) { -+ if (g_strcmp0 (alpm_db_get_name (i->data), repo) == 0) { -+ break; -+ } -+ } -+ -+ if (i == NULL) { -+ enum _alpm_errno_t errno = ALPM_ERR_DB_NOT_FOUND; -+ g_set_error (error, ALPM_ERROR, errno, "%s/%s: %s", -+ repo, name, alpm_strerror (errno)); -+ g_strfreev (package); -+ return FALSE; -+ } -+ -+ pkg = alpm_db_get_pkg (i->data, name); -+ if (pkg == NULL || alpm_add_pkg (alpm, pkg) < 0) { -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "%s/%s: %s", -+ repo, name, alpm_strerror (errno)); - g_strfreev (package); - return FALSE; - } -@@ -93,23 +84,27 @@ pk_backend_download_packages_thread (PkBackend *self) - { - alpm_list_t *cachedirs; - const gchar *directory; -- pmtransflag_t flags = 0; -+ alpm_transflag_t flags = 0; - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - - directory = pk_backend_get_string (self, "directory"); - - if (directory != NULL) { - /* download files to a PackageKit directory */ - gchar *cachedir = strdup (directory); -- cachedirs = alpm_list_strdup (alpm_option_get_cachedirs ()); -- alpm_option_set_cachedirs (alpm_list_add (NULL, cachedir)); -+ const alpm_list_t *old = alpm_option_get_cachedirs (alpm); -+ alpm_list_t *new = alpm_list_add (NULL, cachedir); -+ -+ cachedirs = alpm_list_strdup (old); -+ alpm_option_set_cachedirs (alpm, new); - } - -- flags |= PM_TRANS_FLAG_NODEPS; -- flags |= PM_TRANS_FLAG_NOCONFLICTS; -- flags |= PM_TRANS_FLAG_DOWNLOADONLY; -+ flags |= ALPM_TRANS_FLAG_NODEPS; -+ flags |= ALPM_TRANS_FLAG_NOCONFLICTS; -+ flags |= ALPM_TRANS_FLAG_DOWNLOADONLY; - - if (pk_backend_transaction_initialize (self, flags, &error) && - pk_backend_transaction_sync_targets (self, &error) && -@@ -118,7 +113,7 @@ pk_backend_download_packages_thread (PkBackend *self) - } - - if (directory != NULL) { -- alpm_option_set_cachedirs (cachedirs); -+ alpm_option_set_cachedirs (alpm, cachedirs); - } - - return pk_backend_transaction_finish (self, error); -@@ -190,16 +185,17 @@ pk_backend_install_packages (PkBackend *self, gboolean only_trusted, - } - - static gboolean --pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg) -+pk_backend_replaces_dependencies (PkBackend *self, alpm_pkg_t *pkg) - { - const alpm_list_t *i, *replaces; - - g_return_val_if_fail (self != NULL, FALSE); - g_return_val_if_fail (pkg != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - - replaces = alpm_pkg_get_replaces (pkg); -- for (i = alpm_trans_get_remove (); i != NULL; i = i->next) { -- pmpkg_t *rpkg = (pmpkg_t *) i->data; -+ for (i = alpm_trans_get_remove (alpm); i != NULL; i = i->next) { -+ alpm_pkg_t *rpkg = (alpm_pkg_t *) i->data; - const gchar *rname = alpm_pkg_get_name (rpkg); - - if (pk_backend_cancelled (self)) { -@@ -208,7 +204,7 @@ pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg) - continue; - } - -- if (alpm_pkg_get_reason (rpkg) == PM_PKG_REASON_EXPLICIT) { -+ if (alpm_pkg_get_reason (rpkg) == ALPM_PKG_REASON_EXPLICIT) { - return FALSE; - } - } -@@ -224,6 +220,7 @@ pk_backend_update_packages_thread (PkBackend *self) - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (localdb != NULL, FALSE); - - if (!pk_backend_transaction_initialize (self, 0, &error) || -@@ -233,8 +230,8 @@ pk_backend_update_packages_thread (PkBackend *self) - } - - /* change the install reason of packages that replace dependencies */ -- for (i = alpm_trans_get_add (); i != NULL; i = i->next) { -- pmpkg_t *pkg = (pmpkg_t *) i->data; -+ for (i = alpm_trans_get_add (alpm); i != NULL; i = i->next) { -+ alpm_pkg_t *pkg = (alpm_pkg_t *) i->data; - const gchar *name = alpm_pkg_get_name (pkg); - - if (pk_backend_cancelled (self)) { -@@ -254,7 +251,8 @@ pk_backend_update_packages_thread (PkBackend *self) - - for (i = asdeps; i != NULL; i = i->next) { - const gchar *name = (const gchar *) i->data; -- alpm_db_set_pkgreason (localdb, name, PM_PKG_REASON_DEPEND); -+ alpm_pkg_t *pkg = alpm_db_get_pkg (localdb, name); -+ alpm_db_set_pkgreason (alpm, pkg, ALPM_PKG_REASON_DEPEND); - } - - out: -diff --git a/backends/alpm/pk-backend-transaction.c b/backends/alpm/pk-backend-transaction.c -index fdb840e..f812766 100644 ---- a/backends/alpm/pk-backend-transaction.c -+++ b/backends/alpm/pk-backend-transaction.c -@@ -29,10 +29,10 @@ - static off_t dcomplete = 0; - static off_t dtotal = 0; - --static pmpkg_t *dpkg = NULL; -+static alpm_pkg_t *dpkg = NULL; - static GString *dfiles = NULL; - --static pmpkg_t *tpkg = NULL; -+static alpm_pkg_t *tpkg = NULL; - static GString *toutput = NULL; - - static gchar * -@@ -51,25 +51,26 @@ pk_backend_resolve_path (PkBackend *self, const gchar *basename) - } - - static gboolean --alpm_pkg_has_basename (pmpkg_t *pkg, const gchar *basename) -+alpm_pkg_has_basename (alpm_pkg_t *pkg, const gchar *basename) - { - const alpm_list_t *i; - - g_return_val_if_fail (pkg != NULL, FALSE); - g_return_val_if_fail (basename != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - - if (g_strcmp0 (alpm_pkg_get_filename (pkg), basename) == 0) { - return TRUE; - } - -- if (alpm_option_get_usedelta () == 0) { -+ if (alpm_option_get_usedelta (alpm) == 0) { - return FALSE; - } - - for (i = alpm_pkg_get_deltas (pkg); i != NULL; i = i->next) { -- const gchar *patch = alpm_delta_get_filename (i->data); -+ alpm_delta_t *delta = (alpm_delta_t *) i->data; - -- if (g_strcmp0 (patch, basename) == 0) { -+ if (g_strcmp0 (delta->delta, basename) == 0) { - return TRUE; - } - } -@@ -109,6 +110,7 @@ pk_backend_transaction_download_start (PkBackend *self, const gchar *basename) - - g_return_if_fail (self != NULL); - g_return_if_fail (basename != NULL); -+ g_return_if_fail (alpm != NULL); - - /* continue or finish downloading the current package */ - if (dpkg != NULL) { -@@ -127,8 +129,8 @@ pk_backend_transaction_download_start (PkBackend *self, const gchar *basename) - } - - /* figure out what the next package is */ -- for (i = alpm_trans_get_add (); i != NULL; i = i->next) { -- pmpkg_t *pkg = (pmpkg_t *) i->data; -+ for (i = alpm_trans_get_add (alpm); i != NULL; i = i->next) { -+ alpm_pkg_t *pkg = (alpm_pkg_t *) i->data; - - if (alpm_pkg_has_basename (pkg, basename)) { - dpkg = pkg; -@@ -202,16 +204,17 @@ pk_backend_transaction_dlcb (const gchar *basename, off_t complete, off_t total) - } - - static void --pk_backend_transaction_progress_cb (pmtransprog_t type, const gchar *target, -+pk_backend_transaction_progress_cb (alpm_progress_t type, const gchar *target, - gint percent, gsize targets, gsize current) - { - static gint recent = 101; - gsize overall = percent + (current - 1) * 100; - - /* TODO: revert when fixed upstream */ -- if (type == PM_TRANS_PROGRESS_CONFLICTS_START || -- type == PM_TRANS_PROGRESS_DISKSPACE_START || -- type == PM_TRANS_PROGRESS_INTEGRITY_START) { -+ if (type == ALPM_PROGRESS_CONFLICTS_START || -+ type == ALPM_PROGRESS_DISKSPACE_START || -+ type == ALPM_PROGRESS_INTEGRITY_START || -+ type == ALPM_PROGRESS_LOAD_START) { - if (current < targets) { - overall = percent + current++ * 100; - } -@@ -228,12 +231,13 @@ pk_backend_transaction_progress_cb (pmtransprog_t type, const gchar *target, - - /* update transaction progress */ - switch (type) { -- case PM_TRANS_PROGRESS_ADD_START: -- case PM_TRANS_PROGRESS_UPGRADE_START: -- case PM_TRANS_PROGRESS_REMOVE_START: -- case PM_TRANS_PROGRESS_CONFLICTS_START: -- case PM_TRANS_PROGRESS_DISKSPACE_START: -- case PM_TRANS_PROGRESS_INTEGRITY_START: -+ case ALPM_PROGRESS_ADD_START: -+ case ALPM_PROGRESS_UPGRADE_START: -+ case ALPM_PROGRESS_REMOVE_START: -+ case ALPM_PROGRESS_CONFLICTS_START: -+ case ALPM_PROGRESS_DISKSPACE_START: -+ case ALPM_PROGRESS_INTEGRITY_START: -+ case ALPM_PROGRESS_LOAD_START: - if (percent == recent) { - break; - } -@@ -253,7 +257,7 @@ pk_backend_transaction_progress_cb (pmtransprog_t type, const gchar *target, - } - - static void --pk_backend_install_ignorepkg (PkBackend *self, pmpkg_t *pkg, gint *result) -+pk_backend_install_ignorepkg (PkBackend *self, alpm_pkg_t *pkg, gint *result) - { - gchar *output; - -@@ -280,50 +284,52 @@ pk_backend_install_ignorepkg (PkBackend *self, pmpkg_t *pkg, gint *result) - } - - static void --pk_backend_select_provider (PkBackend *self, pmdepend_t *dep, -+pk_backend_select_provider (PkBackend *self, alpm_depend_t *depend, - const alpm_list_t *providers) - { - gchar *output; - - g_return_if_fail (self != NULL); -- g_return_if_fail (dep != NULL); -+ g_return_if_fail (depend != NULL); - g_return_if_fail (providers != NULL); - - output = g_strdup_printf ("provider package was selected " - "(%s provides %s)\n", - alpm_pkg_get_name (providers->data), -- alpm_dep_get_name (dep)); -+ depend->name); - pk_backend_output (self, output); - g_free (output); - } - - static void --pk_backend_transaction_conv_cb (pmtransconv_t question, gpointer data1, -+pk_backend_transaction_conv_cb (alpm_question_t question, gpointer data1, - gpointer data2, gpointer data3, gint *result) - { - g_return_if_fail (result != NULL); - g_return_if_fail (backend != NULL); - - switch (question) { -- case PM_TRANS_CONV_INSTALL_IGNOREPKG: -+ case ALPM_QUESTION_INSTALL_IGNOREPKG: - pk_backend_install_ignorepkg (backend, data1, result); - break; - -- case PM_TRANS_CONV_REPLACE_PKG: -- case PM_TRANS_CONV_CONFLICT_PKG: -- case PM_TRANS_CONV_CORRUPTED_PKG: -- case PM_TRANS_CONV_LOCAL_NEWER: -+ case ALPM_QUESTION_REPLACE_PKG: -+ case ALPM_QUESTION_CONFLICT_PKG: -+ case ALPM_QUESTION_CORRUPTED_PKG: -+ case ALPM_QUESTION_LOCAL_NEWER: - /* these actions are mostly harmless */ - g_debug ("safe question %d", question); - *result = 1; - break; - -- case PM_TRANS_CONV_REMOVE_PKGS: -+ case ALPM_QUESTION_REMOVE_PKGS: -+ /* TODO: handle keys better */ -+ case ALPM_QUESTION_IMPORT_KEY: - g_debug ("unsafe question %d", question); - *result = 0; - break; - -- case PM_TRANS_CONV_SELECT_PROVIDER: -+ case ALPM_QUESTION_SELECT_PROVIDER: - pk_backend_select_provider (backend, data1, data2); - *result = 0; - break; -@@ -349,7 +355,7 @@ pk_backend_output_end (PkBackend *self) - } - - static void --pk_backend_output_start (PkBackend *self, pmpkg_t *pkg) -+pk_backend_output_start (PkBackend *self, alpm_pkg_t *pkg) - { - g_return_if_fail (self != NULL); - g_return_if_fail (pkg != NULL); -@@ -398,7 +404,7 @@ pk_backend_transaction_test_commit (PkBackend *self) - } - - static void --pk_backend_transaction_add_start (PkBackend *self, pmpkg_t *pkg) -+pk_backend_transaction_add_start (PkBackend *self, alpm_pkg_t *pkg) - { - g_return_if_fail (self != NULL); - g_return_if_fail (pkg != NULL); -@@ -409,18 +415,19 @@ pk_backend_transaction_add_start (PkBackend *self, pmpkg_t *pkg) - } - - static void --pk_backend_transaction_add_done (PkBackend *self, pmpkg_t *pkg) -+pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg) - { - const gchar *name, *version; - const alpm_list_t *i, *optdepends; - - g_return_if_fail (self != NULL); - g_return_if_fail (pkg != NULL); -+ g_return_if_fail (alpm != NULL); - - name = alpm_pkg_get_name (pkg); - version = alpm_pkg_get_version (pkg); - -- alpm_logaction ("installed %s (%s)\n", name, version); -+ alpm_logaction (alpm, "installed %s (%s)\n", name, version); - pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED); - - optdepends = alpm_pkg_get_optdepends (pkg); -@@ -438,7 +445,7 @@ pk_backend_transaction_add_done (PkBackend *self, pmpkg_t *pkg) - } - - static void --pk_backend_transaction_remove_start (PkBackend *self, pmpkg_t *pkg) -+pk_backend_transaction_remove_start (PkBackend *self, alpm_pkg_t *pkg) - { - g_return_if_fail (self != NULL); - g_return_if_fail (pkg != NULL); -@@ -449,24 +456,25 @@ pk_backend_transaction_remove_start (PkBackend *self, pmpkg_t *pkg) - } - - static void --pk_backend_transaction_remove_done (PkBackend *self, pmpkg_t *pkg) -+pk_backend_transaction_remove_done (PkBackend *self, alpm_pkg_t *pkg) - { - const gchar *name, *version; - - g_return_if_fail (self != NULL); - g_return_if_fail (pkg != NULL); -+ g_return_if_fail (alpm != NULL); - - name = alpm_pkg_get_name (pkg); - version = alpm_pkg_get_version (pkg); - -- alpm_logaction ("removed %s (%s)\n", name, version); -+ alpm_logaction (alpm, "removed %s (%s)\n", name, version); - pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED); - pk_backend_output_end (self); - } - - static void --pk_backend_transaction_upgrade_start (PkBackend *self, pmpkg_t *pkg, -- pmpkg_t *old) -+pk_backend_transaction_upgrade_start (PkBackend *self, alpm_pkg_t *pkg, -+ alpm_pkg_t *old) - { - PkRoleEnum role; - PkStatusEnum state; -@@ -491,8 +499,8 @@ pk_backend_transaction_upgrade_start (PkBackend *self, pmpkg_t *pkg, - } - - static void --pk_backend_transaction_upgrade_done (PkBackend *self, pmpkg_t *pkg, -- pmpkg_t *old) -+pk_backend_transaction_upgrade_done (PkBackend *self, alpm_pkg_t *pkg, -+ alpm_pkg_t *old) - { - const gchar *name, *pre, *post; - const alpm_list_t *i; -@@ -501,12 +509,13 @@ pk_backend_transaction_upgrade_done (PkBackend *self, pmpkg_t *pkg, - g_return_if_fail (self != NULL); - g_return_if_fail (pkg != NULL); - g_return_if_fail (old != NULL); -+ g_return_if_fail (alpm != NULL); - - name = alpm_pkg_get_name (pkg); - pre = alpm_pkg_get_version (old); - post = alpm_pkg_get_version (pkg); - -- alpm_logaction ("upgraded %s (%s -> %s)\n", name, pre, post); -+ alpm_logaction (alpm, "upgraded %s (%s -> %s)\n", name, pre, post); - pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED); - - optdepends = alpm_list_diff (alpm_pkg_get_optdepends (pkg), -@@ -528,53 +537,65 @@ pk_backend_transaction_upgrade_done (PkBackend *self, pmpkg_t *pkg, - } - - static void --pk_backend_transaction_event_cb (pmtransevt_t event, gpointer data, -+pk_backend_transaction_setup (PkBackend *self) -+{ -+ g_return_if_fail (self != NULL); -+ -+ pk_backend_set_status (self, PK_STATUS_ENUM_SETUP); -+} -+ -+static void -+pk_backend_transaction_event_cb (alpm_event_t event, gpointer data, - gpointer old) - { - g_return_if_fail (backend != NULL); - - /* figure out the backend status and package info */ - switch (event) { -- case PM_TRANS_EVT_CHECKDEPS_START: -- case PM_TRANS_EVT_RESOLVEDEPS_START: -+ case ALPM_EVENT_CHECKDEPS_START: -+ case ALPM_EVENT_RESOLVEDEPS_START: - pk_backend_transaction_dep_resolve (backend); - break; - -- case PM_TRANS_EVT_FILECONFLICTS_START: -- case PM_TRANS_EVT_INTERCONFLICTS_START: -- case PM_TRANS_EVT_INTEGRITY_START: -- case PM_TRANS_EVT_DELTA_INTEGRITY_START: -- case PM_TRANS_EVT_DISKSPACE_START: -+ case ALPM_EVENT_FILECONFLICTS_START: -+ case ALPM_EVENT_INTERCONFLICTS_START: -+ case ALPM_EVENT_INTEGRITY_START: -+ case ALPM_EVENT_DELTA_INTEGRITY_START: -+ case ALPM_EVENT_DISKSPACE_START: - pk_backend_transaction_test_commit (backend); - break; - -- case PM_TRANS_EVT_ADD_START: -+ case ALPM_EVENT_ADD_START: - pk_backend_transaction_add_start (backend, data); - break; - -- case PM_TRANS_EVT_ADD_DONE: -+ case ALPM_EVENT_ADD_DONE: - pk_backend_transaction_add_done (backend, data); - break; - -- case PM_TRANS_EVT_REMOVE_START: -+ case ALPM_EVENT_REMOVE_START: - pk_backend_transaction_remove_start (backend, data); - break; - -- case PM_TRANS_EVT_REMOVE_DONE: -+ case ALPM_EVENT_REMOVE_DONE: - pk_backend_transaction_remove_done (backend, data); - break; - -- case PM_TRANS_EVT_UPGRADE_START: -+ case ALPM_EVENT_UPGRADE_START: - pk_backend_transaction_upgrade_start (backend, data, - old); - break; - -- case PM_TRANS_EVT_UPGRADE_DONE: -+ case ALPM_EVENT_UPGRADE_DONE: - pk_backend_transaction_upgrade_done (backend, data, - old); - break; - -- case PM_TRANS_EVT_SCRIPTLET_INFO: -+ case ALPM_EVENT_LOAD_START: -+ pk_backend_transaction_setup (backend); -+ break; -+ -+ case ALPM_EVENT_SCRIPTLET_INFO: - pk_backend_output (backend, data); - break; - -@@ -588,27 +609,32 @@ static void - transaction_cancelled_cb (GCancellable *object, gpointer data) - { - g_return_if_fail (data != NULL); -+ g_return_if_fail (alpm != NULL); - -- alpm_trans_interrupt (); -+ alpm_trans_interrupt (alpm); - } - - gboolean --pk_backend_transaction_initialize (PkBackend *self, pmtransflag_t flags, -+pk_backend_transaction_initialize (PkBackend *self, alpm_transflag_t flags, - GError **error) - { - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (cancellable != NULL, FALSE); - -- if (alpm_trans_init (flags, pk_backend_transaction_event_cb, -- pk_backend_transaction_conv_cb, -- pk_backend_transaction_progress_cb) < 0) { -- g_set_error_literal (error, ALPM_ERROR, pm_errno, -- alpm_strerrorlast ()); -+ if (alpm_trans_init (alpm, flags) < 0) { -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error_literal (error, ALPM_ERROR, errno, -+ alpm_strerror (errno)); - return FALSE; - } - -- alpm_option_set_dlcb (pk_backend_transaction_dlcb); -- alpm_option_set_totaldlcb (pk_backend_transaction_totaldlcb); -+ alpm_option_set_eventcb (alpm, pk_backend_transaction_event_cb); -+ alpm_option_set_questioncb (alpm, pk_backend_transaction_conv_cb); -+ alpm_option_set_progresscb (alpm, pk_backend_transaction_progress_cb); -+ -+ alpm_option_set_dlcb (alpm, pk_backend_transaction_dlcb); -+ alpm_option_set_totaldlcb (alpm, pk_backend_transaction_totaldlcb); - - g_cancellable_connect (cancellable, - G_CALLBACK (transaction_cancelled_cb), -@@ -649,10 +675,11 @@ alpm_miss_build_list (const alpm_list_t *i) - } - - for (; i != NULL; i = i->next) { -- pmdepend_t *dep = alpm_miss_get_dep (i->data); -- gchar *depend = alpm_dep_compute_string (dep); -+ alpm_depmissing_t *miss = (alpm_depmissing_t *) i->data; -+ gchar *depend = alpm_dep_compute_string (miss->depend); -+ - g_string_append_printf (list, "%s <- %s, ", depend, -- alpm_miss_get_target (i->data)); -+ miss->target); - free (depend); - } - -@@ -661,25 +688,21 @@ alpm_miss_build_list (const alpm_list_t *i) - } - - static void --alpm_dep_free (gpointer dep) -+alpm_depend_free (alpm_depend_t *depend) - { -- /* TODO: remove when implemented in libalpm */ -- free ((gpointer) alpm_dep_get_name (dep)); -- free ((gpointer) alpm_dep_get_version (dep)); -- free (dep); -+ free (depend->name); -+ free (depend->version); -+ free (depend); - } - - static void --alpm_miss_free (gpointer miss) -+alpm_depmissing_free (gpointer miss) - { -- /* TODO: remove when implemented in libalpm */ -- const gchar *temp = alpm_miss_get_causingpkg (miss); -- if (temp != NULL) { -- free ((gpointer) temp); -- } -+ alpm_depmissing_t *self = (alpm_depmissing_t *) miss; - -- free ((gpointer) alpm_miss_get_target (miss)); -- alpm_dep_free (alpm_miss_get_dep (miss)); -+ free (self->target); -+ alpm_depend_free (self->depend); -+ free (self->causingpkg); - free (miss); - } - -@@ -695,17 +718,20 @@ alpm_conflict_build_list (const alpm_list_t *i) - } - - for (; i != NULL; i = i->next) { -- const gchar *first = alpm_conflict_get_package1 (i->data); -- const gchar *second = alpm_conflict_get_package2 (i->data); -- const gchar *reason = alpm_conflict_get_reason (i->data); -+ alpm_conflict_t *conflict = (alpm_conflict_t *) i->data; -+ alpm_depend_t *depend = conflict->reason; - -- if (g_strcmp0 (first, reason) == 0 || -- g_strcmp0 (second, reason) == 0) { -- g_string_append_printf (list, "%s <-> %s, ", first, -- second); -+ if (g_strcmp0 (conflict->package1, depend->name) == 0 || -+ g_strcmp0 (conflict->package2, depend->name) == 0) { -+ g_string_append_printf (list, "%s <-> %s, ", -+ conflict->package1, -+ conflict->package2); - } else { -- g_string_append_printf (list, "%s <-> %s (%s), ", first, -- second, reason); -+ gchar *reason = alpm_dep_compute_string (depend); -+ g_string_append_printf (list, "%s <-> %s (%s), ", -+ conflict->package1, -+ conflict->package2, reason); -+ g_free (reason); - } - } - -@@ -716,10 +742,10 @@ alpm_conflict_build_list (const alpm_list_t *i) - static void - alpm_conflict_free (gpointer conflict) - { -- /* TODO: remove when implemented in libalpm */ -- free ((gpointer) alpm_conflict_get_package1 (conflict)); -- free ((gpointer) alpm_conflict_get_package2 (conflict)); -- free ((gpointer) alpm_conflict_get_reason (conflict)); -+ alpm_conflict_t *self = (alpm_conflict_t *) conflict; -+ -+ free (self->package1); -+ free (self->package2); - free (conflict); - } - -@@ -735,15 +761,17 @@ alpm_fileconflict_build_list (const alpm_list_t *i) - } - - for (; i != NULL; i = i->next) { -- const gchar *target = alpm_fileconflict_get_target (i->data); -- const gchar *file = alpm_fileconflict_get_file (i->data); -- const gchar *ctarget = alpm_fileconflict_get_ctarget (i->data); -- if (*ctarget != '\0') { -+ alpm_fileconflict_t *conflict = (alpm_fileconflict_t *) i->data; -+ -+ if (*conflict->ctarget != '\0') { - g_string_append_printf (list, "%s <-> %s (%s), ", -- target, ctarget, file); -+ conflict->target, -+ conflict->ctarget, -+ conflict->file); - } else { -- g_string_append_printf (list, "%s (%s), ", target, -- file); -+ g_string_append_printf (list, "%s (%s), ", -+ conflict->target, -+ conflict->file); - } - } - -@@ -754,14 +782,11 @@ alpm_fileconflict_build_list (const alpm_list_t *i) - static void - alpm_fileconflict_free (gpointer conflict) - { -- /* TODO: remove when implemented in libalpm */ -- const gchar *temp = alpm_fileconflict_get_ctarget (conflict); -- if (*temp != '\0') { -- free ((gpointer) temp); -- } -+ alpm_fileconflict_t *self = (alpm_fileconflict_t *) conflict; - -- free ((gpointer) alpm_fileconflict_get_target (conflict)); -- free ((gpointer) alpm_fileconflict_get_file (conflict)); -+ free (self->target); -+ free (self->file); -+ free (self->ctarget); - free (conflict); - } - -@@ -771,29 +796,32 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error) - alpm_list_t *data = NULL; - gchar *prefix; - -- if (alpm_trans_prepare (&data) >= 0) { -+ g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); -+ -+ if (alpm_trans_prepare (alpm, &data) >= 0) { - return TRUE; - } - -- switch (pm_errno) { -- case PM_ERR_PKG_INVALID_ARCH: -+ switch (alpm_errno (alpm)) { -+ case ALPM_ERR_PKG_INVALID_ARCH: - prefix = alpm_pkg_build_list (data); - alpm_list_free (data); - break; - -- case PM_ERR_UNSATISFIED_DEPS: -+ case ALPM_ERR_UNSATISFIED_DEPS: - prefix = alpm_miss_build_list (data); -- alpm_list_free_inner (data, alpm_miss_free); -+ alpm_list_free_inner (data, alpm_depmissing_free); - alpm_list_free (data); - break; - -- case PM_ERR_CONFLICTING_DEPS: -+ case ALPM_ERR_CONFLICTING_DEPS: - prefix = alpm_conflict_build_list (data); - alpm_list_free_inner (data, alpm_conflict_free); - alpm_list_free (data); - break; - -- case PM_ERR_FILE_CONFLICTS: -+ case ALPM_ERR_FILE_CONFLICTS: - prefix = alpm_fileconflict_build_list (data); - alpm_list_free_inner (data, alpm_fileconflict_free); - alpm_list_free (data); -@@ -802,18 +830,21 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error) - default: - prefix = NULL; - if (data != NULL) { -- g_warning ("unhandled error %d", pm_errno); -+ g_warning ("unhandled error %d", -+ alpm_errno (alpm)); - } - break; - } - - if (prefix != NULL) { -- g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s", prefix, -- alpm_strerrorlast ()); -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "%s: %s", prefix, -+ alpm_strerror (errno)); - g_free (prefix); - } else { -- g_set_error_literal (error, ALPM_ERROR, pm_errno, -- alpm_strerrorlast ()); -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error_literal (error, ALPM_ERROR, errno, -+ alpm_strerror (errno)); - } - - return FALSE; -@@ -826,10 +857,11 @@ pk_backend_transaction_packages (PkBackend *self) - PkInfoEnum info; - - g_return_if_fail (self != NULL); -+ g_return_if_fail (alpm != NULL); - g_return_if_fail (localdb != NULL); - - /* emit packages that would have been installed */ -- for (i = alpm_trans_get_add (); i != NULL; i = i->next) { -+ for (i = alpm_trans_get_add (alpm); i != NULL; i = i->next) { - if (pk_backend_cancelled (self)) { - break; - } else { -@@ -856,7 +888,7 @@ pk_backend_transaction_packages (PkBackend *self) - } - - /* emit packages that would have been removed */ -- for (i = alpm_trans_get_remove (); i != NULL; i = i->next) { -+ for (i = alpm_trans_get_remove (alpm); i != NULL; i = i->next) { - if (pk_backend_cancelled (self)) { - break; - } else { -@@ -890,6 +922,9 @@ pk_backend_transaction_commit (PkBackend *self, GError **error) - alpm_list_t *data = NULL; - gchar *prefix; - -+ g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); -+ - if (pk_backend_cancelled (self)) { - return TRUE; - } -@@ -897,19 +932,19 @@ pk_backend_transaction_commit (PkBackend *self, GError **error) - pk_backend_set_allow_cancel (self, FALSE); - pk_backend_set_status (self, PK_STATUS_ENUM_RUNNING); - -- if (alpm_trans_commit (&data) >= 0) { -+ if (alpm_trans_commit (alpm, &data) >= 0) { - return TRUE; - } - -- switch (pm_errno) { -- case PM_ERR_FILE_CONFLICTS: -+ switch (alpm_errno (alpm)) { -+ case ALPM_ERR_FILE_CONFLICTS: - prefix = alpm_fileconflict_build_list (data); - alpm_list_free_inner (data, alpm_fileconflict_free); - alpm_list_free (data); - break; - -- case PM_ERR_PKG_INVALID: -- case PM_ERR_DLT_INVALID: -+ case ALPM_ERR_PKG_INVALID: -+ case ALPM_ERR_DLT_INVALID: - prefix = alpm_string_build_list (data); - alpm_list_free (data); - break; -@@ -917,18 +952,21 @@ pk_backend_transaction_commit (PkBackend *self, GError **error) - default: - prefix = NULL; - if (data != NULL) { -- g_warning ("unhandled error %d", pm_errno); -+ g_warning ("unhandled error %d", -+ alpm_errno (alpm)); - } - break; - } - - if (prefix != NULL) { -- g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s", prefix, -- alpm_strerrorlast ()); -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "%s: %s", prefix, -+ alpm_strerror (errno)); - g_free (prefix); - } else { -- g_set_error_literal (error, ALPM_ERROR, pm_errno, -- alpm_strerrorlast ()); -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error_literal (error, ALPM_ERROR, errno, -+ alpm_strerror (errno)); - } - - return FALSE; -@@ -938,9 +976,14 @@ gboolean - pk_backend_transaction_end (PkBackend *self, GError **error) - { - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); -+ -+ alpm_option_set_eventcb (alpm, NULL); -+ alpm_option_set_questioncb (alpm, NULL); -+ alpm_option_set_progresscb (alpm, NULL); - -- alpm_option_set_dlcb (NULL); -- alpm_option_set_totaldlcb (NULL); -+ alpm_option_set_dlcb (alpm, NULL); -+ alpm_option_set_totaldlcb (alpm, NULL); - - if (dpkg != NULL) { - pk_backend_transaction_download_end (self); -@@ -949,9 +992,10 @@ pk_backend_transaction_end (PkBackend *self, GError **error) - pk_backend_output_end (self); - } - -- if (alpm_trans_release () < 0) { -- g_set_error_literal (error, ALPM_ERROR, pm_errno, -- alpm_strerrorlast ()); -+ if (alpm_trans_release (alpm) < 0) { -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error_literal (error, ALPM_ERROR, errno, -+ alpm_strerror (errno)); - return FALSE; - } - -diff --git a/backends/alpm/pk-backend-transaction.h b/backends/alpm/pk-backend-transaction.h -index 6bb1d69..e3733d6 100644 ---- a/backends/alpm/pk-backend-transaction.h -+++ b/backends/alpm/pk-backend-transaction.h -@@ -25,7 +25,7 @@ - #include <pk-backend.h> - - gboolean pk_backend_transaction_initialize (PkBackend *self, -- pmtransflag_t flags, -+ alpm_transflag_t flags, - GError **error); - - gboolean pk_backend_transaction_simulate (PkBackend *self, -diff --git a/backends/alpm/pk-backend-update.c b/backends/alpm/pk-backend-update.c -index a281953..37ade1e 100644 ---- a/backends/alpm/pk-backend-update.c -+++ b/backends/alpm/pk-backend-update.c -@@ -34,7 +34,7 @@ - #include "pk-backend-update.h" - - static gchar * --alpm_pkg_build_replaces (pmpkg_t *pkg) -+alpm_pkg_build_replaces (alpm_pkg_t *pkg) - { - const alpm_list_t *i; - GString *string = NULL; -@@ -44,7 +44,7 @@ alpm_pkg_build_replaces (pmpkg_t *pkg) - - /* make a list of the packages that package replaces */ - for (i = alpm_pkg_get_replaces (pkg); i != NULL; i = i->next) { -- pmpkg_t *replaces = alpm_db_get_pkg (localdb, i->data); -+ alpm_pkg_t *replaces = alpm_db_get_pkg (localdb, i->data); - - if (replaces != NULL) { - gchar *package = alpm_pkg_build_id (replaces); -@@ -65,7 +65,7 @@ alpm_pkg_build_replaces (pmpkg_t *pkg) - } - - static gchar * --alpm_pkg_build_urls (pmpkg_t *pkg) -+alpm_pkg_build_urls (alpm_pkg_t *pkg) - { - GString *string = g_string_new (""); - #ifdef ALPM_PACKAGE_URL -@@ -97,7 +97,7 @@ alpm_pkg_build_urls (pmpkg_t *pkg) - } - - static gboolean --alpm_pkg_same_pkgver (pmpkg_t *a, pmpkg_t *b) -+alpm_pkg_same_pkgver (alpm_pkg_t *a, alpm_pkg_t *b) - { - const gchar *version_a, *version_b, *last_a, *last_b; - gsize length_a, length_b; -@@ -145,8 +145,8 @@ pk_backend_get_update_detail_thread (PkBackend *self) - - /* collect details about updates */ - for (; *packages != NULL; ++packages) { -- pmpkg_t *pkg, *old; -- pmdb_t *db; -+ alpm_pkg_t *pkg, *old; -+ alpm_db_t *db; - - gchar *upgrades, *replaces, *urls; - const gchar *reason; -@@ -245,18 +245,19 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) { - const alpm_list_t *i; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - - if (!pk_backend_transaction_initialize (self, 0, error)) { - return FALSE; - } - -- alpm_logaction ("synchronizing package lists\n"); -+ alpm_logaction (alpm, "synchronizing package lists\n"); - -- dlcb = alpm_option_get_dlcb (); -- totaldlcb = alpm_option_get_totaldlcb (); -+ dlcb = alpm_option_get_dlcb (alpm); -+ totaldlcb = alpm_option_get_totaldlcb (alpm); - - /* set total size to minus the number of databases */ -- i = alpm_option_get_syncdbs (); -+ i = alpm_option_get_syncdbs (alpm); - totaldlcb (-alpm_list_count (i)); - - for (; i != NULL; i = i->next) { -@@ -274,9 +275,10 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) { - /* fake the download when already up to date */ - dlcb ("", 1, 1); - } else if (result < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s", -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "[%s]: %s", - alpm_db_get_name (i->data), -- alpm_strerrorlast ()); -+ alpm_strerror (errno)); - break; - } - } -@@ -292,20 +294,21 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) { - } - - static gboolean --alpm_pkg_is_ignorepkg (pmpkg_t *pkg) -+alpm_pkg_is_ignorepkg (alpm_pkg_t *pkg) - { -- const alpm_list_t *ignorepkgs, *ignoregrps, *i; -+ const alpm_list_t *ignorepkgs, *ignoregroups, *i; - - g_return_val_if_fail (pkg != NULL, TRUE); -+ g_return_val_if_fail (alpm != NULL, TRUE); - -- ignorepkgs = alpm_option_get_ignorepkgs (); -+ ignorepkgs = alpm_option_get_ignorepkgs (alpm); - if (alpm_list_find_str (ignorepkgs, alpm_pkg_get_name (pkg)) != NULL) { - return TRUE; - } - -- ignoregrps = alpm_option_get_ignoregrps (); -+ ignoregroups = alpm_option_get_ignoregroups (alpm); - for (i = alpm_pkg_get_groups (pkg); i != NULL; i = i->next) { -- if (alpm_list_find_str (ignoregrps, i->data) != NULL) { -+ if (alpm_list_find_str (ignoregroups, i->data) != NULL) { - return TRUE; - } - } -@@ -314,7 +317,7 @@ alpm_pkg_is_ignorepkg (pmpkg_t *pkg) - } - - static gboolean --alpm_pkg_is_syncfirst (pmpkg_t *pkg) -+alpm_pkg_is_syncfirst (alpm_pkg_t *pkg) - { - g_return_val_if_fail (pkg != NULL, FALSE); - -@@ -325,8 +328,18 @@ alpm_pkg_is_syncfirst (pmpkg_t *pkg) - return FALSE; - } - --static pmpkg_t * --alpm_pkg_find_update (pmpkg_t *pkg, const alpm_list_t *dbs) -+static gboolean -+alpm_pkg_replaces (alpm_pkg_t *pkg, const gchar *name) -+{ -+ g_return_val_if_fail (pkg != NULL, FALSE); -+ g_return_val_if_fail (name != NULL, FALSE); -+ -+ return alpm_list_find_str (alpm_pkg_get_replaces (pkg), name) != NULL; -+} -+ -+ -+static alpm_pkg_t * -+alpm_pkg_find_update (alpm_pkg_t *pkg, const alpm_list_t *dbs) - { - const gchar *name; - const alpm_list_t *i; -@@ -336,7 +349,7 @@ alpm_pkg_find_update (pmpkg_t *pkg, const alpm_list_t *dbs) - name = alpm_pkg_get_name (pkg); - - for (; dbs != NULL; dbs = dbs->next) { -- pmpkg_t *update = alpm_db_get_pkg (dbs->data, name); -+ alpm_pkg_t *update = alpm_db_get_pkg (dbs->data, name); - - if (update != NULL) { - if (alpm_pkg_vercmp (alpm_pkg_get_version (update), -@@ -349,8 +362,7 @@ alpm_pkg_find_update (pmpkg_t *pkg, const alpm_list_t *dbs) - - i = alpm_db_get_pkgcache (dbs->data); - for (; i != NULL; i = i->next) { -- if (alpm_list_find_str (alpm_pkg_get_replaces (i->data), -- name) != NULL) { -+ if (alpm_pkg_replaces (i->data, name)) { - return i->data; - } - } -@@ -367,6 +379,7 @@ pk_backend_get_updates_thread (PkBackend *self) - const alpm_list_t *i, *syncdbs; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (localdb != NULL, FALSE); - - time (&one_hour_ago); -@@ -385,9 +398,9 @@ pk_backend_get_updates_thread (PkBackend *self) - } - - /* find outdated and replacement packages */ -- syncdbs = alpm_option_get_syncdbs (); -+ syncdbs = alpm_option_get_syncdbs (alpm); - for (i = alpm_db_get_pkgcache (localdb); i != NULL; i = i->next) { -- pmpkg_t *upgrade = alpm_pkg_find_update (i->data, syncdbs); -+ alpm_pkg_t *upgrade = alpm_pkg_find_update (i->data, syncdbs); - - if (pk_backend_cancelled (self)) { - break; diff --git a/community-testing/packagekit/packagekit.install b/community-testing/packagekit/packagekit.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/community-testing/packagekit/packagekit.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/paraview/12859-VisItBrige-external-tiff-support.diff b/community-testing/paraview/12859-VisItBrige-external-tiff-support.diff deleted file mode 100644 index 1901d0146..000000000 --- a/community-testing/paraview/12859-VisItBrige-external-tiff-support.diff +++ /dev/null @@ -1,32 +0,0 @@ -commit c69690edb180b96081f3e75d0c23bbd5abcb3d65 -Author: Robert Maynard <robert.maynard@kitware.com> -Date: Mon Jan 9 12:50:32 2012 -0500 - - Corrected build issues when using system tiff library. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0b2ee9e..a83beb7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -216,6 +216,9 @@ VISIT_VTK_THIRD_PARTY_INCLUDE(NETCDF vtknetcdf/include) - #setup png - VISIT_VTK_THIRD_PARTY_INCLUDE(PNG vtkpng) - -+#setup tiff -+VISIT_VTK_THIRD_PARTY_INCLUDE(TIFF vtktiff) -+ - - #----------------------------------------------------------------------------- - # Detect packages here. We could probably write macros that we can include from -diff --git a/visit_vtk/full/CMakeLists.txt b/visit_vtk/full/CMakeLists.txt -index e83e041..532dc62 100644 ---- a/visit_vtk/full/CMakeLists.txt -+++ b/visit_vtk/full/CMakeLists.txt -@@ -115,6 +115,6 @@ set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES - "${VISIT_SOURCE_DIR}/parser;${tmp_include_dirs}") - - VTK_ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES}) --TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging vtktiff) -+TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging ${VTK_TIFF_LIBRARIES}) - - VISIT_INSTALL_TARGETS(visit_vtk) diff --git a/community-testing/paraview/PKGBUILD b/community-testing/paraview/PKGBUILD deleted file mode 100644 index 32fce25f2..000000000 --- a/community-testing/paraview/PKGBUILD +++ /dev/null @@ -1,78 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Michele Mocciola <mickele> -# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> - -pkgname=paraview -pkgver=3.12.0 -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' 'libtheora') -makedepends=('cmake' 'desktop-file-utils' 'boost') -source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" - 'paraview.png' - 'paraview.desktop' - 'fix-boost-graph-api-changes.diff' - '12859-VisItBrige-external-tiff-support.diff') -md5sums=('8feabc6261e2060648eaac593d85b1de' - 'db623002bc71a257ddfdd0c9c7b14c3f' - '4e4b7172ed18171c37446fd7c4f1e8f5' - '2aa5b98288cadd201ffbd057f18929b0' - '9321279c8fc6f289a7cf228648edcb5f') - -build() { - cd ParaView-${pkgver}/VTK - # fix http://www.vtk.org/Bug/view.php?id=12772 remove on next pkgver bump - patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff - - - cd ${srcdir}/ParaView-${pkgver}/Utilities/VisItBridge - # fix http://paraview.org/Bug/view.php?id=12849 remove on next pkgver bump - patch -Np1 -i ${srcdir}/12859-VisItBrige-external-tiff-support.diff - - mkdir ${srcdir}/build - cd ${srcdir}/build - - # flags to enable using system libs - local cmake_system_flags="" - for lib in HDF5 FREETYPE JPEG PNG TIFF ZLIB EXPAT LIBXML2 OGGTHEORA; do - 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" - - # enable when http://paraview.org/Bug/view.php?id=12718 gets fixed - #-DCMAKE_SKIP_RPATH:BOOL=YES \ - # the following flags enable the feature request at https://bugs.archlinux.org/task/27525 - # -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON -DVISIT_BUILD_READER_CGNS:BOOL=ON - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DVTK_USE_BOOST:BOOL=ON \ - -DPARAVIEW_USE_MPI:BOOL=ON \ - -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \ - -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \ - -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \ - -DVISIT_BUILD_READER_CGNS:BOOL=ON \ - ${cmake_system_flags} \ - ${cmake_system_python_flags} \ - ../ParaView-${pkgver} - - make -} - -package() { - cd build - - make DESTDIR=${pkgdir} install - - # Install license - install -Dm644 ${srcdir}/ParaView-${pkgver}/License_v1.2.txt ${pkgdir}/usr/share/licenses/paraview/LICENSE - - # Install desktop shortcuts - install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png - desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop -} diff --git a/community-testing/paraview/fix-boost-graph-api-changes.diff b/community-testing/paraview/fix-boost-graph-api-changes.diff deleted file mode 100644 index 37d78665b..000000000 --- a/community-testing/paraview/fix-boost-graph-api-changes.diff +++ /dev/null @@ -1,42 +0,0 @@ -commit d3ecc2c459dd1df937fc97887581ace1036da533 -Author: Marcus D. Hanwell <marcus.hanwell@kitware.com> -Date: Tue Dec 13 15:36:06 2011 -0500 - - BUG: 12772 fixes for change in Boost graph API - - This fixes bug 12772, where an API change in Boost was causing - compilation failures using Boost 1.38. Thanks to Orion Poplawski for - reporting the issue and posting the patch. - - Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06 - -diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -index c789f6b..cf7cd47 100644 ---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx -+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -@@ -47,6 +47,15 @@ using namespace boost; - vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); - - -+namespace { -+ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { -+ return e.Id; -+ } -+ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { -+ return e.underlying_desc.Id; -+ } -+} -+ - // Redefine the bfs visitor, the only visitor we - // are using is the tree_edge visitor. - template <typename IdMap> -@@ -95,7 +104,8 @@ public: - - // Copy the vertex and edge data from the graph to the tree. - tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); -- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); -+ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), -+ unwrap_edge_id(e), tree_e.Id); - } - - private: diff --git a/community-testing/paraview/paraview.desktop b/community-testing/paraview/paraview.desktop deleted file mode 100644 index 2f5b8ec69..000000000 --- a/community-testing/paraview/paraview.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=ParaView -GenericName=Data Viewer -Comment=ParaView allows visualization of large data sets -Type=Application -Terminal=false -Icon=paraview -Categories=Graphics; -Exec=/usr/bin/paraview diff --git a/community-testing/paraview/paraview.png b/community-testing/paraview/paraview.png Binary files differdeleted file mode 100644 index 6e39f3d4f..000000000 --- a/community-testing/paraview/paraview.png +++ /dev/null diff --git a/community-testing/patchage/PKGBUILD b/community-testing/patchage/PKGBUILD deleted file mode 100644 index 805cc211c..000000000 --- a/community-testing/patchage/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 63232 2012-01-30 19:04:43Z 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=3 -pkgdesc="A modular patch bay for audio and MIDI systems" -arch=('i686' 'x86_64') -url="http://drobilla.net/software/patchage" -license=('GPL') -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") -sha256sums=('9bb9d1ba0205c0ad95c6dbecba56c513ff706f1057348d33ff7567bc9cbd89d2') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - python2 waf configure --prefix=/usr - python2 waf build $MAKEFLAGS -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - python2 waf --destdir="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/patchage/patchage.install b/community-testing/patchage/patchage.install deleted file mode 100644 index e4f8fd06c..000000000 --- a/community-testing/patchage/patchage.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/percona-server/PKGBUILD b/community-testing/percona-server/PKGBUILD deleted file mode 100644 index 4a03ded15..000000000 --- a/community-testing/percona-server/PKGBUILD +++ /dev/null @@ -1,103 +0,0 @@ -# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> - -pkgname=percona-server -pkgver=5.5.18_rel23.0 -pkgrel=1 -pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" -arch=('i686' 'x86_64') - -depends=('mysql-clients' 'libaio') -conflicts=('mysql') -provides=('mysql') -optdepends=('perl-dbi' 'perl-dbd-mysql') -makedepends=('cmake' 'openssl' 'zlib') - -license=('GPL') -url="http://www.percona.com/software/percona-server/" -options=('!libtool' 'emptydirs') -backup=('etc/mysql/my.cnf') -install=percona.install -source=("http://www.percona.com/redir/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/Percona-Server-${pkgver/_/-}.tar.gz" - 'mysqld' - 'my.cnf') - -build() { - cd "${srcdir}/Percona-Server-${pkgver/_/-}" - sed -i 's|ADD_SUBDIRECTORY(libmysqld/examples)|# ADD_SUBDIRECTORY(libmysqld/examples)|' CMakeLists.txt - - cd "${srcdir}" - rm -rf build - mkdir build - cd build - - # CFLAGS/CXXFLAGS as suggested upstream - CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ - - cmake "${srcdir}/Percona-Server-${pkgver/_/-}" \ - -DMANUFACTURER=Arch \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ - -DDEFAULT_CHARSET=utf8 \ - -DDEFAULT_COLLATION=utf8_general_ci \ - -DENABLED_LOCAL_INFILE=ON \ - -DINSTALL_INFODIR=share/mysql/docs \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_SHAREDIR=share/mysql \ - -DWITH_READLINE=OFF \ - -DWITH_ZLIB=system \ - -DWITH_SSL=system \ - -DWITH_LIBWRAP=OFF \ - -DWITH_LIBEDIT=OFF \ - -DWITH_UNIT_TESTS=OFF \ - -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ - -DWITH_EXTRA_CHARSETS=complex \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=ON \ - -DWITH_PARTITION_STORAGE_ENGINE=ON \ - -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \ - -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ - -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ - -DWITH_FEDERATED_STORAGE_ENGINE=OFF \ - -DWITH_EXAMPLE_STORAGE_ENGINE=OFF - - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR=${pkgdir} install - - install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf - install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld - - # provided by libmysqlclient - rm ${pkgdir}/usr/bin/mysql_config - rm ${pkgdir}/usr/lib/libmysql* - rm -r ${pkgdir}/usr/include/ - rm ${pkgdir}/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 - - # provided by mysql-clients - rm ${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} - rm ${pkgdir}/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 - - # not needed - rm -r ${pkgdir}/usr/{data,mysql-test,sql-bench} - rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 - - install -dm700 "${pkgdir}"/var/lib/mysql -} - -md5sums=('17b266f5c10d01838522188f313a1ead' - '243864805611764a7e5883c1dba7afd8' - '1c949c0dbea5206af0db14942d9927b6') diff --git a/community-testing/percona-server/my.cnf b/community-testing/percona-server/my.cnf deleted file mode 100644 index 9a41b4fc3..000000000 --- a/community-testing/percona-server/my.cnf +++ /dev/null @@ -1,145 +0,0 @@ -# MySQL config file for medium systems. -# -# This is for a system with little memory (32M - 64M) where MySQL plays -# an important part, or systems up to 128M where MySQL is used together with -# other programs (such as a web server) -# -# MySQL programs look for option files in a set of -# locations which depend on the deployment platform. -# You can copy this option file to one of those -# locations. For information about these locations, see: -# http://dev.mysql.com/doc/mysql/en/option-files.html -# -# In this file, you can use all long options that a program supports. -# If you want to know which options a program supports, run the program -# with the "--help" option. - -# The following options will be passed to all MySQL clients -[client] -#password = your_password -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -# Here follows entries for some specific programs - -# The MySQL server -[mysqld] -port = 3306 -socket = /var/run/mysqld/mysqld.sock -datadir = /var/lib/mysql -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 1M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -# Don't listen on a TCP/IP port at all. This can be a security enhancement, -# if all processes that need to connect to mysqld run on the same host. -# All interaction with mysqld must be made via Unix sockets or named pipes. -# Note that using this option without enabling named pipes on Windows -# (via the "enable-named-pipe" option) will render mysqld useless! -# -skip-networking - -# Replication Master Server (default) -# binary logging is required for replication -log-bin=mysql-bin - -# binary logging format - mixed recommended -binlog_format=mixed - -# required unique id between 1 and 2^32 - 1 -# defaults to 1 if master-host is not set -# but will not function as a master if omitted -server-id = 1 - -# Replication Slave (comment out master section to use this) -# -# To configure this host as a replication slave, you can choose between -# two methods : -# -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - -# the syntax is: -# -# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, -# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; -# -# where you replace <host>, <user>, <password> by quoted strings and -# <port> by the master's port number (3306 by default). -# -# Example: -# -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, -# MASTER_USER='joe', MASTER_PASSWORD='secret'; -# -# OR -# -# 2) Set the variables below. However, in case you choose this method, then -# start replication for the first time (even unsuccessfully, for example -# if you mistyped the password in master-password and the slave fails to -# connect), the slave will create a master.info file, and any later -# change in this file to the variables' values below will be ignored and -# overridden by the content of the master.info file, unless you shutdown -# the slave server, delete master.info and restart the slaver server. -# For that reason, you may want to leave the lines below untouched -# (commented) and instead use CHANGE MASTER TO (see above) -# -# required unique id between 2 and 2^32 - 1 -# (and different from the master) -# defaults to 2 if master-host is set -# but will not function as a slave if omitted -#server-id = 2 -# -# The replication master for this slave - required -#master-host = <hostname> -# -# The username the slave will use for authentication when connecting -# to the master - required -#master-user = <username> -# -# The password the slave will authenticate with when connecting to -# the master - required -#master-password = <password> -# -# The port the master is listening on. -# optional - defaults to 3306 -#master-port = <port> -# -# binary logging - not required for slaves, but recommended -#log-bin=mysql-bin - -# Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = /var/lib/mysql -#innodb_data_file_path = ibdata1:10M:autoextend -#innodb_log_group_home_dir = /var/lib/mysql -# You can set .._buffer_pool_size up to 50 - 80 % -# of RAM but beware of setting memory usage too high -#innodb_buffer_pool_size = 16M -#innodb_additional_mem_pool_size = 2M -# Set .._log_file_size to 25 % of buffer pool size -#innodb_log_file_size = 5M -#innodb_log_buffer_size = 8M -#innodb_flush_log_at_trx_commit = 1 -#innodb_lock_wait_timeout = 50 - -[mysqldump] -quick -max_allowed_packet = 16M - -[mysql] -no-auto-rehash -# Remove the next comment character if you are not familiar with SQL -#safe-updates - -[myisamchk] -key_buffer_size = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[mysqlhotcopy] -interactive-timeout diff --git a/community-testing/percona-server/mysqld b/community-testing/percona-server/mysqld deleted file mode 100755 index 07f6b7e4c..000000000 --- a/community-testing/percona-server/mysqld +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting Percona Server" - [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /var/run/mysqld/mysqld.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Percona Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /var/run/mysqld/mysqld.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/percona-server/percona.install b/community-testing/percona-server/percona.install deleted file mode 100644 index caacccf1b..000000000 --- a/community-testing/percona-server/percona.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install(){ - groupadd -g 89 mysql &>/dev/null - useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - /usr/bin/mysql_install_db --user=mysql --basedir=/usr - chown -R mysql:mysql var/lib/mysql &>/dev/null -} - -post_upgrade(){ - getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null - getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - - if [ "$(vercmp $2 5.5)" -lt 0 ]; then - echo " >> " - echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." - echo " >> " - fi -} - -post_remove(){ - if getent passwd mysql >/dev/null 2>&1; then - userdel mysql - fi - if getent group mysql >/dev/null 2>&1; then - groupdel mysql - fi -} diff --git a/community-testing/performous/PKGBUILD b/community-testing/performous/PKGBUILD deleted file mode 100644 index 3f7b9871e..000000000 --- a/community-testing/performous/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 63234 2012-01-30 19:04:51Z ibiru $ -# Maintainer : Laurent Carlier <lordheavym@gmail.com> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=performous -pkgver=0.6.1 -pkgrel=12 -pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' -arch=('i686' 'x86_64') -url="http://performous.org/" -license=('GPL') -depends=('boost-libs>=1.48' 'imagemagick' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg') -#depends=('boost-libs>=1.48' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \ -# 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') -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" - png15.patch) -md5sums=('451a759de77984b5a699e91107fe52e2' - '42a8c825d80b0de16bd5752d2a80e585' - 'ff0ffa681dfaa09c4f42133a65309bf0' - '89157d5e21b0efd09fcbeee299d23c7e') - -build() { - cd ${srcdir}/Performous-${pkgver}-Source - - # fix to built against boost 1.46 and later, upstream (git) now support v3 - 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 - - # fix config loading with libxml++ - export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} - - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr .. - - make -} - -package() { - cd ${srcdir}/Performous-${pkgver}-Source/build - - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/performous/boost-filesystem-v3.patch b/community-testing/performous/boost-filesystem-v3.patch deleted file mode 100644 index 22dd07213..000000000 --- a/community-testing/performous/boost-filesystem-v3.patch +++ /dev/null @@ -1,135 +0,0 @@ -diff --git a/game/backgrounds.cc b/game/backgrounds.cc -index 7fd3cd0..cdedefb 100644 ---- a/game/backgrounds.cc -+++ b/game/backgrounds.cc -@@ -55,8 +55,13 @@ void Backgrounds::reload_internal(fs::path const& parent) { - for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { - fs::path p = dirIt->path(); - if (fs::is_directory(p)) { reload_internal(p); continue; } -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string name = p.leaf(); // File basename - std::string path = p.directory_string(); // Path without filename -+#else -+ std::string name = p.filename().string(); // File basename -+ std::string path = p.string(); // Path without filename -+#endif - path.erase(path.size() - name.size()); - if (!regex_match(name.c_str(), match, expression)) continue; - { -diff --git a/game/cache.cc b/game/cache.cc -index 69974e2..0f1edd0 100644 ---- a/game/cache.cc -+++ b/game/cache.cc -@@ -9,7 +9,11 @@ namespace cache { - fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){ - fs::path cache_filename; - std::string const lod = (boost::format("%.2f") % factor).str(); -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png"; -+#else -+ std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png"; -+#endif - - if (isThemeResource(svgfilename)) { - std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s()); -diff --git a/game/filemagic.hh b/game/filemagic.hh -index bf87ded..29e81fe 100644 ---- a/game/filemagic.hh -+++ b/game/filemagic.hh -@@ -71,7 +71,11 @@ namespace filemagic { - // For now, just check the extension an assume it's not lying. - - // Get file extension in lower case -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string ext = filename.extension(); -+#else -+ std::string ext = filename.extension().string(); -+#endif - // somehow this does not convert the extension to lower case: - //std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower)); - std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower ); -diff --git a/game/fs.cc b/game/fs.cc -index e34a784..767a7ab 100644 ---- a/game/fs.cc -+++ b/game/fs.cc -@@ -128,7 +128,11 @@ std::string getThemePath(std::string const& filename) { - - bool isThemeResource(fs::path filename){ - try { -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string themefile = getThemePath(filename.filename()); -+#else -+ std::string themefile = getThemePath(filename.filename().string()); -+#endif - return themefile == filename; - } catch (...) { return false; } - } -diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc -index 38e163b..db15d79 100644 ---- a/game/songparser-ini.cc -+++ b/game/songparser-ini.cc -@@ -104,7 +104,11 @@ void SongParser::iniParseHeader() { - // Search the dir for the music files - for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { - boost::filesystem::path p = dirIt->path(); -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string name = p.leaf(); // File basename (notes.txt) -+#else -+ std::string name = p.filename().string(); // File basename (notes.txt) -+#endif - if (regex_match(name.c_str(), match, midifile)) { - s.midifilename = name; - } else if (regex_match(name.c_str(), match, audiofile_background)) { -diff --git a/game/songparser.cc b/game/songparser.cc -index 2b7b9b4..ac9f3f6 100644 ---- a/game/songparser.cc -+++ b/game/songparser.cc -@@ -100,7 +100,11 @@ SongParser::SongParser(Song& s): - - for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { - boost::filesystem::path p = dirIt->path(); -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string name = p.leaf(); // File basename -+#else -+ std::string name = p.filename().string(); // File basename -+#endif - if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) { - m_song.cover = name; - } else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) { -diff --git a/game/songs.cc b/game/songs.cc -index 62ab26d..afab383 100644 ---- a/game/songs.cc -+++ b/game/songs.cc -@@ -67,8 +67,13 @@ void Songs::reload_internal(fs::path const& parent) { - for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { - fs::path p = dirIt->path(); - if (fs::is_directory(p)) { reload_internal(p); continue; } -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string name = p.leaf(); // File basename (notes.txt) - std::string path = p.directory_string(); // Path without filename -+#else -+ std::string name = p.filename().string(); // File basename (notes.txt) -+ std::string path = p.string(); // Path without filename -+#endif - path.erase(path.size() - name.size()); - if (!regex_match(name.c_str(), match, expression)) continue; - try { -diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh -index 58e19dc..8895d94 100644 ---- a/tools/ss_helpers.hh -+++ b/tools/ss_helpers.hh -@@ -10,7 +10,11 @@ extern "C" void xmlLogger(void* logger, char const* msg, ...) { if (logger) *(st - void enableXMLLogger(std::ostream& os = std::cerr) { xmlSetGenericErrorFunc(&os, xmlLogger); } - void disableXMLLogger() { xmlSetGenericErrorFunc(NULL, xmlLogger); } - -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string filename(boost::filesystem::path const& p) { return *--p.end(); } -+#else -+std::string filename(boost::filesystem::path const& p) { return p.filename().string(); } -+#endif - - /** Fix Singstar's b0rked XML **/ - std::string xmlFix(std::vector<char> const& data) { --- -1.7.4.1 - diff --git a/community-testing/performous/png15.patch b/community-testing/performous/png15.patch deleted file mode 100644 index b6fb8fb14..000000000 --- a/community-testing/performous/png15.patch +++ /dev/null @@ -1,33 +0,0 @@ -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-testing/perl-berkeleydb/PKGBUILD b/community-testing/perl-berkeleydb/PKGBUILD deleted file mode 100644 index d57c0ede6..000000000 --- a/community-testing/perl-berkeleydb/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 61880 2012-01-09 18:50:05Z stephane $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-berkeleydb -pkgver=0.50 -pkgrel=2 -pkgdesc="Interface to Berkeley DB version 2, 3 or 4" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/BerkeleyDB/" -license=('GPL' 'PerlArtistic') -depends=('perl' 'db') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz) -md5sums=('6afc8f49133c262c606d1b96e1412863') - -build() { - cd $srcdir/BerkeleyDB-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - _dbver=`pacman -Q db | cut -d\ -f2 | cut -d- -f1` - depends=('perl' "db=$_dbver") - - cd $srcdir/BerkeleyDB-$pkgver - make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-gnome2-wnck/PKGBUILD b/community-testing/perl-gnome2-wnck/PKGBUILD deleted file mode 100644 index a77422f29..000000000 --- a/community-testing/perl-gnome2-wnck/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 63236 2012-01-30 19:04:55Z ibiru $ -# Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> - -pkgname=perl-gnome2-wnck -pkgver=0.16 -pkgrel=5 -pkgdesc="Perl interface to the Window Navigator Construction Kit" -arch=('i686' 'x86_64') -license=("GPL" "Artistic") -url="http://search.cpan.org/dist/Gnome2-Wnck" -depends=('perl' 'perl-extutils-depends' 'perl-extutils-pkgconfig' 'gnome-perl' 'libwnck') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Wnck-${pkgver}.tar.gz") -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-testing/perl-gtk2-sexy/PKGBUILD b/community-testing/perl-gtk2-sexy/PKGBUILD deleted file mode 100644 index fde5853fb..000000000 --- a/community-testing/perl-gtk2-sexy/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 63238 2012-01-30 19:05:02Z 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=6 -pkgdesc="Perl/CPAN Module Gtk2::Sexy" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Gtk2-Sexy" -license=('GPL' 'PerlArtistic') -depends=('gtk2' 'libsexy') -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends' 'gtk2-perl') -options=(docs !emptydirs) -source=("http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-Sexy-${pkgver}.tar.gz") -md5sums=('3e291808250d7b956ba8443013a1b461') - -build() { - cd Gtk2-Sexy-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd Gtk2-Sexy-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gtk2-trayicon/PKGBUILD b/community-testing/perl-gtk2-trayicon/PKGBUILD deleted file mode 100644 index f8c1cbf17..000000000 --- a/community-testing/perl-gtk2-trayicon/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 63240 2012-01-30 19:05:07Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Tom K <tomk@runbox.com> - -pkgname=perl-gtk2-trayicon -pkgver=0.06 -pkgrel=8 -pkgdesc="Perl interface to the EggTrayIcon library" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Gtk2-TrayIcon/" -depends=('gtk2-perl') -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -license=("GPL") -options=('!emptydirs') -source=("http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-TrayIcon-${pkgver}.tar.gz") -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-testing/perl-gtk2-webkit/PKGBUILD b/community-testing/perl-gtk2-webkit/PKGBUILD deleted file mode 100644 index 551b9af92..000000000 --- a/community-testing/perl-gtk2-webkit/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 63242 2012-01-30 19:05:13Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> - -pkgname=perl-gtk2-webkit -pkgver=0.09 -pkgrel=2 -pkgdesc="Gtk2::WebKit" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Gtk2-WebKit" -license=('GPL' 'PerlArtistic') -depends=('perl' 'gtk2-perl' 'libwebkit' 'perl-extutils-depends' 'perl-extutils-pkgconfig') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-WebKit-${pkgver}.tar.gz) -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-testing/pidgin-libnotify/PKGBUILD b/community-testing/pidgin-libnotify/PKGBUILD deleted file mode 100644 index 500f5d532..000000000 --- a/community-testing/pidgin-libnotify/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Daenyth <Daenyth+Arch [at] gmail [dot] com> -# Contributor: Hugo Doria <hugodoria@gmail.com> -# Contributor pidgin-libnotify: 3ED <kas1987@o2.pl> - -pkgname=pidgin-libnotify -pkgver=0.14 -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/" -license=('GPL') -depends=('pidgin' 'libnotify' 'perlxml' 'gettext' 'notification-daemon') -makedepends=('libtool' 'intltool') -replaces=('gaim-libnotify') -options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/gaim-libnotify/$pkgname-$pkgver.tar.gz language_fixes.patch - pidgin-libnotify-0.14-libnotify-0.7.patch) -md5sums=('bfb5368b69c02d429b2b17c00a6673c0' - 'e9bdbb3c7faa61f062fc64277457b6c0' - '05538625f14d9f2c12adae5fa6a1fa26') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/language_fixes.patch" - patch -p0 -i "$srcdir/pidgin-libnotify-0.14-libnotify-0.7.patch" - ./configure --prefix=/usr --disable-deprecated --disable-static - make - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/pidgin-libnotify/language_fixes.patch b/community-testing/pidgin-libnotify/language_fixes.patch deleted file mode 100644 index 6898b0483..000000000 --- a/community-testing/pidgin-libnotify/language_fixes.patch +++ /dev/null @@ -1,536 +0,0 @@ -diff -Naur pidgin-libnotify-0.14/po/de.po pidgin-libnotify-0.14/po-new/de.po ---- pidgin-libnotify-0.14/po/de.po 2010-03-09 18:20:47.365124617 +0100 -+++ pidgin-libnotify-0.14/po-new/de.po 2010-03-09 18:02:40.715216935 +0100 -@@ -48,7 +48,7 @@ - #: src/pidgin-libnotify.c:379 - #, c-format - msgid "%s signed off" --msgstr "%s hat sich angemeldet" -+msgstr "%s hat sich abgemeldet" - - #: src/pidgin-libnotify.c:406 - #, c-format -diff -Naur pidgin-libnotify-0.14/po/et.po pidgin-libnotify-0.14/po-new/et.po ---- pidgin-libnotify-0.14/po/et.po 1970-01-01 01:00:00.000000000 +0100 -+++ pidgin-libnotify-0.14/po-new/et.po 2010-03-09 18:14:58.831811232 +0100 -@@ -0,0 +1,80 @@ -+# Pidgin-libnotify translation to Estonian language. -+# Copyright (C) 2009 The Gnome Translation Team. -+# This file is distributed under the same license as the pidgin-libnotify package. -+# Mattias Põldaru <mahfiaz gmail com>, 2009. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: Pdgin Libnotify\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2009-03-23 11:04+0200\n" -+"PO-Revision-Date: 2009-03-23 11:09+0300\n" -+"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n" -+"Language-Team: Gnome Estonian Translation Team <gnome-et@linux.ee>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=2; plural = n!=1;\n" -+"X-Poedit-Language: Estonian\n" -+ -+#: ../src/pidgin-libnotify.c:57 -+msgid "New messages" -+msgstr "Uutele sõnumitele" -+ -+#: ../src/pidgin-libnotify.c:62 -+msgid "Only new conversations" -+msgstr "Ainult uutele vestlustele" -+ -+#: ../src/pidgin-libnotify.c:67 -+msgid "Ignore events from blocked users" -+msgstr "Blokitud kasutajaid eiratakse" -+ -+#: ../src/pidgin-libnotify.c:72 -+msgid "Buddy signs on" -+msgstr "Sõber logib sisse" -+ -+#: ../src/pidgin-libnotify.c:77 -+msgid "Buddy signs off" -+msgstr "Sõber logib välja" -+ -+#: ../src/pidgin-libnotify.c:82 -+msgid "Only when available" -+msgstr "Ainult siis, kui olekuks on saadaval" -+ -+#: ../src/pidgin-libnotify.c:320 -+msgid "Show" -+msgstr "Näita" -+ -+#: ../src/pidgin-libnotify.c:352 -+#, c-format -+msgid "%s signed on" -+msgstr "%s logis sisse" -+ -+#: ../src/pidgin-libnotify.c:384 -+#, c-format -+msgid "%s signed off" -+msgstr "%s logis välja" -+ -+#: ../src/pidgin-libnotify.c:411 -+#, c-format -+msgid "%s says:" -+msgstr "%s ütleb:" -+ -+#: ../src/pidgin-libnotify.c:577 -+msgid "Libnotify Popups" -+msgstr "Libnotify hüpikaknad" -+ -+#: ../src/pidgin-libnotify.c:578 -+msgid "Displays popups via libnotify." -+msgstr "Kuvab hüpikaknaid kasutades libnotify'd." -+ -+#: ../src/pidgin-libnotify.c:579 -+msgid "" -+"Pidgin-libnotify:\n" -+"Displays popups via libnotify." -+msgstr "" -+"Pidgin-libnotify:\n" -+"Kuvab hüpikaknaid kasutades libnotify'd." -+ -+ -+ -diff -Naur pidgin-libnotify-0.14/po/hu.po pidgin-libnotify-0.14/po-new/hu.po ---- pidgin-libnotify-0.14/po/hu.po 2007-06-30 20:53:22.000000000 +0200 -+++ pidgin-libnotify-0.14/po-new/hu.po 2010-03-09 18:13:38.721834227 +0100 -@@ -1,8 +1,7 @@ - msgid "" - msgstr "" --"Project-Id-Version: \n" --"Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2007-06-30 19:58+0000\n" -+"Project-Id-Version: pidgin-libnotify\n" -+"POT-Creation-Date: \n" - "PO-Revision-Date: 2006-11-01 18:33+0100\n" - "Last-Translator: Peter Avramucz <muczy@freestart.hu>\n" - "Language-Team: \n" -@@ -11,58 +10,58 @@ - "Content-Transfer-Encoding: 8bit\n" - "X-Poedit-Country: HUNGARY\n" - --#: src/pidgin-libnotify.c:57 -+#: src/gaim-libnotify.c:57 - msgid "New messages" - msgstr "Új üzenetek" - --#: src/pidgin-libnotify.c:62 -+#: src/gaim-libnotify.c:62 - msgid "Only new conversations" - msgstr "Csak az új beszélgetéseknél" - --#: src/pidgin-libnotify.c:67 -+#: src/gaim-libnotify.c:67 - msgid "Ignore events from blocked users" - msgstr "Hagyja figyelmen kívűl a blokkolt felhasználókat" - --#: src/pidgin-libnotify.c:72 -+#: src/gaim-libnotify.c:72 - msgid "Buddy signs on" - msgstr "Partner bejelentkezett" - --#: src/pidgin-libnotify.c:77 -+#: src/gaim-libnotify.c:77 - msgid "Buddy signs off" - msgstr "Partner kijelentkezett" - --#: src/pidgin-libnotify.c:315 -+#: src/gaim-libnotify.c:295 - msgid "Show" - msgstr "Mutasd" - --#: src/pidgin-libnotify.c:347 -+#: src/gaim-libnotify.c:324 - #, c-format - msgid "%s signed on" - msgstr "%s bejelentkezett" - --#: src/pidgin-libnotify.c:379 -+#: src/gaim-libnotify.c:353 - #, c-format - msgid "%s signed off" - msgstr "%s kijelentkezett" - --#: src/pidgin-libnotify.c:406 -+#: src/gaim-libnotify.c:380 - #, c-format - msgid "%s says:" - msgstr "%s mondja:" - --#: src/pidgin-libnotify.c:572 -+#: src/gaim-libnotify.c:543 - msgid "Libnotify Popups" - msgstr "Libnotify buborékok" - --#: src/pidgin-libnotify.c:573 -+#: src/gaim-libnotify.c:544 - msgid "Displays popups via libnotify." - msgstr "Mutassa a buborékokat libnotify segítségével." - --#: src/pidgin-libnotify.c:574 --#, fuzzy -+#: src/gaim-libnotify.c:545 - msgid "" --"Pidgin-libnotify:\n" -+"Gaim-libnotify:\n" - "Displays popups via libnotify." - msgstr "" - "Gaim-libnotify:\n" - "Mutassa a buborékokat libnotify segítségével." -+ -diff -Naur pidgin-libnotify-0.14/po/it.po pidgin-libnotify-0.14/po-new/it.po ---- pidgin-libnotify-0.14/po/it.po 2007-06-30 20:53:22.000000000 +0200 -+++ pidgin-libnotify-0.14/po-new/it.po 2010-03-09 18:03:34.565229551 +0100 -@@ -1,79 +1,78 @@ - # Italian (it) translation of gaim-libnotify. --# Copyright (C) 2006, Marco Cabizza <marco87@gmail.com> --# - # This file is distributed under the same license as gaim-libnotify. -+# Copyright (C) 2006, Marco Cabizza <marco87@gmail.com> -+# Copyright (C) 2009, The Free Software Foundation, Inc. -+# Gruppo traduzione italiano di Ubuntu, <gruppo-traduzione@ubuntu-it.org> -+# Milo Casagrande <milo@ubuntu.com> - # - msgid "" - msgstr "" - "Project-Id-Version: gaim-libnotify\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2007-06-30 19:58+0000\n" --"PO-Revision-Date: 2007-05-25 12:30-0300\n" --"Last-Translator: Marco Cabizza <marco87@gmail.com>\n" -+"POT-Creation-Date: 2009-09-29 16:23+0000\n" -+"PO-Revision-Date: 2009-11-04 15:15+0000\n" -+"Last-Translator: Milo Casagrande <milo@casagrande.name>\n" - "Language-Team: \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Plural-Forms: nplurals=2; plural=n != 1;\n" -+"X-Launchpad-Export-Date: 2009-11-11 17:20+0000\n" -+"X-Generator: Launchpad (build Unknown)\n" - --#: src/pidgin-libnotify.c:57 --#, fuzzy -+#: ../src/pidgin-libnotify.c:95 - msgid "New messages" - msgstr "Nuovi messaggi" - --#: src/pidgin-libnotify.c:62 -+#: ../src/pidgin-libnotify.c:100 - msgid "Only new conversations" --msgstr "Solo le nuove finestre" -+msgstr "Solo nuove conversazioni" - --#: src/pidgin-libnotify.c:67 -+#: ../src/pidgin-libnotify.c:105 - msgid "Ignore events from blocked users" --msgstr "Ignora gli utenti bloccati" -+msgstr "Ignora eventi da utenti bloccati" - --#: src/pidgin-libnotify.c:72 --#, fuzzy -+#: ../src/pidgin-libnotify.c:110 - msgid "Buddy signs on" --msgstr "%s entra" -+msgstr "Il conoscente si connette" - --#: src/pidgin-libnotify.c:77 --#, fuzzy -+#: ../src/pidgin-libnotify.c:115 - msgid "Buddy signs off" --msgstr "%s entra" -+msgstr "Il conoscente si disconnette" - --#: src/pidgin-libnotify.c:315 -+#: ../src/pidgin-libnotify.c:120 -+msgid "Only when available" -+msgstr "Solo quando disponibile" -+ -+#: ../src/pidgin-libnotify.c:125 -+msgid "Names to remove notifications for" -+msgstr "Nomi per cui rimuovere le notifiche" -+ -+#: ../src/pidgin-libnotify.c:505 - msgid "Show" - msgstr "Mostra" - --#: src/pidgin-libnotify.c:347 --#, c-format --msgid "%s signed on" --msgstr "%s è entrato" -- --#: src/pidgin-libnotify.c:379 --#, fuzzy, c-format --msgid "%s signed off" --msgstr "%s è entrato" -- --#: src/pidgin-libnotify.c:406 --#, c-format --msgid "%s says:" --msgstr "%s dice:" -+#: ../src/pidgin-libnotify.c:538 -+msgid "is online" -+msgstr "è in linea" -+ -+#: ../src/pidgin-libnotify.c:567 -+msgid "is offline" -+msgstr "non è in linea" - --#: src/pidgin-libnotify.c:572 -+#: ../src/pidgin-libnotify.c:1399 - msgid "Libnotify Popups" --msgstr "Popups di libnotify" -+msgstr "Notifiche di libnotify" - --#: src/pidgin-libnotify.c:573 -+#: ../src/pidgin-libnotify.c:1400 - msgid "Displays popups via libnotify." --msgstr "Mostra avvisi mediante libnotify." -+msgstr "Visualizza le notifiche mediante libnotify." - --#: src/pidgin-libnotify.c:574 --#, fuzzy -+#: ../src/pidgin-libnotify.c:1401 - msgid "" - "Pidgin-libnotify:\n" - "Displays popups via libnotify." - msgstr "" --"Gaim-libnotify:\n" --"Mostra avvisi mediante libnotify." -+"Pidgin-libnotify:\n" -+"Visualizza le notifiche mediante libnotify." - --#~ msgid "Libnotify Interface" --#~ msgstr "Interfaccia libnotify" -+ -diff -Naur pidgin-libnotify-0.14/po/nl.po pidgin-libnotify-0.14/po-new/nl.po ---- pidgin-libnotify-0.14/po/nl.po 2007-06-30 20:53:22.000000000 +0200 -+++ pidgin-libnotify-0.14/po-new/nl.po 2010-03-09 18:17:48.188461774 +0100 -@@ -31,12 +31,12 @@ - - #: src/pidgin-libnotify.c:72 - msgid "Buddy signs on" --msgstr "Contactpersoon heeft zich aangemeld" -+msgstr "Contactpersoon meldt zich aan" - - #: src/pidgin-libnotify.c:77 - #, fuzzy - msgid "Buddy signs off" --msgstr "Contactpersoon heeft zich aangemeld" -+msgstr "Contactpersoon meldt zich af" - - #: src/pidgin-libnotify.c:315 - msgid "Show" -@@ -50,7 +50,7 @@ - #: src/pidgin-libnotify.c:379 - #, fuzzy, c-format - msgid "%s signed off" --msgstr "%s heeft zich aangemeld" -+msgstr "%s heeft zich afgemeld" - - #: src/pidgin-libnotify.c:406 - #, c-format -@@ -59,7 +59,7 @@ - - #: src/pidgin-libnotify.c:572 - msgid "Libnotify Popups" --msgstr "" -+msgstr "Libnotify Popups" - - #: src/pidgin-libnotify.c:573 - msgid "Displays popups via libnotify." -@@ -71,7 +71,7 @@ - "Pidgin-libnotify:\n" - "Displays popups via libnotify." - msgstr "" --"Gaim-libnotify:\n" -+"Pidgin-libnotify:\n" - "Toont popups via libnotify." - - #~ msgid "Libnotify Interface" -diff -Naur pidgin-libnotify-0.14/po/pl.po pidgin-libnotify-0.14/po-new/pl.po ---- pidgin-libnotify-0.14/po/pl.po 2008-12-14 18:03:42.000000000 +0100 -+++ pidgin-libnotify-0.14/po-new/pl.po 2010-03-09 18:09:47.555190702 +0100 -@@ -1,22 +1,18 @@ --# Polish (pl) translation of gaim-libnotify --# Copyright (C) 2006, Krzysztof Rosiński <kr@post.pl> --# This file is distributed under the same license as the gaim-libnotify package. -+# translation of pl.po to Polish - # Krzysztof Rosiński <kr@post.pl>, 2006. - # Piotr Drąg <raven@pmail.pl>, 2007. - # - msgid "" - msgstr "" --"Project-Id-Version: gaim-libnotify\n" -+"Project-Id-Version: pl\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-06-30 19:58+0000\n" --"PO-Revision-Date: 2006-03-13 19:39+ZONE\n" -+"PO-Revision-Date: 2007-06-09 19:00+0200\n" - "Last-Translator: Piotr Drąg <raven@pmail.pl>\n" - "Language-Team: Polish <pl@li.org>\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " --"|| n%100>=20) ? 1 : 2);\n" - - #: src/pidgin-libnotify.c:57 - msgid "New messages" -@@ -73,3 +69,5 @@ - "Pidgin-libnotify:\n" - "Wyświetla powiadomienia przez libnotify." - -+ -+ -diff -Naur pidgin-libnotify-0.14/po/ro.po pidgin-libnotify-0.14/po-new/ro.po ---- pidgin-libnotify-0.14/po/ro.po 2007-06-30 20:53:22.000000000 +0200 -+++ pidgin-libnotify-0.14/po-new/ro.po 2010-03-09 18:14:01.732650658 +0100 -@@ -8,69 +8,66 @@ - msgstr "" - "Project-Id-Version: ro\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2007-06-30 19:58+0000\n" --"PO-Revision-Date: 2007-01-25 22:00+0200\n" --"Last-Translator: Ion Alin <alyn3d@gmail.com>\n" --"Language-Team: <ro@li.org>\n" -+"POT-Creation-Date: 2009-04-24 10:15+0000\n" -+"PO-Revision-Date: 2009-09-10 13:40+0000\n" -+"Last-Translator: Adi Roiban <adi@roiban.ro>\n" -+"Language-Team: <ro@li.org>\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"X-Generator: KBabel 1.11.4\n" --"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " --"20)) ? 1 : 2;\n" -+"X-Launchpad-Export-Date: 2009-09-10 16:28+0000\n" -+"X-Generator: Launchpad (build Unknown)\n" - --#: src/pidgin-libnotify.c:57 -+#: ../src/pidgin-libnotify.c:75 - msgid "New messages" - msgstr "Mesaje noi" - --#: src/pidgin-libnotify.c:62 -+#: ../src/pidgin-libnotify.c:80 - msgid "Only new conversations" --msgstr "Numai conversatii noi" -+msgstr "Doar conversațiile noi" - --#: src/pidgin-libnotify.c:67 -+#: ../src/pidgin-libnotify.c:85 - msgid "Ignore events from blocked users" --msgstr "Ignora evenimentele de la utilizatorii blocati" -+msgstr "Ignoră evenimentele de la utilizatorii blocați" - --#: src/pidgin-libnotify.c:72 -+#: ../src/pidgin-libnotify.c:90 - msgid "Buddy signs on" --msgstr "Userul este online" -+msgstr "Contact conectat" - --#: src/pidgin-libnotify.c:77 -+#: ../src/pidgin-libnotify.c:95 - msgid "Buddy signs off" --msgstr "Userul este offline" -+msgstr "Contact deconectat" - --#: src/pidgin-libnotify.c:315 -+#: ../src/pidgin-libnotify.c:100 -+msgid "Only when available" -+msgstr "Doar când sunt disponibil(ă)" -+ -+#: ../src/pidgin-libnotify.c:454 - msgid "Show" --msgstr "Arata" -+msgstr "Afișează" -+ -+#: ../src/pidgin-libnotify.c:487 -+msgid "is online" -+msgstr "s-a conectat" - --#: src/pidgin-libnotify.c:347 --#, c-format --msgid "%s signed on" --msgstr "%s este online" -- --#: src/pidgin-libnotify.c:379 --#, c-format --msgid "%s signed off" --msgstr "%s este offline" -- --#: src/pidgin-libnotify.c:406 --#, c-format --msgid "%s says:" --msgstr "%s spune:" -+#: ../src/pidgin-libnotify.c:516 -+msgid "is offline" -+msgstr "s-a deconectat" - --#: src/pidgin-libnotify.c:572 -+#: ../src/pidgin-libnotify.c:1200 - msgid "Libnotify Popups" --msgstr "Pop-up Libnotify" -+msgstr "Notificări libnotify" - --#: src/pidgin-libnotify.c:573 -+#: ../src/pidgin-libnotify.c:1201 - msgid "Displays popups via libnotify." --msgstr "Arata popup-uri via libnotify." -+msgstr "Afișează notificări via libnotify." - --#: src/pidgin-libnotify.c:574 --#, fuzzy -+#: ../src/pidgin-libnotify.c:1202 - msgid "" - "Pidgin-libnotify:\n" - "Displays popups via libnotify." - msgstr "" --"Gaim-libnotify:\n" --"Arata popup-uri via libnotify." -+"Pidgin-libnotify:\n" -+"Afișează notificări via libnotify." -+ -+ -diff -Naur pidgin-libnotify-0.14/po/ru.po pidgin-libnotify-0.14/po-new/ru.po ---- pidgin-libnotify-0.14/po/ru.po 2008-12-14 18:09:59.000000000 +0100 -+++ pidgin-libnotify-0.14/po-new/ru.po 2010-03-09 18:08:58.941861562 +0100 -@@ -7,11 +7,11 @@ - msgstr "" - "Project-Id-Version: gaim-libnotify\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2007-06-30 19:58+0000\n" -+"POT-Creation-Date: 2009-08-07 18:45+0000\n" - "PO-Revision-Date: 2007-11-29 12:30-0300\n" - "Last-Translator: Dmitry Egorkin <egorkin@gmail.com>\n" - "Language-Team: Russian\n" --"MIME-Version: 1.0\n" -+"MIME-Version: 1.1\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=n != 1;\n" -@@ -43,12 +43,12 @@ - #: src/pidgin-libnotify.c:347 - #, c-format - msgid "%s signed on" --msgstr "%s пришёл" -+msgstr "%s в сети" - - #: src/pidgin-libnotify.c:379 - #, c-format - msgid "%s signed off" --msgstr "%s ушёл" -+msgstr "%s не в сети" - - #: src/pidgin-libnotify.c:406 - #, c-format -@@ -73,3 +73,5 @@ - - #~ msgid "Libnotify Interface" - #~ msgstr "Настройки libnotify" -+ -+ diff --git a/community-testing/pidgin-libnotify/pidgin-libnotify-0.14-libnotify-0.7.patch b/community-testing/pidgin-libnotify/pidgin-libnotify-0.14-libnotify-0.7.patch deleted file mode 100644 index 40e6c02b8..000000000 --- a/community-testing/pidgin-libnotify/pidgin-libnotify-0.14-libnotify-0.7.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- src/pidgin-libnotify.c -+++ src/pidgin-libnotify.c -@@ -286,7 +286,15 @@ - g_free (tr_body); - return; - } -+#ifdef NOTIFY_CHECK_VERSION -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ notification = notify_notification_new (title, tr_body, NULL); -+#else - notification = notify_notification_new (title, tr_body, NULL, NULL); -+#endif -+#else -+ notification = notify_notification_new (title, tr_body, NULL, NULL); -+#endif - purple_debug_info (PLUGIN_ID, "notify(), new: " - "title: '%s', body: '%s', buddy: '%s'\n", - title, tr_body, best_name (buddy)); diff --git a/community-testing/pingus/ChangeLog b/community-testing/pingus/ChangeLog deleted file mode 100644 index c182f92eb..000000000 --- a/community-testing/pingus/ChangeLog +++ /dev/null @@ -1,21 +0,0 @@ -2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - - * pingus 0.7.2-8 - * Rebuilt against boost 1.41.0 - -2010-02-23 Eric Belanger <eric@archlinux.org> - - * pingus 0.7.2-7 - * Rebuilt against boost 1.42.0 - -2010-01-20 Eric Belanger <eric@archlinux.org> - - * pingus 0.7.2-6 - * Rebuilt against libpng 1.4/libjpeg 8 - -2009-07-13 Eric Belanger <eric@archlinux.org> - - * pingus 0.7.2-2 - * Rebuilt against boost 1.39 - * Added gcc 4.4 patch - * Added ChangeLog diff --git a/community-testing/pingus/PKGBUILD b/community-testing/pingus/PKGBUILD deleted file mode 100644 index 708e7ce40..000000000 --- a/community-testing/pingus/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 63246 2012-01-30 19:05:32Z ibiru $ -# Maintainer: Eric Belanger <eric@archlinux.org> - -pkgname=pingus -pkgver=0.7.6 -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) -md5sums=('561798686f34d3fa4e69135d655f47ac' - '9eec34047bdcff49e08f41e81764e20c') -sha1sums=('b5f5a25d71beb197c9466fb8928018a377f56487' - '579a1144f161ce89e6e024cea37210149b89c0c0') - -build() { - cd ${pkgname}-${pkgver} - - scons prefix=/usr -} - -package() { - cd ${pkgname}-${pkgver} - - make install DESTDIR="${pkgdir}" PREFIX="/usr" - - install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop" -} diff --git a/community-testing/pingus/pingus.desktop b/community-testing/pingus/pingus.desktop deleted file mode 100644 index 276db36a4..000000000 --- a/community-testing/pingus/pingus.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Pingus -Comment=A free Lemmings[tm] clone -Exec=pingus -Terminal=false -Type=Application -Categories=Application;Game;LogicGame -Icon=/usr/share/pingus/images/core/editor/actions.png diff --git a/community-testing/pinot/PKGBUILD b/community-testing/pinot/PKGBUILD deleted file mode 100644 index 8dd7c740a..000000000 --- a/community-testing/pinot/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 62017 2012-01-14 12:25:05Z ibiru $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=pinot -pkgver=0.98 -pkgrel=2 -pkgdesc='Personal search and metasearch tool' -arch=('i686' 'x86_64') -url='http://pinot.berlios.de/' -license=('GPL') -depends=('gtkmm' 'xapian-core' 'libtextcat' 'sqlite3' 'libxml++' 'curl' - 'gmime' 'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' - 'hicolor-icon-theme' 'cairo' 'exiv2') -makedepends=('boost' 'desktop-file-utils') -optdepends=('unzip: ZIP files extraction' - 'poppler: PDF to text conversion' - 'catdvi: DVI to text conversion' - 'djvulibre: DjVu text extraction' - 'unrtf: RTF to HTML conversion' - 'antiword: MS Word to text conversion' - 'catdoc: XLS and PPT to text conversion' - 'deskbar-applet: Pinot Deskbar-Applet module') -options=('!emptydirs') -install=$pkgname.install -changelog=$pkgname.changelog -source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('8a89a73a48344074aa8f4534ce68fd18e3d84553645cef864c137ab21d8d341c') - -build() { - cd ${srcdir}/$pkgname-$pkgver - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt - sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm russian-iso8859_5\n\ -/usr/share/libtextcat/LM/russian-koi8_r.lm russian-koi8_r\n\ -/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat_conf.txt - - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - - make DESTDIR=${pkgdir} install - - # Remove Deskbar-Applet handler - rm -rf ${pkgdir}/usr/lib/deskbar-applet/handlers -} diff --git a/community-testing/pinot/pinot.changelog b/community-testing/pinot/pinot.changelog deleted file mode 100644 index 7d899cdb0..000000000 --- a/community-testing/pinot/pinot.changelog +++ /dev/null @@ -1,2 +0,0 @@ -2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * pinot 0.98-1 diff --git a/community-testing/pinot/pinot.install b/community-testing/pinot/pinot.install deleted file mode 100644 index 55ab40426..000000000 --- a/community-testing/pinot/pinot.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo "Starting with 0.63, the service is auto-started. " - echo "The file that enables this is located at " - echo "/etc/xdg/autostart/pinot-dbus-daemon.desktop" - echo "Delete this file if you don't want the auto-start." -} - -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community-testing/pkgtools/PKGBUILD b/community-testing/pkgtools/PKGBUILD deleted file mode 100644 index 922bb5fa3..000000000 --- a/community-testing/pkgtools/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> -# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com> -pkgname=pkgtools -pkgver=23 -pkgrel=3 -pkgdesc="A collection of scripts for Arch Linux packages" -arch=('i686' 'x86_64') -url="http://bbs.archlinux.org/viewtopic.php?pid=384196" -license=('GPL') -source=(v$pkgver::http://github.com/Daenyth/pkgtools/tarball/v$pkgver) -backup=('etc/pkgtools/newpkg.conf' 'etc/pkgtools/pkgfile.conf' 'etc/pkgtools/spec2arch.conf') -install=pkgtools.install -provides=(newpkg pkgfile) -depends=('bash>=4' 'pcre' 'libarchive' 'python') -optdepends=('cron: For pkgfile --update entry' - 'abs: Provides proto packaging files for newpkg' - 'python-yaml: for gem2arch' - 'python2: for pkgconflict') -md5sums=('5361111e31741f8d7ff8ca45c7996b6b') - -build() { - cd "$srcdir/Daenyth-$pkgname"-* - - make -} - -package() { - cd "$srcdir/Daenyth-$pkgname"-* - - make DESTDIR="$pkgdir" install - - # fix infinite loop in autotools configure scripts - sed -i '/export -f command_not_found_handle/d' "$pkgdir/usr/share/pkgtools/pkgfile-hook.bash" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/pkgtools/pkgtools.install b/community-testing/pkgtools/pkgtools.install deleted file mode 100644 index bcbf2f85c..000000000 --- a/community-testing/pkgtools/pkgtools.install +++ /dev/null @@ -1,66 +0,0 @@ -_MSG_UPDATE=" - Make sure to run pkgfile --update before use" -_MSG_CRON=" - An entry has been placed in /etc/cron.daily to run pkgfile --update - If you do not want this functionality, set UPDATE_CRON=0 in /etc/pkgtools/pkgfile.conf" -_MSG_HOOK=" - pkgfile includes a \"command not found\" hook for both zsh and bash. - This will automatically run pkgfile whenever you run - a command which the shell cannot find. If you want - this functionality, set CMD_SEARCH_ENABLED to 1 in - /etc/pkgtools/pkgfile.conf (or per-user by copying - that file to \${XDG_CONFIG_HOME}/pkgtools/pkgfile.conf), then - in your current shell run: - source /etc/profile" - -is_update_from() { - res="`vercmp $1 $2`" - case $res in - '-1'|'0') return 0;; - '1') return 1;; - esac -} - -## arg 1: the new package version -post_install() { - echo "$_MSG_UPDATE" - echo "$_MSG_HOOK" - echo "$_MSG_CRON" -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - if is_update_from $2 11-1; then - echo " - All bugs related to pkgfile -b should be fixed in this update." - fi - if is_update_from $2 12-1; then - echo " - NOTE: pkgtools' \"command not found\" hook configuration has changed." - echo " Please remove any old symlinks relating to it." - echo "$_MSG_HOOK" - fi - if is_update_from $2 15-1; then - echo " - pkgtools now uses \$XDG_CONFIG_HOME for all user-specific configuration." - echo " run «mv ~/.pkgtools \"\$XDG_CONFIG_HOME/pkgtools\"»" - fi - if is_update_from $2 18-1; then - echo " - newpkg has been rewritten to be completely modular. See here for more info: http://github.com/Daenyth/pkgtools/commit/2d37197" - fi - if is_update_from $2 19-1; then - echo " ! This version contains an important bugfix for pkgfile. Previously, package updates would cause the pkgfile --update cron job to" - echo " regain +x mode, causing updates to run even when manually disabled. This version disables the cronjob by setting UPDATE_CRON=0" - echo " in /etc/pkgtools/pkgfile.conf" - echo " - This version of pkgtools contains a new tool called 'maintpkg'" - echo " It sets the Maintainer in a PKGBUILD to your PACKAGER while preserving old Contributors" - fi - if is_update_from $2 22-1; then - echo " - This is the largest release in a long time. This updates all python scripts to py3k." - echo " - This version of pkgtools includes a new tool called gem2arch, for automating ruby gem packaging" - fi -} - -## arg 1: the old package version -post_remove() { - cat << _EOM - - You may want to clean /var/cache/pkgtools/lists -_EOM -} - -# vim:set ts=2 sw=2 et filetype=sh: diff --git a/community-testing/png2ico/PKGBUILD b/community-testing/png2ico/PKGBUILD deleted file mode 100644 index 9436ad54b..000000000 --- a/community-testing/png2ico/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 63248 2012-01-30 19:05:37Z 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=5 -arch=('i686' 'x86_64') -pkgdesc="Converts PNG files to Windows icon resource files" -url="http://www.winterdrache.de/freeware/png2ico/" -license=("GPL2") -depends=('libpng' 'gcc') -source=(http://www.winterdrache.de/freeware/png2ico/data/$pkgname-src-2002-12-08.tar.gz) -md5sums=('9b663df81c826cd564638cba2e6bc75b') - -build() { - 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-testing/podofo/PKGBUILD b/community-testing/podofo/PKGBUILD deleted file mode 100644 index 8545ec3dd..000000000 --- a/community-testing/podofo/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 63250 2012-01-30 19:05:45Z 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=3 -pkgdesc="A C++ library to work with the PDF file format" -arch=('i686' 'x86_64') -url="http://podofo.sourceforge.net" -license=('GPL') -depends=( 'gcc-libs' 'fontconfig' 'libpng' 'libtiff') -makedepends=('cmake') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('cec586ab69f92bc88d38b5d4b8eee5a0') - -build() { - cd ${pkgname}-${pkgver} - - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ - -DPODOFO_BUILD_SHARED=1 \ - -DPODOFO_HAVE_JPEG_LIB=1 \ - -DPODOFO_HAVE_PNG_LIB=1 \ - -DPODOFO_HAVE_TIFF_LIB=1 - make -} - -package() { - cd ${pkgname}-${pkgver}/build - make DESTDIR=$pkgdir install -} diff --git a/community-testing/poedit/PKGBUILD b/community-testing/poedit/PKGBUILD deleted file mode 100644 index 59e2358a5..000000000 --- a/community-testing/poedit/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 61882 2012-01-09 18:50:15Z stephane $ -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=poedit -pkgver=1.4.6.1 -pkgrel=6 -pkgdesc="Cross-platform gettext catalogs (.po files) editor" -arch=('i686' 'x86_64') -url="http://www.poedit.net/" -license=('custom') -depends=('wxgtk>=2.8.11' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext') -makedepends=('pkgconfig') -install=poedit.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('c63ffd991b1a6085ef356a6922356e0a') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community-testing/poedit/poedit.install b/community-testing/poedit/poedit.install deleted file mode 100644 index 21b79d2d4..000000000 --- a/community-testing/poedit/poedit.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community-testing/prboom/PKGBUILD b/community-testing/prboom/PKGBUILD deleted file mode 100644 index d1b17fb7a..000000000 --- a/community-testing/prboom/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 63252 2012-01-30 19:05:52Z 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=6 -pkgdesc='A game engine which provides a program to play Doom levels.' -url='http://prboom.sourceforge.net/' -license=('GPL2') -arch=('i686' 'x86_64') -depends=('libpng' 'mesa' 'sdl_mixer' 'sdl_net') -source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz" - 'libpng-1.4.patch') -md5sums=('a8a15f61fa2626ab98051ab2703378c4' - 'ba53474db8e747035ca2320a445e4ae0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 < ../libpng-1.4.patch - - ./configure --prefix=/usr --disable-i386-asm - sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - diff --git a/community-testing/prboom/libpng-1.4.patch b/community-testing/prboom/libpng-1.4.patch deleted file mode 100644 index a2215e37b..000000000 --- a/community-testing/prboom/libpng-1.4.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c ---- prboom-2.5.0-orig/src/SDL/i_sshot.c 2010-01-24 23:26:03.000000000 -0500 -+++ prboom-2.5.0/src/SDL/i_sshot.c 2010-01-24 23:28:42.000000000 -0500 -@@ -231,7 +231,7 @@ - if (fp) - { - png_struct *png_ptr = png_create_write_struct( -- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); -+ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); - - if (png_ptr) - { -@@ -279,7 +279,7 @@ - break; - } - } -- png_destroy_write_struct(&png_ptr, png_infopp_NULL); -+ png_destroy_write_struct(&png_ptr, NULL); - } - fclose(fp); - } diff --git a/community-testing/pyqt3/PKGBUILD b/community-testing/pyqt3/PKGBUILD deleted file mode 100644 index 95437c443..000000000 --- a/community-testing/pyqt3/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 63254 2012-01-30 19:05:57Z 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=10 -pkgdesc="A set of Python bindings for the Qt3 toolkit" -arch=('i686' 'x86_64') -url="http://www.riverbankcomputing.com/software/pyqt/intro" -depends=('python2-sip' 'qscintilla-qt3') -license=('GPL') -source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz") -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 -} - -package() { - cd ${srcdir}/PyQt-x11-gpl-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/pysfml/PKGBUILD b/community-testing/pysfml/PKGBUILD deleted file mode 100644 index 204197c1b..000000000 --- a/community-testing/pysfml/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 29367 2010-10-13 15:58:47Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: scj <scj(at)archlinux(dot)us> - -pkgname=('python-pysfml' 'python2-pysfml') -pkgbase=python-pysfml -pkgver=1.6 -pkgrel=2 -pkgdesc="Python bindings for the SFML library" -arch=('i686' 'x86_64') -url="http://www.sfml-dev.org" -makedepends=('sfml' 'python' 'python2') -license=('zlib') -depends=() -replaces=('pysfml') -source=(http://downloads.sourceforge.net/sfml/SFML-${pkgver}-python-sdk.zip) -md5sums=('9acaf793ae9a498a51f7f6fc74307b32') - -build() { - cd "${srcdir}/SFML-${pkgver}/python" -} - -package_python-pysfml() { - depends=('sfml' 'python') - - cd "${srcdir}/SFML-${pkgver}/python" - - python3 setup.py install --root=${pkgdir} -} - -package_python2-pysfml() { - depends=('sfml' 'python2') - - cd "${srcdir}/SFML-${pkgver}/python" - - python2 setup.py install --root=${pkgdir} -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/python-bsddb/LICENSE b/community-testing/python-bsddb/LICENSE deleted file mode 100644 index 7d6035775..000000000 --- a/community-testing/python-bsddb/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2008-2009 Jesus Cea Avion - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE.
\ No newline at end of file diff --git a/community-testing/python-bsddb/PKGBUILD b/community-testing/python-bsddb/PKGBUILD deleted file mode 100644 index 8f7c2fb53..000000000 --- a/community-testing/python-bsddb/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 61884 2012-01-09 18:50:28Z stephane $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgbase=python-bsddb -pkgname=('python2-bsddb' 'python-bsddb') -pkgver=5.2.0 -pkgrel=3 -pkgdesc="Python interface for BerkeleyDB" -license=('MIT') -arch=('i686' 'x86_64') -url="http://www.jcea.es/programacion/pybsddb.htm" -makedepends=('python2-distribute' 'python-distribute') -source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz - db_5.3.patch - LICENSE) -sha1sums=('4395c125807fc8c4bac4d367f4556e623605c7a8' - '150bb6ce1758ca29f55e876ac75dbac76c9d743d' - 'ef4e4caf618781104dbf5824279ed39d127b4713') - -build () { - cd "${srcdir}" - - pushd bsddb3-${pkgver} - patch -Np1 -i ../db_5.3.patch - popd - - cp -r bsddb3-${pkgver}{,-python2} - - # Build python 3 module - cd bsddb3-${pkgver} - python setup.py --berkeley-db=/usr build - - # Build python 2 module - cd ../bsddb3-${pkgver}-python2 - python2 setup.py --berkeley-db=/usr build -} - -package_python2-bsddb() { - depends=('db' 'python2>=2.7') - cd "${srcdir}/bsddb3-${pkgver}-python2" - - python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 - install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} - -package_python-bsddb() { - depends=('db' 'python>=3.2') - cd "${srcdir}/bsddb3-${pkgver}" - - python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 - install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community-testing/python-bsddb/db_5.3.patch b/community-testing/python-bsddb/db_5.3.patch deleted file mode 100644 index 6ea4d18bb..000000000 --- a/community-testing/python-bsddb/db_5.3.patch +++ /dev/null @@ -1,20 +0,0 @@ -# HG changeset patch -# User Jesus Cea <jcea@jcea.es> -# Date 1324876054 -3600 -# Node ID b9ff8f6918a383ed4985e4a09ca36ed1776dba12 -# Parent 670b1ec4472908a9dc745a338a9f595f92aba667 -Support Berkeley DB 5.3.x - -diff -r 670b1ec44729 -r b9ff8f6918a3 setup2.py ---- a/setup2.py Mon Dec 26 06:04:34 2011 +0100 -+++ b/setup2.py Mon Dec 26 06:07:34 2011 +0100 -@@ -128,7 +128,7 @@ - incdir = libdir = None - if not BERKELEYDB_DIR and not BERKELEYDB_LIBDIR and not BERKELEYDB_INCDIR: - # Supported Berkeley DB versions, in order of preference. -- db_ver_list = ((5, 2), (5, 1), (5, 0), -+ db_ver_list = ((5, 3), (5, 2), (5, 1), (5, 0), - (4, 8), (4, 7), (4, 6), (4, 5), (4, 4), (4, 3), (4, 2)) - - # construct a list of paths to look for the header file in on - diff --git a/community-testing/python-galago-gtk/PKGBUILD b/community-testing/python-galago-gtk/PKGBUILD deleted file mode 100644 index 1ea5a8c24..000000000 --- a/community-testing/python-galago-gtk/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 63258 2012-01-30 19:06:12Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=python-galago-gtk -pkgver=0.5.0 -pkgrel=6 -pkgdesc="A library of simple functions that are optimized for various CPUs" -arch=('i686' 'x86_64') -url="http://galago-project.org" -options=('!libtool') -license=('LGPL') -depends=('libgalago-gtk' 'pygtk' 'python-galago') -source=(http://galago-project.org/files/releases/source/galago-gtk-python/galago-gtk-python-$pkgver.tar.bz2) -md5sums=('3eb752eaa87d986bf272cf1266528c43') - -build() { - cd $srcdir/galago-gtk-python-$pkgver - ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install -} diff --git a/community-testing/python2-matplotlib/PKGBUILD b/community-testing/python2-matplotlib/PKGBUILD deleted file mode 100644 index 7680b6272..000000000 --- a/community-testing/python2-matplotlib/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 63256 2012-01-30 19:06:05Z 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> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> - -pkgname=python2-matplotlib -pkgver=1.1.0 -pkgrel=2 -pkgdesc="A python plotting library, making publication quality plots" -arch=('i686' 'x86_64') -url="http://matplotlib.sourceforge.net/" -backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc) -depends=('python2-dateutil' 'python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-qt') -optdepends=('pygtk: for use with the GTK or GTKAgg backend' - 'tk: used by the TkAgg backend' - 'wxpython: for use with the WXAgg backend') -makedepends=('pygtk' 'tk' 'wxpython') -provides=('matplotlib' "python-matplotlib=${pkgver}") -replaces=('python-matplotlib') -conflicts=('python-matplotlib') -source=("http://downloads.sourceforge.net/matplotlib/matplotlib-${pkgver}.tar.gz" - setup.cfg) -sha1sums=('435b4f04a7e099b79f66451d69ad0b5ce66030ae' - 'bcb5a83db9d95c96a57ca518fa6bd1897b23558f') -license=('custom') - -build() { - cd "${srcdir}/matplotlib-${pkgver}" - - cp ../setup.cfg . - - # remove internal copy of pyparsing - rm lib/matplotlib/pyparsing.py - sed -i "s/matplotlib.pyparsing/pyparsing/g" lib/matplotlib/{mathtext,fontconfig_pattern}.py - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \ - -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file} - done - - python2 setup.py build -} - -package() { - cd "${srcdir}/matplotlib-${pkgver}" - python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr - - install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m 644 doc/users/license.rst "${pkgdir}/usr/share/licenses/${pkgname}" -} diff --git a/community-testing/python2-matplotlib/setup.cfg b/community-testing/python2-matplotlib/setup.cfg deleted file mode 100644 index 4b82986e9..000000000 --- a/community-testing/python2-matplotlib/setup.cfg +++ /dev/null @@ -1,83 +0,0 @@ -# Rename this file to setup.cfg to modify matplotlib's -# build options. - -[egg_info] -tag_svn_revision = 1 - -[directories] -# Uncomment to override the default basedir in setupext.py. -# This can be a single directory or a space-delimited list of directories. -#basedirlist = /usr - -[status] -# To suppress display of the dependencies and their versions -# at the top of the build log, uncomment the following line: -#suppress = True -# -# Uncomment to insert lots of diagnostic prints in extension code -#verbose = True - -[provide_packages] -# By default, matplotlib checks for a few dependencies and -# installs them if missing. This feature can be turned off -# by uncommenting the following lines. Acceptible values are: -# True: install, overwrite an existing installation -# False: do not install -# auto: install only if the package is unavailable. This -# is the default behavior -# -## Date/timezone support: -#pytz = False -#dateutil = False - -[gui_support] -# Matplotlib supports multiple GUI toolkits, including Cocoa, -# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of -# these toolkits requires AGG, the Anti-Grain Geometry library, -# which is provided by matplotlib and built by default. -# -# Some backends are written in pure Python, and others require -# extension code to be compiled. By default, matplotlib checks -# for these GUI toolkits during installation and, if present, -# compiles the required extensions to support the toolkit. GTK -# support requires the GTK runtime environment and PyGTK. Wx -# support requires wxWidgets and wxPython. Tk support requires -# Tk and Tkinter. The other GUI toolkits do not require any -# extension code, and can be used as long as the libraries are -# installed on your system. -# -# You can uncomment any the following lines if you know you do -# not want to use the GUI toolkit. Acceptible values are: -# True: build the extension. Exits with a warning if the -# required dependencies are not available -# False: do not build the extension -# auto: build if the required dependencies are available, -# otherwise skip silently. This is the default -# behavior -# -gtk = True -gtkagg = True -tkagg = True -wxagg = True -macosx = False - -[rc_options] -# User-configurable options -# -# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo, -# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg. -# -# The Agg, Ps, Pdf and SVG backends do not require external -# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg -# if you have disabled the relevent extension modules. Agg will be used -# by default. -# -backend = Qt4Agg -# -# The numerix module was historically used to provide -# compatibility between the Numeric, numarray, and NumPy array -# packages. Now that NumPy has emerge as the universal array -# package for python, numerix is not really necessary and is -# maintained to provide backward compatibility. Do not change -# this unless you have a compelling reason to do so. -numerix = numpy diff --git a/community-testing/qcad/PKGBUILD b/community-testing/qcad/PKGBUILD deleted file mode 100644 index a1f498364..000000000 --- a/community-testing/qcad/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 63260 2012-01-30 19:06:27Z 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=9 -pkgdesc="A 2D CAD package based upon Qt" -arch=('i686' 'x86_64') -url="http://www.ribbonsoft.com/qcad.html" -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.patch) - # http://ghost1227.com/files/misc/qm.tar.gz) -md5sums=('96b6a56027782aec953c9c4e64c5998c' - 'da32fec0d2fb85d96126bf28bb0ab9ff' - 'b4d1eb6724b4b41f191f1ab6fd859c39' - '92f900fe1fd3a8f841232b587b49c7da' - '7e6779b1e3b10da1eb4daf36d93f8479') - -build() { - export PATH="/opt/qt/bin:$PATH" - export QTDIR=/opt/qt - - cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src - - #Arch64 fix - gentoo patch - [ "$CARCH" = "x86_64" ] && patch -p1 < ../qcad-intptr.patch - patch -p1 < ../qcad.patch - sed -i "s:"-pedantic"::g" mkspecs/defs.pro - - cd scripts - ./build_qcad.sh notrans -} - -package() { - cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad - - 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 - cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad - #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/ -} diff --git a/community-testing/qcad/QCad.desktop b/community-testing/qcad/QCad.desktop deleted file mode 100644 index a55f5940f..000000000 --- a/community-testing/qcad/QCad.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=/usr/bin/qcad -Icon=/usr/share/pixmaps/qcad.xpm -Name=QCad -StartupNotify=true -Terminal=false -Type=Application -Categories=Application;Office; diff --git a/community-testing/qcad/qcad-intptr.patch b/community-testing/qcad/qcad-intptr.patch deleted file mode 100644 index 6d8b6acca..000000000 --- a/community-testing/qcad/qcad-intptr.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp ---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp 2004-09-14 15:13:02.000000000 -0500 -+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp 2006-06-23 14:21:40.000000000 -0500 -@@ -849,7 +849,7 @@ - os << " layer: NULL "; - } else { - os << " layer: " << e.layer->getName().latin1() << " "; -- os << " layer address: " << (int)(e.layer) << " "; -+ os << " layer address: " << (intptr_t)(e.layer) << " "; - } - - os << e.pen << "\n"; -diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp ---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp 2004-09-14 15:13:02.000000000 -0500 -+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp 2006-06-23 14:21:23.000000000 -0500 -@@ -57,7 +57,7 @@ - os << " name: " << l.getName().latin1() - << " pen: " << l.getPen() - << " frozen: " << (int)l.isFrozen() -- << " address: " << (int)(&l) -+ << " address: " << (intptr_t)(&l) - << std::endl; - return os; - } diff --git a/community-testing/qcad/qcad.patch b/community-testing/qcad/qcad.patch deleted file mode 100644 index f051f29af..000000000 --- a/community-testing/qcad/qcad.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h ---- qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h 2008-12-11 22:29:51.000000000 +0100 -@@ -37,6 +37,7 @@ - #endif - - #include <iostream> -+#include <cstring> - - #include "dl_attributes.h" - #include "dl_codes.h" -diff -aur qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp ---- qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp 2008-12-11 22:29:51.000000000 +0100 -@@ -23,7 +23,7 @@ - ** not clear to you. - ** - **********************************************************************/ -- -+#include <cstdlib> - #include "rs_actionzoompan.h" - #include "rs_snapper.h" - #include "rs_point.h" -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.orig.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.orig.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.rej. -diff -aur qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp ---- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp 2008-12-11 22:30:18.000000000 +0100 -@@ -25,7 +25,7 @@ - **********************************************************************/ - - #include "rs_information.h" -- -+#include <cstdlib> - #include "rs_constructionline.h" - - -diff -aur qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh ---- qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh 2008-12-11 22:31:37.000000000 +0100 -@@ -16,9 +16,6 @@ - echo " distcc use distcc for distributed compilation. DISTCC_HOSTS must be set." - echo - --echo "QTDIR is: $QTDIR" --echo "QMAKESPEC is: $QMAKESPEC" -- - # detect system: - if [ "x$OS" == "xWindows_NT" ] - then diff --git a/community-testing/qcad/qcad.xpm b/community-testing/qcad/qcad.xpm deleted file mode 100644 index e747fa984..000000000 --- a/community-testing/qcad/qcad.xpm +++ /dev/null @@ -1,132 +0,0 @@ -/* XPM */ -static const char * qcad_xpm[] = { -"32 32 97 2", -" c None", -". c #3F3F3F", -"+ c #010180", -"@ c #FFFFFF", -"# c #E0E0EF", -"$ c #41419F", -"% c #4545A1", -"& c #4949A3", -"* c #4D4DA5", -"= c #5151A7", -"- c #5555A9", -"; c #5959AB", -"> c #4444A2", -", c #3C3C9D", -"' c #40409F", -") c #4444A1", -"! c #4848A3", -"~ c #4C4CA5", -"{ c #5050A7", -"] c #5454A9", -"^ c #5858AB", -"/ c #5D5DAD", -"( c #6161AF", -"_ c #6565B1", -": c #5C5CAD", -"< c #6060AF", -"[ c #6464B1", -"} c #6868B3", -"| c #6C6CB5", -"1 c #7070B7", -"2 c #7474B9", -"3 c #7878BB", -"4 c #3F3F9E", -"5 c #4343A0", -"6 c #4747A3", -"7 c #4B4BA5", -"8 c #000000", -"9 c #7C7CBD", -"0 c #8080BF", -"a c #4747A2", -"b c #4B4BA4", -"c c #4F4FA6", -"d c #7B7BBD", -"e c #7F7FBF", -"f c #8383C1", -"g c #5353A8", -"h c #8787C3", -"i c #5757AA", -"j c #8B8BC5", -"k c #4E4EA6", -"l c #5252A8", -"m c #5656AA", -"n c #5A5AAC", -"o c #8787C2", -"p c #8F8FC7", -"q c #5E5EAE", -"r c #8B8BC4", -"s c #8F8FC6", -"t c #9393C8", -"u c #6262B0", -"v c #8E8EC6", -"w c #9292C8", -"x c #9696CA", -"y c #6666B2", -"z c #9A9ACC", -"A c #6A6AB4", -"B c #9E9ECE", -"C c #6565B2", -"D c #6969B4", -"E c #6D6DB6", -"F c #7171B8", -"G c #7575BA", -"H c #9D9DCE", -"I c #A1A1D0", -"J c #7171B7", -"K c #7575B9", -"L c #7979BC", -"M c #7D7DBE", -"N c #8181C0", -"O c #8585C2", -"P c #8989C4", -"Q c #8D8DC6", -"R c #9191C8", -"S c #9595CA", -"T c #9999CC", -"U c #A5A5D2", -"V c #7979BB", -"W c #7D7DBD", -"X c #8181BF", -"Y c #8585C1", -"Z c #8989C3", -"` c #A9A9D4", -" . c #8D8DC5", -".. c #9191C7", -"+. c #9595C9", -"@. c #9999CB", -"#. c #ADADD6", -" ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" . . . . . . . . ", -" . . . + + + + + + + . . . ", -" . @ . @ + + # # # # # # # + + @ . @ . @ . ", -" . . . . . . . + # # $ % & * = - ; > > + . . . . . . . . . ", -" . . + # , ' ) ! ~ { ] ^ / ( _ > + . . ", -" . . + # , ' ) ! ~ { ] ^ : < [ } | > + . . ", -" . @ + # , ' ) ! ~ { ] ^ : < [ } | 1 2 > + @ . @ . ", -" . . . . + # ' ) ! . . . . . . . . . 1 2 3 > + . . . . . . ", -" . + # 4 5 6 7 . @ @ @ @ @ @ @ . 8 3 9 0 > + . . ", -" . + # 5 a b c . @ @ @ @ @ @ @ . 8 d e f > + . . ", -" . + # a b c g . @ @ @ @ @ @ @ . 8 e f h > + . @ . ", -" . . . + # b c g i . @ @ @ @ @ @ @ . 8 f h j > + . . . . . ", -" . + # k l m n . @ @ @ @ @ @ @ . 8 o j p > + . . ", -" . + # l m n q . @ @ @ @ @ @ @ . 8 r s t > + . . ", -" . + # m n q u . @ @ @ @ @ @ @ . 8 v w x > + . @ . ", -" . . . + # n q u y . @ @ @ @ @ @ @ . 8 w x z > + . . . . . ", -" . + # q u y A . @ @ @ @ @ @ @ . 8 x z B > + . . ", -" . + > C D E . . . . . . . . . 8 z B > + . . ", -" . @ + > D E F G 8 8 8 8 8 8 8 8 8 H I > + @ . @ . ", -" . . . . . + > J K L M N O P Q R S T H I U + . . . . . . . ", -" . . + > V W X Y Z Q R S T H I U ` > + . . ", -" . . + > > Y Z ...+.@.H > U ` #.#.> + . . ", -" . @ . @ + + > > > > > > > + > #.#.#.> + . @ . ", -" . . . . . . . . . . + + + + + + + . + > #.#.> + . . . . . ", -" . . . . . + > > + . . ", -" . . . . . + + . . ", -" . @ . @ . @ . @ . @ . @ . @ . ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" ", -" "}; diff --git a/community-testing/qpxtool/PKGBUILD b/community-testing/qpxtool/PKGBUILD deleted file mode 100644 index 8d1cf584c..000000000 --- a/community-testing/qpxtool/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 63262 2012-01-30 19:06:37Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com> - -pkgname=qpxtool -pkgver=0.7.1_002 -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 - 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 - mkdir -p $pkgdir/usr/bin - make DESTDIR=$pkgdir install -} diff --git a/community-testing/qpxtool/libpng15.patch b/community-testing/qpxtool/libpng15.patch deleted file mode 100644 index 05e6f49d2..000000000 --- a/community-testing/qpxtool/libpng15.patch +++ /dev/null @@ -1,127 +0,0 @@ -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-testing/rawstudio/PKGBUILD b/community-testing/rawstudio/PKGBUILD deleted file mode 100644 index 77ed76702..000000000 --- a/community-testing/rawstudio/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 63264 2012-01-30 19:06:46Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Roman Kyrylych <roman@archlinux.org> -# Contributor: cdhotfire <cdhotfire@gmail.com> - -pkgname=rawstudio -pkgver=2.0 -pkgrel=5 -pkgdesc="An open source raw-image converter written in GTK+" -arch=('i686' 'x86_64') -license=('GPL') -url="http://rawstudio.org/" -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 - libpng15.patch) -md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' - '2f8b7acbe10d8096ce613cbea7986fd3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 <$srcdir/libpng15.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}/usr" install - mkdir $pkgdir/usr/lib/rawstudio - mv $pkgdir/usr/share/rawstudio/plugins $pkgdir/usr/lib/rawstudio - ln -s ../../lib/rawstudio/plugins $pkgdir/usr/share/rawstudio/plugins -} diff --git a/community-testing/rawstudio/libpng15.patch b/community-testing/rawstudio/libpng15.patch deleted file mode 100644 index 6d3b85968..000000000 --- a/community-testing/rawstudio/libpng15.patch +++ /dev/null @@ -1,40 +0,0 @@ -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-testing/rawstudio/rawstudio.install b/community-testing/rawstudio/rawstudio.install deleted file mode 100644 index 261adb7b4..000000000 --- a/community-testing/rawstudio/rawstudio.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q || true -} - -post_upgrade() { - update-desktop-database -q || true -} - -post_remove() { - update-desktop-database -q || true -} diff --git a/community-testing/rawtherapee/PKGBUILD b/community-testing/rawtherapee/PKGBUILD deleted file mode 100644 index c189b5d62..000000000 --- a/community-testing/rawtherapee/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 63357 2012-01-31 10:21:09Z stativ $ -# 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.7 -pkgrel=1 -pkgdesc="RAW photo editor" -arch=('i686' 'x86_64') -url="http://www.rawtherapee.com/" -license=('GPL3') -depends=('gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('mercurial' 'cmake') -install=rawtherapee.install -source=() -md5sums=() - -_root="https://rawtherapee.googlecode.com/hg/" -_repo="rawtherapee" - -build() { - cd "$srcdir" - msg "Connecting to Mercurial server...." - - if [ -d $_repo ] ; then - cd $_repo - hg pull - hg up "$pkgver" - msg "The local files are updated." - else - hg clone -u "$pkgver" $_root $_repo - fi - - msg "Mercurial checkout done or server timeout" - msg "Starting make..." - - if [ -e "$srcdir/$_repo-build" ]; then - rm -rf "$srcdir/$_repo-build" - fi - mkdir "$srcdir/$_repo-build" - cd "$srcdir/$_repo-build" - - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - ../$_repo - make -} - -package() { - cd "$srcdir/$_repo-build" - make DESTDIR="$pkgdir/" install -} diff --git a/community-testing/rawtherapee/rawtherapee.install b/community-testing/rawtherapee/rawtherapee.install deleted file mode 100644 index 385eec8f4..000000000 --- a/community-testing/rawtherapee/rawtherapee.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - echo "update desktop mime database..." - update-desktop-database -q - update-mime-database usr/share/mime 1>&2 > /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install $1 - - if [ ${2%%_*} == "3.0a1" ]; then - echo "There were lots of changes to the behavior of the majority of tools." - echo "This may cause your files to look differently than before." - fi -} - -post_remove() { - post_install $1 -} - - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/remmina-plugins/PKGBUILD b/community-testing/remmina-plugins/PKGBUILD deleted file mode 100644 index e80a0efbe..000000000 --- a/community-testing/remmina-plugins/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 63268 2012-01-30 19:07:02Z 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=3 -pkgdesc="Remina plugins" -#"Remmina supports multiple network protocols in an integrated and consistant user interface. -# Currently RDP, VNC, XDMCP and SSH are supported." -arch=(i686 x86_64) -url="http://sourceforge.net/projects/remmina/" -license=('GPL') -conflicts=(remmina-plugins-svn) -depends=("remmina>=0.9.0" freerdp libxkbfile telepathy-glib) -makedepends=(intltool pkgconfig gettext perl avahi) -install=remmina-plugins.install -options=('!libtool') -source=(http://downloads.sourceforge.net/project/remmina/0.9/$pkgname-$pkgver.tar.gz) -md5sums=('6f6b7cb18f7604f3f17eeda5173ede6a') - -build() { - cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-ssh --enable-rdp \ - --enable-vnc --enable-xdmcp --enable-nx \ - --enable-telepathy - make - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/remmina-plugins/remmina-plugins.install b/community-testing/remmina-plugins/remmina-plugins.install deleted file mode 100644 index 1a05f573e..000000000 --- a/community-testing/remmina-plugins/remmina-plugins.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/root/PKGBUILD b/community-testing/root/PKGBUILD deleted file mode 100644 index d277db4ec..000000000 --- a/community-testing/root/PKGBUILD +++ /dev/null @@ -1,102 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Sebastian Voecking <voeck@web.de> - -pkgname=root -pkgver=5.32.00 -pkgrel=3 -pkgdesc='C++ data analysis framework and interpreter from CERN.' -arch=('i686' 'x86_64') -url='http://root.cern.ch' -license=('LGPL2.1') -depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient' - 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme') -makedepends=('fftw') -install='root.install' -options=('!emptydirs') -source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" - 'root.sh' - 'rootd' - 'root.xml' - 'fix-mathcore-generation-r42566.diff') -md5sums=('1c30e4e6eeae62ff1ad5118cd1309679' - '0e883ad44f99da9bc7c23bc102800b62' - 'efd06bfa230cc2194b38e0c8939e72af' - '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 - - 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 - sed \ - -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \ - -i cint/reflex/python/genreflex/Makefile.am - sed \ - -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 \ - --enable-gdml \ - --enable-gsl-shared \ - --enable-minuit2 \ - --enable-soversion \ - --enable-roofit \ - --enable-python \ - --with-python-incdir=/usr/include/python2.7 \ - --with-python-libdir=/usr/lib \ - ${sys_libs} - - make -} - -package() { - cd root - - make DESTDIR=${pkgdir} install - - install -D ${srcdir}/root.sh \ - ${pkgdir}/etc/profile.d/root.sh - install -D ${srcdir}/rootd \ - ${pkgdir}/etc/rc.d/rootd - install -D -m644 ${srcdir}/root.xml \ - ${pkgdir}/usr/share/mime/packages/root.xml - - install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.desktop.in \ - ${pkgdir}/usr/share/applications/root-system-bin.desktop - # replace @prefix@ with /usr for the desktop - sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop - - install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.png \ - ${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png - - # use a file that pacman can track instead of adding directly to ld.so.conf - install -d ${pkgdir}/etc/ld.so.conf.d - echo '/usr/lib/root' > ${pkgdir}/etc/ld.so.conf.d/root.conf - - rm -rf ${pkgdir}/etc/root/daemons -} diff --git a/community-testing/root/fix-mathcore-generation-r42566.diff b/community-testing/root/fix-mathcore-generation-r42566.diff deleted file mode 100644 index ae22c23c0..000000000 --- a/community-testing/root/fix-mathcore-generation-r42566.diff +++ /dev/null @@ -1,40 +0,0 @@ -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-testing/root/root.install b/community-testing/root/root.install deleted file mode 100644 index afabb7aea..000000000 --- a/community-testing/root/root.install +++ /dev/null @@ -1,25 +0,0 @@ -post_install() { - update-desktop-database >/dev/null - - update-mime-database /usr/share/mime >/dev/null - - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_remove() { - # leave for pre 5.30.03-3 - if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then - cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot - mv /tmp/.pacroot etc/ld.so.conf - chmod 644 etc/ld.so.conf - sbin/ldconfig -r . - fi -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community-testing/root/root.sh b/community-testing/root/root.sh deleted file mode 100644 index 685e6036b..000000000 --- a/community-testing/root/root.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [ $PYTHONPATH ]; then - export PYTHONPATH=$PYTHONPATH:/usr/lib/root; -else - export PYTHONPATH=/usr/lib/root; -fi diff --git a/community-testing/root/root.xml b/community-testing/root/root.xml deleted file mode 100644 index af8dd69c5..000000000 --- a/community-testing/root/root.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/x-root"> - <comment>ROOT file</comment> - <comment xml:lang="de">ROOT-Datei</comment> - <glob pattern="*.root"/> - <magic priority="80"> - <match value="root" type="string" offset="0:64"/> - </magic> - </mime-type> -</mime-info> diff --git a/community-testing/root/rootd b/community-testing/root/rootd deleted file mode 100644 index fb2c3388c..000000000 --- a/community-testing/root/rootd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/rootd` -case "$1" in - start) - stat_busy "Starting ROOT file server daemon" - [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID /usr/sbin/rootd` - echo $PID >/var/run/rootd.pid - add_daemon rootd - stat_done - fi - ;; - stop) - stat_busy "Stopping ROOT file server daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon rootd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/sage-mathematics/PKGBUILD b/community-testing/sage-mathematics/PKGBUILD deleted file mode 100644 index 4b4dff9ad..000000000 --- a/community-testing/sage-mathematics/PKGBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Osman Ugus <ugus11@yahoo.com> -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD - -pkgname=sage-mathematics -pkgver=4.7.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') -license=('GPL') -#depends=('readline') -depends=('ppl') -makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core') -optdepends=('imagemagick: some plotting functionality benefits from it' - 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' - 'sage-mathematics-spkgs: original packages used to build additional packages') -options=('!makeflags') -install="${pkgname}.install" -source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" - 'SAGE-notebook.desktop') -md5sums=('b3073997e6c7ec00a269f84ff2e54973' - 'dc391f12b7d17dd37326343ec0e99bbd') - -build() { - cd sage-${pkgver} - - # modularization of sage, sort of :) - # fixes the following error: - # bash: symbol lookup error: bash: undefined symbol: rl_filename_rewrite_hook - # remove this hack when sage uses a readline 6.1 or greater, or when sage uses its own internal bash - # this is for people who have custom kernels (sage works this around by checking uname -r) - #mkdir -p spkg/installed - #touch spkg/installed/readline-6.1 - mkdir -p spkg/installed - touch spkg/installed/ppl-0.11.2 - - # fix "missing sage.all error" during build - unset CFLAGS - unset CXXFLAGS - - # fix build errors - unset LDFLAGS - - # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS - export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }') - export MAKE="make -j${SAGE_BUILD_THREADS}" - - # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran - export SAGE_FORTRAN='/usr/bin/gfortran' - export SAGE_FORTRAN_LIB='/usr/lib/libgfortran.so' - - # disable building with debugging support - export SAGE_DEBUG='no' - - # enable fat binaries (disables processor specific optimizations) - # comment out if you're only building it for yourself - export SAGE_FAT_BINARY='yes' - - # can't write to root in a clean chroot - export DOT_SAGE='/build/src/' - - # only build sage, no documents - #make build - make -} - -<< COMMENT -check() { - cd sage-${pkgver} - - # uncomment if we want to run all the tests (warning: very long) - #make ptestlong -} -COMMENT - -package() { - cd sage-${pkgver} - - # cp because make install is experimental and will corrupt the install - install -d ${pkgdir}/opt/sage - cp -r * ${pkgdir}/opt/sage - - # move SageTeX files to more appropriate directory - install -d ${pkgdir}/usr/share - mv ${pkgdir}/opt/sage/local/share/texmf \ - ${pkgdir}/usr/share - - desktop-file-install ${srcdir}/SAGE-notebook.desktop \ - --dir ${pkgdir}/usr/share/applications - - # create link to main binary - install -d ${pkgdir}/usr/bin - ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage - - # remove build logs - rm -f ${pkgdir}/opt/sage/install.log - rm -rf ${pkgdir}/opt/sage/spkg/logs - - # remove source packages, since they are rarely needed, they are 300mb in size (compressed) - # no need to package them together, put into sage-mathematics-spkgs - rm -f ${pkgdir}/opt/sage/spkg/base/*spkg - rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg -} diff --git a/community-testing/sage-mathematics/SAGE-notebook.desktop b/community-testing/sage-mathematics/SAGE-notebook.desktop deleted file mode 100644 index 26a35d3ac..000000000 --- a/community-testing/sage-mathematics/SAGE-notebook.desktop +++ /dev/null @@ -1,19 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=SAGE -Comment=SAGE NOTEBOOK -Comment[en_US]=SAGE NOTEBOOK -Exec=/opt/sage/sage -notebook -GenericName= -GenericName[de]= -Icon=/opt/sage/data/extcode/notebook/images/sageicon.png -MimeType= -Name[de]=SAGE -StartupNotify=true -Terminal=true -Type=Application -Categories=Science;Math; -X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= -GenericName[en_US]= diff --git a/community-testing/sage-mathematics/sage-mathematics.install b/community-testing/sage-mathematics/sage-mathematics.install deleted file mode 100644 index 6caa5299e..000000000 --- a/community-testing/sage-mathematics/sage-mathematics.install +++ /dev/null @@ -1,56 +0,0 @@ -post_install() { - cd /opt/sage - - # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership - # the files it writes to ~/.sage can be safely ignored - HOME=/tmp ./sage -c - - # add sagemath user for the daemon - useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath - - # Update LaTeX db to point to SageTeX - if [ -f /usr/bin/texhash ]; then - /usr/bin/texhash /usr/share/texmf - else - echo 'Warning: could not find /usr/bin/texhash' - echo 'SageTeX has been installed but you need to run:' - echo '# texhash /usr/share/texmf' - echo 'So that LaTeX will be able to find it.' - fi - -echo ' - ___ -/ (_) o | -\__ _ _ __ | -/ / |/ | | / \_| | | -\___/ | |_/|/\__/ \_/|/o - /| /| - \| \| - ________________________________ -< sage-mathematics, I mean, MOO! > - -------------------------------- - \ ^__^ - \ (oo)\_______ - (__)\ )\/\ - ||----w | - || || -' - -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - # Update LaTeX db to remove SageTeX entries - if [ -f /usr/bin/texhash ]; then - /usr/bin/texhash /usr/share/texmf - fi - - # remove the sagemath daemon user - userdel sagemath - - # clean up left overs - rm -rf /opt/sage -} diff --git a/community-testing/scantailor/PKGBUILD b/community-testing/scantailor/PKGBUILD deleted file mode 100644 index dee23fb7c..000000000 --- a/community-testing/scantailor/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 63274 2012-01-30 19:07:34Z 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=2 -pkgdesc="Interactive post-processing tool for scanned pages" -arch=(i686 x86_64) -url="http://scantailor.sourceforge.net" -license="GPL" -depends=('qt') -makedepends=('cmake' 'boost') -options=('!makeflags') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - build-fix.patch) -md5sums=('f962c93a2d63b449fa3f6612ade3b028' - '0aeb1bae724b5cae208ae8af95e8ed9b') - -build() { - cd $srcdir/$pkgname-$pkgver - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - patch -p1 <$srcdir/build-fix.patch - cmake . - cmake \ - -DCMAKE_CXX_FLAGS="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ - -DCMAKE_CXX_FLAGS_DEBUG="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ - -DCMAKE_CXX_FLAGS_RELEASE="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release . - make - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/scantailor/build-fix.patch b/community-testing/scantailor/build-fix.patch deleted file mode 100644 index 85b620020..000000000 --- a/community-testing/scantailor/build-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -wbBur scantailor-0.9.10/zones/EditableZoneSet.h scantailor-0.9.10.my/zones/EditableZoneSet.h ---- scantailor-0.9.10/zones/EditableZoneSet.h 2011-07-31 00:47:25.000000000 +0400 -+++ scantailor-0.9.10.my/zones/EditableZoneSet.h 2011-08-03 01:59:40.000000000 +0400 -@@ -76,6 +77,12 @@ - - EditableZoneSet(); - -+ EditableZoneSet(const EditableZoneSet& zs) -+ { -+ m_splineMap = zs.m_splineMap; -+ m_defaultProps = zs.m_defaultProps; -+ } -+ - const_iterator begin() const { return iterator(m_splineMap.begin()); } - - const_iterator end() const { return iterator(m_splineMap.end()); } diff --git a/community-testing/scorched3d/PKGBUILD b/community-testing/scorched3d/PKGBUILD deleted file mode 100644 index 8a481c910..000000000 --- a/community-testing/scorched3d/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# Contributor: Seppo Porspakka <sporspak@paju.oulu.fi> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=scorched3d -pkgver=43.2a -pkgrel=2 -pkgdesc="A 3d artillery combat game" -arch=('i686' 'x86_64') -url="http://www.scorched3d.co.uk/" -license=('GPL') -depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'mesa' 'fftw' 'libjpeg>=8' 'xdg-utils') -makedepends=('sharutils') -install=scorched3d.install -source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${pkgver}-src.tar.gz" - 'scorched3d.desktop' - '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() { - cd scorched - -# 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 - sh autogen.sh \ - --prefix=/usr \ - --datadir=/usr/share/scorched3d \ - --disable-openaltest \ - --with-wx-config=wx-config - - #sed -i 's/-lz/-lz -lalut/g' src/scorched/Makefile || return 1 - #sed -i 's|/usr/local/lib/libwx_gtk-2.4.a||' src/scorched/Makefile || return 1 - - make -} - -package() { - cd scorched - - make DESTDIR=${pkgdir} install - - # freedesktop stuff - png and desktop file ganked from debian - cd ${srcdir} - - uudecode --output-file=scorched3d.png scorched3d.png.uu - - install -D -m644 scorched3d.png \ - ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png - install -D -m644 scorched3d.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop -} diff --git a/community-testing/scorched3d/libpng14.patch b/community-testing/scorched3d/libpng14.patch deleted file mode 100644 index 7a5a9434c..000000000 --- a/community-testing/scorched3d/libpng14.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- src/common/image/ImagePng.cpp 2009-02-23 04:14:20.000000000 +0100 -+++ src/common/image/ImagePng.cpp_patched 2010-01-24 22:01:04.000000000 +0100 -@@ -189,7 +189,7 @@ - info_ptr = png_create_info_struct(png_ptr);
- if (info_ptr == NULL)
- {
-- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, NULL, NULL);
- return false;
- }
-
-@@ -200,7 +200,7 @@ - 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, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- /* If we get here, we had a problem reading the file */
- return false;
- }
-@@ -258,7 +258,7 @@ - }
- else
- {
-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-
- Logger::log(S3D::formatStringBuffer(
- "Invalid PNG format.\n"
-@@ -272,7 +272,7 @@ - // END NEW CODE
-
- /* clean up after the read, and free any memory allocated - REQUIRED */
-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-
- /* that's it */
- return true;
diff --git a/community-testing/scorched3d/scorched3d-42.1-fixups.patch b/community-testing/scorched3d/scorched3d-42.1-fixups.patch deleted file mode 100644 index 36a027cb6..000000000 --- a/community-testing/scorched3d/scorched3d-42.1-fixups.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4 ---- scorched.orig/configure-al.m4 2008-03-03 16:17:18.000000000 -0500 -+++ scorched/configure-al.m4 2009-02-15 20:43:35.000000000 -0500 -@@ -7,25 +7,9 @@ - [ --disable-openaltest Do not try to compile and run a test OpenAL program], - , enable_openaltest=yes) - AC_MSG_CHECKING(for OpenAL support) --AC_PATH_PROG(OPENAL_CONFIG, openal-config, no) --if test x$OPENAL_CONFIG = xno; then -- echo "*** The openal-config script installed by OpenAL could not be found" -- echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG" -- echo "*** environment variable to the full path to openal-config." -- -- AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/]) --else -- -- if test x"$use_static_openal" = x"yes"; then -- AL_LIBS="/usr/local/lib/libopenal.a" -- else -- AL_LIBS="`$OPENAL_CONFIG --libs`" -- fi -- -- AL_CFLAGS="`$OPENAL_CONFIG --cflags`" -- -- AC_MSG_RESULT(yes) --fi -+AL_LIBS="-lopenal" -+AL_CFLAGS="-I/usr/include/AL" -+AC_MSG_RESULT(yes) - - AC_MSG_CHECKING(for Freealut support) - AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no) -diff -ru scorched.orig/configure.ac scorched/configure.ac ---- scorched.orig/configure.ac 2008-03-03 16:17:18.000000000 -0500 -+++ scorched/configure.ac 2009-02-15 20:40:30.000000000 -0500 -@@ -13,22 +13,6 @@ - AC_PROG_INSTALL - AC_PROG_RANLIB - --LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6" --CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6" -- --if test `uname` == Darwin; then --LDFLAGS="$LDFLAGS -lmx" --CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__" --else --LDFLAGS="$LDFLAGS -L/usr/local/lib" --CPPFLAGS="$CPPFLAGS -I/usr/local/include" --fi -- --AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[ -- echo "Warning: No beer found in fridge!"; -- echo "We highly suggest that you rectify this situation immediately." --]) -- - AC_ARG_ENABLE(serveronly, - [ --enable-serveronly Enable server only compilation], - , enable_serveronly=no, diff --git a/community-testing/scorched3d/scorched3d-42.1-gcc43.patch b/community-testing/scorched3d/scorched3d-42.1-gcc43.patch deleted file mode 100644 index b235f07c5..000000000 --- a/community-testing/scorched3d/scorched3d-42.1-gcc43.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur scorched.old/src/common/common/main.h scorched/src/common/common/main.h ---- scorched.old/src/common/common/main.h 2009-02-18 20:06:22.000000000 +0200 -+++ scorched/src/common/common/main.h 2009-02-18 20:07:18.000000000 +0200 -@@ -40,7 +40,7 @@ - void _no_storage()
- {
- printf("Failed to allocate memory!!");
-- std::exit(1);
-+ exit(1);
- }
-
- void run_main(int argc, char *argv[], OptionsParameters ¶ms)
-diff -ur scorched.old/src/common/porting/windows.h scorched/src/common/porting/windows.h ---- scorched.old/src/common/porting/windows.h 2009-02-18 20:06:22.000000000 +0200 -+++ scorched/src/common/porting/windows.h 2009-02-18 20:06:46.000000000 +0200 -@@ -20,7 +20,7 @@ - typedef unsigned short WORD;
- typedef unsigned char BYTE;
-
--typedef int HWND;
-+// typedef int HWND;
- typedef void * HINSTANCE;
- typedef int WPARAM;
- typedef int LPARAM;
diff --git a/community-testing/scorched3d/scorched3d-libpng1.5.patch b/community-testing/scorched3d/scorched3d-libpng1.5.patch deleted file mode 100644 index 4e8f003b8..000000000 --- a/community-testing/scorched3d/scorched3d-libpng1.5.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- ./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-testing/scorched3d/scorched3d.desktop b/community-testing/scorched3d/scorched3d.desktop deleted file mode 100644 index b18d86581..000000000 --- a/community-testing/scorched3d/scorched3d.desktop +++ /dev/null @@ -1,17 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Exec=/usr/bin/scorched3d -Icon=scorched3d.png -Terminal=false -Name=Scorched 3D -Name[lt_LT]=Scorched 3D -Comment=3D artillery game similar to Scorched Earth -Comment[de_DE]=3D Reimplementation des Klassikers Scorched Earth -Comment[fr_FR]=un jeu d'artillerie en 3 proche de Scorched Earth -Comment[lt_LT]=Nuotaikingas 3D taktinis-artilerinis žaidimas, panaÅ¡us į Scorched Earth -Comment[pl_PL]=Artyleryjska gra 3D podobna do Scorched Earth -Comment[ro_RO]=Un joc 3D cu artilerie similar cu Scorched Earth -Categories=Game;ArcadeGame; -StartupNotify=true diff --git a/community-testing/scorched3d/scorched3d.install b/community-testing/scorched3d/scorched3d.install deleted file mode 100644 index c5571196e..000000000 --- a/community-testing/scorched3d/scorched3d.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} diff --git a/community-testing/scorched3d/scorched3d.png.uu b/community-testing/scorched3d/scorched3d.png.uu deleted file mode 100644 index 4fb7e50db..000000000 --- a/community-testing/scorched3d/scorched3d.png.uu +++ /dev/null @@ -1,105 +0,0 @@ -begin 600 scorched3d.png -MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!F)+1T0`_P#_ -M`/^@O:>3````"7!(67,```L2```+$@'2W7[\````!W1)344'TP@#%`([XJF@ -M!```$5Q)1$%4>-IEFNER9$>.I3_`W>\2$0PFF5*VI.HJ]58]2\\\W#S/O,*\ -M35LO9FU5U:62E,H4DUM$W+B+.S`__`:3.4.S(!D+G0XX<`"<X_)__O?_<EQ0 -M4R0(D@1M%$3`'35##,1!J:^[.#D;RY)9<@9`4*(H3=.0VH;4)&+3(!IPE-F4 -M;)E<9G(I+'EAR3.S%<P<UO4C2D!0P''<"U@!G\$S:@"*J**J1$0``:T_G/H0 -M'-:W$%Z^1`1$J#\$%<'7CSK@[OBZ(=SK<]8W5U/QZA"0S\NO[SOU\[;^_OE+ -M$;3N;=T#"!%M>%E1``7#7O:LNKY\>5L4$46BH0[!A&(%6RVW[)A:?6`0%2YK -M7'SLCI9"S`JF%#.*.RZ0<<H7&[_\922@J`*BB`10):I62U0_>]P13.J.RNI> -M\6JT**@(JG7!((&\+"S%,*_^*Z6P+`N(5+\%K2'AH":H"V%UD;O@)K@[1C7" -M^"(H$`25@$A`D.K`]1'U$D$JH`(")EJ/4JH7Q1T10500$8(J(20\@,7"HHHL -MF:64NA$WBF6D*$D4UNW6DW2T1@2H4$Q1##=>@L;7]X-`6/TOJA#J&<H:4((0 -M]8L8D^IAA>*">3U[4\>I[H\2""$14T,0Q=V)*:'SC,PSMAHAHC6DS!&QEVA0 -M<50+N.%:(PRM)VSV*G"L[D/EQ=;Z_!*/4LV-U>2:C+IZ^7)\944<=P=WS)6" -MDET)*(1(%%!=CQ1A67)%%2`$)28(T590DW630K:P[BJO8`"F@E\,74,UB"`H -M&@4)6G,7J>'FA8A51`EK=M>-U.R-"*;4V#;'33&4[$*T&L<2`DD5<4$<8A!L -M=65J'8V@T8G!<0/+PE*$>0DLLR+FB!;4'!.P=3,:(8BNP5?#0M?C,*=^\T*\ -MQ!0&8H*8HC'4.%^-<;P:DF6%6'U!'05B4+2)A`@Q&*(9C87-KE`,<E'ZKCK< -M#4S@>!2>'H7C(>$.^`(X&@5-]0A4:CU`P"ZG9]6A9H8!<<V=NHB!NN!>$R2( -M$+7B+\Z*$(*+$E5I4Z!-2A.@:2$V`0V1)<.\*,L26):`E8CDZD$-H(W2=L[U -MC='VQN%9.1TCF*&QADN%O!6:J;7,N(3R)=F%6%[5*<$1JT>-"BI*#"M<ND(` -MUYK,0964E*81^@9V^T*W=7*.'`=E6HSC,^1%P0(3B@9!D]/T@=@4NDVFVP%) -M*2HL4\5J"6L=7C=?S"E2/7XICK:&5OPB]0U$5YA#<6+%6JEP^)(CHDB,A*BT -MC;#?9YJM8QIX>@Z<#LXX&%(*458(6=N0;$X^*8R*)*7=&+M]H=_!XWU@FI1< -M!#"L&%B%<A-J&*.X644Z@YA\K7JE(H6JD41H@M)$I0G5@(H4*PY+P`BDY/1] -M(23C/,!Q"`P'9YX-*]587YL"P0`A6,5`%\6+D*>.%`N;WI$;Y7A23L,*!%JP -M4M"2U[XH5_A]`14G-E*K8#$C3\Z2'9%(U(@$1UP@:(6PM38Z%5YC*K3=0B[. -MTX/R\""8%\!>"IJ9X6XKEE=@4%5<:IW)4T..1I.<JRO#$9:L+%EP@Z!>6P>L -MPO":!W5]B*W68C2;\O[^Q"]/$[NK*Z[W6V[V6][>7K'?);8Q$3#<*RHU<:9I -M,N[&W9UP.!CC7"MP[2"]'OUZW*I"4"&J$&)$".`!`XX'9YJ,K]_---%IDF(% -MT$+0@FFI38)'4'`K&`7#B#5?!(F1?=<P+@:>F8:!3WGA<!I(*9%BI$F!)B7Z -M+G)S#;$7/"GG'%B\QJE?DLXR!J@&0)A+1LQ0@5`J]H-2J+`8)J-I9V)RND8H -MDZ(.B&.J2-0:B*:89\K:[;XT<R$J7]\HNVW+,&:F;$QYXNE\9ER,;$+3-/1] -MS_6^PV/"FT@S1QX&R/.E1=;:2VE$-!";%@V1:3Q32J:8,2\%]Z6BC%2T"=$( -MSX7]WNA:F#0B5F<)%<5"((IBQ2C4&B%`),::H!K8]BU7JB_]M@.+%<[CPG#. -M#%-A*E#*PFB9/[V?>7A<.#XE^G[+?K^A2Y&NV=!WB7[;TVXVI)0HR\PTCIR' -M,X?G`]-T)N<9UT((D%R8BX,**0EHPB0"L9Z`2VWL&JM-GH!BQ*YI$8$8(Q)J -M@K$F]6*&B-'UB7Z[XYONBBRU"]W?9H[#3&H6NL98EL+3X<Q_?+RCY$R*@=W5 -MCNUN0]]W-*&V&FZ.F3-.QFD8&<Y';FYZWGV]HW@M5AZ@2*`00`*N^C*;!(6H -MBJMB"'';M?4$0FVNBCMYSLQ+8<R9C-%N-ER]N>7FJ^\(38L$H]^>&2?C]@8> -M[T=^?O\K?_CC#_SSO_X'#P_/F#G]IF.WW;#;;=AO.KJVI>LZ=KLM<\X<CD?N -M/]WS=_(5[][=@$1$"Q(<-.$2L,M4L#:A(=0V0Z2B86S;ME8_58IY+1X8(DK3 -M=%R_N66SOZ'=7)$-IF%"-=,T`^)*TH:^ZYCGS*]W#WRZ>^+A\8EY69B73(R) -MON^XOM[1Q$@,@;9-A)1`A.D\<7.S9YH:;F[?L-TY_::PW22PPCS/Y)()XH10 -M>R\3(XH3)!!I4^TWO-8#1`A-H&EZ9@+/H_/+TZ^<AI\XG4=4A>TF\NUWT'4= -ML"7/&VZNKOAOO_];MEW'X],3A].)^\<#3\\GSN/,D@OC.%.6"K.I;>C[CDW7 -M`PFC(<:.%`,BA7DVAK,Q34Z,@IHCJ>9+$"?%.IM$"^O@D2&;D;,S%6?RP'') -M_/CA$S_]_)$/'SYQGB:ZKN7F9LOW'UO>OMVQV>[QY0U-ZOB;WW[';[[]FF$< -M:W@\///^PR<^WCTPG$>.AX'#X<0PG"C+@K>)_7[+]9LW['8W;+:WI#;@S#P? -M'_CT,#%/$U>;!%V=RV-R0@()0A`EEIPKG!D,T\3=_9%_^_,=[^^>^7C_Q(>/ -M=QP.)Y:<Z=J6INOH?TG\_![>WD:VFX['QQU]=\6;-UNNMCW;7<]NN^'W?_<[ -M_LO??\^2"Z?AS/W]$[]^NN?CW0/G822&P&^__VO^Z;__(__T/_XGUV^_I6V= -MP^%7'I_>\_[GCYS/`U]]=<N;ZXZ=)'I;$#=B,E0A+N?I90X=AH%?'Q[Y]S_^ -MP(>[9TZG,\=A8)XSYHZ&B$\S9H5E<8H)U_LSQ^/`I\<G?OJEI>NJ4=MMSWZW -MH>M:FB;1Q$A*@6_^ZBN^_NH6`5*,7%WMN;W>$.5$TA^Y^S#PGW_ZP,/])Z9I -M).?,\^&XSI4]NNG0:&A9R,M$'`]CG2_%.9T&'IX.O/]PQ]/S@`!=DP@Q4@Q" -M#&BHY78<A6%PNKX0NY'#_<C#IPJ#(0@I**E)M&W#MN^X?;/G]LV>FYL]-]=7 -M;'<;NK:MU;:<.#[_F9AF_O*G1_[M7QXX'L]`(47E/$W(40DA$%,/ZDQS85YF -MXO/3<VU&W7@^C8SGJ<96C!6V5`GF9*O]#-0FS0W&T3B=X/9MY&H'TRB<S[(2 -M4,*2"Z6,G,\3]T\'XH^_$&.@:Q)-T]+W+5^_W?&/_[#'PXY?'S?<?RJH))QQ -MG4F$B)*7S.%P1*/R^&3,XYEE?B(^'0XU!XHQC#-YFHCJJ$#.1EXR2UF+&J_H -M%73-'2%%IVV$OWJG/#XIX]E9%BB7YFBE$30(JL()Z+K`DB,I/?*'/[=\^-0Q -MCALVW1NNMGMN;ZY9ELPT+XQSQLV9Y\S=W0,/#\\<#@?>W2;BTVFH\V1VQCE# -MSEQU$2N%\Y0Y#3/C-'.><QWY@A""$C0PC<HX"%C@W3ME?ZVXURE[,*&XKD8( -M(01"K".EN-$T1MLNY#+PPX_.\03G4\/O_OHW_/[O$^_>WM!WPC@OR'DB+POS -M-//IXSU_^<M[#H<#5]TWQ-D,'$JNA.*V;_FOO_V*XL8P+?SQIWO^\Y<'GHY# -M'3M+S2>7.GHJPFF(W#TH^^O`M]\$=E>![29@IDRSDK.2&EM[+MANG1AK-1U' -MY7!0#@<P,W[X\0/'X\`_?/\=W__N.[YY=TLV>'X^\O/[C_ST\Z_<W3\B7LCC -M3-1X804*%".XT,?*S*4F\NU7UPQSYCQGAO-<*_7:WQM0W+$Y,Q?A/"TL<Z!K -M`TU2N@YP!8^D%'$32A&F43@599Z$G(5I$J:YLGXY9^9YP;)QGA:^GQ?^]F]^ -MP]PFBM7^:9XS;81ESL38=+4"ATQ>,B67VG"Y(P%NWNSX=BG,Q;B[/S%-"VY. -M4&$Q8RX%S"C%&$[.<#2:F.EZX?K:2#'4ZJJ)4I1Y%MR5\ZA,XTJ=K+FANB;_ -MLO##./-\''@^#ESO-PSCS-/SB6G)B$`*0LZ%V&S:RJ0MB@D4@&R44LA6F>#; -MZRTI!6ZN=QQ/(^-8Q\AA'!G.4^5ZO!+!>5DP<X;!&0;08*@:*C/%:F*+*#$$ -M8HBDF.C:1*.ALH%4DM<\\_C\Q/D/`Z?SB7DN/#T-Y#FSZ1*[7A"\AI!8_:/@ -MCKD`I?:`7CG*E!+;+4A0=IN6>2[D8LS+PC3/S'.IW>N<.9U&2JD$^9*-I13* -M4GOXRE`Z3J$$)ZLQ+IEIF9F;R*9OB1>F3VMOEJ>9GW[^6!$Q&UT3V/21W2Y" -M$*(2,'5$`R$X'E^Q7^Z4XH@Z(00V?4O7-!1SW&SUE#&."^<Q<SK//+>)G(UB -MQI07AO/,.&52N-#ISIP+[E8I^>Q,,TQS1,3INY96$U$J+6_NG,\CI3@A*&VC -M;#?*9I-`A;B"T$42X44L62EWC8JZ(U[YF(Q3IUTJ>Q8"_2[0]<Y^W_'UVQTY -M&U/.#,/$\7CF-,RX5*1;E@SC1"DK*@4A%Z<8/)TFIL78M(5MW]$VL0HL"DF$ -MO@F\O>G8;!*ZTMIQ\4J'9RN4]6%8A<D+'Q650*!(C>E@QDH\X.*KW%1;B)`@ -MF1-SI$V13=^PS+ERI-E8EH5AG%B6\D*YG*?,>39$E9@:NKYCLVE0$8H9082^ -MB[RYZMCU+3&N6AU2#<"=[%:%":P.VJN'-2A10%01C^B*.!5\:JBLN@SF==!& -MI`I^*;+9M)7/S%"*D4MF7!:6N9"7VL^<QIEA*D!DN^VXWK7LNE!/<BJH*M=7 -M#;?7'6U*5.G!7Y&[%_5!0A4X*E6-F%<!8I6!"I=-&-E6AMB,[%`L5RIEG7O= -M#,OE)1Z5VL-'E&Z3UC7!<F$I1BZ5J&I2H&N4)@AF3C80=YHHI*B5`O)5Z`-B -M2DT=XD4H6A!3I!AJ!<>1U0!<JEY0?%W8<;>7WW.)%,_5J%)'TZPU67&'^#F_ -M*O$LE6>W"X-WD5J=L(9E")!6-2JL%&NEBFJ3!T+LNPYW(^=:&'(NF&3<9>7; -M/U/OH+A66348+SQE-J.40+:`6<:+48JS6*@<Y\J_OBQS>;*"1JC'ACI5HBJE -MDF(X0==18'T`*R>T)O%^+633HLS+PJ(+12^48)W4[.6?VPM-:PJR2DEZT6*+ -M5_980(*!*69RV?]GA*L#R.?7W/%2_^>*"%32I"JD]H5:#*]-BGV;,#/$"V(% -M<2&[D!%RJ8N;5;$NNU&\4H>.UUCTSYLP').:U'43CE"5%7^M=2,O^@54`UT" -ME`H"KK7*5CG%7B1L6?6!U^Z(30R8"::*ARH!N=22CJ_)N,;Y;)EL3G%J;%?M -MLDY5Z^+FSJNMO4C5_D74^"L1>\6/VK54[<'7JP9NM2NX2/W.NL%7!JRD5Q7C -MRN<XN\1/A<I"MK*BSF>-BE>W%'3UV/^SM?__KL(7*2#82W)X#9MU"E,#\:I\ -M:CW;SU</UIQQA^A>U@0J-6FH@&$B>!!LI?N*5W2HWO*UT-466%]YV\)%<UL_ -MJZOZN?96_OI.A=L7]R1>3E16+<U7]5JK(7[)!G<PIY@3W3)NAE@AK)ML%`C5 -M=J$FEB`448HXQ5=5'WFY3E"/=I6"ULVY7&*\>KIVK:MH9Q7WY8M(NNC5*P^Z -M$KK$]?4+CEDMNFI&).=U54/<JI>3U.9.A$:5%)0EE/4^Q.OCKWY7>Y7,:^R: -MKW<GW&N..36??*TCE_!YC3#VZCZ&U@L*0:HX&%;9%;<J<'AM>?XO+.\[U&WH -.P#``````245.1*Y"8((` -` -end diff --git a/community-testing/scummvm-tools/PKGBUILD b/community-testing/scummvm-tools/PKGBUILD deleted file mode 100644 index 57a545833..000000000 --- a/community-testing/scummvm-tools/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 63278 2012-01-30 19:08:00Z 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=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') -depends=('libpng' 'wxgtk' 'flac' 'libvorbis') -arch=('i686' 'x86_64') -source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.gz) -md5sums=('43cbf9f5c4939876cf4149dd59e68044') - -build() { - cd ${pkgname}-${pkgver} - - install -d ${pkgdir}/usr/bin - - ./configure --prefix=/usr - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install - - install -Dm 644 README ${pkgdir}/usr/share/doc/scummvm-tools/README - install -Dm 644 convert_dxa.sh ${pkgdir}/usr/share/doc/scummvm-tools/samples/convert_dxa.sh -} -#vim: sw=2 ts=2 et: diff --git a/community-testing/silly/PKGBUILD b/community-testing/silly/PKGBUILD deleted file mode 100644 index 642de82ca..000000000 --- a/community-testing/silly/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 63280 2012-01-30 19:08:06Z ibiru $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> - -pkgname=silly -pkgver=0.1.0 -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 - silly-libpng1.5.patch) -md5sums=('c3721547fced7792a36ffc9ce6ec23fd' - '530551c2942aea6fa20f10d06f1e604f') - -build() { - cd "${srcdir}/SILLY-${pkgver}" - 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-testing/silly/silly-libpng1.5.patch b/community-testing/silly/silly-libpng1.5.patch deleted file mode 100644 index 0b2d27252..000000000 --- a/community-testing/silly/silly-libpng1.5.patch +++ /dev/null @@ -1,14 +0,0 @@ -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-testing/smc/PKGBUILD b/community-testing/smc/PKGBUILD deleted file mode 100644 index 2f60020b0..000000000 --- a/community-testing/smc/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 63282 2012-01-30 19:08:17Z ibiru $ -# Maintainer: -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Kritoke <typeolinux@yahoo.com> - -pkgname=smc -pkgver=1.9 -pkgrel=14 -pkgdesc="Secret Maryo Chronicles" -arch=('i686' 'x86_64') -url="http://www.secretmaryo.org/" -license=('GPL3') -depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data') -makedepends=('autoconf' 'automake' 'boost') -source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2 - smc-for-cegui-v0-7.diff - smc.desktop - smc.png) -md5sums=('75ab7826303c49aec25b052a8b90287f' - '51dfea21b741ad19df14e738df52f1cf' - '80fe208132ff41dd7677a53ee429ecdb' - 'efca7580e28748625eb676c9d24ee122') - -build() { - 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" - # fix for boost-1.46 - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - - ./autogen.sh - LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - 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" - - rm -rf "$pkgdir/usr/share/smc/" -} diff --git a/community-testing/smc/smc-for-cegui-v0-7.diff b/community-testing/smc/smc-for-cegui-v0-7.diff deleted file mode 100644 index a99cbce6c..000000000 --- a/community-testing/smc/smc-for-cegui-v0-7.diff +++ /dev/null @@ -1,437 +0,0 @@ -diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac ---- smc-1.9/configure.ac 2009-08-17 15:59:00.000000000 +0200 -+++ smc-1.9-b/configure.ac 2011-01-19 00:43:37.809884881 +0100 -@@ -53,7 +53,7 @@ - AC_MSG_ERROR([SDL_ttf library not found])) - - # Check for the CEGUI library --PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0) -+PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0) - CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS" - LIBS="$LIBS $CEGUI_LIBS" - -diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp ---- smc-1.9/src/core/editor.cpp 2009-08-13 17:11:42.000000000 +0200 -+++ smc-1.9-b/src/core/editor.cpp 2011-01-19 00:44:46.734328121 +0100 -@@ -118,16 +118,10 @@ - return tmp;
- }
-
--void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
-+void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
- {
- // draw text
-- list_text->draw( position, alpha, clipper );
--}
--
--void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
--{
-- // draw text
-- list_text->draw( cache, targetRect, zBase, alpha, clipper );
-+ list_text->draw( buffer, targetRect, alpha, clipper );
- }
-
- void cEditor_Item_Object :: Draw_Image( void )
-@@ -533,12 +527,12 @@ - if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
- {
- // Listbox dimension
-- float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
-- float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
-+ float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
-+ float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
- // Vertical ScrollBar Position
- float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
- // font height
-- float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
-+ float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
-
- // draw items
- for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
-diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h ---- smc-1.9/src/core/editor.h 2009-02-18 05:21:30.000000000 +0100 -+++ smc-1.9-b/src/core/editor.h 2011-01-19 00:43:37.809884881 +0100 -@@ -62,8 +62,7 @@ - */
- virtual CEGUI::Size getPixelSize( void ) const;
- // draw
-- void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
-- void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
-+ void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
- // draw image
- void Draw_Image( void );
-
-diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp ---- smc-1.9/src/core/game_core.cpp 2009-08-16 18:44:42.000000000 +0200 -+++ smc-1.9-b/src/core/game_core.cpp 2011-01-19 00:59:02.668958883 +0100 -@@ -265,7 +265,7 @@ -
-
- // align text
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- // fixme : Can't handle multiple lines of text
- float text_width = font->getTextExtent( text ) * global_downscalex;
-
-@@ -1182,7 +1182,7 @@ - text_default->setText( gui_text );
-
- // align text
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = font->getTextExtent( gui_text ) * global_downscalex;
-
- text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
-@@ -1190,7 +1190,7 @@ - text_default->moveToFront();
-
- // set window height
-- text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
-+ text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
-
- while( draw )
- {
-diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp ---- smc-1.9/src/core/main.cpp 2009-05-12 10:36:04.000000000 +0200 -+++ smc-1.9-b/src/core/main.cpp 2011-01-19 00:43:37.809884881 +0100 -@@ -444,13 +444,15 @@ - - if( pGuiSystem ) - { -- delete pGuiSystem; -+ CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider(); -+ pGuiSystem->destroy(); - pGuiSystem = NULL; -+ delete rp; - } - - if( pGuiRenderer ) - { -- delete pGuiRenderer; -+ pGuiRenderer->destroy( *pGuiRenderer ); - pGuiRenderer = NULL; - } - -@@ -507,7 +509,7 @@ - } - case SDL_VIDEORESIZE: - { -- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); -+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); - break; - } - case SDL_KEYDOWN: -diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp ---- smc-1.9/src/gui/hud.cpp 2009-05-01 15:00:16.000000000 +0200 -+++ smc-1.9-b/src/gui/hud.cpp 2011-01-19 00:43:37.816550365 +0100 -@@ -946,7 +946,7 @@ - m_text_debug_text->setVisible( 1 );
-
- // update position
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = font->getTextExtent( gui_text ) * global_downscalex;
-
- if( text_width > 800.0f )
-diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp ---- smc-1.9/src/input/mouse.cpp 2009-04-24 21:16:58.000000000 +0200 -+++ smc-1.9-b/src/input/mouse.cpp 2011-01-19 00:43:37.813217623 +0100 -@@ -432,17 +432,12 @@ -
- void cMouseCursor :: Render( void ) const
- {
-- if( !m_active )
-- {
-+ CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-+
-+ if ( m_active == mouse->isVisible() )
- return;
-- }
-
-- // Render CEGUI Mouse
-- pGuiRenderer->setQueueingEnabled( 0 );
-- CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-- mouse->setVisible( 1 );
-- mouse->draw();
-- mouse->setVisible( 0 );
-+ mouse->setVisible( m_active );
- }
-
- void cMouseCursor :: Update_Position( void )
-diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp ---- smc-1.9/src/level/level_settings.cpp 2009-08-07 03:04:28.000000000 +0200 -+++ smc-1.9-b/src/level/level_settings.cpp 2011-01-19 01:06:59.064259070 +0100 -@@ -163,8 +163,8 @@ - editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
- // preview window
- CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
-- background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
-- background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
-+ background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
-+ background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
-
- Update_BG_Colors( CEGUI::EventArgs() );
-
-@@ -555,8 +555,8 @@ -
- // set default rect
- CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
-- background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
-- background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
-+ background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
-+ background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
-
- if( !File_Exists( filename ) )
- {
-diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp ---- smc-1.9/src/objects/sprite.cpp 2009-04-18 09:55:06.000000000 +0200 -+++ smc-1.9-b/src/objects/sprite.cpp 2011-01-19 00:43:37.813217623 +0100 -@@ -1663,7 +1663,7 @@ - window_name->setText( name );
- window_name->setTooltipText( tooltip );
- // get text width
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
- // all names should have the same width
- if( text_width > m_editor_window_name_width )
-diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp ---- smc-1.9/src/video/video.cpp 2009-07-04 11:46:56.000000000 +0200 -+++ smc-1.9-b/src/video/video.cpp 2011-01-19 01:22:45.338524592 +0100 -@@ -103,15 +103,15 @@ -
- /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-
--cFake_Renderer :: cFake_Renderer( void )
--{
-- d_identifierString = "Fake Renderer";
--}
-+//cFake_Renderer :: cFake_Renderer( void )
-+//{
-+// d_identifierString = "Fake Renderer";
-+//}
-
--cFake_Renderer :: ~cFake_Renderer( void )
--{
-+//cFake_Renderer :: ~cFake_Renderer( void )
-+//{
-
--}
-+//}
-
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
-
-@@ -158,7 +158,7 @@ - std::string log_dump_dir = "/dev/null";
- #endif
- // create fake system and renderer
-- pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
-+ pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
- }
-
- void cVideo :: Delete_CEGUI_Fake( void ) const
-@@ -166,7 +166,7 @@ - CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
- CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
-
-- delete pGuiSystem;
-+ pGuiSystem->destroy();
- pGuiSystem = NULL;
- delete renderer;
- delete rp;
-@@ -177,7 +177,7 @@ - // create renderer
- try
- {
-- pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
-+ pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -186,10 +186,10 @@ - exit( EXIT_FAILURE );
- }
-
-- /* create Resource Provider
-- * no need to destroy it later since it is handled by the CEGUI renderer
-- */
-- CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
-+ pGuiRenderer->enableExtraStateSettings(true);
-+
-+ // create Resource Provider
-+ CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
-
- // set Resource Provider directories
- rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
-@@ -215,7 +215,7 @@ - // create system
- try
- {
-- pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
-+ pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -242,7 +242,7 @@ - // load the scheme file, which auto-loads the imageset
- try
- {
-- CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
-+ CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -254,9 +254,7 @@ - // default mouse cursor
- pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
- // force new mouse image
-- CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
-- // hide CEGUI mouse always because we render it manually
-- CEGUI::MouseCursor::getSingleton().hide();
-+ CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
- // default tooltip
- pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
- // create default root window
-@@ -553,7 +551,7 @@ - pFont->Restore_Textures();
-
- // send new size to CEGUI
-- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-
- // check if CEGUI is initialized
- bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
-diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h ---- smc-1.9/src/video/video.h 2009-07-04 10:49:50.000000000 +0200 -+++ smc-1.9-b/src/video/video.h 2011-01-19 01:16:42.791283379 +0100 -@@ -23,7 +23,7 @@ - #include "SDL_opengl.h"
- // CEGUI
- #include "CEGUI.h"
--#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
-+#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
-
- namespace SMC
- {
-@@ -129,31 +129,100 @@ - EFFECT_IN_AMOUNT
- };
-
--/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-+/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
-+// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
-+class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
-+{
-+ void draw() const {}
-+ void setTranslation(const CEGUI::Vector3&) {}
-+ void setRotation(const CEGUI::Vector3&) {}
-+ void setPivot(const CEGUI::Vector3&) {}
-+ void setClippingRegion(const CEGUI::Rect&) {}
-+ void appendVertex(const CEGUI::Vertex&) {}
-+ void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
-+ void setActiveTexture(CEGUI::Texture*) {}
-+ void reset() {}
-+ CEGUI::Texture* getActiveTexture() const { return 0; }
-+ CEGUI::uint getVertexCount() const { return 0; }
-+ CEGUI::uint getBatchCount() const { return 0; }
-+ void setRenderEffect(CEGUI::RenderEffect*) {}
-+ CEGUI::RenderEffect* getRenderEffect() { return 0; }
-+};
-
--class cFake_Renderer : public CEGUI::Renderer
-+class cFake_Texture : public CEGUI::Texture
-+{
-+public:
-+ cFake_Texture() :
-+ m_size(1, 1),
-+ m_scaling(1, 1) {}
-+
-+ const CEGUI::Size& getSize() const { return m_size; }
-+ const CEGUI::Size& getOriginalDataSize() const { return m_size; }
-+ const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
-+ void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
-+ void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
-+ void saveToMemory(void*) {}
-+
-+private:
-+ CEGUI::Size m_size;
-+ CEGUI::Vector2 m_scaling;
-+};
-+
-+class cFake_RenderTarget : public CEGUI::RenderTarget
- {
- public:
-- cFake_Renderer( void );
-- virtual ~cFake_Renderer( void );
-+ cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
-+ void draw(const CEGUI::GeometryBuffer&) {}
-+ void draw(const CEGUI::RenderQueue&) {}
-+ void setArea(const CEGUI::Rect&) {}
-+ const CEGUI::Rect& getArea() const { return m_area; }
-+ bool isImageryCache() const { return false; }
-+ void activate() {}
-+ void deactivate() {}
-+ void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
-+
-+private:
-+ CEGUI::Rect m_area;
-+};
-
-- virtual void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
-- virtual void doRender(void) {};
-- virtual void clearRenderList(void) {};
-- virtual void setQueueingEnabled(bool setting) {};
-- virtual CEGUI::Texture *createTexture(void) { return NULL; };
-- virtual CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
-- virtual CEGUI::Texture *createTexture(float size) { return NULL; };
-- virtual void destroyTexture(CEGUI::Texture* texture) {};
-- virtual void destroyAllTextures(void) {};
-- virtual bool isQueueingEnabled(void) const { return 0; };
-- virtual float getWidth(void) const { return 0; };
-- virtual float getHeight(void) const { return 0; };
-- virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
-- virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
-- virtual unsigned int getMaxTextureSize(void) const { return 0; };
-- virtual unsigned int getHorzScreenDPI(void) const { return 0; };
-- virtual unsigned int getVertScreenDPI(void) const { return 0; };
-+class cFake_Renderer : public CEGUI::Renderer
-+{
-+public:
-+ cFake_Renderer( void ) :
-+ m_size(0, 0),
-+ m_dpi(0, 0),
-+ m_identifierString("Fake Renderer"),
-+ m_root(m_target) {}
-+ ~cFake_Renderer( void ) {}
-+
-+ CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
-+ CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
-+ void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
-+ void destroyAllGeometryBuffers() {}
-+ CEGUI::TextureTarget* createTextureTarget() { return 0; }
-+ void destroyTextureTarget(CEGUI::TextureTarget*) {}
-+ void destroyAllTextureTargets() {}
-+ CEGUI::Texture& createTexture() { return m_texture; }
-+ CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
-+ CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
-+ void destroyTexture(CEGUI::Texture&) {}
-+ void destroyAllTextures() {}
-+ void beginRendering() {}
-+ void endRendering() {}
-+ void setDisplaySize(const CEGUI::Size&) {}
-+ const CEGUI::Size& getDisplaySize() const { return m_size; }
-+ const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
-+ CEGUI::uint getMaxTextureSize() const { return 0; }
-+ const CEGUI::String& getIdentifierString() const { return m_identifierString; }
-+
-+private:
-+ CEGUI::Size m_size;
-+ CEGUI::Vector2 m_dpi;
-+ CEGUI::String m_identifierString;
-+ cFake_GeometryBuffer m_geometry;
-+ cFake_Texture m_texture;
-+ cFake_RenderTarget m_target;
-+ CEGUI::RenderingRoot m_root;
- };
-
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/community-testing/smc/smc.desktop b/community-testing/smc/smc.desktop deleted file mode 100644 index 6cfe5b018..000000000 --- a/community-testing/smc/smc.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry]
-Name=Secret Maryo Chronicles
-GenericName=Arcade Game
-Exec=smc
-Icon=smc.png
-Terminal=false
-Type=Application
-Categories=Game;ArcadeGame;KidsGame;
-StartupNotify=false
\ No newline at end of file diff --git a/community-testing/smc/smc.png b/community-testing/smc/smc.png Binary files differdeleted file mode 100644 index f02af1bfc..000000000 --- a/community-testing/smc/smc.png +++ /dev/null diff --git a/community-testing/speed-dreams/PKGBUILD b/community-testing/speed-dreams/PKGBUILD deleted file mode 100644 index db818e3be..000000000 --- a/community-testing/speed-dreams/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 63286 2012-01-30 19:08:35Z 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=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' - '6b45e9c40984ebb79a1dfaddbfabde92') - -build() { - 7z x ${pkgname}-${_pkgver}-src.tar.7z - tar xf ${pkgname}-${_pkgver}-src.tar - - cd "${pkgname}-${_pkgver}-src" - - cmake . \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSD_BINDIR=/usr/bin \ - -DSD_DATADIR=/usr/share/speed-dreams-2 \ - -DSD_LIBDIR=/usr/lib/speed-dreams-2 \ - -DOPTION_OFFICIAL_ONLY:BOOL=ON - - make -} - -package() { - cd "$srcdir/${pkgname}-${_pkgver}-src" - - make DESTDIR="${pkgdir}/" install - - rm -r "${pkgdir}/usr/share" - - install -Dm644 "data/data/icons/icon.png" "${pkgdir}/usr/share/pixmaps/speed-dreams.png" - install -Dm644 "data/data/icons/icon.svg" "${pkgdir}/usr/share/pixmaps/speed-dreams.svg" - install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/speed-dreams.desktop" - - mkdir -p "${pkgdir}/usr/share/doc/${pkgname}" - cp -r doc/* "${pkgdir}/usr/share/doc/${pkgname}/" - rm -r "${pkgdir}/usr/share/doc/${pkgname}/man" - - mkdir -p "${pkgdir}/usr/share/man/man6/${pkgname}" - cp doc/man/* "${pkgdir}/usr/share/man/man6/${pkgname}" - - # Symlink for backwards compatibility - cd "${pkgdir}/usr/bin" - ln -s speed-dreams-2 speed-dreams -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/speed-dreams/speed-dreams.desktop b/community-testing/speed-dreams/speed-dreams.desktop deleted file mode 100644 index f04b71791..000000000 --- a/community-testing/speed-dreams/speed-dreams.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Speed Dreams -Comment=The Open Racing Car Simulator Fork -Exec=speed-dreams-2 -Icon=speed-dreams.svg -Terminal=false -Type=Application -Encoding=UTF-8 -Categories=Application;Game; diff --git a/community-testing/speed-dreams/speed-dreams.sh b/community-testing/speed-dreams/speed-dreams.sh deleted file mode 100644 index fa6dde97a..000000000 --- a/community-testing/speed-dreams/speed-dreams.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -cd /opt/speed-dreams/bin -./speed-dreams diff --git a/community-testing/synfig/PKGBUILD b/community-testing/synfig/PKGBUILD deleted file mode 100644 index 16b7885ad..000000000 --- a/community-testing/synfig/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 63288 2012-01-30 19:08:44Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Franco Iacomella <yaco@gnu.org> - -pkgname=synfig -pkgver=0.63.03 -pkgrel=2 -pkgdesc="Professional vector animation program (CLI renderer only)" -arch=(i686 x86_64) -url="http://synfig.org" -license=('GPL2') -depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg' 'fontconfig' 'libpng' - 'libtiff' 'libdv' 'libmng') -optdepends=('openexr' 'libsigc++') -conflicts=('synfig-core') -replaces=('synfig-core') -options=(!libtool) -source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz - build-fix.patch - ffmpeg-0.8.patch) -md5sums=('9bd77cd2fc2381adfbd50a7b9c1c6e7c' - 'b5568b06fae1a7ee465b5380b1139b83' - 'ebf41046097cfd778dee9a9854561dae') - -build() { - cd $srcdir/$pkgname-$pkgver - [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; } - [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv - patch -p1 -i $srcdir/build-fix.patch - patch -Np1 -i $srcdir/ffmpeg-0.8.patch - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/community-testing/synfig/build-fix.patch b/community-testing/synfig/build-fix.patch deleted file mode 100644 index be45fdc68..000000000 --- a/community-testing/synfig/build-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp ---- synfig-core/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-05 13:04:07.000000000 +0400 -+++ synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-14 14:32:49.000000000 +0400 -@@ -31,6 +31,10 @@ - # include <config.h> - #endif - -+#include <libavcodec/avcodec.h> -+#include <libavformat/avformat.h> -+#include <libswscale/swscale.h> -+ - #include "trgt_av.h" - - extern "C" -@@ -116,14 +120,14 @@ - picture = avcodec_alloc_frame(); - if (!picture) - return NULL; -- size = avpicture_get_size(pix_fmt, width, height); -+ size = avpicture_get_size((enum ::PixelFormat)pix_fmt, width, height); - picture_buf = (uint8_t *)malloc(size); - if (!picture_buf) { - av_free(picture); - return NULL; - } - avpicture_fill((AVPicture *)picture, picture_buf, -- pix_fmt, width, height); -+ (enum ::PixelFormat)pix_fmt, width, height); - return picture; - } - diff --git a/community-testing/synfig/ffmpeg-0.8.patch b/community-testing/synfig/ffmpeg-0.8.patch deleted file mode 100644 index 4ba40fff2..000000000 --- a/community-testing/synfig/ffmpeg-0.8.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -aur synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp ---- synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp 2011-09-29 10:51:41.000000000 +0200 -+++ synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp 2011-10-31 16:39:03.000000000 +0100 -@@ -441,7 +441,7 @@ - if( context->coded_frame ) - pkt.pts = context->coded_frame->pts; - if( context->coded_frame && context->coded_frame->key_frame) -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - - //kluge for raw picture format (they said they'd fix) - if (formatc->oformat->flags & AVFMT_RAWPICTURE) -@@ -463,7 +463,7 @@ - if( context->coded_frame ) - pkt.pts = context->coded_frame->pts; - if( context->coded_frame && context->coded_frame->key_frame) -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - - ret = av_write_frame(formatc, &pkt); - -@@ -567,17 +567,17 @@ - if (typestring) - { - //formatptr guess_format(type, filename, MIME type) -- format = guess_format(typestring,NULL,NULL); -+ format = av_guess_format(typestring,NULL,NULL); - } - else - { -- format = guess_format(NULL, filename, NULL); -+ format = av_guess_format(NULL, filename, NULL); - } - - if(!format) - { - synfig::warning("Unable to Guess the output, defaulting to mpeg"); -- format = guess_format("mpeg", NULL, NULL); -+ format = av_guess_format("mpeg", NULL, NULL); - } - - if(!format) -@@ -753,7 +753,7 @@ - - context = st->codec; - context->codec_id = (CodecID)codec_id; -- context->codec_type = CODEC_TYPE_VIDEO; -+ context->codec_type = AVMEDIA_TYPE_VIDEO; - - //PARAMETERS MUST BE PASSED IN SOMEHOW (ANOTHER FUNCTION PARAMETER???) - -@@ -800,7 +800,7 @@ - - context = stream->codec; - context->codec_id = (CodecID)codec_id; -- context->codec_type = CODEC_TYPE_AUDIO; -+ context->codec_type = AVMEDIA_TYPE_AUDIO; - - /* put sample parameters */ - context->bit_rate = 64000; diff --git a/community-testing/ted/PKGBUILD b/community-testing/ted/PKGBUILD deleted file mode 100644 index 1786b85cb..000000000 --- a/community-testing/ted/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 63290 2012-01-30 19:08:55Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=ted -pkgver=2.21 -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 - 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 - 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/ - sed -i "s|usr/local/afm|usr/share/Ted/afm|g" gsafm.sh - mv *.sh "$pkgdir/usr/bin/" -} diff --git a/community-testing/ted/ted-2.21-libpng15.patch b/community-testing/ted/ted-2.21-libpng15.patch deleted file mode 100644 index afd30f9a4..000000000 --- a/community-testing/ted/ted-2.21-libpng15.patch +++ /dev/null @@ -1,423 +0,0 @@ -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-testing/tmw/PKGBUILD b/community-testing/tmw/PKGBUILD deleted file mode 100644 index bc7dba665..000000000 --- a/community-testing/tmw/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 63292 2012-01-30 19:09:03Z ibiru $ -# Contributor: Bjorn Lindeijer <bjorn lindeijer nl> -# Maintainer: Mateusz Herych <heniekk@gmail.com> - -pkgname=tmw -pkgver=0.5.2 -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" -license=('GPL') -depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs' -'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf') -makedepends=('cmake' 'mesa') -source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgver.tar.bz2) -md5sums=('c843ef420aced82db1e51fa14e80174a') - -build() { - cd "$srcdir" - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "$srcdir" - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/tomoyo-tools/PKGBUILD b/community-testing/tomoyo-tools/PKGBUILD deleted file mode 100644 index c2e406cd5..000000000 --- a/community-testing/tomoyo-tools/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 61687 2012-01-06 17:27:08Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> - -pkgname=tomoyo-tools -_basever=2.5.0 -_timestamp=20111025 -_file=53357 -pkgver=${_basever}.${_timestamp} -pkgrel=1 -pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernels 2.6.36 - 3.0' -arch=('i686' 'x86_64') -url='http://tomoyo.sourceforge.jp' -#url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818' -license=('GPL') -depends=('ncurses') -conflicts=('ccs-tools') -install=tomoyo-tools.install -source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz") -md5sums=('99999779698ea5f44c74d49e8c640ec1') - -build() { - cd "${srcdir}/${pkgname}" - make -j1 -} - -package() { - cd "${srcdir}/${pkgname}" - make INSTALLDIR="${pkgdir}" install -} diff --git a/community-testing/tomoyo-tools/tomoyo-tools.install b/community-testing/tomoyo-tools/tomoyo-tools.install deleted file mode 100644 index 695a53f19..000000000 --- a/community-testing/tomoyo-tools/tomoyo-tools.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install () { - echo - echo " * To enable TOMOYO Linux, append 'security=tomoyo' to the kernel" - echo " boot options and initialize policy with this command:" - echo " /usr/lib/tomoyo/init_policy" - echo -} - -post_upgrade () { - post_install $1 -} diff --git a/community-testing/torcs/PKGBUILD b/community-testing/torcs/PKGBUILD deleted file mode 100644 index 7f8a7c16a..000000000 --- a/community-testing/torcs/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 63294 2012-01-30 19:09:14Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Shahar Weiss <sweiss4@gmx.net> - -pkgname=torcs -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' 'libvorbis') -makedepends=('plib') -options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 - torcs.desktop - torcs-gcc.patch) -md5sums=('254b8f4c14d067dd63da8d54d3cfdba8' - '328e419e9f985c3e7b69924fe299330d' - '5ae7e903df37300d3b8744328c756bff') - -build() { - cd $srcdir/$pkgname-${pkgver/_/-} - unset LDFLAGS - ./configure --prefix=/usr --x-includes=/usr/include --x-libraries=/usr/lib - make -} - -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 - install -D -m644 ../torcs.desktop ${pkgdir}/usr/share/applications/torcs.desktop - find ${pkgdir} -type d -exec chmod 755 {} \; -} diff --git a/community-testing/torcs/torcs-gcc.patch b/community-testing/torcs/torcs-gcc.patch deleted file mode 100644 index fcc5604e7..000000000 --- a/community-testing/torcs/torcs-gcc.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -aur src.old/drivers/olethros/Trajectory.cpp src/drivers/olethros/Trajectory.cpp ---- src.old/drivers/olethros/Trajectory.cpp 2008-04-06 22:21:31.000000000 +0200 -+++ src/drivers/olethros/Trajectory.cpp 2008-04-06 22:28:52.000000000 +0200 -@@ -10,8 +10,10 @@ - ***************************************************************************/ - #include <cstdio> - #include <cstdlib> -+#include <cstring> - #include <cmath> - #include <cassert> -+#include <ctime> - #include <list> - #include <vector> - #include "Trajectory.h" -diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp ---- src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp 2008-04-06 22:21:31.000000000 +0200 -+++ src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp 2008-04-06 22:22:57.000000000 +0200 -@@ -32,7 +32,7 @@ - #include "Transform.h" - - #include <algorithm> --#include <new.h> -+#include <new> - - class BBoxCompAxis { - public: -diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp ---- src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp 2008-04-06 22:21:31.000000000 +0200 -+++ src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp 2008-04-06 22:23:11.000000000 +0200 -@@ -32,7 +32,7 @@ - #include "Transform.h" - #include "BBoxTree.h" - --#include <new.h> -+#include <new> - - BBoxInternal *free_node; - -diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp ---- src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp 2008-04-06 22:21:31.000000000 +0200 -+++ src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp 2008-04-06 22:22:29.000000000 +0200 -@@ -32,7 +32,7 @@ - #include "Object.h" - #include "Encounter.h" - --#include <new.h> -+#include <new> - - void addPair(ObjectPtr object1, ObjectPtr object2); - void removePair(ObjectPtr object1, ObjectPtr object2); -diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp ---- src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp 2008-04-06 22:21:31.000000000 +0200 -+++ src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp 2008-04-06 22:22:40.000000000 +0200 -@@ -33,7 +33,7 @@ - #include "Convex.h" - #include "Complex.h" - --#include <new.h> -+#include <new> - - Object::Object(DtObjectRef obj, ShapePtr shape) : - ref(obj), -diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp ---- src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp 2008-04-06 22:21:31.000000000 +0200 -+++ src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp 2008-04-06 22:22:12.000000000 +0200 -@@ -37,7 +37,7 @@ - } - - #include <vector> --#include <new.h> -+#include <new> - - typedef vector<unsigned int> IndexBuf; - diff --git a/community-testing/torcs/torcs.desktop b/community-testing/torcs/torcs.desktop deleted file mode 100644 index 03d1ba010..000000000 --- a/community-testing/torcs/torcs.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=TORCS -Comment=The Open Racing Car Simulator -Exec=torcs -Icon=torcs.png -Terminal=false -Type=Application -Encoding=UTF-8 -Categories=Application;Game; diff --git a/community-testing/torcs/torcs.sh b/community-testing/torcs/torcs.sh deleted file mode 100644 index 0f1b4fe8d..000000000 --- a/community-testing/torcs/torcs.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -export PATH=$PATH:/opt/torcs/bin diff --git a/community-testing/tuxpaint/PKGBUILD b/community-testing/tuxpaint/PKGBUILD deleted file mode 100644 index 003e686ee..000000000 --- a/community-testing/tuxpaint/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 63296 2012-01-30 19:09:20Z 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=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 tuxpaint-0.9.21-libpng1.5.patch) -md5sums=('a88401d1860648098eeed819cff038fa' - '11d11119b3316c13f7b7a77048317bce') -sha1sums=('082a179a3cb44ee17af47421bc92125a890846e4' - '5595a65ebabc46bebd2d0670589effc8dbdd4e0c') - -build() { - 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="$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-testing/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch b/community-testing/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch deleted file mode 100644 index 25e80cd2a..000000000 --- a/community-testing/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch +++ /dev/null @@ -1,19 +0,0 @@ -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-testing/tvtime/PKGBUILD b/community-testing/tvtime/PKGBUILD deleted file mode 100644 index d1f042ba4..000000000 --- a/community-testing/tvtime/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 63298 2012-01-30 19:09:33Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer:thefatprecious <marty@loomar.com> - -pkgname=tvtime -pkgver=1.0.2 -pkgrel=3 -pkgdesc="A high quality television application for use with video capture cards" -arch=('i686' 'x86_64') -url='http://tvtime.sourceforge.net/' -license=('GPL' 'LGPL') -depends=('gcc-libs' 'libpng' 'libxml2' 'freetype2' 'libxtst' 'libxinerama' 'libxv' - 'libsm' 'libxxf86vm') -makedepends=('libxt' 'v4l-utils') -source=(http://downloads.sourceforge.net/sourceforge/tvtime/$pkgname-$pkgver.tar.gz - tvtime-1.0.2+linux-headers-2.6.18.patch - tvtime-1.0.2-gcc41.patch - tvtime-1.0.2-locale_t.patch) -md5sums=('4b3d03afe61be239b08b5e522cd8afed' - 'e956821745686b5b3a784f7471996ade' - 'c782789825dfa664e1f6fcc96ac7246c' - '1069dc5b47bba8456cbf48e34cb5c0b6') - -build() { - cd $srcdir/$pkgname-$pkgver - 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 - install -D -m644 docs/html/default.tvtime.xml $pkgdir/usr/share/tvtime/default.tvtime.xml -} diff --git a/community-testing/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch b/community-testing/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch deleted file mode 100644 index d0772783d..000000000 --- a/community-testing/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: tvtime-1.0.2/src/videoinput.c -=================================================================== ---- tvtime-1.0.2.orig/src/videoinput.c -+++ tvtime-1.0.2/src/videoinput.c -@@ -35,8 +35,9 @@ - #ifdef HAVE_CONFIG_H - # include "config.h" - #endif --#include "videodev.h" --#include "videodev2.h" -+#include <libv4l1-videodev.h> -+#include <linux/videodev2.h> -+#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ - #include "videoinput.h" - #include "mixer.h" - diff --git a/community-testing/tvtime/tvtime-1.0.2-gcc41.patch b/community-testing/tvtime/tvtime-1.0.2-gcc41.patch deleted file mode 100644 index 58e9bb204..000000000 --- a/community-testing/tvtime/tvtime-1.0.2-gcc41.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Naur tvtime-1.0.1/plugins/greedyh.asm tvtime-1.0.1-gcc41/plugins/greedyh.asm ---- tvtime-1.0.1/plugins/greedyh.asm 2005-08-14 18:16:43.000000000 +0200 -+++ tvtime-1.0.1-gcc41/plugins/greedyh.asm 2005-11-28 17:53:09.210774544 +0100 -@@ -18,7 +18,7 @@ - - #include "x86-64_macros.inc" - --void DScalerFilterGreedyH::FUNCT_NAME(TDeinterlaceInfo* pInfo) -+void FUNCT_NAME(TDeinterlaceInfo* pInfo) - { - int64_t i; - bool InfoIsOdd = (pInfo->PictureHistory[0]->Flags & PICTURE_INTERLACED_ODD) ? 1 : 0; -diff -Naur tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc ---- tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc 2004-10-20 17:31:05.000000000 +0200 -+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc 2005-11-28 17:53:33.251119856 +0100 -@@ -5,9 +5,9 @@ - #endif - - #ifdef USE_STRANGE_BOB --#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n##_SB) -+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB) - #else --#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n) -+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n) - #endif - - int SEARCH_EFFORT_FUNC(0) // we don't try at all ;-) -diff -Naur tvtime-1.0.1/plugins/tomsmocomp.cpp tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp ---- tvtime-1.0.1/plugins/tomsmocomp.cpp 2004-10-20 19:38:04.000000000 +0200 -+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp 2005-11-28 17:52:53.862107896 +0100 -@@ -31,7 +31,7 @@ - - #define IS_MMX - #define SSE_TYPE MMX --#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_MMX -+#define FUNCT_NAME filterDScaler_MMX - #include "tomsmocomp/TomsMoCompAll.inc" - #undef IS_MMX - #undef SSE_TYPE -@@ -39,7 +39,7 @@ - - #define IS_3DNOW - #define SSE_TYPE 3DNOW --#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_3DNOW -+#define FUNCT_NAME filterDScaler_3DNOW - #include "tomsmocomp/TomsMoCompAll.inc" - #undef IS_3DNOW - #undef SSE_TYPE -@@ -47,7 +47,7 @@ - - #define IS_SSE - #define SSE_TYPE SSE --#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_SSE -+#define FUNCT_NAME filterDScaler_SSE - #include "tomsmocomp/TomsMoCompAll.inc" - #undef IS_SSE - #undef SSE_TYPE diff --git a/community-testing/tvtime/tvtime-1.0.2-locale_t.patch b/community-testing/tvtime/tvtime-1.0.2-locale_t.patch Binary files differdeleted file mode 100644 index cbbb05458..000000000 --- a/community-testing/tvtime/tvtime-1.0.2-locale_t.patch +++ /dev/null diff --git a/community-testing/vdrift/PKGBUILD b/community-testing/vdrift/PKGBUILD deleted file mode 100644 index 297df9eb7..000000000 --- a/community-testing/vdrift/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 61760 2012-01-07 13:17:55Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Anton Bazhenov <anton.bazhenov at gmail> -# Contributor: Lone_Wolf lonewolf@xs4all.nl - -pkgname=vdrift -pkgver=2011.10.22 -pkgrel=3 -pkgdesc="An open source driving simulation made with drift racing in mind" -arch=('i686' 'x86_64') -url="http://vdrift.net/" -license=('GPL') -depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') -makedepends=('scons' 'boost' 'asio') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2) -md5sums=('6f8806ab1be303e9e1e47522c9eee890') -install=vdrift.install - -build() { - cd "$srcdir"/$pkgname-${pkgver//./-} - - # select arch - if [ `uname -m` = "x86_64" ]; then - _sconsarch="a64" - else - _sconsarch="686" - fi - - #sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp - #sed -i '/types.h/d' src/http.h - - # build and install - scons $MAKEFLAGS \ - "destdir"="$pkgdir" \ - "arch"=$_sconsarch \ - "release"=1 \ - "force_feedback"=1 \ - "prefix"=/usr \ - "datadir"=share/$pkgname/ \ - "extbullet"=1 -} - -package() { - cd "$srcdir"/$pkgname-${pkgver//./-} - - scons install - - # install .desktop file - install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop - - # install icons - install -Dm644 data/textures/icons/vdrift-16x16.png \ - "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png - install -Dm644 data/textures/icons/vdrift-32x32.png \ - "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png - install -Dm644 data/textures/icons/vdrift-64x64.png \ - "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png - - rm -r $pkgdir/usr/share/vdrift -} -# vim: sw=2:ts=2 et: diff --git a/community-testing/vdrift/vdrift.desktop b/community-testing/vdrift/vdrift.desktop deleted file mode 100644 index 7078f0d9c..000000000 --- a/community-testing/vdrift/vdrift.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=VDrift -Version=2009-06-15 -GenericName=Racing Simulation -Comment=An open source driving simulation made with drift racing in mind -Exec=vdrift -Icon=vdrift.png -Terminal=false -Categories=Game;Simulation; diff --git a/community-testing/vdrift/vdrift.install b/community-testing/vdrift/vdrift.install deleted file mode 100644 index 868f6717b..000000000 --- a/community-testing/vdrift/vdrift.install +++ /dev/null @@ -1,11 +0,0 @@ -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community-testing/virtualbox-modules/60-vboxguest.rules b/community-testing/virtualbox-modules/60-vboxguest.rules deleted file mode 100644 index 6285f7249..000000000 --- a/community-testing/virtualbox-modules/60-vboxguest.rules +++ /dev/null @@ -1,2 +0,0 @@ -ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" -ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" diff --git a/community-testing/virtualbox-modules/LocalConfig.kmk b/community-testing/virtualbox-modules/LocalConfig.kmk deleted file mode 100644 index af79f90cd..000000000 --- a/community-testing/virtualbox-modules/LocalConfig.kmk +++ /dev/null @@ -1,19 +0,0 @@ -VBOX_WITH_ADDITION_DRIVERS = -VBOX_WITH_INSTALLER = 1 -VBOX_WITH_LINUX_ADDITIONS = 1 -VBOX_WITH_X11_ADDITIONS = -VBOX_WITH_TESTCASES = -VBOX_WITH_TESTSUITE = -VBOX_WITH_ORIGIN := -VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox -VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox -VBOX_PATH_APP_DOCS := /usr/share/virtualbox -VBOX_WITH_REGISTRATION_REQUEST = -VBOX_WITH_UPDATE_REQUEST = -VBOX_WITH_VNC := 1 -VBOX_BLD_PYTHON = python2 -VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk -VBOX_GCC_WERR = -VBOX_GCC_WARN = diff --git a/community-testing/virtualbox-modules/PKGBUILD b/community-testing/virtualbox-modules/PKGBUILD deleted file mode 100644 index ea3d9e7ce..000000000 --- a/community-testing/virtualbox-modules/PKGBUILD +++ /dev/null @@ -1,101 +0,0 @@ -# $Id: PKGBUILD 61651 2012-01-05 16:53:34Z ibiru $ -#Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgbase=virtualbox-modules -pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules') -pkgver=4.1.8 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://virtualbox.org' -license=('GPL') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers') -[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') -source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 - LocalConfig.kmk 60-vboxguest.rules) -md5sums=('2092bba46baa62fab5520d67dee2ece8' - '4c88bd122677a35f68abd76eb01b378b' - 'ed1341881437455d9735875ddf455fbe') - -_extramodules=extramodules-3.2-ARCH -_kernver="$(cat /lib/modules/${_extramodules}/version || true)" - -export KERN_DIR=/lib/modules/${_kernver}/build -export KERN_INCL=/usr/src/linux-${_kernver}/include/ - -build() { - cd "$srcdir/VirtualBox-${pkgver}_OSE" - - cp "$srcdir/LocalConfig.kmk" . - - ./configure \ - --with-linux=/usr/src/linux-${_kernver} \ - --disable-java \ - --disable-docs \ - --disable-xpcom \ - --disable-python \ - --disable-sdl-ttf \ - --disable-alsa \ - --disable-pulse \ - --disable-dbus \ - --disable-opengl \ - --build-headless \ - --nofatal - source ./env.sh - kmk all - - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" -} - -package_virtualbox-archlinux-modules(){ - pkgdesc="Additions only for Arch Linux guests (kernel modules)" - license=('GPL') - install=virtualbox-archlinux-modules.install - depends=('linux>=3.2' 'linux<3.3') - replaces=('virtualbox-guest-modules') - conflicts=('virtualbox-guest-modules') - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - - for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do - install -D -m644 ${module} \ - "$pkgdir/lib/modules/${_extramodules}/${module}" - done - - install -D -m 0644 "$srcdir/60-vboxguest.rules" \ - "$pkgdir/lib/udev/rules.d/60-vboxguest.rules" - - find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; - - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-archlinux-modules.install" -} - -package_virtualbox-modules(){ - pkgdesc="Kernel modules for VirtualBox" - license=('GPL') - install=virtualbox-modules.install - depends=('linux>=3.2' 'linux<3.3') - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" - - install -D -m644 vboxdrv.ko \ - "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko" - - install -D -m644 vboxnetadp.ko \ - "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko" - - install -D -m644 vboxnetflt.ko \ - "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko" - - install -D -m644 vboxpci.ko \ - "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko" - - find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; - - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install" -} diff --git a/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install b/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install deleted file mode 100644 index 74af049cc..000000000 --- a/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { -cat << EOF -===> You may want to load vboxguest, vboxsf and vboxvideo -EOF - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} diff --git a/community-testing/virtualbox-modules/virtualbox-modules.install b/community-testing/virtualbox-modules/virtualbox-modules.install deleted file mode 100644 index eeab16ca9..000000000 --- a/community-testing/virtualbox-modules/virtualbox-modules.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { -/bin/cat << EOF -===> You must load vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -EOF - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) - echo 'In order to use the new version, reload all virtualbox modules manually.' -} - -post_remove() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} diff --git a/community-testing/virtualbox/10-vboxdrv.rules b/community-testing/virtualbox/10-vboxdrv.rules deleted file mode 100644 index 37403ae2f..000000000 --- a/community-testing/virtualbox/10-vboxdrv.rules +++ /dev/null @@ -1,5 +0,0 @@ -KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1" -SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" -SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/community-testing/virtualbox/LocalConfig.kmk b/community-testing/virtualbox/LocalConfig.kmk deleted file mode 100644 index e5cbcebcd..000000000 --- a/community-testing/virtualbox/LocalConfig.kmk +++ /dev/null @@ -1,19 +0,0 @@ -VBOX_WITH_ADDITION_DRIVERS = -VBOX_WITH_INSTALLER = 1 -VBOX_WITH_LINUX_ADDITIONS = 1 -VBOX_WITH_X11_ADDITIONS = 1 -VBOX_WITH_TESTCASES = -VBOX_WITH_TESTSUITE = -VBOX_WITH_ORIGIN := -VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox -VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox -VBOX_PATH_APP_DOCS := /usr/share/virtualbox -VBOX_WITH_REGISTRATION_REQUEST = -VBOX_WITH_UPDATE_REQUEST = -VBOX_WITH_VNC := 1 -VBOX_BLD_PYTHON = python2 -VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk -VBOX_GCC_WERR = -VBOX_GCC_WARN = diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD deleted file mode 100644 index 9b503c19c..000000000 --- a/community-testing/virtualbox/PKGBUILD +++ /dev/null @@ -1,189 +0,0 @@ -# $Id: PKGBUILD 63300 2012-01-30 19:09:55Z ibiru $ -#Maintainer: Ionut Biru <ibiru@archlinux.org> -pkgbase=virtualbox -pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source') -pkgver=4.1.8 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://virtualbox.org' -license=('GPL' 'custom') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2') -#'xorg-server-devel' 'xf86driproto' 'libxcomposite') -[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') -source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 - UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf - 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild - change_default_driver_dir.patch vbox-service.conf vbox-service.rc) - -_extramodules=extramodules-3.2-ARCH -_kernver="$(cat /lib/modules/${_extramodules}/version)" - -build() { - cd "$srcdir/VirtualBox-${pkgver}_OSE" - - patch -Np1 -i "$srcdir/vboxdrv-reference.patch" - patch -Np1 -i "$srcdir/change_default_driver_dir.patch" - - cp "$srcdir/LocalConfig.kmk" . - - ./configure --disable-docs \ - --enable-webservice \ - --enable-vde \ - --enable-vnc \ - --nofatal \ - --with-linux=/usr/src/linux-${_kernver} - source ./env.sh - kmk all - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" -} - -package_virtualbox() { - pkgdesc="Powerful x86 virtualization for enterprise as well as home use" - 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' - 'virtualbox-source: host kernel source modules for non-stock kernels') - - backup=('etc/vbox/vbox.cfg') - replaces=('virtualbox-ose') - conflicts=('virtualbox-ose') - install=virtualbox.install - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls} - - #doc - install -m 0644 "$srcdir/UserManual-$pkgver.pdf" "$pkgdir/usr/share/virtualbox/UserManual.pdf" - - #Binaries and Wrapper with Launchers - install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox" - - for i in VBoxHeadless vboxheadless VBoxManage vboxmanage VBoxSDL vboxsdl VirtualBox virtualbox vboxwebsrv VBoxBalloonCtrl vboxballoonctrl; do - ln -sf VBox "$pkgdir/usr/bin/$i" - done - install -m 0755 VBoxTunctl "$pkgdir/usr/bin" - - #components - install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components" - - #lib - install -m 0755 *.so "$pkgdir/usr/lib/virtualbox" - install -m 0644 *.gc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox" - - #setuid root binaries - install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox" - #other binaries - install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox" - - #language - install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls" - - #useless scripts - install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox" - - #icons - install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png" - - pushd icons - for i in *; do - install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" - cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" - done - popd - - #desktop - install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop" - install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml" - - #install configuration - mkdir -p "$pkgdir/etc/vbox" - echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg" - - #udev and licence - install -D -m 0644 "$srcdir/VirtualBox-${pkgver}_OSE/COPYING" \ - "$pkgdir/usr/share/licenses/virtualbox/LICENSE" - install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ - "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules" -} - -package_virtualbox-source() { - pkgdesc="VirtualBox kernel modules source" - depends=(gcc make) - provides=(virtualbox-modules) - optdepends=('linux-headers' - 'kernel26-lts-headers') - install=virtualbox-source.install - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - mkdir -p $pkgdir/usr/lib/virtualbox - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - - #sources for modules - cp -r src ${pkgdir}/usr/lib/virtualbox - #install compilation script - install -D -m 755 "${srcdir}/vboxbuild" "${pkgdir}/usr/bin/vboxbuild" -} - -package_virtualbox-sdk() { - pkgdesc="VirtualBox Software Developer Kit (SDK)" - depends=('python2') - - mkdir -p "$pkgdir/usr/lib/virtualbox" - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - - install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" - #python sdk - pushd sdk/installer - VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "${pkgdir}" - popd - rm -rf sdk/installer - mv sdk "$pkgdir/usr/lib/virtualbox" -} - -package_virtualbox-archlinux-additions(){ - pkgdesc="Additions only for Arch Linux guests (userspace tools)" - depends=("virtualbox-archlinux-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') - replaces=('virtualbox-guest-additions') - conflicts=('virtualbox-guest-additions') - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - - install -d "$pkgdir"/{usr/bin,sbin} - install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" - install -m755 mount.vboxsf "$pkgdir/sbin" - - install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ - "$pkgdir"/usr/bin/VBoxClient-all - install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \ - "$pkgdir"/etc/xdg/autostart/vboxclient.desktop - install -D vboxvideo_drv_111.so \ - "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" - install -d "$pkgdir/usr/lib/xorg/modules/dri" - install -m755 VBoxOGL*.so "$pkgdir/usr/lib" - ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" - install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so" - - # install rc.d script - install -D -m755 "${srcdir}/vbox-service.rc" "${pkgdir}/etc/rc.d/vbox-service" - - # install sample config - install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service" -} -md5sums=('2092bba46baa62fab5520d67dee2ece8' - '2f6b36ff143eb8da55ee92676708e757' - '5f85710e0b8606de967716ded7b2d351' - '6ab2455c391d8cc005e2f4461ae26a3b' - '78ffa67ff131680f1d2b6f06d4325c5b' - '67688bff176d3c6fac5664dc282fea52' - '97e193f050574dd272a38e5ee5ebe62b' - '3c08ad30b89add47d3f45121200a5360' - 'e7416331d0bc331f3b5aae3e5d104642') diff --git a/community-testing/virtualbox/change_default_driver_dir.patch b/community-testing/virtualbox/change_default_driver_dir.patch deleted file mode 100644 index d8531499d..000000000 --- a/community-testing/virtualbox/change_default_driver_dir.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c ---- VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 15:11:37.903456612 +0000 -+++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 15:12:41.024021274 +0000 -@@ -36,13 +36,8 @@ - //#define DEBUG_DRI_CALLS - - //@todo this could be different... --#ifdef RT_ARCH_AMD64 --# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri" -+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" - # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" --#else --# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri" --# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" --#endif - - #ifdef DEBUG_DRI_CALLS - #define SWDRI_SHOWNAME(pext, func) \ diff --git a/community-testing/virtualbox/vbox-service.conf b/community-testing/virtualbox/vbox-service.conf deleted file mode 100644 index 9d4ec629f..000000000 --- a/community-testing/virtualbox/vbox-service.conf +++ /dev/null @@ -1,2 +0,0 @@ -# VBoxService -h -VBOX_SERVICE_OPTION="" diff --git a/community-testing/virtualbox/vbox-service.rc b/community-testing/virtualbox/vbox-service.rc deleted file mode 100644 index 6f1b8d892..000000000 --- a/community-testing/virtualbox/vbox-service.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/vbox-service - -name=VBoxService -PID=$(pidof -o %PPID $name) - -case "$1" in - start) - stat_busy "Starting $name service" - [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \ - && { add_daemon vbox-service; stat_done; } \ - || { stat_fail; exit 1; } - ;; - stop) - stat_busy "Stopping $name service" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon vbox-service; stat_done; } \ - || { stat_fail; exit 1; } - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - status) - stat_busy "Checking $name status"; - ck_status $name - ;; - *) - echo "usage: $0 {start|stop|restart|status}" - exit 1 -esac - -exit 0 - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/virtualbox/vboxbuild b/community-testing/virtualbox/vboxbuild deleted file mode 100644 index e6fb94edd..000000000 --- a/community-testing/virtualbox/vboxbuild +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/vbox/vbox.cfg - -MODLIST=() -LOG="/var/log/vbox-install.log" ->| "$LOG" - -if [[ $INSTALL_DIR ]]; then - VBOXMANAGE=$INSTALL_DIR/VBoxManage - BUILDVBOXDRV=$INSTALL_DIR/src/vboxdrv/build_in_tmp - BUILDVBOXNETFLT=$INSTALL_DIR/src/vboxnetflt/build_in_tmp - BUILDVBOXNETADP=$INSTALL_DIR/src/vboxnetadp/build_in_tmp - BUILDVBOXPCI=$INSTALL_DIR/src/vboxpci/build_in_tmp -else - echo "error: missing vbox.cfg" - exit 1 -fi - -if [[ -f /proc/modules ]]; then - IFS=$'\n' read -r -d '' -a MODLIST < \ - <(grep -oE '^vbox(pci|netflt|netadp|drv)' /proc/modules) -fi - -if (( ${#MODLIST[*]} )); then - stat_busy "Unloading VirtualBox kernel modules" - modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail -fi - -for kdir in /lib/modules/[2-3]*; do - if [[ ! -d $kdir/kernel ]]; then - # found a stale kernel - mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*) - if (( ${#mods[@]} )); then - stat_busy "Removing all old VirtualBox kernel modules" - if rm -f "${mods[@]}" && - rmdir -p --ignore-fail-on-non-empty "$kdir/extramodules" 2>/dev/null; then - stat_done - else - stat_fail - fi - fi - fi -done - -# default to the currently running kernel -if (( ! $# )); then - set -- $(uname -r) -fi - -for kernver; do - export KERN_DIR=/lib/modules/$kernver/build - export MODULE_DIR=/lib/modules/$kernver/extramodules - if [[ ! -d $KERN_DIR ]]; then - printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \ - "$KERN_DIR" - continue - fi - - stat_busy "Recompiling VirtualBox kernel modules ($kernver)" - if ! $BUILDVBOXDRV \ - --save-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - stat_fail - fi - for build in BUILDVBOX{NETFLT,NETADP,PCI}; do - if ! ${!build} \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - stat_fail - fi - done - gzip -f9 "$MODULE_DIR"/*.ko - depmod "$kernver" - stat_done -done - -if (( ${#MODLIST[*]} )); then - stat_busy "Reloading VirtualBox kernel modules" - modprobe -a "${MODLIST[@]}" && stat_done || stat_fail -fi - diff --git a/community-testing/virtualbox/vboxdrv-reference.patch b/community-testing/virtualbox/vboxdrv-reference.patch deleted file mode 100644 index 710e2e511..000000000 --- a/community-testing/virtualbox/vboxdrv-reference.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp ---- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000 -+++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000 -@@ -75,10 +75,9 @@ - "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " - "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " - "module by executing<br/><br/>" -- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" -- "as root. If it is available in your distribution, you should install the " -- "DKMS package first. This package keeps track of Linux kernel changes and " -- "recompiles the vboxdrv kernel module if necessary." -+ " <font color=blue>'pacman -S virtualbox-modules'</font><br/><br/>" -+ "as root. If you don't use our stock kernel, install virtualbox-source and" -+ "execute /usr/bin/vboxbuild ." - ); - - QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( -@@ -90,11 +89,8 @@ - - QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( - "The VirtualBox kernel modules do not match this version of " -- "VirtualBox. The installation of VirtualBox was apparently not " -- "successful. Executing<br/><br/>" -- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" -- "may correct this. Make sure that you do not mix the " -- "OSE version and the PUEL version of VirtualBox." -+ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> " -+ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>" - ); - - QString g_QStrHintOtherNoDriver = QApplication::tr( -diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh ---- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000 -+++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000 -@@ -32,17 +32,18 @@ - cat << EOF - WARNING: The vboxdrv kernel module is not loaded. Either there is no module - available for the current kernel (`uname -r`) or it failed to -- load. Please recompile the kernel module and install it by -+ load. Please reinstall the kernel module virtualbox-modules or -+ if you don't use our stock kernel compile the modules with - -- sudo /etc/init.d/vboxdrv setup -+ sudo /usr/bin/vboxbuild - - You will not be able to start VMs until this problem is fixed. - EOF - elif [ ! -c /dev/vboxdrv ]; then - cat << EOF --WARNING: The character device /dev/vboxdrv does not exist. Try -+WARNING: The character device /dev/vboxdrv does not exist. Try to load the module - -- sudo /etc/init.d/vboxdrv restart -+ sudo modprobe vboxdrv - - and if that is not successful, try to re-install the package. - diff --git a/community-testing/virtualbox/virtualbox-source.install b/community-testing/virtualbox/virtualbox-source.install deleted file mode 100644 index 24d90b1c2..000000000 --- a/community-testing/virtualbox/virtualbox-source.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { -/bin/cat << EOF -===> To compile the modules do /usr/bin/vboxbuild -EOF - -} - -post_upgrade() { -/bin/cat << EOF -===> To recompile the modules do /usr/bin/vboxbuild -EOF -} diff --git a/community-testing/virtualbox/virtualbox.install b/community-testing/virtualbox/virtualbox.install deleted file mode 100644 index c794b857d..000000000 --- a/community-testing/virtualbox/virtualbox.install +++ /dev/null @@ -1,34 +0,0 @@ -utils() { - if [ -x usr/bin/update-mime-database ]; then - update-mime-database usr/share/mime > /dev/null 2>&1 - fi - - if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1 - fi - - if [ -x usr/bin/update-desktop-database ]; then - usr/bin/update-desktop-database -q - fi -} - -post_install() { - getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers - utils -} - -post_upgrade() { - getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers - utils - if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then -/bin/cat << EOF -===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules. -===> Use virtualbox-source package if you don't use our stock linux package. -EOF - fi -} - -post_remove() { - groupdel vboxusers >/dev/null 2>&1 || true - utils -} diff --git a/community-testing/virtviewer/PKGBUILD b/community-testing/virtviewer/PKGBUILD deleted file mode 100644 index 598c81431..000000000 --- a/community-testing/virtviewer/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 63302 2012-01-30 19:09:59Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Jonathan Wiersma <archaur at jonw dot org> - -pkgname=virtviewer -pkgver=0.4.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') -url="http://virt-manager.et.redhat.com" -arch=('i686' 'x86_64') -license=('GPL') -source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz") -md5sums=('1cc86ed3fbbe37a56faa6476b2e6dbcd') - -build() { - cd $srcdir/virt-viewer-$pkgver - export LDFLAGS=-lX11 - ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install -} diff --git a/community-testing/vtk/PKGBUILD b/community-testing/vtk/PKGBUILD deleted file mode 100644 index 39187a72c..000000000 --- a/community-testing/vtk/PKGBUILD +++ /dev/null @@ -1,116 +0,0 @@ -# $Id: PKGBUILD 63306 2012-01-30 19:10:27Z ibiru $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> -# Contributor: leepesjee <lpeschier at xs4all dot nl> -# Contributor: Olivier Medoc -# Contributor: ignotus -# Contributor: Fabian Moser -# Contributor: djscholl - -pkgname=vtk -pkgver=5.8.0 -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' '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' - 'tk: tcl bindings' - 'gnuplot: plotting tools' - 'graphviz: drawing tools') -source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz" - "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" - 'fixkernelversioncheck.diff' - 'ffmpeg-0.8.diff' - 'fix-boost-graph-api-changes.diff') -md5sums=('37b7297d02d647cc6ca95b38174cb41f' - 'a05295b81930e894fc0e31866f399151' - '9e137af23701f76fc727222ebac23389' - 'e992321c9d1def6034d0fa6607b40c5a' - 'e715aef2aea26fc05f904efb5d0d5627') - -build() { - cd VTK - - # fix compilation error: http://vtk.org/Bug/view.php?id=12568 - # remove next pkgver bump - patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff - - # fix compilation error: - # remove next pkgver bump - patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff - - # fix compilation error: http://vtk.org/Bug/view.php?id=12772 - # remove next pkgver bump - patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff - - cd ${srcdir} - - rm -rf 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 \ - -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ - -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData \ - -DBUILD_DOCUMENTATION:BOOL=ON \ - -DDOCUMENTATION_HTML_HELP:BOOL=ON \ - -DDOCUMENTATION_HTML_TARZ:BOOL=ON \ - -DBUILD_EXAMPLES:BOOL=ON \ - -DVTK_USE_HYBRID:BOOL=ON \ - -DVTK_USE_PARALLEL:BOOL=ON \ - -DVTK_USE_PATENTED:BOOL=ON \ - -DVTK_USE_BOOST:BOOL=ON \ - -DVTK_USE_INFOVIS:BOOL=ON \ - -DVTK_USE_GL2PS:BOOL=ON \ - -DVTK_USE_MYSQL:BOOL=ON \ - -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \ - -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \ - -DVTK_WRAP_JAVA:BOOL=ON \ - -DVTK_WRAP_PYTHON:BOOL=ON \ - -DVTK_WRAP_TCL:BOOL=ON \ - -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \ - -DVTK_USE_QT:BOOL=ON \ - -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \ - -DVTK_USE_GUISUPPORT:BOOL=ON \ - -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ - ${cmake_system_flags} \ - ${cmake_system_python_flags} \ - ${srcdir}/VTK - - make -} - -package() { - cd build - - make DESTDIR=${pkgdir} install - - # Move the vtk.jar to the arch-specific location - install -dv ${pkgdir}/usr/share/java/vtk - mv -v ${pkgdir}/usr/lib/vtk-${pkgver:0:3}/java/vtk.jar \ - ${pkgdir}/usr/share/java/vtk - - # Install license - install -dv ${pkgdir}/usr/share/licenses/vtk - install -m644 ${srcdir}/VTK/Copyright.txt \ - ${pkgdir}/usr/share/licenses/vtk - - # Put an entry in /etc/ld.so.conf.d - install -dv ${pkgdir}/etc/ld.so.conf.d - echo "/usr/lib/vtk-${pkgver:0:3}" > ${pkgdir}/etc/ld.so.conf.d/vtk.conf -} diff --git a/community-testing/vtk/ffmpeg-0.8.diff b/community-testing/vtk/ffmpeg-0.8.diff deleted file mode 100644 index 523919d6f..000000000 --- a/community-testing/vtk/ffmpeg-0.8.diff +++ /dev/null @@ -1,66 +0,0 @@ -Description: Upstream changes introduced in version 5.6.1-6.1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - vtk (5.6.1-6.1) unstable; urgency=low - . - [ Michael Schutte ] - * Non-maintainer upload. - * Remove absolute paths to required libraries from - /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes: - #506992. Due to the multiarch transition, the original behavior - frequently causes reverse build-deps to FTBFS. This change should - probably be reverted once all required libraries are multiarched. - . - [ Steve M. Robbins ] - * Override lintian diagnostic about embedded libraries ftgl and sqlite. - * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav - 0.7. - . - The person named in the Author field signed this changelog entry. -Author: Steve M. Robbins <smr@debian.org> -Bug-Debian: http://bugs.debian.org/506992 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx -+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx -@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start() - } - - //choose avi media file format -- this->avOutputFormat = guess_format("avi", NULL, NULL); -+ this->avOutputFormat = av_guess_format("avi", NULL, NULL); - if (!this->avOutputFormat) - { - vtkGenericWarningMacro (<< "Could not open the avi media file format."); -@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start() - //Set up the codec. - AVCodecContext *c = this->avStream->codec; - c->codec_id = (CodecID)this->avOutputFormat->video_codec; -- c->codec_type = CODEC_TYPE_VIDEO; -+ c->codec_type = AVMEDIA_TYPE_VIDEO; - c->width = this->Dim[0]; - c->height = this->Dim[1]; - c->pix_fmt = PIX_FMT_YUVJ420P; -@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm - pkt.stream_index = this->avStream->index; - if (cc->coded_frame->key_frame) //treat keyframes well - { -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - } - pkt.duration = 0; //presentation duration in time_base units or 0 if NA - pkt.pos = -1; //byte position in stream or -1 if NA diff --git a/community-testing/vtk/fix-boost-graph-api-changes.diff b/community-testing/vtk/fix-boost-graph-api-changes.diff deleted file mode 100644 index 2162e7a28..000000000 --- a/community-testing/vtk/fix-boost-graph-api-changes.diff +++ /dev/null @@ -1,42 +0,0 @@ -commit d3ecc2c459dd1df937fc97887581ace1036da533 -Author: Marcus D. Hanwell <marcus.hanwell@kitware.com> -Date: Tue Dec 13 15:36:06 2011 -0500 - - BUG: 12772 fixes for change in Boost graph API - - This fixes bug 12772, where an API change in Boost was causing - compilation failures using Boost 1.38. Thanks to Orion Poplawski for - reporting the issue and posting the patch. - - Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06 - -diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -index c789f6b..cf7cd47 100644 ---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx -+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -@@ -47,6 +47,15 @@ using namespace boost; - vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); - - -+namespace { -+ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { -+ return e.Id; -+ } -+ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { -+ return e.underlying_desc.Id; -+ } -+} -+ - // Redefine the bfs visitor, the only visitor we - // are using is the tree_edge visitor. - template <typename IdMap> -@@ -95,7 +104,8 @@ public: - - // Copy the vertex and edge data from the graph to the tree. - tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); -- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); -+ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), -+ unwrap_edge_id(e), tree_e.Id); - } - - private: diff --git a/community-testing/vtk/fixkernelversioncheck.diff b/community-testing/vtk/fixkernelversioncheck.diff deleted file mode 100644 index 165f07366..000000000 --- a/community-testing/vtk/fixkernelversioncheck.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- a/Utilities/vtkhdf5/ConfigureChecks.cmake -+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake -@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION) - ENDIF (HDF5_WANT_DCONV_EXCEPTION) - - SET (LINUX_LFS 0) --IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") -+IF (CMAKE_SYSTEM MATCHES "Linux") - # Linux Specific flags - ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE) - OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) - IF (HDF5_ENABLE_LARGE_FILE) - SET (LARGEFILE 1) - ENDIF (HDF5_ENABLE_LARGE_FILE) --ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") -+ENDIF (CMAKE_SYSTEM MATCHES "Linux") - SET (HDF5_EXTRA_FLAGS) - IF (LINUX_LFS) - SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) diff --git a/community-testing/w3cam/PKGBUILD b/community-testing/w3cam/PKGBUILD deleted file mode 100644 index 8a63cdf9a..000000000 --- a/community-testing/w3cam/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 63308 2012-01-30 19:10:32Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Christian Schmidt <mucknert@gmx.net> - -pkgname=w3cam -pkgver=0.7.2 -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/" -license=('GPL') -depends=('libpng' 'libjpeg') -makedepends=('v4l-utils') -source=(http://mpx.freeshell.net/$pkgname-$pkgver.tar.gz) -md5sums=('eec0b301b32bc8e9f65a4e54248c9868') - -build() { - cd $srcdir/$pkgname-$pkgver - sed -i 's|#include <linux/videodev.h>|#include <libv4l1-videodev.h>|' v4l.c vidcat.c w3cam.c w3camd/w3v4l.c - ./configure --prefix=/usr --with-device=/dev/video0 --with-ttf-inc=/usr/include/freetype - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - mkdir -p $pkgdir/usr/cgi-bin $pkgdir/usr/bin $pkgdir/usr/man/man1 $pkgdir/usr/share/ - make prefix=$pkgdir/usr/ install - mkdir -p $pkgdir/usr/lib/w3cam/ - mv $pkgdir/usr/cgi-bin/* $pkgdir/usr/lib/w3cam/ - mv $pkgdir/usr/man $pkgdir/usr/share/man - rm -rf $pkgdir/usr/cgi-bin -} diff --git a/community-testing/warmux/PKGBUILD b/community-testing/warmux/PKGBUILD deleted file mode 100644 index 17e0dfdd2..000000000 --- a/community-testing/warmux/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 63310 2012-01-30 19:10:44Z ibiru $ -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: pukyxd -# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> - -pkgname=warmux -pkgver=11.04.1 -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 - include-zlib.patch - gcc-fix.patch) -md5sums=('26ff65c43a9bb61a3f0529c98b943e35' - 'c8285955e880f80e3c68312715a3061c' - '693176b72c9568c0c223be76ea7dd0d2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver/.1/}" - - # libpng 1.5 fix - patch -Np1 -i ../include-zlib.patch - # gcc fix - patch -Np1 -i ../gcc-fix.patch - - ./configure --prefix=/usr - make -} - -package() { - depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}") - - cd "${srcdir}/${pkgname}-${pkgver/.1/}" - - make DESTDIR="${pkgdir}" install - rm -r ${pkgdir}/usr/share/warmux -} diff --git a/community-testing/warmux/gcc-fix.patch b/community-testing/warmux/gcc-fix.patch deleted file mode 100644 index d4ceb0746..000000000 --- a/community-testing/warmux/gcc-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -## 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-testing/warmux/include-zlib.patch b/community-testing/warmux/include-zlib.patch deleted file mode 100644 index c7e77aba1..000000000 --- a/community-testing/warmux/include-zlib.patch +++ /dev/null @@ -1,11 +0,0 @@ -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-testing/warzone2100/PKGBUILD b/community-testing/warzone2100/PKGBUILD deleted file mode 100644 index eaeae8a6c..000000000 --- a/community-testing/warzone2100/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 63312 2012-01-30 19:10:50Z ibiru $ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Angelo Theodorou <encelo@users.sourceforge.net> - -pkgname=warzone2100 -pkgver=2.3.9 -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' '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') - -build() { - cd ${pkgname}-${pkgver} - - ./configure --prefix=/usr --with-distributor="Arch linux" - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/widelands/PKGBUILD b/community-testing/widelands/PKGBUILD deleted file mode 100644 index 49c336ea2..000000000 --- a/community-testing/widelands/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 63314 2012-01-30 19:11:05Z ibiru $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Arkham <arkham at archlinux dot us> -# Contributor: Christoph Zeiler <rabyte*gmail> - -pkgname=widelands -pkgver=16 -_realver=build16 -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') - -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 \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWL_INSTALL_PREFIX=/usr \ - -DWL_INSTALL_DATADIR=share/$pkgname \ - -DWL_INSTALL_BINDIR=bin - make -} - -package() { - depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2' 'widelands-data>=16') - - cd $srcdir/$pkgname-$_realver-src/build/compile - - make DESTDIR="$pkgdir" install - - rm -r $pkgdir/usr/share/widelands/{campaigns,fonts,global,locale,maps,music,pics,scripting,sound,tribes,txts,worlds} - - # Install bin, icon and desktop file - #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname - #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname - install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png - install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop -} diff --git a/community-testing/widelands/widelands-0.16-libpng15.patch b/community-testing/widelands/widelands-0.16-libpng15.patch deleted file mode 100644 index 9f733e7b9..000000000 --- a/community-testing/widelands/widelands-0.16-libpng15.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- 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-testing/widelands/widelands-build15-gcc-4.5-patch b/community-testing/widelands/widelands-build15-gcc-4.5-patch deleted file mode 100644 index 6ba313358..000000000 --- a/community-testing/widelands/widelands-build15-gcc-4.5-patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc ---- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-04-16 15:41:22.000000000 +0000 -+++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-07-01 21:15:56.000000000 +0000 -@@ -113,7 +113,7 @@ - posx, posy, width, height, - g_gr->get_picture(PicMod_UI, "pics/but1.png"), - &Main_Menu_New_Map::button_clicked, *this, 4, -- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - posy += height + spacing + spacing + spacing; - -@@ -142,7 +142,7 @@ - if (m_currentworld == m_worlds.size()) - m_currentworld = 0; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name - ()); - break; - } -diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc ---- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-04-16 15:41:22.000000000 +0000 -+++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-07-01 21:17:39.000000000 +0000 -@@ -272,7 +272,7 @@ - posx, posy, width, height, - g_gr->get_picture(PicMod_UI, "pics/but1.png"), - &Main_Menu_New_Random_Map::button_clicked, *this, 8, -- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - posy += height + spacing + spacing + spacing; - -@@ -343,7 +343,7 @@ - if (m_currentworld == m_worlds.size()) - m_currentworld = 0; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - break; - case 9: - break; -@@ -476,7 +476,7 @@ - (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str())) - ++m_currentworld; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - button_clicked(-1); // Update other values in UI as well - diff --git a/community-testing/widelands/widelands.desktop b/community-testing/widelands/widelands.desktop deleted file mode 100644 index 9715d816c..000000000 --- a/community-testing/widelands/widelands.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Widelands -GenericName=Widelands -Comment=Realtime strategy game -Icon=widelands -Exec=widelands -Type=Application -Categories=Game;StrategyGame; diff --git a/community-testing/widelands/widelands.png b/community-testing/widelands/widelands.png Binary files differdeleted file mode 100644 index c329cf667..000000000 --- a/community-testing/widelands/widelands.png +++ /dev/null diff --git a/community-testing/widelands/widelands.sh b/community-testing/widelands/widelands.sh deleted file mode 100644 index 0b21a1694..000000000 --- a/community-testing/widelands/widelands.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /usr/share/widelands -./widelands $* diff --git a/community-testing/xautomation/PKGBUILD b/community-testing/xautomation/PKGBUILD deleted file mode 100644 index 8374931da..000000000 --- a/community-testing/xautomation/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 63317 2012-01-30 19:11:16Z ibiru $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: raubkopierer <mail[dot]sensenmann[at]gmail[dot]com> - -pkgname=xautomation -pkgver=1.05 -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" - '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 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/xautomation/xautomation-1.05-fix-libs.patch b/community-testing/xautomation/xautomation-1.05-fix-libs.patch deleted file mode 100644 index ee3f9247a..000000000 --- a/community-testing/xautomation/xautomation-1.05-fix-libs.patch +++ /dev/null @@ -1,24 +0,0 @@ -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-testing/xemacs/PKGBUILD b/community-testing/xemacs/PKGBUILD deleted file mode 100644 index 62f4d9f27..000000000 --- a/community-testing/xemacs/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 63321 2012-01-30 19:11:47Z ibiru $ -# Maintainer: juergen <juergen@archlinux.org> -# Contributor : Stéphane Gaudreault <stephane@archlinux.org> - -pkgname=xemacs -pkgver=21.5.31 -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/" -license=('GPL') -depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib') -optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface' - 'xorg-fonts-100dpi: X bitmap fonts needed for the interface') -makedepends=('xbitmaps') -install=xemacs.install -source=(http://ftp.xemacs.org/pub/xemacs/beta/${pkgname}-${pkgver}.tar.gz - xemacs.desktop - xemacs-21.5.29-optimization-bug.patch) -md5sums=('0185fe905d0b8d8d094d9b60cf262d4a' - 'a4d3d5c0aa2c7ce7bec491f809ca3694' - 'eb061b10ea3bbe1026df5326ae1618e3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - -# Fix problem caused by improper optimization with GCC>=4.1.2 on i686 -# (and possibly other arches). See -# http://tracker.xemacs.org/XEmacs/its/issue354 -# for the upstream bug report. - patch -Np0 -i ../xemacs-21.5.29-optimization-bug.patch - - ./configure --build="${CHOST}" --prefix=/usr --with-dynamic \ - --without-postgresql --with-athena=xaw \ - --enable-database=berkdb --without-ldap \ - --enable-menubars=lucid --enable-scrollbars=lucid \ - --enable-widgets=athena --enable-dialogs=athena \ - --enable-external-widget \ - --with-jpeg --with-png --with-tiff \ - --with-ncurses --with-pop --with-xfs --disable-sound \ - --infodir=/usr/share/info \ - --with-mule \ - --mandir=/usr/share/man/man1 - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man1" infodir="${pkgdir}/usr/share/info" install gzip-el - - rm "${pkgdir}"/usr/bin/{b2m,ctags,etags} - rm "${pkgdir}"/usr/share/man/man1/{ctags.1,etags.1} - - # fix FS#7927 - install -d -m755 "${pkgdir}/usr/share/pixmaps" - install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - ln -sf /usr/share/xemacs-${pkgver%.*}-b${pkgver##*.}/etc/xemacs-icon.xpm "${pkgdir}/usr/share/pixmaps/xemacs-icon.xpm" - - # correct permissions - chown -R root:root "${pkgdir}" - - rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info} -} -# vim: ts=2 sw=2 et ft=sh diff --git a/community-testing/xemacs/xemacs-21.5.29-optimization-bug.patch b/community-testing/xemacs/xemacs-21.5.29-optimization-bug.patch deleted file mode 100644 index 32a1a02c2..000000000 --- a/community-testing/xemacs/xemacs-21.5.29-optimization-bug.patch +++ /dev/null @@ -1,14 +0,0 @@ -Work around a GCC optimization bug as described in -http://tracker.xemacs.org/XEmacs/its/issue354 - ---- src/dumper.c.~1~ 2008-01-26 09:54:11.000000000 +0100 -+++ src/dumper.c 2008-05-03 10:17:03.000000000 +0200 -@@ -2584,7 +2584,7 @@ - #endif /* !WIN32_NATIVE */ - - --static int -+int - pdump_file_try (Wexttext *exe_path) - { - Wexttext *w = exe_path + wext_strlen (exe_path); diff --git a/community-testing/xemacs/xemacs.desktop b/community-testing/xemacs/xemacs.desktop deleted file mode 100644 index 257c56947..000000000 --- a/community-testing/xemacs/xemacs.desktop +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Name=XEmacs Text Editor -Name[bg]=редактор XEmacs -Name[ca]=Editor XEmacs -Name[cs]=Editor XEmacs -Name[da]=XEmacs tekstredigerer -Name[de]=XEmacs Texteditor -Name[eo]=La redaktilo XEmakso -Name[es]=Emacs para X -Name[et]=Emacs X'i kasutajaliidesega -Name[fi]=XEmacs editori -Name[fr]=Éditeur XEmacs -Name[hu]=XEmacs szövegszerkesztő -Name[is]=XEmacs-ritill -Name[it]=Emacs per X -Name[ja]=XEmacs テキスト・エディター -Name[mk]=Софистицираниот XEmacs уредувач -Name[no]=XEmacs-tekstredigerer -Name[pt]=Editor XEmacs -Name[ro]=Editorul XEmacs -Name[ru]=Редактор XEmacs -Name[sk]=Editor XEmacs -Name[sl]=Urejevalnik XEmacs -Name[uk]=Редактор XEmacs -GenericName=Text Editor -Comment=Edit text -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=xemacs %f -Icon=/usr/share/pixmaps/xemacs-icon.xpm -Type=Application -Terminal=false -Categories=Development;TextEditor; -Encoding=UTF-8 -StartupWMClass=Emacs diff --git a/community-testing/xemacs/xemacs.install b/community-testing/xemacs/xemacs.install deleted file mode 100644 index a04ee187f..000000000 --- a/community-testing/xemacs/xemacs.install +++ /dev/null @@ -1,35 +0,0 @@ -infodir=usr/share/info -filelist=(beta.info.gz custom.info.gz - emodules.info.gz external-widget.info.gz - internals.info-1.gz internals.info-2.gz - internals.info-3.gz internals.info-4.gz - internals.info-5.gz internals.info.gz - lispref.info-1.gz lispref.info-10.gz - lispref.info-2.gz lispref.info-3.gz - lispref.info-4.gz lispref.info-5.gz - lispref.info-6.gz lispref.info-7.gz - lispref.info-8.gz lispref.info-9.gz - lispref.info.gz new-users-guide.info.gz - term.info.gz termcap.info.gz - xemacs-faq.info-1.gz xemacs-faq.info-2.gz - xemacs-faq.info.gz xemacs.info-1.gz - xemacs.info-2.gz xemacs.info-3.gz - xemacs.info-4.gz xemacs.info.gz) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done - update-desktop-database -q -} diff --git a/community-testing/xfmedia/PKGBUILD b/community-testing/xfmedia/PKGBUILD deleted file mode 100644 index f2b4b3b97..000000000 --- a/community-testing/xfmedia/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 61733 2012-01-07 05:11:32Z ebelanger $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer : Tom Killian <tomk@runbox.com> -# Contributor: Spider.007 <archPackage@spider007.net> - -pkgname=xfmedia -pkgver=0.9.2 -pkgrel=10 -pkgdesc="xfce media player" -arch=('i686' 'x86_64') -license=('GPL') -url="http://spuriousinterrupt.org/projects/xfmedia/" -depends=('xine-lib' 'taglib' 'exo' 'libxtst' 'libxss' 'libxfcegui4' 'dbus-glib') -makedepends=('intltool' 'libxt') -install=xfmedia.install -source=(http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2 - xfmedia-dbus-0.6-support.patch - xfmedia-empty-prev-next-fix.patch - xfmedia-exo-0.6.patch - xfmedia-xine-1.2.0.patch) -md5sums=('6eb8bd1f67201f829e0f45e733c02bd5' - '8f2aa12eea584de65d8ed28179e56b51' - '650f8cb9e2ddd9a8a2a03748b8757110' - 'f5e17fcdf2056dcc8ca8aae8600c0132' - '934603c7d3a1a0a66edb847bcb930df1') - -build() { - cd ${srcdir}/$pkgname-$pkgver - patch -Np1 -i ../xfmedia-dbus-0.6-support.patch - patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch - patch -Np1 -i ../xfmedia-exo-0.6.patch - patch -Np1 -i ../xfmedia-xine-1.2.0.patch - LDFLAGS="$LDFLAGS -lXext -lm" ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch b/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch deleted file mode 100644 index 9b1eb3678..000000000 --- a/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur xfmedia-0.9.1.orig/src/remote.c xfmedia-0.9.1/src/remote.c ---- xfmedia-0.9.1.orig/src/remote.c 2005-09-05 00:56:37.000000000 -0400 -+++ xfmedia-0.9.1/src/remote.c 2006-04-08 00:27:18.000000000 -0400 -@@ -55,6 +55,10 @@ - #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER DBUS_SERVICE_REPLY_PRIMARY_OWNER - #endif - -+#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT -+#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT DBUS_NAME_FLAG_DO_NOT_QUEUE -+#endif -+ - #endif /* HAVE_DBUS */ - - #include <libxfce4util/libxfce4util.h> diff --git a/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch b/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch deleted file mode 100644 index e2d0d8166..000000000 --- a/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -wbBur xfmedia-0.9.2/src/mainwin.c xfmedia-0.9.2.my/src/mainwin.c ---- xfmedia-0.9.2/src/mainwin.c 2006-11-27 07:21:23.000000000 +0000 -+++ xfmedia-0.9.2.my/src/mainwin.c 2010-11-01 13:01:17.000000000 +0000 -@@ -1865,6 +1865,10 @@ - gboolean use_playlist_q = xfmedia_playlist_queue_n_entries(mwin->playlist_q); - gboolean ret = FALSE; - -+ if(xfmedia_playlist_get_n_entries(mwin->plist) == 0) -+// if(xfmedia_playlist_queue_is_empty(mwin->plist)) -+ return; -+ - if(mwin->cur_playing - && xfmedia_settings_get_bool("/xfmedia/playlist/shuffle") - && !use_playlist_q ) -@@ -1899,6 +1903,10 @@ - { - gint tot_items, idx = -1; - -+ if(xfmedia_playlist_get_n_entries(mwin->plist) == 0) -+// if(xfmedia_playlist_queue_is_empty(mwin->plist)) -+ return; -+ - if(xfmedia_settings_get_bool("/xfmedia/playlist/shuffle")) { - XfmediaPlaylistEntryRef *ref = NULL; - gboolean playing = FALSE; diff --git a/community-testing/xfmedia/xfmedia-exo-0.6.patch b/community-testing/xfmedia/xfmedia-exo-0.6.patch deleted file mode 100644 index 1de611c82..000000000 --- a/community-testing/xfmedia/xfmedia-exo-0.6.patch +++ /dev/null @@ -1,196 +0,0 @@ -diff -wbBur xfmedia-0.9.2/configure xfmedia-0.9.2.my/configure ---- xfmedia-0.9.2/configure 2006-11-27 20:20:59.000000000 +0000 -+++ xfmedia-0.9.2.my/configure 2011-01-31 17:15:58.000000000 +0000 -@@ -27417,7 +27417,7 @@ - - - if test x"$xdt_cv_EXO_check" = x"yes"; then -- if $PKG_CONFIG --exists "exo-0.3 >= 0.3.0" >/dev/null 2>&1; then -+ if $PKG_CONFIG --exists "exo-1 >= 0.3.0" >/dev/null 2>&1; then - - - # minimum supported version of pkg-config -@@ -27501,22 +27501,22 @@ - fi - - -- { echo "$as_me:$LINENO: checking for exo-0.3 >= 0.3.0" >&5 --echo $ECHO_N "checking for exo-0.3 >= 0.3.0... $ECHO_C" >&6; } -- if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then -- EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"` -+ { echo "$as_me:$LINENO: checking for exo-1 >= 0.3.0" >&5 -+echo $ECHO_N "checking for exo-1 >= 0.3.0... $ECHO_C" >&6; } -+ if $PKG_CONFIG "--atleast-version=0.3.0" "exo-1" >/dev/null 2>&1; then -+ EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"` - { echo "$as_me:$LINENO: result: $EXO_VERSION" >&5 - echo "${ECHO_T}$EXO_VERSION" >&6; } - - { echo "$as_me:$LINENO: checking EXO_CFLAGS" >&5 - echo $ECHO_N "checking EXO_CFLAGS... $ECHO_C" >&6; } -- EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"` -+ EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"` - { echo "$as_me:$LINENO: result: $EXO_CFLAGS" >&5 - echo "${ECHO_T}$EXO_CFLAGS" >&6; } - - { echo "$as_me:$LINENO: checking EXO_LIBS" >&5 - echo $ECHO_N "checking EXO_LIBS... $ECHO_C" >&6; } -- EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"` -+ EXO_LIBS=`$PKG_CONFIG --libs "exo-1"` - { echo "$as_me:$LINENO: result: $EXO_LIBS" >&5 - echo "${ECHO_T}$EXO_LIBS" >&6; } - -@@ -27535,15 +27535,15 @@ - - EXO_FOUND="yes" - -- elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then -- xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"` -+ elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then -+ xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"` - { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5 - echo "${ECHO_T}found, but $xdt_cv_version" >&6; } - - -- echo "*** The required package exo-0.3 was found on your system," -+ echo "*** The required package exo-1 was found on your system," - echo "*** but the installed version ($xdt_cv_version) is too old." -- echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust" -+ echo "*** Please upgrade exo-1 to atleast version 0.3.0, or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you installed" - echo "*** the new version of the package in a nonstandard prefix so" - echo "*** pkg-config is able to find it." -@@ -27554,8 +27554,8 @@ - echo "${ECHO_T}not found" >&6; } - - -- echo "*** The required package exo-0.3 was not found on your system." -- echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust" -+ echo "*** The required package exo-1 was not found on your system." -+ echo "*** Please install exo-1 (atleast version 0.3.0) or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you" - echo "*** installed the package in a nonstandard prefix so that" - echo "*** pkg-config is able to find it." -@@ -27564,14 +27564,14 @@ - fi - - else -- { echo "$as_me:$LINENO: checking for optional package exo-0.3 >= 0.3.0" >&5 --echo $ECHO_N "checking for optional package exo-0.3 >= 0.3.0... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for optional package exo-1 >= 0.3.0" >&5 -+echo $ECHO_N "checking for optional package exo-1 >= 0.3.0... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: not found" >&5 - echo "${ECHO_T}not found" >&6; } - fi - else -- { echo "$as_me:$LINENO: checking for optional package exo-0.3" >&5 --echo $ECHO_N "checking for optional package exo-0.3... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for optional package exo-1" >&5 -+echo $ECHO_N "checking for optional package exo-1... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: disabled" >&5 - echo "${ECHO_T}disabled" >&6; } - fi -diff -wbBur xfmedia-0.9.2/src/main.c xfmedia-0.9.2.my/src/main.c ---- xfmedia-0.9.2/src/main.c 2006-11-27 07:21:23.000000000 +0000 -+++ xfmedia-0.9.2.my/src/main.c 2011-02-01 11:08:02.000000000 +0000 -@@ -388,6 +388,23 @@ - return optind; - } - -+/** -+ * exo_str_get_md5_str: -+ * @contents : The string to create a digest of. -+ * -+ * Creates a character array MD5 digestof the string -+ * @contents. -+ * -+ * Return value: A newly-allocated character array which -+ * should be free with g_free() when no -+ * longer needed. -+ **/ -+gchar* -+exo_str_get_md5_str (const gchar *contents) -+{ -+ return g_compute_checksum_for_string (G_CHECKSUM_MD5, contents, -1); -+} -+ - int - main(int argc, char **argv) - { -diff -wbBur xfmedia-0.9.2/src/mediamarks.c xfmedia-0.9.2.my/src/mediamarks.c ---- xfmedia-0.9.2/src/mediamarks.c 2006-11-27 07:21:23.000000000 +0000 -+++ xfmedia-0.9.2.my/src/mediamarks.c 2011-02-01 11:04:42.000000000 +0000 -@@ -684,9 +684,9 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - if(gtk_major_version == 2 && gtk_minor_version >= 6) -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - else { -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - } - gtk_tree_view_column_pack_start(col, render, TRUE); -@@ -1693,9 +1693,9 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - if(gtk_major_version == 2 && gtk_minor_version >= 6) -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - else { -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - } - gtk_tree_view_column_pack_start(col, render, TRUE); -@@ -1705,9 +1705,9 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - if(gtk_major_version == 2 && gtk_minor_version >= 6) -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - else { -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - } - col = gtk_tree_view_column_new_with_attributes(_("Location"), render, -diff -wbBur xfmedia-0.9.2/src/playlist.c xfmedia-0.9.2.my/src/playlist.c ---- xfmedia-0.9.2/src/playlist.c 2006-11-27 07:21:22.000000000 +0000 -+++ xfmedia-0.9.2.my/src/playlist.c 2011-02-01 11:04:47.000000000 +0000 -@@ -1409,9 +1409,9 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - if(gtk_major_version == 2 && gtk_minor_version >= 6) -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - else { -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - } - col = gtk_tree_view_column_new_with_attributes(_("Title"), render, "text", -diff -wbBur xfmedia-0.9.2/src/settings-dialog.c xfmedia-0.9.2.my/src/settings-dialog.c ---- xfmedia-0.9.2/src/settings-dialog.c 2006-11-27 07:21:23.000000000 +0000 -+++ xfmedia-0.9.2.my/src/settings-dialog.c 2011-02-01 11:04:53.000000000 +0000 -@@ -552,7 +552,7 @@ - render = exo_cell_renderer_ellipsized_text_new(); - col = gtk_tree_view_column_new_with_attributes("name", render, - "text", PLUGINS_NAME, NULL); -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col); - -diff -wbBur xfmedia-0.9.2/src/xfmedia-playlist-queue.c xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c ---- xfmedia-0.9.2/src/xfmedia-playlist-queue.c 2006-11-27 07:21:22.000000000 +0000 -+++ xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c 2011-02-01 11:04:57.000000000 +0000 -@@ -171,7 +171,7 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - g_object_set(G_OBJECT(render), -- "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, - NULL); - col = gtk_tree_view_column_new_with_attributes("display-name", render, diff --git a/community-testing/xfmedia/xfmedia-xine-1.2.0.patch b/community-testing/xfmedia/xfmedia-xine-1.2.0.patch deleted file mode 100644 index 2e04ac80a..000000000 --- a/community-testing/xfmedia/xfmedia-xine-1.2.0.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.c xfmedia-0.9.2.my/src/xfmedia-xine.c ---- xfmedia-0.9.2/src/xfmedia-xine.c 2006-11-27 10:21:23.000000000 +0300 -+++ xfmedia-0.9.2.my/src/xfmedia-xine.c 2012-01-05 01:23:21.000000000 +0400 -@@ -1450,17 +1450,6 @@ - } - - gboolean --xfmedia_xine_trick_mode(XfmediaXine * xfx, gint mode, gint value) --{ -- -- g_return_val_if_fail(xfx != NULL, 0); -- g_return_val_if_fail(XFMEDIA_IS_XINE(xfx), 0); -- g_return_val_if_fail(xfx->priv->stream != NULL, 0); -- -- return xine_trick_mode(xfx->priv->stream, mode, value); --} -- --gboolean - xfmedia_xine_get_pos_length(XfmediaXine *xfx, gint *pos_stream, - gint *pos_time, gint *length_time) - { -diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.h xfmedia-0.9.2.my/src/xfmedia-xine.h ---- xfmedia-0.9.2/src/xfmedia-xine.h 2006-11-27 10:21:23.000000000 +0300 -+++ xfmedia-0.9.2.my/src/xfmedia-xine.h 2012-01-05 01:20:47.000000000 +0400 -@@ -87,9 +87,6 @@ - gboolean xfmedia_xine_play (XfmediaXine *xfx, - gint pos, - gint start_time); --gboolean xfmedia_xine_trick_mode (XfmediaXine *xfx, -- gint mode, -- gint value); - gint xfmedia_xine_get_stream_info (XfmediaXine *xfx, - gint info); - G_CONST_RETURN gchar *xfmedia_xine_get_meta_info (XfmediaXine *xfx, diff --git a/community-testing/xfmedia/xfmedia.install b/community-testing/xfmedia/xfmedia.install deleted file mode 100644 index b95cc069d..000000000 --- a/community-testing/xfmedia/xfmedia.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} diff --git a/community-testing/xloadimage/PKGBUILD b/community-testing/xloadimage/PKGBUILD deleted file mode 100644 index f65fc905b..000000000 --- a/community-testing/xloadimage/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 63323 2012-01-30 19:11:59Z 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=12 -pkgdesc="An utility to view many different types of images under X11" -arch=(i686 x86_64) -#url="http://world.std.com/~jimf/xloadimage.html" -url="http://sioseis.ucsd.edu/xloadimage.html" -license=("MIT") -depends=('libtiff' 'libpng' 'libx11' 'libxext') -makedepends=('patch' 'imake') -source=(http://archlinux-stuff.googlecode.com/files/xloadimage.$pkgver-1.tar.gz - license.txt - enable-image-types.patch - png15-tiff4.patch) -md5sums=('86b42b1b628a9c00008b7deec21e1175' - 'cc16a51aeb5083b8ff07939dfe244130' - '3a2703925011276fd2d2bd139b676487' - 'c797cfc3f4588b96275d82c2c9cc7025') - -build() { - cd $srcdir/$pkgname.$pkgver - - patch -p1 <$srcdir/enable-image-types.patch - patch -p1 <$srcdir/png15-tiff4.patch - xmkmf - make - - install -D -m755 xloadimage $pkgdir/usr/bin/xloadimage - install -D -m755 uufilter $pkgdir/usr/bin/uufilter - install -D -m644 xloadimagerc $pkgdir/etc/xloadimagerc.example - install -D -m644 xloadimage.man $pkgdir/usr/man/man1/xloadimage.1x - install -D -m644 uufilter.man $pkgdir/usr/man/man1/uufilter.1x - install -D -m644 $srcdir/license.txt $pkgdir/usr/share/licenses/$pkgname/license.txt - ln -s /usr/bin/xloadimage $pkgdir/usr/bin/xsetbg - - mv $pkgdir/usr/man $pkgdir/usr/share/ -} diff --git a/community-testing/xloadimage/enable-image-types.patch b/community-testing/xloadimage/enable-image-types.patch deleted file mode 100644 index b61e36b87..000000000 --- a/community-testing/xloadimage/enable-image-types.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -wbBur xloadimage.4.1/imagetypes.h xloadimage.4.1.my/imagetypes.h ---- xloadimage.4.1/imagetypes.h 2011-02-11 11:47:37.000000000 +0000 -+++ xloadimage.4.1.my/imagetypes.h 2011-02-11 16:04:35.000000000 +0000 -@@ -94,15 +94,9 @@ - {niffIdent, niffLoad, niffDump, "niff", "Native Image File Format (NIFF)"}, - {sunRasterIdent, sunRasterLoad, NULL, "sunraster", "Sun Rasterfile"}, - {gifIdent, gifLoad, NULL, "gif", "GIF Image"}, --#ifdef HAVE_LIBJPEG - {jpegIdent, jpegLoad, jpegDump, "jpeg", "JFIF-style JPEG Image"}, --#endif --#ifdef HAVE_LIBTIFF - {tiffIdent, tiffLoad, tiffDump, "tiff", "TIFF image"}, --#endif --#ifdef HAVE_LIBPNG - {pngIdent, pngLoad, NULL, "png", "PNG image"}, --#endif - {fbmIdent, fbmLoad, NULL, "fbm", "FBM Image"}, - {cmuwmIdent, cmuwmLoad, NULL, "cmuraster", "CMU WM Raster"}, - {pbmIdent, pbmLoad, pbmDump, "pbm", "Portable Bit Map (PBM, PGM, PPM)"}, -diff -wbBur xloadimage.4.1/Imakefile xloadimage.4.1.my/Imakefile ---- xloadimage.4.1/Imakefile 2011-02-11 12:05:53.000000000 +0000 -+++ xloadimage.4.1.my/Imakefile 2011-02-11 16:06:21.000000000 +0000 -@@ -40,7 +40,7 @@ - PNG_SRC = png.c - PNG_OBJ = png.o - -- EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -+ EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -DHAVE_LIBJPEG -DHAVE_LIBTIFF -DHAVE_LIBPNG - LOCAL_LIBRARIES = $(TIFF_LIB) $(JPEG_LIB) $(PNG_LIB) $(XLIB) - - SRCS = new.c niff.c value.c zio.c cmuwmraster.c faces.c fbm.c gif.c imagetypes.c img.c mac.c mcidas.c mc_tables.c pbm.c pcx.c pdsuncomp.c rle.c rlelib.c sunraster.c vff.c vicar.c xbitmap.c xpixmap.c xwd.c bright.c clip.c compress.c dither.c fill.c halftone.c merge.c reduce.c rotate.c smooth.c undither.c zoom.c config.c misc.c options.c root.c send.c window.c xloadimage.c $(TIFF_SRC) $(JPEG_SRC) $(PNG_SRC) -diff -wbBur xloadimage.4.1/Makefile xloadimage.4.1.my/Makefile ---- xloadimage.4.1/Makefile 2011-02-11 12:06:16.000000000 +0000 -+++ xloadimage.4.1.my/Makefile 2011-02-11 16:06:24.000000000 +0000 -@@ -2,7 +2,7 @@ - # $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $ - - # ---------------------------------------------------------------------- --# Makefile generated from "Imake.tmpl" and </tmp/IIf.yUZBVe> -+# Makefile generated from "Imake.tmpl" and </tmp/IIf.7u155R> - # $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ - # $XdotOrg: xc/config/cf/Imake.tmpl,v 1.9 2005/01/24 06:37:31 daniels Exp $ - # -@@ -1063,7 +1063,7 @@ - PNG_SRC = png.c - PNG_OBJ = png.o - -- EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -+ EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -DHAVE_LIBJPEG -DHAVE_LIBTIFF -DHAVE_LIBPNG - LOCAL_LIBRARIES = $(TIFF_LIB) $(JPEG_LIB) $(PNG_LIB) $(XLIB) - - SRCS = new.c niff.c value.c zio.c cmuwmraster.c faces.c fbm.c gif.c imagetypes.c img.c mac.c mcidas.c mc_tables.c pbm.c pcx.c pdsuncomp.c rle.c rlelib.c sunraster.c vff.c vicar.c xbitmap.c xpixmap.c xwd.c bright.c clip.c compress.c dither.c fill.c halftone.c merge.c reduce.c rotate.c smooth.c undither.c zoom.c config.c misc.c options.c root.c send.c window.c xloadimage.c $(TIFF_SRC) $(JPEG_SRC) $(PNG_SRC) -diff -wbBur xloadimage.4.1/png.c xloadimage.4.1.my/png.c ---- xloadimage.4.1/png.c 2011-02-11 11:47:37.000000000 +0000 -+++ xloadimage.4.1.my/png.c 2011-02-11 16:06:50.000000000 +0000 -@@ -18,6 +18,7 @@ - * - */ - -+#define _GETOPT_H - - #include "image.h" /* xloadimage declarations */ - #ifdef HAVE_LIBPNG -diff -wbBur xloadimage.4.1/jpeg.c xloadimage.4.1.my/jpeg.c ---- xloadimage.4.1/jpeg.c 2011-02-11 14:47:37.000000000 +0300 -+++ xloadimage.4.1.my/jpeg.c 2011-11-21 14:32:30.000000000 +0400 -@@ -319,6 +319,7 @@ - if (verbose) - printf(" Using arithmetic coding.\n"); - cinfo->arith_code = TRUE; -+ } - #else - fprintf(stderr, "jpegDump: sorry, arithmetic coding not supported\n"); - } diff --git a/community-testing/xloadimage/license.txt b/community-testing/xloadimage/license.txt deleted file mode 100644 index be7eec597..000000000 --- a/community-testing/xloadimage/license.txt +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 1989, 1993 Jim Frost - * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation. The author makes no representations - * about the suitability of this software for any purpose. It is - * provided "as is" without express or implied warranty. - * - * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE - * USE OR PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/community-testing/xloadimage/png15-tiff4.patch b/community-testing/xloadimage/png15-tiff4.patch deleted file mode 100644 index 8536e36f3..000000000 --- a/community-testing/xloadimage/png15-tiff4.patch +++ /dev/null @@ -1,50 +0,0 @@ -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-testing/xmoto/PKGBUILD b/community-testing/xmoto/PKGBUILD deleted file mode 100644 index 0a865690d..000000000 --- a/community-testing/xmoto/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Travis Willard <travisw@wmpub.ca> -# Contributor: Denis (dtonator@gmail.com) - -pkgname=xmoto -pkgver=0.5.9 -pkgrel=1 -pkgdesc="A challenging 2D motocross platform game, where physics play an important role." -arch=('i686' 'x86_64') -url="http://xmoto.tuxfamily.org" -license=('GPL') -depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.11.1' 'curl' - 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'libxdg-basedir' 'libxml++') -install=xmoto.install -source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" - 'xmoto-0.5.9-libpng15.patch') -sha1sums=('07757accce78151dc8873bef8270df0e56196772' - '27f52bd30772f67898e0bfd8c1e12478a4848192') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - patch -Np1 -i "${srcdir}/xmoto-0.5.9-libpng15.patch" - - # build and install - ./configure LDFLAGS="-L/usr/lib" --prefix=/usr --disable-sdltest - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} mangdir=/usr/share/man/man6 install - - # install desktop file - install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.desktop \ - ${pkgdir}/usr/share/applications/xmoto.desktop - - # install icon for desktop file - install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.xpm \ - ${pkgdir}/usr/share/pixmaps/xmoto.xpm -} diff --git a/community-testing/xmoto/xmoto-0.5.9-libpng15.patch b/community-testing/xmoto/xmoto-0.5.9-libpng15.patch deleted file mode 100644 index 0410c81c5..000000000 --- a/community-testing/xmoto/xmoto-0.5.9-libpng15.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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-testing/xmoto/xmoto.desktop b/community-testing/xmoto/xmoto.desktop deleted file mode 100644 index 5ae6fe226..000000000 --- a/community-testing/xmoto/xmoto.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Icon=/usr/share/xmoto/xmoto_icone_x.ico -Exec=/usr/bin/xmoto -Terminal=false -StartupNotify=false - -Name=XMoto -GenericName=Game -Comment=is a 2D physics-based motocross game. - -Categories=Game; diff --git a/community-testing/xmoto/xmoto.install b/community-testing/xmoto/xmoto.install deleted file mode 100644 index 52399d4c1..000000000 --- a/community-testing/xmoto/xmoto.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - /usr/bin/update-desktop-database -} - -post_upgrade() { - /usr/bin/update-desktop-database -} - -post_remove() { - /usr/bin/update-desktop-database -} - -op=$1 -shift -$op $* diff --git a/community-testing/xnc/PKGBUILD b/community-testing/xnc/PKGBUILD deleted file mode 100644 index 4cf3968de..000000000 --- a/community-testing/xnc/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 63327 2012-01-30 19:12:18Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=xnc -pkgver=5.0.4 -pkgrel=6 -pkgdesc="X nortern captain file manager" -arch=(i686 x86_64) -url="http://xnc.jinr.ru/" -license=('GPL') -depends=('gcc-libs' 'libpng' 'libtiff' 'libsm' 'libxext' 'libjpeg>=7') -makedepends=('libxt') -options=('!makeflags') -#source=(http://xnc.jinr.ru/src-5/xnc-$pkgver.src.tar.gz xnc-gcc44.patch) -source=(ftp://ftp.archlinux.org/other/community/xnc/xnc-$pkgver.src.tar.gz - xnc-gcc44.patch - libpng15.patch) -md5sums=('62446cdfdf5730f125fb351a658c0bd3' - 'c0037a081824bca691e59a4ec68b6686' - '7159af1c645fda860f0e5057100651ad') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 <$srcdir/xnc-gcc44.patch - patch -p1 <$srcdir/libpng15.patch - ./configure --prefix=/usr --mandir=/usr/share/man - make - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/xnc/libpng15.patch b/community-testing/xnc/libpng15.patch deleted file mode 100644 index 53b941b81..000000000 --- a/community-testing/xnc/libpng15.patch +++ /dev/null @@ -1,63 +0,0 @@ -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-testing/xnc/xnc-gcc44.patch b/community-testing/xnc/xnc-gcc44.patch deleted file mode 100644 index 120d9d467..000000000 --- a/community-testing/xnc/xnc-gcc44.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -wbBur xnc-5.0.4/src/include/commonfuncs.h xnc-5.0.4.my/src/include/commonfuncs.h ---- xnc-5.0.4/src/include/commonfuncs.h 2002-10-16 10:44:17.000000000 +0400 -+++ xnc-5.0.4.my/src/include/commonfuncs.h 2011-11-17 18:59:19.000000000 +0400 -@@ -15,7 +15,7 @@ - extern int path_to_fullpath(char* dest, char *srcdir); - extern void add_path_content(char *curdir, const char *cont, int vms_host=0); - extern void upper_path(char *curdir, int vms_host=0); --extern char* get_first_content(const char *curdir, char *cont); -+extern const char* get_first_content(const char *curdir, char *cont); - extern void get_last_content(char *curdir, char *cont); - extern void get_last_and_rest_content(char* curdir, char* last, char* rest); - extern void str_swap(char *str1, char *str2); -diff -wbBur xnc-5.0.4/src/lib/tool/commonfuncs.cxx xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx ---- xnc-5.0.4/src/lib/tool/commonfuncs.cxx 2002-10-16 10:44:20.000000000 +0400 -+++ xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx 2011-11-17 18:59:19.000000000 +0400 -@@ -117,9 +117,9 @@ - } - - //Get first content of dirname --char* get_first_content(const char *curdir, char *cont) -+const char* get_first_content(const char *curdir, char *cont) - { -- char *b=strchr(curdir,'/'); -+ const char *b=strchr(curdir,'/'); - if(b) - { - strncpy(cont,curdir,b-curdir); -diff -wbBur xnc-5.0.4/src/lib/vfs/afs.cxx xnc-5.0.4.my/src/lib/vfs/afs.cxx ---- xnc-5.0.4/src/lib/vfs/afs.cxx 2003-11-27 18:36:43.000000000 +0300 -+++ xnc-5.0.4.my/src/lib/vfs/afs.cxx 2011-11-17 18:59:19.000000000 +0400 -@@ -29,7 +29,7 @@ - // The return value is static, so copy it before using the - // method again! - --char *create_dirs(char *rootdir, char* dirlist) -+char *create_dirs(char *rootdir, const char* dirlist) - { - char str[L_MAXPATH]; - char cont[FLIST_NAME]; -@@ -1350,7 +1350,7 @@ - add_path_content(curdir, to_dir); - } else //If we here then we doing cd not to subdir but to subdir/subdir... - { -- char *s=to_dir; -+ const char *s=to_dir; - if(*s) - { - do -diff -wbBur xnc-5.0.4/src/lib/vfs/ftpfs.cxx xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx ---- xnc-5.0.4/src/lib/vfs/ftpfs.cxx 2002-10-30 15:47:38.000000000 +0300 -+++ xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx 2011-11-17 18:59:19.000000000 +0400 -@@ -1413,7 +1413,7 @@ - return; - if(strcmp(dir,"/")) - { -- char *s=dir; -+ const char *s=dir; - if(*s=='/') //Skip leading '/' - s++; - do -diff -wbBur xnc-5.0.4/src/man_page.cxx xnc-5.0.4.my/src/man_page.cxx ---- xnc-5.0.4/src/man_page.cxx 2002-10-02 16:54:33.000000000 +0400 -+++ xnc-5.0.4.my/src/man_page.cxx 2011-11-17 18:59:00.000000000 +0400 -@@ -81,7 +81,7 @@ - buf[j] = 0; - manf->size = j; - delete buf; -- fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC); -+ fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC, 0600); - write(fp, buf2, j); - close(fp); - delete manf; diff --git a/community-testing/xplanet/PKGBUILD b/community-testing/xplanet/PKGBUILD deleted file mode 100644 index f23f65846..000000000 --- a/community-testing/xplanet/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 63329 2012-01-30 19:12:24Z 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=2 -pkgdesc="An Xearth wannabe" -arch=(i686 x86_64) -url="http://xplanet.sourceforge.net/" -license=('GPL') -depends=('pango' 'libungif' 'libtiff' 'libxss') -source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz) -md5sums=('b38c3b4cfdd772643f876a9bb15f288b') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --with-freetype - make - make prefix=$pkgdir/usr install -} |
