summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
Diffstat (limited to 'community')
-rw-r--r--community/ccid/PKGBUILD10
-rw-r--r--community/fbv/PKGBUILD8
-rwxr-xr-xcommunity/geary/PKGBUILD23
-rw-r--r--community/klavaro/PKGBUILD6
-rw-r--r--community/libvirt/PKGBUILD26
-rw-r--r--community/lxpanel/PKGBUILD18
-rw-r--r--community/mplayer2/PKGBUILD67
-rw-r--r--community/mplayer2/giflib-5.0.patch111
-rw-r--r--community/mplayer2/mplayer2.install11
-rw-r--r--community/python-pillow/PKGBUILD14
-rw-r--r--community/python-pillow/pull325.diff38
-rw-r--r--community/rawstudio/PKGBUILD16
-rw-r--r--community/shotwell/PKGBUILD27
-rw-r--r--community/shotwell/libraw-0.15.2.patch33
-rw-r--r--community/shotwell/no-libexec.patch26
15 files changed, 61 insertions, 373 deletions
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 <giovanni@archlinux.org>
# Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
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 <pupykin.s+arch@gmail.com>
# Contributor: Aectann <aectann@infoline.su>
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 <alucryd at gmail dot com>
# Contributor : sebikul <sebikul@gmail.com>
# Contributor : Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
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 <l.jirkovsky@gmail.com>
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 <pupykin.s+arch@gmail.com>
# Contributor: Jonathan Wiersma <archaur at jonw dot org>
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 <nospam@bpiotrowski.pl>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
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 <nospam@bpiotrowski.pl>
-# Contributor: Martin Panter <vadmium+aur@gmail.com>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-
-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 <keenerd@gmail.com>
# 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 <pupykin.s+arch@gmail.com>
# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
# Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -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 <pupykin.s+arch@gmail.com>
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
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");
- }
- }
-