From 9478c3c735c37ebdda0eb99126f5925790fb3e55 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 5 Oct 2013 01:28:55 -0700 Subject: Sat Oct 5 01:28:41 PDT 2013 --- community/ccid/PKGBUILD | 10 +- community/fbv/PKGBUILD | 8 +- community/geary/PKGBUILD | 23 +++-- community/klavaro/PKGBUILD | 6 +- community/libvirt/PKGBUILD | 26 ++--- community/lxpanel/PKGBUILD | 18 +--- community/mplayer2/PKGBUILD | 67 ------------- community/mplayer2/giflib-5.0.patch | 111 --------------------- community/mplayer2/mplayer2.install | 11 -- community/python-pillow/PKGBUILD | 14 +-- community/python-pillow/pull325.diff | 38 ------- community/rawstudio/PKGBUILD | 16 +-- community/shotwell/PKGBUILD | 27 ++--- community/shotwell/libraw-0.15.2.patch | 33 ------ community/shotwell/no-libexec.patch | 26 ----- core/sudo/PKGBUILD | 6 +- extra/libdiscid/PKGBUILD | 6 +- extra/slim/PKGBUILD | 22 ++-- extra/slim/slim-1.3.6-fix-libslim-libraries.patch | 20 ++++ extra/vlc/PKGBUILD | 6 +- libre/calibre-libre/PKGBUILD | 17 +--- nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD | 6 +- nonprism/kdepim-runtime-nonprism/PKGBUILD | 6 +- pcr/youtube-dl-current/PKGBUILD | 4 +- 24 files changed, 118 insertions(+), 409 deletions(-) delete mode 100644 community/mplayer2/PKGBUILD delete mode 100644 community/mplayer2/giflib-5.0.patch delete mode 100644 community/mplayer2/mplayer2.install delete mode 100644 community/python-pillow/pull325.diff delete mode 100644 community/shotwell/libraw-0.15.2.patch delete mode 100644 community/shotwell/no-libexec.patch create mode 100644 extra/slim/slim-1.3.6-fix-libslim-libraries.patch diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD index b39649246..c2d95dd32 100644 --- a/community/ccid/PKGBUILD +++ b/community/ccid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 98011 2013-10-03 16:17:48Z giovanni $ +# $Id: PKGBUILD 98050 2013-10-04 16:09:59Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Daniel Plaza pkgname=ccid pkgver=1.4.12 -pkgrel=1 +pkgrel=2 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver" arch=('i686' 'x86_64') url="http://pcsclite.alioth.debian.org/ccid.html" @@ -20,7 +20,8 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ - --enable-twinserial + --enable-twinserial \ + --enable-serialconfdir=/etc/reader.conf.d make } @@ -28,4 +29,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + # move the configuration file in /etc and create a symbolic link + mv "${pkgdir}/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist" "${pkgdir}/etc/libccid_Info.plist" + ln -s /etc/libccid_Info.plist ${pkgdir}/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist } diff --git a/community/fbv/PKGBUILD b/community/fbv/PKGBUILD index be75edd40..aef9871e8 100644 --- a/community/fbv/PKGBUILD +++ b/community/fbv/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 94921 2013-08-01 07:01:11Z bpiotrowski $ +# $Id: PKGBUILD 98028 2013-10-04 09:54:24Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Aectann pkgname=fbv pkgver=1.0b -pkgrel=7 +pkgrel=8 pkgdesc="FrameBuffer image viewer" arch=('i686' 'x86_64') url="http://s-tech.elsat.net.pl/fbv/" license=('GPL') -depends=('libpng' 'libungif' 'libjpeg') +depends=('libpng' 'giflib' 'libjpeg') source=(http://s-tech.elsat.net.pl/fbv/$pkgname-$pkgver.tar.gz giflib-5.0.patch) md5sums=('3e466375b930ec22be44f1041e77b55d' @@ -18,7 +18,7 @@ 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|LIBS.*|LIBS=-lpng -ljpeg -lgif|' Make.conf sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c patch -Np1 -i ../giflib-5.0.patch make diff --git a/community/geary/PKGBUILD b/community/geary/PKGBUILD index b9b769daa..4496e9a43 100755 --- a/community/geary/PKGBUILD +++ b/community/geary/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 89890 2013-05-04 23:09:02Z alucryd $ +# $Id: PKGBUILD 98024 2013-10-04 08:12:31Z alucryd $ # Maintainer: Maxime Gauduin # Contributor : sebikul # Contributor : Massimiliano Torromeo pkgname=geary -pkgver=0.3.1 -pkgrel=4 +pkgver=0.4.0 +pkgrel=1 pkgdesc="A lightweight email client for the GNOME desktop" arch=('i686' 'x86_64') url="http://www.yorba.org/projects/geary/" license=('GPL3') -depends=('desktop-file-utils' 'gmime' 'hicolor-icon-theme' 'libcanberra' 'libgee06' 'libgnome-keyring' 'libnotify' 'libunique3' 'webkitgtk3') +depends=('desktop-file-utils' 'gmime' 'hicolor-icon-theme' 'libcanberra' 'libgee' 'libnotify' 'libunique3' 'webkitgtk3') makedepends=('cmake' 'gobject-introspection' 'intltool' 'vala') -install=${pkgname}.install +install="${pkgname}.install" source=("http://www.yorba.org/download/${pkgname}/${pkgver%.?}/${pkgname}-${pkgver}.tar.xz") -sha256sums=('a1bf8cc95022ce0894a340dea0ab94047ac7a7ea0066b8602b136c74e93ffaed') +sha256sums=('eb6418fe48ee2d25350999e6fc8fd23de15da5670569f4c2478f9435fe2a2ae1') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-{desktop-update,icon-update,schemas-compile} + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -D{DESKTOP_UPDATE,GSETTINGS_COMPILE{,_IN_PLACE},ICON_UPDATE}='OFF' make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver}/build make DESTDIR="${pkgdir}" install } diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD index a3e2f1bfa..147471612 100644 --- a/community/klavaro/PKGBUILD +++ b/community/klavaro/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 95139 2013-08-06 07:59:09Z stativ $ +# $Id: PKGBUILD 98040 2013-10-04 13:46:45Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=klavaro -pkgver=1.9.8 +pkgver=2.00 pkgrel=1 pkgdesc="Free touch typing tutor program" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('intltool') optdepends=('espeakup: voice output') install=$pkgname.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('62ad2c6bec1c2bafab4bdd29227433ac') +md5sums=('f7c804fbad7f9a053dfcfbea6d91dce6') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index cfeb7738b..d3ade0aa0 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 97608 2013-09-25 13:45:00Z spupykin $ +# $Id: PKGBUILD 98038 2013-10-04 13:33:02Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt -pkgver=1.1.2 -pkgrel=2 +pkgver=1.1.3 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -32,25 +32,11 @@ install="libvirt.install" source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.conf.d - libvirt.tmpfiles.d - 0001-Also-store-user-group-ID-values-in-virIdentity.patch - 0002-Ensure-system-identity-includes-process-start-time.patch - 0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch) -md5sums=('1835bbfa492099bce12e2934870e5611' + libvirt.tmpfiles.d) +md5sums=('b0dfe373ebe0c588b42a28c14d36a3e6' '3ed0e24f5b5e25bf553f5427d64915e6' '0a96ed876ffb1fcb9dff5a9b3a609c1e' - '020971887442ebbf1b6949e031c8dd3f' - '60912fc049f0e8cf8d89c919ea619415' - 'a42387495f75dd918a6c25b36eb3b428' - '2dba51f17f37f59585852092e4c86e44') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 <$srcdir/0001-Also-store-user-group-ID-values-in-virIdentity.patch - patch -p1 <$srcdir/0002-Ensure-system-identity-includes-process-start-time.patch - patch -p1 <$srcdir/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch - autoreconf -} + '020971887442ebbf1b6949e031c8dd3f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD index f06e08208..ba5c7dc83 100644 --- a/community/lxpanel/PKGBUILD +++ b/community/lxpanel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96687 2013-09-03 02:37:13Z bgyorgy $ +# $Id: PKGBUILD 98054 2013-10-04 17:26:39Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Angel Velasquez # Contributor: Juergen Hoetzel pkgname=lxpanel -pkgver=0.5.12 -pkgrel=2 +pkgver=0.6.1 +pkgrel=1 pkgdesc='Lightweight X11 desktop panel for LXDE' arch=('i686' 'x86_64') license=('GPL2') @@ -14,16 +14,8 @@ groups=('lxde') depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data' 'libwnck') makedepends=('intltool' 'docbook-xml' 'docbook-xsl' 'wireless_tools') optdepends=('wireless_tools: netstat plugin') -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz - lxpanel-0.5.12-automake-1.14-support.patch) -sha256sums=('c29997c522f138e4beb02fc549c84136fc840a836c1f69b400d90d2d4e91de1b' - 'ce5bf608374188da00ce3f0a1c74d1ddebd160555db4119eebd85f64731fe1d1') - -prepare() { - cd $pkgname-$pkgver - patch -Np0 -i ../lxpanel-0.5.12-automake-1.14-support.patch - ./autogen.sh -} +source=(http://downloads.sourceforge.net/sourceforge/lxde/lxpanel-$pkgver.tar.gz) +sha256sums=('a16a21b2186218c70ed98dc7875c54d6bb12ae7271825ff5060feb8d2a4e86cb') build() { cd $pkgname-$pkgver diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD deleted file mode 100644 index 8f2b40879..000000000 --- a/community/mplayer2/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# $Id: PKGBUILD 94896 2013-08-01 06:55:15Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski -# Contributor: Martin Panter -# Contributor: Stéphane Gaudreault - -pkgname=mplayer2 -pkgver=20130428 -pkgrel=4 -pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project' -arch=('i686' 'x86_64') -license=('GPL') -url='http://www.mplayer2.org/' -install=$pkgname.install -depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' - 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' - 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread' - 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau' - 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' - 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu' 'giflib') -makedepends=('mesa' 'mesa-libgl' 'unzip' 'yasm' 'python' 'python-docutils' 'git') -backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') -provides=('mplayer') -conflicts=('mplayer') -options=(!emptydirs) -source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa - giflib-5.0.patch) -sha256sums=('SKIP' - '20706ebb35e7c1935ae263c48d623a878db3b634ca575927913f56d9ce059c7a') - -pkgver() { - cd $pkgname - git log -1 --format="%cd" --date=short | sed 's|-||g' -} - -prepare() { - cd $pkgname - sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop - find -type f -exec sed -e 's/python3/python/' -i {} \; - patch -Np1 -i ../giflib-5.0.patch -} - -build() { - cd $pkgname - - ./configure --prefix=/usr --confdir=/etc/mplayer \ - --enable-translation --language=all \ - --enable-runtime-cpudetection \ - --enable-joystick \ - --enable-gif \ - --disable-speex \ - --disable-openal \ - --disable-libdv \ - --disable-musepack - make -} - -package() { - cd $pkgname - make DESTDIR=$pkgdir install - - install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/ - install -dm755 $pkgdir/usr/share/mplayer/ - ln -s /usr/share/fonts/TTF/DejaVuSans.ttf $pkgdir/usr/share/mplayer/subfont.ttf - - install -dm755 $pkgdir/usr/share/applications/ - install -m 644 etc/mplayer.desktop $pkgdir/usr/share/applications/ -} diff --git a/community/mplayer2/giflib-5.0.patch b/community/mplayer2/giflib-5.0.patch deleted file mode 100644 index 9eaa6e98e..000000000 --- a/community/mplayer2/giflib-5.0.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c -index b808f81..c61d86c 100644 ---- a/libvo/vo_gif89a.c -+++ b/libvo/vo_gif89a.c -@@ -196,7 +196,11 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, - mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Some functionality has been disabled.\n"); - #endif - -+#if GIFLIB_MAJOR > 4 -+ new_gif = EGifOpenFileName(gif_filename, 0, NULL); -+#else - new_gif = EGifOpenFileName(gif_filename, 0); -+#endif - if (new_gif == NULL) { - mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: error opening file \"%s\" for output.\n", gif_filename); - return 1; -@@ -215,7 +219,11 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, - return 1; - } - -+#if GIFLIB_MAJOR > 4 -+ reduce_cmap = GifMakeMapObject(256, NULL); -+#else - reduce_cmap = MakeMapObject(256, NULL); -+#endif - if (reduce_cmap == NULL) { - free(slice_data); slice_data = NULL; - free(reduce_data); reduce_data = NULL; -@@ -267,7 +275,11 @@ static int gif_reduce(int width, int height, uint8_t *src, uint8_t *dst, GifColo - } - - R = Ra; G = Ga; B = Ba; -+#if GIFLIB_MAJOR > 4 -+ return GifQuantizeBuffer(width, height, &size, R, G, B, dst, colors); -+#else - return QuantizeBuffer(width, height, &size, R, G, B, dst, colors); -+#endif - } - - static void flip_page(void) -@@ -365,8 +377,11 @@ static void uninit(void) - free(gif_filename); - free(slice_data); - free(reduce_data); -+#if GIFLIB_MAJOR > 4 -+ if (reduce_cmap != NULL) GifFreeMapObject(reduce_cmap); -+#else - if (reduce_cmap != NULL) FreeMapObject(reduce_cmap); -- -+#endif - // set the pointers back to null. - new_gif = NULL; - gif_filename = NULL; - -diff --git a/configure b/configure -index 95a5ae8..d9c826f 100755 ---- a/configure -+++ b/configure -@@ -3659,6 +3659,7 @@ if test "$_gif" = auto ; then - _gif=no - for _ld_gif in "-lungif" "-lgif" ; do - statement_check gif_lib.h 'QuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $_ld_gif && _gif=yes && break -+ statement_check gif_lib.h 'GifQuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $_ld_gif && _gif=yes && break - done - fi - -diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c -index eee7a85..a764474 100644 ---- a/libmpdemux/demux_gif.c -+++ b/libmpdemux/demux_gif.c -@@ -44,6 +44,16 @@ typedef struct { - - #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') - -+static void PrintGifError(errcode) -+{ -+ char *Err = GifErrorString(errcode); -+ -+ if (Err != NULL) -+ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); -+ else -+ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", errcode); -+} -+ - #ifndef CONFIG_GIF_TVT_HACK - // not supported by certain versions of the library - static int my_read_gif(GifFileType *gif, uint8_t *buf, int len) -@@ -240,6 +250,7 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) - gif_priv_t *priv = calloc(1, sizeof(gif_priv_t)); - sh_video_t *sh_video = NULL; - GifFileType *gif = NULL; -+ int GifError; - - priv->current_pts = 0; - demuxer->seekable = 0; // FIXME -@@ -254,12 +265,12 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) - // not read from the beginning of the file and the command will fail. - // with this hack enabled, you will lose the ability to stream a GIF. - lseek(demuxer->stream->fd, 0, SEEK_SET); -- gif = DGifOpenFileHandle(demuxer->stream->fd); -+ gif = DGifOpenFileHandle(demuxer->stream->fd, &GifError); - #else -- gif = DGifOpen(demuxer->stream, my_read_gif); -+ gif = DGifOpen(demuxer->stream, my_read_gif, &GifError); - #endif - if (!gif) { -- PrintGifError(); -+ PrintGifError(GifError); - free(priv); - return NULL; - } diff --git a/community/mplayer2/mplayer2.install b/community/mplayer2/mplayer2.install deleted file mode 100644 index 660593cf5..000000000 --- a/community/mplayer2/mplayer2.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/python-pillow/PKGBUILD b/community/python-pillow/PKGBUILD index 3cf4c2a3c..6ef3cd700 100644 --- a/community/python-pillow/PKGBUILD +++ b/community/python-pillow/PKGBUILD @@ -1,22 +1,19 @@ -# $Id: PKGBUILD 97882 2013-09-30 13:00:41Z bgyorgy $ +# $Id: PKGBUILD 98021 2013-10-04 01:35:36Z kkeen $ # Maintainer: Kyle Keen # Contributor: minder pkgbase=python-pillow pkgname=(python-pillow python2-pillow) _appname=Pillow -pkgver=2.1.0 -pkgrel=5 +pkgver=2.2.1 +pkgrel=1 pkgdesc="Python Imaging Library (PIL) fork. Python3 version." arch=('i686' 'x86_64') url="http://python-imaging.github.io/" license=('BSD') makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane') -# remove pull325.diff on 2.1.1 release, fixes FS#36945 -source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip" - "pull325.diff") -md5sums=('ec630d8ae15d4a3c4ae7b7efdeac8200' - 'aa3fa12bd2d61041f6d01fedddab39fb') +source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip") +md5sums=('d1d20d3db5d1ab312da0951ff061e6bf') build() { cd "$srcdir" @@ -52,7 +49,6 @@ package_python2-pillow() { conflicts=('python-imaging' 'python2-imaging') replaces=('python2-imaging') cd "$srcdir/${_appname}2-$pkgver" - patch -Np1 -i ../pull325.diff python2 setup.py install --root="$pkgdir/" --optimize=0 pushd Sane python2 setup.py install --root="$pkgdir/" --optimize=0 diff --git a/community/python-pillow/pull325.diff b/community/python-pillow/pull325.diff deleted file mode 100644 index 48b36ab48..000000000 --- a/community/python-pillow/pull325.diff +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/PIL/Image.py b/PIL/Image.py -index bb15aaa..2e120e5 100644 ---- a/PIL/Image.py -+++ b/PIL/Image.py -@@ -706,7 +706,7 @@ def convert(self, mode=None, data=None, dither=None, - if self.mode == "L" and mode == "RGBA" and "transparency" in self.info: - from PIL import ImagePalette - self.mode = "P" -- bytePalette = bytes([i//3 for i in range(768)]) -+ bytePalette = bytes(bytearray([i//3 for i in range(768)])) - self.palette = ImagePalette.raw("RGB", bytePalette) - self.palette.dirty = 1 - self.load() -diff --git a/_imaging.c b/_imaging.c -index 9f48030..84f06e9 100644 ---- a/_imaging.c -+++ b/_imaging.c -@@ -287,6 +287,7 @@ int PyImaging_GetBuffer(PyObject* buffer, Py_buffer *view) - static const char* wrong_raw_mode = "unrecognized raw mode"; - static const char* outside_image = "image index out of range"; - static const char* outside_palette = "palette index out of range"; -+static const char* wrong_palette_size = "invalid palette size"; - static const char* no_palette = "image has no palette"; - static const char* readonly = "image is readonly"; - /* static const char* no_content = "image has no content"; */ -@@ -1413,6 +1414,11 @@ int PyImaging_GetBuffer(PyObject* buffer, Py_buffer *view) - return NULL; - } - -+ if ( palettesize * 8 / bits > 256) { -+ PyErr_SetString(PyExc_ValueError, wrong_palette_size); -+ return NULL; -+ } -+ - ImagingPaletteDelete(self->image->palette); - - strcpy(self->image->mode, "P"); - diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD index b35cb720a..2bb5810a7 100644 --- a/community/rawstudio/PKGBUILD +++ b/community/rawstudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81067 2012-12-11 14:37:23Z allan $ +# $Id: PKGBUILD 98046 2013-10-04 15:27:57Z bgyorgy $ # Maintainer: Sergej Pupykin # Maintainer: Daniel J Griffiths # Contributor: Roman Kyrylych @@ -6,13 +6,13 @@ pkgname=rawstudio pkgver=2.0 -pkgrel=8 +pkgrel=9 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') +depends=('gconf' 'lcms' 'exiv2' 'fftw' 'lensfun' 'flickcurl' 'sqlite' + 'libgphoto2' 'gtk-engines' 'desktop-file-utils') install=${pkgname}.install options=('!libtool') source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz @@ -20,11 +20,15 @@ source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' '2f8b7acbe10d8096ce613cbea7986fd3') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 <$srcdir/libpng15.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" export LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 6f4bf9e35..dd699b5e6 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,39 +1,26 @@ -# $Id: PKGBUILD 96421 2013-08-28 11:35:15Z spupykin $ +# $Id: PKGBUILD 98032 2013-10-04 09:55:22Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer : Ionut Biru # Contributor: Joeny Ang pkgname=shotwell -pkgver=0.14.1 -pkgrel=5 +pkgver=0.15.0 +pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" license=('LGPL2.1') -depends=('libgee06' 'webkitgtk' 'libgexiv2' 'libraw' 'rest' +depends=('libgee' 'webkitgtk' 'libgexiv2' 'libraw' 'rest' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib' 'gst-plugins-base' 'libgphoto2') makedepends=('intltool' 'vala>=0.17.2' 'libunique3') install=shotwell.install -source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz" - "no-libexec.patch" - "libraw-0.15.2.patch" - "FS35899.patch::http://redmine.yorba.org/projects/shotwell/repository/revisions/4f635ba4236dbbb8cb3f8b7bdd201432961fb283/diff/src/AppDirs.vala?format=diff") -md5sums=('bb5783f9265e1ce2d4c9f354987c3ab1' - 'b4124e022c98b4382530e6fbcef965e2' - '3ad21364f82229122f48452f5c74dfde' - '9f9690f4b860f52ffd44f8ab6d4fd3b5') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 <$srcdir/no-libexec.patch - patch -Rp1 <$srcdir/libraw-0.15.2.patch - patch -p1 <$srcdir/FS35899.patch -} +source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz") +md5sums=('8b33dd5df51f49e7f4f451b431d7c133') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ + ./configure --prefix=/usr --libexec=/usr/lib/shotwell \ --disable-schemas-compile \ --disable-desktop-update \ --disable-icon-update diff --git a/community/shotwell/libraw-0.15.2.patch b/community/shotwell/libraw-0.15.2.patch deleted file mode 100644 index 248c5f236..000000000 --- a/community/shotwell/libraw-0.15.2.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -wbBur shotwell-0.14.1/src/photos/GRaw.vala shotwell-0.14.1/src/photos/GRaw.vala ---- /home/sergej/tmp/BUILD/staging-i686/sergej/build/shotwell/src/shotwell-0.14.1/src/photos/GRaw.vala 2013-06-17 16:26:12.247179310 +0400 -+++ shotwell-0.14.1/src/photos/GRaw.vala 2013-04-03 04:54:23.000000000 +0400 -@@ -168,7 +168,7 @@ - } - - public void document_mode_processing() throws Exception { -- throw_exception("document_mode_processing", 0); -+ throw_exception("document_mode_processing", proc.document_mode_processing()); - } - - public unowned LibRaw.ImageOther get_image_other() { -@@ -244,7 +244,7 @@ - // threshold - output_params->half_size = half_size; - // four_color_rgb --// output_params->document_mode = GRaw.DocMode.STANDARD; -+ output_params->document_mode = GRaw.DocMode.STANDARD; - output_params->highlight = GRaw.HighlightMode.CLIP; - output_params->use_auto_wb = true; - output_params->use_camera_wb = true; -diff -wbBur shotwell-0.14.1/vapi/libraw.vapi shotwell-0.14.1/vapi/libraw.vapi ---- /home/sergej/tmp/BUILD/staging-i686/sergej/build/shotwell/src/shotwell-0.14.1/vapi/libraw.vapi 2013-06-17 16:25:23.623846536 +0400 -+++ shotwell-0.14.1/vapi/libraw.vapi 2013-04-03 04:54:23.000000000 +0400 -@@ -184,6 +184,8 @@ - public Processor(Options flags = Options.NONE); - - public Result adjust_sizes_info_only(); -+ [CCode (cname="libraw_dcraw_document_mode_processing")] -+ public Result document_mode_processing(); - public unowned ImageOther get_image_other() { return other; } - public unowned ImageParams get_image_params() { return idata; } - public Progress get_progress_flags() { return progress_flags; } diff --git a/community/shotwell/no-libexec.patch b/community/shotwell/no-libexec.patch deleted file mode 100644 index fe8960719..000000000 --- a/community/shotwell/no-libexec.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur shotwell-0.13.1.orig/Makefile shotwell-0.13.1/Makefile ---- shotwell-0.13.1.orig/Makefile 2012-10-05 20:07:37.000000000 +0200 -+++ shotwell-0.13.1/Makefile 2012-10-31 22:27:30.382869896 +0100 -@@ -558,8 +558,8 @@ - mkdir -p $(DESTDIR)$(PREFIX)/bin - $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin - $(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(PREFIX)/bin -- mkdir -p $(DESTDIR)$(PREFIX)/libexec/shotwell -- $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/libexec/shotwell -+ mkdir -p $(DESTDIR)$(PREFIX)/lib/shotwell -+ $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/lib/shotwell - mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons - $(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons - mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps -diff -Naur shotwell-0.13.1.orig/src/AppDirs.vala shotwell-0.13.1/src/AppDirs.vala ---- shotwell-0.13.1.orig/src/AppDirs.vala 2012-10-05 19:56:07.000000000 +0200 -+++ shotwell-0.13.1/src/AppDirs.vala 2012-10-31 22:28:17.634388872 +0100 -@@ -109,7 +109,7 @@ - // not installed yet - use wherever we were run from - libexec_dir = get_exec_dir(); - } else { -- libexec_dir = File.new_for_path(Resources.PREFIX + "/libexec/shotwell"); -+ libexec_dir = File.new_for_path(Resources.PREFIX + "/lib/shotwell"); - } - } - diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index b57ede276..662d13b90 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188591 2013-06-16 17:14:27Z foutrelis $ +# $Id: PKGBUILD 195898 2013-10-04 13:41:05Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Allan McRae # Contributor: Tom Newsom pkgname=sudo -_sudover=1.8.7 +_sudover=1.8.8 pkgver=${_sudover/p/.p} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -17,7 +17,7 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} sudo.pam) -sha256sums=('39626cf3d48c4fd5a9139a2627d42bfefac7ce47f470bdba3aeb4e3d7c49566a' +sha256sums=('9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9' 'SKIP' 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD index da9201f54..86ad80d34 100644 --- a/extra/libdiscid/PKGBUILD +++ b/extra/libdiscid/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192092 2013-08-05 19:32:28Z eric $ +# $Id: PKGBUILD 195896 2013-10-03 23:11:52Z eric $ # Maintainer: Andrea Scarpino # Contributor: Eric Gillingham pkgname=libdiscid -pkgver=0.5.2 +pkgver=0.6.1 pkgrel=1 pkgdesc="A Library for creating MusicBrainz DiscIDs" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL') depends=('glibc') options=('!libtool') source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz") -md5sums=('ce5141be6082cf2f8a31f624ce8510c9') +md5sums=('98c4b281780707e6b446cc526a825e7a') build() { cd ${pkgname}-${pkgver} diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 0451efc72..27a492819 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184434 2013-05-06 19:39:43Z foutrelis $ +# $Id: PKGBUILD 195897 2013-10-03 23:13:04Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Gaetan Bisson # Contributor: Thayer Williams @@ -6,27 +6,35 @@ # Contributor: Hugo Ideler pkgname=slim -pkgver=1.3.5 -pkgrel=3 +pkgver=1.3.6 +pkgrel=1 pkgdesc="Desktop-independent graphical login manager for X11" arch=('i686' 'x86_64') url="http://slim.berlios.de/" license=('GPL2') -depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'xorg-xauth') +depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr' 'xorg-xauth') makedepends=('cmake' 'freeglut') backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim') source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz + slim-1.3.6-fix-libslim-libraries.patch slim.pam slim.logrotate) -sha256sums=('818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629' +sha256sums=('21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df' + '3dfa697f8c058390c7e02e7aba769475057ef8ddde945dc43b8cb7f9724dbda0' 'b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4' '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # Fix installation path of slim.service - sed -i 's|usr/lib/systemd/system|/&|' CMakeLists.txt + sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt + + patch -Np1 -i "$srcdir/slim-1.3.6-fix-libslim-libraries.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/slim/slim-1.3.6-fix-libslim-libraries.patch b/extra/slim/slim-1.3.6-fix-libslim-libraries.patch new file mode 100644 index 000000000..b6c90f9f4 --- /dev/null +++ b/extra/slim/slim-1.3.6-fix-libslim-libraries.patch @@ -0,0 +1,20 @@ +diff -upr slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt +--- slim-1.3.6.orig/CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300 ++++ slim-1.3.6/CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300 +@@ -119,6 +119,7 @@ if(USE_PAM) + if(PAM_FOUND) + message("\tPAM Found") + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM") ++ target_link_libraries(libslim ${PAM_LIBRARY}) + target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY}) + target_link_libraries(slimlock ${PAM_LIBRARY}) + include_directories(${PAM_INCLUDE_DIR}) +@@ -178,6 +179,8 @@ include_directories( + ) + + target_link_libraries(libslim ++ ${X11_Xft_LIB} ++ ${X11_Xrandr_LIB} + ${JPEG_LIBRARIES} + ${PNG_LIBRARIES} + ) diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index ca7fdea37..c9186597f 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 195175 2013-09-26 15:49:07Z foutrelis $ +# $Id: PKGBUILD 195902 2013-10-04 17:29:00Z bpiotrowski $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=2.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' - 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg-compat' 'faad2' 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' 'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca' diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 830a515b8..f1eab5401 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97648 2013-09-26 18:03:56Z jelle $ +# $Id: PKGBUILD 98047 2013-10-04 15:29:48Z jelle $ # Maintainer: jelle van der Waa # Maintainer: Daniel Wallace # Contributor: Giovanni Scafora @@ -10,8 +10,8 @@ _pkgname=calibre pkgname=calibre-libre pkgver=1.5 -pkgrel=1 -pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" +pkgrel=2 +pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" license=('GPL3') @@ -27,14 +27,13 @@ replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver install=calibre.install -source=('http://download.calibre-ebook.com/1.4.0/calibre-1.4.0.tar.xz' +source=('http://download.calibre-ebook.com/1.5.0/calibre-1.5.0.tar.xz' 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('7d5b331bd81d5f2d40e126059a49ce0f' +md5sums=('adb8543044f81f93d6faef372710bcb5' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') - prepare(){ cd "${srcdir}/${_pkgname}" #rm -rf src/{cherrypy,pyPdf} @@ -51,12 +50,6 @@ prepare(){ build() { cd "${srcdir}/${_pkgname}" - # Remove nonfree fonts - cd resources/fonts; \ - rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \ - rm prs500/tt0011m_.ttf; ln -s ../liberation/LiberationSerif-Regular.ttf prs500/tt0011m_.ttf; \ - rm prs500/tt0419m_.ttf; ln -s ../liberation/LiberationMono-Regular.ttf prs500/tt0419m_.ttf; \ - cd ../.. LANG='en_US.UTF-8' python2 setup.py build # LANG='en_US.UTF-8' python2 setup.py resources diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD index bd4532a4f..f54f3b92c 100644 --- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD +++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $ +# $Id: PKGBUILD 195745 2013-10-01 15:33:32Z svenstaro $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre-nonprism -pkgver=4.11.1 +pkgver=4.11.2 pkgrel=1 pkgdesc='Instant Messenger, without skype and support for unsafe and dangerous for privacy protocols' url='http://kde.org/applications/internet/kopete/' @@ -22,7 +22,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz" 'libotr3.patch' 'mediastreamer29.patch' 'libre-nonprism.patch') -sha1sums=('1dd677e6fd4335e6d0bb906f4c981395ca204e12' +sha1sums=('d7616376d7488050ce2c6ec6b7a1f4010fe91084' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' '317683a5c2acd0a0058c5ab42f6006e9db511ef3' '3c46e5c80ef0cd3f6fe9fb6d5cb8c252c6792208') diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD index 79f9b9221..9e42ee3ca 100644 --- a/nonprism/kdepim-runtime-nonprism/PKGBUILD +++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $ +# $Id: PKGBUILD 195505 2013-10-01 15:14:14Z svenstaro $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva _pkgname=kdepim-runtime pkgname=kdepim-runtime-nonprism -pkgver=4.11.1 +pkgver=4.11.2 pkgrel=1 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ replaces=('kdepim-runtime' 'kdepim-runtime-coherence') conflicts=kdepim-runtime provides=kdepim-runtime=$pkgver source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz") -sha1sums=('a61c1b4cafe16b88213c8cf2f4f64b38a20ed74d') +sha1sums=('acc133c3c9d5cff0cdc9901b5ff7bd8b31a15825') prepare() { mkdir build diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 636366fd4..bb2a7dab6 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.10.01.1 +pkgver=2013.10.04 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -28,5 +28,5 @@ package() { install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('d513e2a9a8eb7e117b685fc0e0ea99b9' +md5sums=('c0a295a474f07c3e052d9c046e774122' 'SKIP') -- cgit v1.2.3-54-g00ecf