From 031887a2047546085998f965214f5b682664de9b Mon Sep 17 00:00:00 2001 From: root Date: Sun, 21 Apr 2013 01:12:26 -0700 Subject: Sun Apr 21 01:12:25 PDT 2013 --- extra/calligra/PKGBUILD | 6 +- extra/cinepaint/PKGBUILD | 24 ++- extra/enblend-enfuse/PKGBUILD | 25 +-- extra/enblend-enfuse/enblend-4.0-libpng15.patch | 220 --------------------- extra/enblend-enfuse/libpng-1.4.patch | 14 -- extra/evas_generic_loaders/PKGBUILD | 4 +- extra/fyre/PKGBUILD | 4 +- extra/gegl/PKGBUILD | 10 +- extra/gstreamer-vaapi/PKGBUILD | 54 +++++ extra/harfbuzz/PKGBUILD | 6 +- extra/hugin/PKGBUILD | 4 +- extra/ilmbase/PKGBUILD | 9 +- extra/imagemagick/PKGBUILD | 12 +- extra/inkscape/PKGBUILD | 15 +- extra/inkscape/inkscape-0.48.4-spuriouscomma.patch | 11 ++ extra/kdelibs3/PKGBUILD | 84 ++++---- extra/libdrm/PKGBUILD | 16 +- extra/libdrm/no-pthread-stubs.patch | 17 ++ extra/libreoffice/PKGBUILD | 8 +- extra/libwps/PKGBUILD | 8 +- extra/opencv/PKGBUILD | 8 +- extra/openexr/PKGBUILD | 14 +- extra/poppler/PKGBUILD | 16 +- 23 files changed, 214 insertions(+), 375 deletions(-) delete mode 100644 extra/enblend-enfuse/enblend-4.0-libpng15.patch delete mode 100644 extra/enblend-enfuse/libpng-1.4.patch create mode 100644 extra/gstreamer-vaapi/PKGBUILD create mode 100644 extra/inkscape/inkscape-0.48.4-spuriouscomma.patch (limited to 'extra') diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 007b3ce5f..02a4f3a58 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182625 2013-04-11 16:04:29Z andrea $ +# $Id: PKGBUILD 183278 2013-04-20 16:41:10Z heftig $ # Maintainer: Ronald van Haren # Maintainer: Andrea Scarpino @@ -18,11 +18,11 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.6.3 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' +makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio' 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc') diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD index 9473111c1..c298060dd 100644 --- a/extra/cinepaint/PKGBUILD +++ b/extra/cinepaint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169741 2012-10-27 23:41:34Z eric $ +# $Id: PKGBUILD 183279 2013-04-20 16:41:11Z heftig $ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] pkgname=cinepaint pkgver=1.3 -pkgrel=5 +pkgrel=6 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" arch=('i686' 'x86_64') license=('LGPL' 'GPL' 'MIT') @@ -23,18 +23,24 @@ sha1sums=('1982e32b0f461f4fd0ff0fe17a2e81ccd8dbd52b' '3dfc9f06f02791aee59b60d33ddf9d305b0f1de5' 'a4f43aabdbb33d059f1a38442cd6625e4f00c5b9') -build() { - cd "${srcdir}/${pkgname}" +prepare() { + cd ${pkgname} patch -p1 -i ../cinepaint-libpng15.patch patch -p1 -i ../cinepaint-missing-include.patch find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in + sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' \ + -e 's|AM_PROG_CC_STDC|AC_PROG_CC|' configure.in -# aclocal -I aclocal -# autoconf + aclocal -I aclocal + autoconf sh autogen.sh - - LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \ +} + +build() { + cd ${pkgname} + LIBS+="-lstdc++ -lm -lX11" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --libdir=/usr/lib --mandir=/usr/share/man \ --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2 sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \ plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile @@ -42,7 +48,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}" + cd ${pkgname} make DESTDIR="${pkgdir}" install sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \ -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool" diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index bb983bc6a..8ea642657 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,38 +1,31 @@ -# $Id: PKGBUILD 181119 2013-03-31 19:16:43Z stephane $ +# $Id: PKGBUILD 183281 2013-04-20 16:41:14Z heftig $ # Maintainer: tobias # Contributor: Dominik Ryba pkgname=enblend-enfuse -pkgver=4.0 -pkgrel=10 +pkgver=4.1.1 +pkgrel=1 pkgdesc="Intelligent blend tool for overlapping picture" arch=("i686" "x86_64") license=('GPL') url="http://enblend.sourceforge.net" -depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs') +depends=('openexr' 'glew' 'freeglut' 'lcms2' 'boost-libs' 'vigra' 'gsl') makedepends=('boost' 'mesa') replaces=('enblend') conflicts=('enblend') provides=('enblend') install=${pkgname}.install -source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} \ - libpng-1.4.patch enblend-4.0-libpng15.patch) -sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' - 'aac6364b29b0a9d6c61c3db0982f52ce1579e934' - 'eae6cf48ea082865130302d0b4d1ca0b884a563b' - '71e961d90be842eafe9d473d8d70b04b29077036') +source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz) +sha1sums=('bc18fca3033b031d603b22678b2e680a0ffae1b6') build() { - cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" - sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx - patch -p1 -i ../libpng-1.4.patch - patch -p0 -i ../enblend-4.0-libpng15.patch - LIBS="-lboost_system" ./configure --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info" install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info" diff --git a/extra/enblend-enfuse/enblend-4.0-libpng15.patch b/extra/enblend-enfuse/enblend-4.0-libpng15.patch deleted file mode 100644 index d4465ccad..000000000 --- a/extra/enblend-enfuse/enblend-4.0-libpng15.patch +++ /dev/null @@ -1,220 +0,0 @@ ---- src/vigra_impex/png.cxx -+++ src/vigra_impex/png.cxx -@@ -81,7 +81,7 @@ - static void PngError( png_structp png_ptr, png_const_charp error_msg ) - { - png_error_message = std::string(error_msg); -- longjmp( png_ptr->jmpbuf, 1 ); -+ longjmp( png_jmpbuf( png_ptr ), 1 ); - } - - // called on non-fatal errors -@@ -213,7 +213,7 @@ - vigra_postcondition( png != 0, "could not create the read struct." ); - - // create info struct -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_read_struct( &png, &info, NULL ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() ); - } -@@ -221,14 +221,14 @@ - vigra_postcondition( info != 0, "could not create the info struct." ); - - // init png i/o -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_read_struct( &png, &info, NULL ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); - } - png_init_io( png, file.get() ); - - // specify that the signature was already read -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_read_struct( &png, &info, NULL ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() ); - } -@@ -244,13 +244,13 @@ - void PngDecoderImpl::init() - { - // read all chunks up to the image data -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() ); - png_read_info( png, info ); - - // pull over the header fields - int interlace_method, compression_method, filter_method; -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() ); - png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type, - &interlace_method, &compression_method, &filter_method ); -@@ -264,7 +264,7 @@ - - // transform palette to rgb - if ( color_type == PNG_COLOR_TYPE_PALETTE) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() ); - png_set_palette_to_rgb(png); - color_type = PNG_COLOR_TYPE_RGB; -@@ -273,7 +273,7 @@ - - // expand gray values to at least one byte size - if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); - png_set_expand_gray_1_2_4_to_8(png); - bit_depth = 8; -@@ -283,7 +283,7 @@ - #if 0 - // strip alpha channel - if ( color_type & PNG_COLOR_MASK_ALPHA ) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() ); - png_set_strip_alpha(png); - color_type ^= PNG_COLOR_MASK_ALPHA; -@@ -323,12 +323,12 @@ - - // read icc profile - #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) -- char * dummyName; -+ png_charpp dummyName; - int dummyCompType; -- char * profilePtr; -+ png_bytepp profilePtr; - png_uint_32 profileLen; -- if (info->valid & PNG_INFO_iCCP) { -- png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; -+ if (png_get_valid(png, info, PNG_INFO_iCCP)) { -+ png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ; - iccProfilePtr = (unsigned char *) profilePtr; - iccProfileLength = profileLen; - } -@@ -340,7 +340,7 @@ - // image gamma - double image_gamma = 0.45455; - if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() ); - png_get_gAMA( png, info, &image_gamma ); - } -@@ -349,26 +349,26 @@ - double screen_gamma = 2.2; - - // set gamma correction -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() ); - png_set_gamma( png, screen_gamma, image_gamma ); - #endif - - // interlace handling, get number of read passes needed -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str()); - n_interlace_passes = png_set_interlace_handling(png); - - // update png library state to reflect any changes that were made -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() ); - png_read_update_info( png, info ); - -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str()); - n_channels = png_get_channels(png, info); - -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str()); - rowsize = png_get_rowbytes(png, info); - -@@ -379,7 +379,7 @@ - void PngDecoderImpl::nextScanline() - { - for (int i=0; i < n_interlace_passes; i++) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str()); - png_read_row(png, row_data.begin(), NULL); - } -@@ -545,7 +545,7 @@ - vigra_postcondition( png != 0, "could not create the write struct." ); - - // create info struct -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_write_struct( &png, &info ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() ); - } -@@ -556,7 +556,7 @@ - } - - // init png i/o -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_write_struct( &png, &info ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); - } -@@ -571,7 +571,7 @@ - void PngEncoderImpl::finalize() - { - // write the IHDR -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() ); - png_set_IHDR( png, info, width, height, bit_depth, color_type, - PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, -@@ -579,7 +579,7 @@ - - // set resolution - if (x_resolution > 0 && y_resolution > 0) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() ); - png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5), - (png_uint_32) (y_resolution / 0.0254 + 0.5), -@@ -588,7 +588,7 @@ - - // set offset - if (position.x > 0 && position.y > 0) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() ); - png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL); - } -@@ -597,12 +597,12 @@ - // set icc profile - if (iccProfile.size() > 0) { - png_set_iCCP(png, info, "icc", 0, -- (char *)iccProfile.begin(), iccProfile.size()); -+ iccProfile.begin(), iccProfile.size()); - } - #endif - - // write the info struct -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() ); - png_write_info( png, info ); - -@@ -634,10 +634,10 @@ - } - - // write the whole image -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() ); - png_write_image( png, row_pointers.begin() ); -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() ); - png_write_end(png, info); - } diff --git a/extra/enblend-enfuse/libpng-1.4.patch b/extra/enblend-enfuse/libpng-1.4.patch deleted file mode 100644 index 3bf852b58..000000000 --- a/extra/enblend-enfuse/libpng-1.4.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx ---- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx 2010-01-19 22:09:36.000000000 -0500 -+++ enblend-enfuse-3.2/src/vigra_impex/png.cxx 2010-01-19 22:13:43.000000000 -0500 -@@ -275,8 +275,8 @@ - // expand gray values to at least one byte size - if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { - if (setjmp(png->jmpbuf)) -- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); -- png_set_gray_1_2_4_to_8(png); -+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); -+ png_set_expand_gray_1_2_4_to_8(png); - bit_depth = 8; - } - diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index 300515304..7809431e3 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180552 2013-03-23 07:23:57Z bpiotrowski $ +# $Id: PKGBUILD 183282 2013-04-20 16:41:15Z heftig $ # Maintainer: Ronald van Haren # Contributor: Gustavo Sverzut Barbieri pkgname=evas_generic_loaders pkgver=1.7.5 -pkgrel=3 +pkgrel=4 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') url="http://www.enlightenment.org" diff --git a/extra/fyre/PKGBUILD b/extra/fyre/PKGBUILD index 061d99698..b0df14cb0 100644 --- a/extra/fyre/PKGBUILD +++ b/extra/fyre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169745 2012-10-27 23:41:44Z eric $ +# $Id: PKGBUILD 183283 2013-04-20 16:41:16Z heftig $ # Maintainer: Eric Bélanger pkgname=fyre pkgver=1.0.1 -pkgrel=6 +pkgrel=7 pkgdesc="Rendering of the Peter de Jong map" arch=('i686' 'x86_64') url="http://fyre.navi.cx/" diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index ce98d5f33..5ee14dbf4 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180578 2013-03-23 23:09:32Z td123 $ +# $Id: PKGBUILD 183284 2013-04-20 16:41:17Z heftig $ # Maintainer: Daniel Isenmann pkgname=gegl pkgver=0.2.0 -pkgrel=6 +pkgrel=7 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64') url="http://www.gegl.org/" @@ -19,9 +19,13 @@ source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar. sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573' 'c10fd988c634fcf0948cc91a51d6528f6f1704ba') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff" +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff" ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ --with-libavformat --with-jasper --disable-docs make diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD new file mode 100644 index 000000000..6cd486b41 --- /dev/null +++ b/extra/gstreamer-vaapi/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 183264 2013-04-19 23:02:28Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgbase=gstreamer-vaapi +pkgname=(gst-vaapi gstreamer0.10-vaapi) +pkgver=0.5.3 +pkgrel=1 +pkgdesc="GStreamer Multimedia Framework VA Plugins" +arch=(i686 x86_64) +license=(LGPL) +url="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/" +makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva) +options=(!libtool !emptydirs) + +source=($url/$pkgbase-${pkgver}.tar.bz2) +sha1sums=('f99f657c8c19dd008a8066d8b2237aff4a05810d') + +prepare() { + cd $pkgbase-$pkgver + mkdir build-1.0 build-0.10 +} + + +build() { + cd $pkgbase-$pkgver/build-1.0 + ../configure --prefix=/usr --disable-static --with-gstreamer-api=1.0 + make + + cd ../build-0.10 + ../configure --prefix=/usr --disable-static --with-gstreamer-api=0.10 + make +} + +check() { + cd $pkgbase-$pkgver/build-1.0 + make check + + cd ../build-0.10 + make check +} + +package_gst-vaapi() { + depends=(gst-plugins-base gst-plugins-bad libva) + + cd $pkgbase-$pkgver/build-1.0 + make DESTDIR="$pkgdir" install +} + +package_gstreamer0.10-vaapi() { + depends=(gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva) + + cd $pkgbase-$pkgver/build-0.10 + make DESTDIR="$pkgdir" install +} diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index f5f608208..96cdd4a34 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182119 2013-04-07 20:49:30Z heftig $ +# $Id: PKGBUILD 183266 2013-04-20 05:39:22Z heftig $ # Maintainer: Jan de Groot pkgname=harfbuzz -pkgver=0.9.15 +pkgver=0.9.16 pkgrel=1 pkgdesc="OpenType text shaping engine." arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2') optdepends=('cairo: hb-view program') options=(!libtool) source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('214f919c2c998eb1316dd1a14a13adf27460e706a709488777076babf7fbbf1d') +sha256sums=('6da7e032f705d8a5c91487cd296628d64975672a5b0c1704829cf2285072c92b') build() { cd ${pkgname}-${pkgver} diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 0f4dfca35..3375f4298 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181120 2013-03-31 19:16:44Z stephane $ +# $Id: PKGBUILD 183285 2013-04-20 16:41:18Z heftig $ # Maintainer: Gaetan Bisson # Contributor: Tobias Kieslich # Contributor: Giovanni Scafora @@ -6,7 +6,7 @@ pkgname=hugin pkgver=2012.0.0 -pkgrel=4 +pkgrel=5 pkgdesc='Panorama photo stitcher' url='http://hugin.sourceforge.net/' license=('GPL') diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD index fe1618f48..6d84a4278 100644 --- a/extra/ilmbase/PKGBUILD +++ b/extra/ilmbase/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Tobias Powalowski pkgname=ilmbase -pkgver=1.0.3 +pkgver=2.0.0 pkgrel=1 depends=('gcc-libs') pkgdesc="Base libraries from ILM for OpenEXR" @@ -10,14 +10,10 @@ arch=(i686 x86_64) url="http://www.openexr.com" license=('custom') options=('!libtool') -source=(https://github.com/downloads/openexr/openexr/$pkgname-$pkgver.tar.gz - ilmbase-IexMath.patch) -md5sums=('d99962ec7e2bfac0647aaabf6b91d5de' - '9c8efaf15f60bccf79749ec879657962') +source=(http://download.savannah.nongnu.org/releases/openexr/$pkgname-$pkgver.tar.gz) build() { cd "${srcdir}/$pkgname-$pkgver" - patch -p0 -i "${srcdir}/ilmbase-IexMath.patch" ./configure --prefix=/usr make } @@ -33,3 +29,4 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } +md5sums=('70f1413840c2a228783d1332b8b168e6') diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 8d8bc6fc4..bfe98c9a8 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181383 2013-04-04 03:27:53Z eric $ +# $Id: PKGBUILD 183287 2013-04-20 16:41:21Z heftig $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.4.6 +pkgver=6.8.4.10 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -13,16 +13,18 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('80acfe2bcc9b28c84db28a8e94bfa6180dcdd6f5' +sha1sums=('8d5529f35f624b83ad925958c977a381ab30c0f7' 'e143cf9d530fabf3b58023899b5cc544ba93daec') -build() { +prepare() { cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - sed '/AC_PATH_XTRA/d' -i configure.ac autoreconf --force --install patch -p0 -i "${srcdir}/perlmagick.rpath.patch" +} +build() { + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index febf4bc16..204600f6a 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 180553 2013-03-23 07:23:58Z bpiotrowski $ +# $Id: PKGBUILD 183288 2013-04-20 16:41:22Z heftig $ # Maintainer: Gaetan Bisson # Contributor: Tobias Kieslich # Contributor: tobias pkgname=inkscape pkgver=0.48.4 -pkgrel=5 +pkgrel=6 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') arch=('i686' 'x86_64') makedepends=('boost' 'intltool') -depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.0' 'popt' +depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.3' 'popt' 'python2' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('pstoedit: latex formulas' 'texlive-core: latex formulas' @@ -20,13 +20,18 @@ optdepends=('pstoedit: latex formulas' 'pyxml: some extensions' 'uniconvertor: reading/writing to some proprietary formats') options=('!libtool') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c') +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + inkscape-0.48.4-spuriouscomma.patch) +sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' + '7d1d5a6d1d2b0926721a994d5889c52890fc57c1') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # fix FTBS, patch taken from FC + patch -Np0 -i ${srcdir}/inkscape-0.48.4-spuriouscomma.patch sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py diff --git a/extra/inkscape/inkscape-0.48.4-spuriouscomma.patch b/extra/inkscape/inkscape-0.48.4-spuriouscomma.patch new file mode 100644 index 000000000..bc538068f --- /dev/null +++ b/extra/inkscape/inkscape-0.48.4-spuriouscomma.patch @@ -0,0 +1,11 @@ +--- src/widgets/desktop-widget.h~ 2011-07-08 13:25:09.000000000 -0500 ++++ src/widgets/desktop-widget.h 2013-02-15 16:04:45.806910365 -0600 +@@ -239,7 +239,7 @@ + private: + GtkWidget *tool_toolbox; + GtkWidget *aux_toolbox; +- GtkWidget *commands_toolbox,; ++ GtkWidget *commands_toolbox; + GtkWidget *snap_toolbox; + + static void init(SPDesktopWidget *widget); diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD index 9f21d9a2d..894a2f870 100644 --- a/extra/kdelibs3/PKGBUILD +++ b/extra/kdelibs3/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 182393 2013-04-09 21:34:09Z eric $ +# $Id: PKGBUILD 183291 2013-04-20 16:41:26Z heftig $ # Maintainer: Eric Bélanger # Contributor: Pierre Schmitz # Contributor: Tobias Powalowski pkgname=kdelibs3 pkgver=3.5.10 -pkgrel=16 +pkgrel=17 pkgdesc='KDE3 Core Libraries' arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') -depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper' +depends=('libxslt' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper' 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates') makedepends=('cups' 'hspell') optdepends=('hspell: for Hebrew spell-checking support') @@ -35,59 +35,47 @@ sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82' 'e5f5b8c060a2db9cedb82bf18caadfa869921779' '6a6c544b3336bfe89bb17ef737d783a7ec006c6c') -build() { - cd "$srcdir"/kdelibs-${pkgver} - - . "$srcdir"/kde3.profile - - patch -p0 -i "$srcdir"/kde-3.5-1074156.patch - patch -p1 -i "$srcdir"/acinclude.patch - patch -p1 -i "$srcdir"/kde4-compatibility.patch - patch -p1 -i "${srcdir}"/openssl.patch - patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch - patch -p1 -i "${srcdir}"/kdelibs3-cups16.patch +prepare() { + cd kdelibs-${pkgver} + patch -p0 -i "$srcdir"/kde-3.5-1074156.patch + patch -p1 -i "$srcdir"/acinclude.patch + patch -p1 -i "$srcdir"/kde4-compatibility.patch + patch -p1 -i "${srcdir}"/openssl.patch + patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch + patch -p1 -i "${srcdir}"/kdelibs3-cups16.patch +} - ./configure --prefix=/opt/kde \ - --with-distribution='Arch Linux' \ - --with-alsa \ - --disable-debug \ - --disable-dnssd \ - --disable-dnotify \ - --enable-inotify \ - --enable-sendfile \ - --without-lua \ - --with-hspell \ - --enable-gcc-hidden-visibility \ - --enable-final \ - --enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/qt/lib" \ - --without-arts \ - --disable-libfam - make +build() { + cd kdelibs-${pkgver} + ./configure --prefix=/opt/kde --with-distribution='Arch Linux' \ + --with-alsa --disable-dnssd --disable-dnotify \ + --enable-inotify --enable-sendfile --with-hspell \ + --enable-gcc-hidden-visibility --enable-final \ + --without-arts --without-lua --disable-libfam + make } package() { - cd "$srcdir"/kdelibs-${pkgver} + cd kdelibs-${pkgver} - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install - # disable broken kconf_update by default - install -D -m644 "$srcdir"/kconf_updaterc \ - "$pkgdir"/opt/kde/share/config/kconf_updaterc +# disable broken kconf_update by default + install -D -m644 "$srcdir"/kconf_updaterc "$pkgdir"/opt/kde/share/config/kconf_updaterc - # install KDE3 profile - install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh - # make KDE3 styles available to Qt3 - install -d -m755 "$pkgdir"/opt/qt/plugins - ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/opt/qt/plugins/styles +# install KDE3 profile + install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh +# make KDE3 styles available to Qt3 + install -d -m755 "$pkgdir"/usr/lib/qt3/plugins + ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/usr/lib/qt3/plugins/styles - # cert bundle seems to be hardcoded - # link it to the one from ca-certificates - rm -f "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt - ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt +# cert bundle seems to be hardcoded +# link it to the one from ca-certificates + ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt - # we don't have khelpcenter anyway - rm -rf "$pkgdir"/opt/kde/share/doc +# we don't have khelpcenter anyway + rm -rf "$pkgdir"/opt/kde/share/doc - install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ - echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf + install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ + echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf } diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 08c0b3fe2..60579b81f 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 180907 2013-03-27 23:06:26Z andyrtr $ +# $Id: PKGBUILD 183277 2013-04-20 14:43:33Z andyrtr $ # Maintainer: Jan de Groot pkgname=libdrm -pkgver=2.4.43 +pkgver=2.4.44 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -15,25 +15,21 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch COPYING) - #git_fixes.diff -sha256sums=('7fb8cd89df06e236a66a1a6a9f6d058271c1b1ec92631e08c66dc9e12abd4975' - '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded' +sha256sums=('42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2' + 'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') build() { cd $pkgname-$pkgver patch -Np1 -i ../no-pthread-stubs.patch - # git_commits - #patch -Np1 -i ${srcdir}/git_fixes.diff - #libtoolize --force autoreconf --force --install ./configure --prefix=/usr \ --enable-udev \ --enable-omap-experimental-api \ - # --enable-exynos-experimental-api \ - # --enable-freedreno-experimental-api + --enable-exynos-experimental-api \ + --enable-freedreno-experimental-api make } diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch index 3b05ce18d..d49e397b7 100644 --- a/extra/libdrm/no-pthread-stubs.patch +++ b/extra/libdrm/no-pthread-stubs.patch @@ -102,3 +102,20 @@ diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am libdrm_exynos_la_SOURCES = exynos_drm.c +--- libdrm-2.4.44/freedreno/Makefile.am 2013-04-19 00:59:07.000000000 +0200 ++++ libdrm-2.4.44/freedreno/Makefile.am.new 2013-04-19 17:19:03.153950143 +0200 +@@ -2,13 +2,12 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/freedreno \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la + libdrm_freedreno_ladir = $(libdir) + libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_freedreno_la_LIBADD = ../libdrm.la + + libdrm_freedreno_la_SOURCES = \ + freedreno_device.c \ diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index cb897bcbb..e3be4a21c 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182085 2013-04-06 18:07:38Z andyrtr $ +# $Id: PKGBUILD 183292 2013-04-20 16:41:28Z heftig $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.0.2.2 pkgver=4.0.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -33,7 +33,7 @@ makedepends=( # makedepends # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.2' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.3' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -299,7 +299,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' - 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.2" + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.3" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD index 1b57dbcc0..fec3ea1c8 100644 --- a/extra/libwps/PKGBUILD +++ b/extra/libwps/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 166173 2012-09-05 06:04:00Z andyrtr $ +# $Id: PKGBUILD 183268 2013-04-20 07:13:33Z andyrtr $ # Maintainer: AndyRTR # Contributor: Robert McCathie pkgname=libwps -pkgver=0.2.7 +pkgver=0.2.8 pkgrel=1 pkgdesc="a Microsoft Works file word processor format import filter library" arch=('i686' 'x86_64') url="http://libwps.sourceforge.net/" license=('LGPL') -depends=('libwpd>=0.9.4') +depends=('libwpd>=0.9.6') makedepends=('boost') options=(!libtool) source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2") -md5sums=('d197bd6211669a2fa4ca648faf04bcb1') +md5sums=('78196c097db366fac66841d032b1ddac') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 044d675db..88f403d39 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182637 2013-04-11 18:36:34Z schiv $ +# $Id: PKGBUILD 183293 2013-04-20 16:41:29Z heftig $ # Maintainer: Ray Rashif # Contributor: Tobias Powalowski @@ -6,7 +6,7 @@ pkgbase=opencv pkgname=('opencv' 'opencv-samples') _realname=OpenCV pkgver=2.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') @@ -97,6 +97,10 @@ package_opencv-samples() { mkdir -p "$pkgdir/usr/share/opencv" cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples" + + # install license file + install -Dm644 "$srcdir/opencv-$pkgver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD index 55a64ac24..42666f4d5 100644 --- a/extra/openexr/PKGBUILD +++ b/extra/openexr/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 169756 2012-10-27 23:42:17Z eric $ +# $Id: PKGBUILD 183294 2013-04-20 16:41:30Z heftig $ # Maintainer: Tobias Powalowski pkgname=openexr -pkgver=1.7.1 -pkgrel=2 +pkgver=2.0.0 +pkgrel=1 pkgdesc="An high dynamic-range image file format library" url="http://www.openexr.com/" arch=('i686' 'x86_64') license=('BSD') depends=('zlib' 'ilmbase') options=('!libtool') -source=("https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gcc43.patch') +source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i "${srcdir}/gcc43.patch" ./configure --prefix=/usr make } @@ -25,6 +23,4 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } - -md5sums=('a9e0369dfd68941c50cdaa93e9d7a8d1' - 'd91fae759053a70bcedcf02eb33ca4a2') +md5sums=('0820e1a8665236cb9e728534ebf8df18') diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 32e197ba7..6292d96aa 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 180549 2013-03-23 07:23:53Z bpiotrowski $ +# $Id: PKGBUILD 183295 2013-04-20 16:41:31Z heftig $ # Maintainer: Jan de Groot pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.22.2 -pkgrel=1 +pkgver=0.22.3 +pkgrel=2 arch=(i686 x86_64) license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu') options=('!libtool' '!emptydirs') url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('3939740201c59c470bc7198003450a20' +md5sums=('be915388eaad6865cee5a156c8119ec1' '9dc64c254a31e570507bdd4ad4ba629a') build() { - . /etc/profile.d/qt4.sh +# . /etc/profile.d/qt4.sh cd "${srcdir}" ln -sf test-${_testtag} test cd ${pkgbase}-${pkgver} + sed -i -e '/AC_PATH_XTRA/d' configure.ac sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ @@ -44,7 +44,7 @@ check() { package_poppler() { pkgdesc="PDF rendering library based on xpdf 3.0" - depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms') + depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms2') optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters') conflicts=("poppler-qt3<${pkgver}") -- cgit v1.2.3-54-g00ecf