diff options
Diffstat (limited to 'extra')
127 files changed, 1440 insertions, 482 deletions
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index a2ed61a4a..53f6fdfb5 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181115 2013-03-31 19:16:36Z stephane $ +# $Id: PKGBUILD 184322 2013-05-06 06:46:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi -pkgver=1.9.1 -pkgrel=3 +pkgver=1.9.2 +pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') url='http://community.kde.org/KDE_PIM/Akonadi' @@ -13,7 +13,7 @@ depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f150d5e9b4776d683d0b1d64316f0276') +md5sums=('bdce288f4b91055d69f35c26dab276d0') build() { mkdir build diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index 204ceef99..b67790a53 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182774 2013-04-15 06:32:19Z tpowa $ +# $Id: PKGBUILD 184466 2013-05-07 10:49:12Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=alsa-lib pkgver=1.0.27 -pkgrel=1 +pkgrel=2 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -12,7 +12,20 @@ optdepends=('python2: for python smixer plugin') makedepends=('python2') license=('GPL') options=(!libtool) -source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2) +source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2 + alsa-lib-1.0.27-segfault.patch + alsa-lib-1.0.27-kernel.patch + alsa-lib-1.0.27-inline.patch + alsa-lib-1.0.27-inline2.patch) + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + # add upstream patches + patch -Np1 -i "$srcdir/alsa-lib-1.0.27-segfault.patch" + patch -Np1 -i "$srcdir/alsa-lib-1.0.27-kernel.patch" + patch -Np1 -i "$srcdir/alsa-lib-1.0.27-inline.patch" + patch -Np1 -i "$srcdir/alsa-lib-1.0.27-inline2.patch" +} build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,4 +37,8 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('f090c7dbd0fe57d786d82e411eac2d08') +md5sums=('f090c7dbd0fe57d786d82e411eac2d08' + '755cfcd116c28feac437eb6b5bdc51bb' + '277e2bc587de25e3294a0f597ae9246e' + 'db14deccb57d8dbcfc6f6d22bed45c1e' + '92ca1fec0cb99bfc302896cf9393a936') diff --git a/extra/alsa-lib/alsa-lib-1.0.27-inline.patch b/extra/alsa-lib/alsa-lib-1.0.27-inline.patch new file mode 100644 index 000000000..cc5cb8d75 --- /dev/null +++ b/extra/alsa-lib/alsa-lib-1.0.27-inline.patch @@ -0,0 +1,155 @@ +From 30122df4faf7ccc79b9525db95f55c5a8ed6fe4d Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai@suse.de> +Date: Thu, 25 Apr 2013 09:52:33 +0200 +Subject: [PATCH] Use __inline__ for exported headers + +Some programs are still using C90. + +Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=817077 +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + include/control.h | 4 ++-- + include/iatomic.h | 14 +++++++------- + include/pcm.h | 2 +- + include/pcm_extplug.h | 4 ++-- + include/use-case.h | 4 ++-- + 5 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/include/control.h b/include/control.h +index 27fe2ac..5fdf379 100644 +--- a/include/control.h ++++ b/include/control.h +@@ -234,7 +234,7 @@ int snd_ctl_open_lconf(snd_ctl_t **ctl, const char *name, int mode, snd_config_t + int snd_ctl_open_fallback(snd_ctl_t **ctl, snd_config_t *root, const char *name, const char *orig_name, int mode); + int snd_ctl_close(snd_ctl_t *ctl); + int snd_ctl_nonblock(snd_ctl_t *ctl, int nonblock); +-static inline int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); } ++static __inline__ int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); } + int snd_async_add_ctl_handler(snd_async_handler_t **handler, snd_ctl_t *ctl, + snd_async_callback_t callback, void *private_data); + snd_ctl_t *snd_async_handler_get_ctl(snd_async_handler_t *handler); +@@ -532,7 +532,7 @@ int snd_hctl_open(snd_hctl_t **hctl, const char *name, int mode); + int snd_hctl_open_ctl(snd_hctl_t **hctlp, snd_ctl_t *ctl); + int snd_hctl_close(snd_hctl_t *hctl); + int snd_hctl_nonblock(snd_hctl_t *hctl, int nonblock); +-static inline int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); } ++static __inline__ int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); } + int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl); + int snd_hctl_poll_descriptors(snd_hctl_t *hctl, struct pollfd *pfds, unsigned int space); + int snd_hctl_poll_descriptors_revents(snd_hctl_t *ctl, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); +diff --git a/include/iatomic.h b/include/iatomic.h +index e92dbfd..5711fe8 100644 +--- a/include/iatomic.h ++++ b/include/iatomic.h +@@ -980,7 +980,7 @@ static __inline__ int atomic_dec_and_test(volatile atomic_t *v) + return result; + } + +-static inline int atomic_add_negative(int i, volatile atomic_t *v) ++static __inline__ int atomic_add_negative(int i, volatile atomic_t *v) + { + unsigned long flags; + int result; +@@ -1160,36 +1160,36 @@ typedef struct { + + void snd_atomic_read_wait(snd_atomic_read_t *t); + +-static inline void snd_atomic_write_init(snd_atomic_write_t *w) ++static __inline__ void snd_atomic_write_init(snd_atomic_write_t *w) + { + w->begin = 0; + w->end = 0; + } + +-static inline void snd_atomic_write_begin(snd_atomic_write_t *w) ++static __inline__ void snd_atomic_write_begin(snd_atomic_write_t *w) + { + w->begin++; + wmb(); + } + +-static inline void snd_atomic_write_end(snd_atomic_write_t *w) ++static __inline__ void snd_atomic_write_end(snd_atomic_write_t *w) + { + wmb(); + w->end++; + } + +-static inline void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w) ++static __inline__ void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w) + { + r->write = w; + } + +-static inline void snd_atomic_read_begin(snd_atomic_read_t *r) ++static __inline__ void snd_atomic_read_begin(snd_atomic_read_t *r) + { + r->end = r->write->end; + rmb(); + } + +-static inline int snd_atomic_read_ok(snd_atomic_read_t *r) ++static __inline__ int snd_atomic_read_ok(snd_atomic_read_t *r) + { + rmb(); + return r->end == r->write->begin; +diff --git a/include/pcm.h b/include/pcm.h +index e440030..95b8aed 100644 +--- a/include/pcm.h ++++ b/include/pcm.h +@@ -451,7 +451,7 @@ int snd_pcm_poll_descriptors_count(snd_pcm_t *pcm); + int snd_pcm_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space); + int snd_pcm_poll_descriptors_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); + int snd_pcm_nonblock(snd_pcm_t *pcm, int nonblock); +-static inline int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); } ++static __inline__ int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); } + int snd_async_add_pcm_handler(snd_async_handler_t **handler, snd_pcm_t *pcm, + snd_async_callback_t callback, void *private_data); + snd_pcm_t *snd_async_handler_get_pcm(snd_async_handler_t *handler); +diff --git a/include/pcm_extplug.h b/include/pcm_extplug.h +index 884f322..e3b71bc 100644 +--- a/include/pcm_extplug.h ++++ b/include/pcm_extplug.h +@@ -188,7 +188,7 @@ int snd_pcm_extplug_set_slave_param_minmax(snd_pcm_extplug_t *extplug, int type, + /** + * set the parameter constraint with a single value + */ +-static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) ++static __inline__ int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) + { + return snd_pcm_extplug_set_param_list(extplug, type, 1, &val); + } +@@ -196,7 +196,7 @@ static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type + /** + * set the parameter constraint for slave PCM with a single value + */ +-static inline int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) ++static __inline__ int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) + { + return snd_pcm_extplug_set_slave_param_list(extplug, type, 1, &val); + } +diff --git a/include/use-case.h b/include/use-case.h +index defd4ea..93b3456 100644 +--- a/include/use-case.h ++++ b/include/use-case.h +@@ -354,7 +354,7 @@ int snd_use_case_mgr_reset(snd_use_case_mgr_t *uc_mgr); + * \param list Returned allocated list + * \return Number of list entries if success, otherwise a negative error code + */ +-static inline int snd_use_case_card_list(const char **list[]) ++static __inline__ int snd_use_case_card_list(const char **list[]) + { + return snd_use_case_get_list(NULL, NULL, list); + } +@@ -365,7 +365,7 @@ static inline int snd_use_case_card_list(const char **list[]) + * \param list Returned list of verbs + * \return Number of list entries if success, otherwise a negative error code + */ +-static inline int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr, ++static __inline__ int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr, + const char **list[]) + { + return snd_use_case_get_list(uc_mgr, "_verbs", list); +-- +1.7.11.7 + diff --git a/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch b/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch new file mode 100644 index 000000000..e99bae864 --- /dev/null +++ b/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch @@ -0,0 +1,28 @@ +From a8f405b8f90d752c3609b9e918dc949c4efadf87 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai@suse.de> +Date: Thu, 25 Apr 2013 09:55:49 +0200 +Subject: [PATCH] Add definition of __inline__ for non-GCC + +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + include/asoundlib-head.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h +index 6edbab0..71b5c29 100644 +--- a/include/asoundlib-head.h ++++ b/include/asoundlib-head.h +@@ -40,6 +40,10 @@ + #include <errno.h> + #include <stdarg.h> + ++#ifndef __GNUC__ ++#define __inline__ inline ++#endif ++ + #include <alsa/asoundef.h> + #include <alsa/version.h> + #include <alsa/global.h> +-- +1.7.11.7 + diff --git a/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch b/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch new file mode 100644 index 000000000..3d4eaf3cb --- /dev/null +++ b/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch @@ -0,0 +1,73 @@ +From 886f0cc3c274643de464e646535afb4ceee1d816 Mon Sep 17 00:00:00 2001 +From: Daniel Mack <zonque@gmail.com> +Date: Thu, 18 Apr 2013 10:37:50 +0200 +Subject: [PATCH] bring pcm.h and pcm.c in sync with the kernel list + +In particular, this adds definitions and descriptions for G.723 and +DSD types. + +Signed-off-by: Daniel Mack <zonque@gmail.com> +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + include/pcm.h | 14 +++++++++++++- + src/pcm/pcm.c | 12 ++++++++++++ + 2 files changed, 25 insertions(+), 1 deletion(-) + +diff --git a/include/pcm.h b/include/pcm.h +index d94ba90..e440030 100644 +--- a/include/pcm.h ++++ b/include/pcm.h +@@ -199,7 +199,19 @@ typedef enum _snd_pcm_format { + SND_PCM_FORMAT_U18_3LE, + /** Unsigned 18bit Big Endian in 3bytes format */ + SND_PCM_FORMAT_U18_3BE, +- SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_U18_3BE, ++ /* G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes */ ++ SND_PCM_FORMAT_G723_24, ++ /* G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte */ ++ SND_PCM_FORMAT_G723_24_1B, ++ /* G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes */ ++ SND_PCM_FORMAT_G723_40, ++ /* G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte */ ++ SND_PCM_FORMAT_G723_40_1B, ++ /* Direct Stream Digital (DSD) in 1-byte samples (x8) */ ++ SND_PCM_FORMAT_DSD_U8, ++ /* Direct Stream Digital (DSD) in 2-byte samples (x16) */ ++ SND_PCM_FORMAT_DSD_U16_LE, ++ SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_DSD_U16_LE, + + #if __BYTE_ORDER == __LITTLE_ENDIAN + /** Signed 16 bit CPU endian */ +diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c +index 2a87a7b..438fb3f 100644 +--- a/src/pcm/pcm.c ++++ b/src/pcm/pcm.c +@@ -1558,6 +1558,12 @@ static const char *const snd_pcm_format_names[] = { + FORMAT(S18_3BE), + FORMAT(U18_3LE), + FORMAT(U18_3BE), ++ FORMAT(G723_24), ++ FORMAT(G723_24_1B), ++ FORMAT(G723_40), ++ FORMAT(G723_40_1B), ++ FORMAT(DSD_U8), ++ FORMAT(DSD_U16_LE), + }; + + static const char *const snd_pcm_format_aliases[SND_PCM_FORMAT_LAST+1] = { +@@ -1611,6 +1617,12 @@ static const char *const snd_pcm_format_descriptions[] = { + FORMATD(S18_3BE, "Signed 18 bit Big Endian in 3bytes"), + FORMATD(U18_3LE, "Unsigned 18 bit Little Endian in 3bytes"), + FORMATD(U18_3BE, "Unsigned 18 bit Big Endian in 3bytes"), ++ FORMATD(G723_24, "G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes"), ++ FORMATD(G723_24_1B, "G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte"), ++ FORMATD(G723_40, "G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes"), ++ FORMATD(G723_40_1B, "G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte"), ++ FORMATD(DSD_U8, "Direct Stream Digital, 1-byte (x8), oldest bit in MSB"), ++ FORMATD(DSD_U16_LE, "Direct Stream Digital, 2-byte (x16), little endian, oldest bits in MSB"), + }; + + static const char *const snd_pcm_type_names[] = { +-- +1.7.11.7 + diff --git a/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch b/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch new file mode 100644 index 000000000..72df46185 --- /dev/null +++ b/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch @@ -0,0 +1,102 @@ +From e1e40c25535af35fa5cdf7ffc95a01fbff098ddd Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai@suse.de> +Date: Mon, 15 Apr 2013 18:12:17 +0200 +Subject: [PATCH] Fix doubly call of dlclose() in dlobj caching code + +When multiple dlobj_cache items point to the same dlobj, dlclose() may +be called wrongly multiple times when these items are cleared, because +we manage the dlobj_cache list as a flat list. This results in a bad +segfault we've seen in openal-soft, for example. + +For fixing this, we need the refcounting of dlobj itself. But, in +this case, we don't have to manage yet another list, since dlopen() +does a proper refcounting by itself. That is, we can just call always +dlopen() at each time a new function is assigned, and also call +dlclose() for each released dlobj_cache item at cleanup. + +Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=814250 + +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + src/dlmisc.c | 31 +++++++++++-------------------- + 1 file changed, 11 insertions(+), 20 deletions(-) + +diff --git a/src/dlmisc.c b/src/dlmisc.c +index 3788382..2de0234 100644 +--- a/src/dlmisc.c ++++ b/src/dlmisc.c +@@ -208,8 +208,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, + { + struct list_head *p; + struct dlobj_cache *c; +- void *func, *dlobj = NULL; +- int dlobj_close = 0; ++ void *func, *dlobj; + + snd_dlobj_lock(); + list_for_each(p, &pcm_dlobj_list) { +@@ -220,7 +219,6 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, + continue; + if (!lib && c->lib) + continue; +- dlobj = c->dlobj; + if (strcmp(c->name, name) == 0) { + c->refcnt++; + func = c->func; +@@ -228,17 +226,16 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, + return func; + } + } ++ ++ dlobj = snd_dlopen(lib, RTLD_NOW); + if (dlobj == NULL) { +- dlobj = snd_dlopen(lib, RTLD_NOW); +- if (dlobj == NULL) { +- if (verbose) +- SNDERR("Cannot open shared library %s", ++ if (verbose) ++ SNDERR("Cannot open shared library %s", + lib ? lib : "[builtin]"); +- snd_dlobj_unlock(); +- return NULL; +- } +- dlobj_close = 1; ++ snd_dlobj_unlock(); ++ return NULL; + } ++ + func = snd_dlsym(dlobj, name, version); + if (func == NULL) { + if (verbose) +@@ -257,8 +254,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, + free((void *)c->lib); + free(c); + __err: +- if (dlobj_close) +- snd_dlclose(dlobj); ++ snd_dlclose(dlobj); + snd_dlobj_unlock(); + return NULL; + } +@@ -298,16 +294,11 @@ void snd_dlobj_cache_cleanup(void) + struct list_head *p, *npos; + struct dlobj_cache *c; + +- /* clean up caches only when really no user is present */ + snd_dlobj_lock(); +- list_for_each(p, &pcm_dlobj_list) { +- c = list_entry(p, struct dlobj_cache, list); +- if (c->refcnt) +- goto unlock; +- } +- + list_for_each_safe(p, npos, &pcm_dlobj_list) { + c = list_entry(p, struct dlobj_cache, list); ++ if (c->refcnt) ++ continue; + list_del(p); + snd_dlclose(c->dlobj); + free((void *)c->name); /* shut up gcc warning */ +-- +1.7.11.7 + diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 40fa035c7..53e3e6a6d 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171940 2012-11-24 17:59:20Z giovanni $ +# $Id: PKGBUILD 184360 2013-05-06 19:36:35Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> @@ -6,7 +6,7 @@ pkgname=amule pkgver=10802 -pkgrel=1.1 +pkgrel=2 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') url="http://www.amule.org" diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 7682e6db2..dbe9af7b7 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182390 2013-04-09 21:23:22Z eric $ +# $Id: PKGBUILD 184361 2013-05-06 19:36:36Z foutrelis $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=6 +pkgrel=7 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index 13c45840d..fa091c893 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178617 2013-02-25 20:45:00Z andyrtr $ +# $Id: PKGBUILD 184362 2013-05-06 19:36:38Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo pkgver=1.12.14 -pkgrel=3 +pkgrel=4 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64 'mips64el') license=('LGPL' 'MPL') @@ -18,11 +18,16 @@ makedepends=('mesa>=9.1' 'mesa-libgl>=9.1' 'librsvg' 'gtk2' 'poppler-glib' 'libs provides=('cairo-xcb') replaces=('cairo-xcb') options=('!libtool') -source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15') +source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz + libpng16.patch) +sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15' + 'c9911f185637d266ce1d2985bd6fb7d0df3d75b2') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver + + patch -Np1 -i ../libpng16.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -50,8 +55,8 @@ build() { #} package() { - depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh') + depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh' 'lzo2') - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/cairo/libpng16.patch b/extra/cairo/libpng16.patch new file mode 100644 index 000000000..c16317811 --- /dev/null +++ b/extra/cairo/libpng16.patch @@ -0,0 +1,40 @@ +From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Tue, 16 Apr 2013 09:58:56 +0000 +Subject: png: Avoid marking the surface as in error after a png warning + +It turns out that libpng will continue to load an image after throwing a +warning, and that libpng16 now throws warnings for images that libpng15 +and earlier loaded without error. As we were happily loading those +images into cairo surfaces before, we are therefore being overzealous +in throwing an error now - so just squelch the warning. + +Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> +--- +diff --git a/src/cairo-png.c b/src/cairo-png.c +index e74a4a8..068617d 100644 +--- a/src/cairo-png.c ++++ b/src/cairo-png.c +@@ -149,13 +149,13 @@ static void + png_simple_warning_callback (png_structp png, + png_const_charp error_msg) + { +- cairo_status_t *error = png_get_error_ptr (png); +- +- /* default to the most likely error */ +- if (*error == CAIRO_STATUS_SUCCESS) +- *error = _cairo_error (CAIRO_STATUS_NO_MEMORY); +- +- /* png does not expect to abort and will try to tidy up after a warning */ ++ /* png does not expect to abort and will try to tidy up and continue ++ * loading the image after a warning. So we also want to return the ++ * (incorrect?) surface. ++ * ++ * We use our own warning callback to squelch any attempts by libpng ++ * to write to stderr as we may not be in control of that output. ++ */ + } + + +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/cairomm/PKGBUILD b/extra/cairomm/PKGBUILD index 8528e991e..d390f9a82 100644 --- a/extra/cairomm/PKGBUILD +++ b/extra/cairomm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148686 2012-02-05 11:46:52Z ibiru $ +# $Id: PKGBUILD 184363 2013-05-06 19:36:39Z foutrelis $ # Maintainer: Kevin <kevin@archlinux.org> # Contributor: criminy <criminy@gmail.com> pkgname=cairomm pkgver=1.10.0 -pkgrel=2.1 +pkgrel=3 pkgdesc="C++ bindings to Cairo vector graphics library" arch=('i686' 'x86_64' 'mips64el') url="http://www.cairographics.org" diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 3194bbae9..25086fd32 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183278 2013-04-20 16:41:10Z heftig $ +# $Id: PKGBUILD 184364 2013-05-06 19:36:46Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -18,7 +18,7 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.6.3 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD index ad85cb082..589080733 100644 --- a/extra/celestia/PKGBUILD +++ b/extra/celestia/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173170 2012-12-12 00:31:40Z eric $ +# $Id: PKGBUILD 184365 2013-05-06 19:36:48Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : Damir Perisa <damir.perisa@bluewin.ch> pkgname=celestia pkgver=1.6.1 -pkgrel=4 +pkgrel=5 pkgdesc="Real-time space simulation" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,33 +12,43 @@ url="http://www.shatters.net/celestia/" depends=('gtk2' 'libtheora' 'lua51' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg' 'mesa') options=('!makeflags') source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz" - 'celestia-1.6.1-gcc46.patch' + 'celestia-1.6.1-gcc46.patch' 'celestia-1.6.1-libpng15.patch' + 'celestia-1.6.1-libpng16.patch' 'celestia-1.6.1-linking.patch' 'gcc-4.7-fixes.diff') sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7' '7c08ca391603806d788cb8f3342acedafc924eef' '46ecc4e10b24191384bc848c206652498843adf0' + '6f357bd319cdac0776206726e0743b90d4d8127b' '534c8eee18d13a868c91f0b870ebecc05f3e7ae1' '582f9eed93eca02a16350f02c29e2ea6f69aa869') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} # build patch patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch" patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch" + patch -Np2 -i "${srcdir}/celestia-1.6.1-libpng16.patch" patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch" patch -Np1 -i "${srcdir}/gcc-4.7-fixes.diff" - # This version of Celestia has a bug in the font rendering and requires -fsigned-char - export CFLAGS="$CFLAGS -fsigned-char" - export CXXFLAGS="$CXXFLAGS -fsigned-char" + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in + + autoreconf -vi +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # This version of Celestia has a bug in the font rendering and requires -fsigned-char + CFLAGS+=' -fsigned-char' + CXXFLAGS+=' -fsigned-char' - autoreconf ./configure --prefix=/usr \ --with-lua=/usr \ - --datadir=/usr/share \ + --datadir=/usr/share \ --with-gtk \ --disable-rpath \ --with-lua @@ -48,6 +58,6 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} MKDIR_P='mkdir -p' install } diff --git a/extra/celestia/celestia-1.6.1-libpng16.patch b/extra/celestia/celestia-1.6.1-libpng16.patch new file mode 100644 index 000000000..78911cb55 --- /dev/null +++ b/extra/celestia/celestia-1.6.1-libpng16.patch @@ -0,0 +1,25 @@ +image.cpp:530:61: error: ‘memcpy’ was not declared in this scope + +https://bugs.gentoo.org/show_bug.cgi?id=464764 + +Patch written by Lars Wendler <polynomial-c@gentoo.org> +--- a/celestia/src/celengine/image.cpp ++++ b/celestia/src/celengine/image.cpp +@@ -42,6 +42,7 @@ extern "C" { + #include "jpeglib.h" + #else + #include <cstdio> ++#include <string.h> + #include <jpeglib.h> + #endif + } +--- a/celestia/src/celengine/texture.cpp ++++ b/celestia/src/celengine/texture.cpp +@@ -28,6 +28,7 @@ + #include <cstdlib> + #include <cstdio> + #include <cassert> ++#include <string.h> + + #ifndef _WIN32 + #ifndef TARGET_OS_MAC diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD index ed200c025..062225adf 100644 --- a/extra/cinepaint/PKGBUILD +++ b/extra/cinepaint/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 183279 2013-04-20 16:41:11Z heftig $ +# $Id: PKGBUILD 184367 2013-05-06 19:36:51Z foutrelis $ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] pkgname=cinepaint pkgver=1.3 -pkgrel=6 +pkgrel=8 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL' 'MIT') url="http://www.cinepaint.org" depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm') -makedepends=('python2' 'gutenprint>=5.2.9') +makedepends=('python2' 'gutenprint>=5.2.9' 'optipng') optdepends=('python2: for python plug-ins' 'gutenprint: for print plug-ins' 'ghostscript: for pdf plug-ins') @@ -35,6 +35,10 @@ prepare() { aclocal -I aclocal autoconf sh autogen.sh + + # Fix invalid PNG icons to work with libpng 1.6 + # Notified the CinePaint Project Manager (Robin Rowe) via email + find -name '*.png' -exec optipng -quiet -force -fix {} + } build() { diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 378680333..4217fbf8f 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180024 2013-03-14 20:15:45Z andrea $ +# $Id: PKGBUILD 184369 2013-05-06 19:36:56Z foutrelis $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') pkgver=3.1.0 -pkgrel=1 +pkgrel=4 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,11 +14,28 @@ url="http://www.digikam.org/" makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen' 'lensfun') -source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd') +source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + "digikam-3.1.0-htmlexport.patch" + "digikam-3.1.0-fixed-pngs.tar.gz") +noextract=("digikam-3.1.0-fixed-pngs.tar.gz") +sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd' + 'ef3ee0b6e56e692eb7c10cda5cd581d20c3c46bb' + 'b0a1991e0df9b72c79562c719bc9d944a3b8bc78') -build() { +prepare() { mkdir build + + cd ${pkgname}-${pkgver} + + # https://bugs.kde.org/show_bug.cgi?id=316620 + patch -Np1 -i "${srcdir}/digikam-3.1.0-htmlexport.patch" + + # Fix invalid PNG images to work with libpng 1.6 + # https://bugs.kde.org/show_bug.cgi?id=319350 + tar xf "${srcdir}/digikam-3.1.0-fixed-pngs.tar.gz" --strip-components=1 +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz b/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz Binary files differnew file mode 100644 index 000000000..cbd21446f --- /dev/null +++ b/extra/digikam/digikam-3.1.0-fixed-pngs.tar.gz diff --git a/extra/digikam/digikam-3.1.0-htmlexport.patch b/extra/digikam/digikam-3.1.0-htmlexport.patch new file mode 100644 index 000000000..c9e2ff365 --- /dev/null +++ b/extra/digikam/digikam-3.1.0-htmlexport.patch @@ -0,0 +1,15 @@ +--- digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-11 10:24:11.000000000 +0200 ++++ digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-13 00:15:05.539275132 +0200 +@@ -468,9 +468,9 @@ + # Currently the cmake module distributed w/ cmake uses a different variable + # name LIBXLST_EXSLT_LIBRARIES for libxeslt than the cmake modeule + # distributed w/ kdelibs LIBEXSLT_LIBRARIES. +- if (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES) +- set(LIBXSLT_EXSLT_LIBRARIES ${LIBXSLT_LIBRARIES}) +- endif (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES) ++ if (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES) ++ set(LIBXSLT_EXSLT_LIBRARIES ${LIBEXSLT_LIBRARIES}) ++ endif (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES) + IF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES) + ADD_SUBDIRECTORY(htmlexport) + ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES) diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD index afb0b16e0..faa374c8c 100644 --- a/extra/dvdauthor/PKGBUILD +++ b/extra/dvdauthor/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180308 2013-03-20 02:35:29Z eric $ +# $Id: PKGBUILD 184370 2013-05-06 19:36:57Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> @@ -6,7 +6,7 @@ pkgname=dvdauthor pkgver=0.7.1 -pkgrel=4 +pkgrel=5 pkgdesc="DVD authoring tools" arch=('i686' 'x86_64' 'mips64el') url="http://dvdauthor.sourceforge.net/" diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index 9d9e9657f..21c3f573e 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180309 2013-03-20 02:35:30Z eric $ +# $Id: PKGBUILD 184371 2013-05-06 19:36:58Z foutrelis $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs pkgver=24.3 -pkgrel=1 +pkgrel=2 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/emacs/emacs.html" diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index 6e2dfabfa..92615a9f2 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174827 2013-01-07 19:41:07Z ronald $ +# $Id: PKGBUILD 184372 2013-05-06 19:36:59Z foutrelis $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas pkgver=1.7.5 -pkgrel=1.1 +pkgrel=2 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD index 0983a84c9..0b137fe90 100644 --- a/extra/fbida/PKGBUILD +++ b/extra/fbida/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177938 2013-02-11 19:29:44Z eric $ +# $Id: PKGBUILD 184373 2013-05-06 19:37:00Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fbida pkgver=2.09 -pkgrel=1 +pkgrel=2 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran" arch=('i686' 'x86_64' 'mips64el') url="http://www.kraxel.org/blog/linux/fbida/" @@ -15,13 +15,17 @@ source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,. sha1sums=('5838b2cb7188481fece6159fccb3b121acd906e7' '18f5660301201326bd9426ce55e9fc217bf720d8') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} sed -i 's/ungif/gif/' GNUmakefile +} + +build() { + cd ${pkgname}-${pkgver} make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make STRIP="" DESTDIR="${pkgdir}" prefix=/usr install } diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index e49c98663..0f95ef0e6 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178053 2013-02-14 21:32:25Z bisson $ +# $Id: PKGBUILD 184374 2013-05-06 19:37:01Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=2.9.1 +pkgver=2.9.2 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' @@ -15,8 +15,8 @@ depends=('giblib' 'curl' 'libxinerama' 'libexif') optdepends=('perl: feh-cam, webcam wrapper for feh' 'imagemagick: support more file formats') makedepends=('libxt') -source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d6effb0bb3074315114b2590722fae9712a531ad') +source=("${url}${pkgname}-${pkgver}.tar.bz2"{,.asc}) +sha1sums=('4d7d183491f916c8f1db668065f986f4a845503e' 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD index 068bb2f74..1ae9e16e0 100644 --- a/extra/ffmpegthumbnailer/PKGBUILD +++ b/extra/ffmpegthumbnailer/PKGBUILD @@ -1,20 +1,27 @@ -# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $ +# $Id: PKGBUILD 184375 2013-05-06 19:37:03Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: boromil@gmail.com pkgname=ffmpegthumbnailer pkgver=2.0.8 -pkgrel=2 +pkgrel=3 pkgdesc="Lightweight video thumbnailer that can be used by file managers." url="http://code.google.com/p/ffmpegthumbnailer/" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('ffmpeg' 'libjpeg' 'libpng') optdepends=('gvfs: support for gio uris') -source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz") +source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz" + "ffmpegthumbnailer-2.0.8-memcpy.patch") options=('!libtool') -sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533') +sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533' + 'c23ef173f98c928fcacacd6e6060dab2e56f1239') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np0 -i "${srcdir}/ffmpegthumbnailer-2.0.8-memcpy.patch" +} build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8-memcpy.patch b/extra/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8-memcpy.patch new file mode 100644 index 000000000..5b9c68613 --- /dev/null +++ b/extra/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8-memcpy.patch @@ -0,0 +1,13 @@ +libffmpegthumbnailer/pngwriter.cpp: In function 'void ffmpegthumbnailer::writeDataCallback(png_structp, png_bytep, png_size_t)': +libffmpegthumbnailer/pngwriter.cpp:111:52: error: 'memcpy' was not declared in this scope + +--- libffmpegthumbnailer/pngwriter.cpp ++++ libffmpegthumbnailer/pngwriter.cpp +@@ -17,6 +17,7 @@ + #include "pngwriter.h" + #include <stdexcept> + #include <cassert> ++#include <cstring> + + using namespace std; + diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD index e42d88143..d1fe8c143 100644 --- a/extra/fltk/PKGBUILD +++ b/extra/fltk/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 173104 2012-12-11 02:30:13Z eric $ +# $Id: PKGBUILD 184377 2013-05-06 19:37:12Z foutrelis $ # Maintainer: pkgbase=fltk pkgname=('fltk' 'fltk-docs' 'fltk-games') pkgver=1.3.2 -pkgrel=1.1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom:LGPL') url="http://www.fltk.org/" makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \ 'alsa-lib' 'desktop-file-utils') -source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz) +source=(http://www.fltk.org/tars/releases/$pkgbase-$pkgver-source.tar.gz) md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d') build() { diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD index 166deaa04..f36057f7c 100644 --- a/extra/fvwm/PKGBUILD +++ b/extra/fvwm/PKGBUILD @@ -1,31 +1,28 @@ -# $Id: PKGBUILD 156673 2012-04-22 21:38:48Z eric $ +# $Id: PKGBUILD 184378 2013-05-06 19:37:15Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fvwm pkgver=2.6.5 -pkgrel=1 +pkgrel=2 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64' 'mips64el') url="http://www.fvwm.org" license=('GPL' 'custom') depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor') makedepends=('libxslt') -provides=('fvwm-devel') -conflicts=('fvwm-devel') -replaces=('fvwm-devel') options=('!emptydirs' '!makeflags') source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop) sha1sums=('c4cf96df65817d501b41c6fd79cf22658dd516a8' '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-stroke-library make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 sample.fvwmrc/{decor_examples,DecorMwm,DecorWin95,new-features,system.*} "${pkgdir}/usr/share/doc/fvwm" install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop" diff --git a/extra/gd/PKGBUILD b/extra/gd/PKGBUILD index ad03da4a5..004201ad0 100644 --- a/extra/gd/PKGBUILD +++ b/extra/gd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148724 2012-02-05 11:48:15Z ibiru $ +# $Id: PKGBUILD 184379 2013-05-06 19:37:20Z foutrelis $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=gd pkgver=2.0.36RC1 -pkgrel=5.2 +pkgrel=6 pkgdesc="Library for the dynamic creation of images by programmers" arch=('i686' 'x86_64' 'mips64el') url="http://www.libgd.org/" diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index 48c3b8ec4..8a61d7f96 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183361 2013-04-21 22:09:16Z heftig $ +# $Id: PKGBUILD 184380 2013-05-06 19:37:23Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gdk-pixbuf2 pkgver=2.28.1 -pkgrel=1 +pkgrel=2 pkgdesc="An image loading library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 658827ec7..8322d2d76 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183284 2013-04-20 16:41:17Z heftig $ +# $Id: PKGBUILD 184381 2013-05-06 19:37:25Z foutrelis $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gegl pkgver=0.2.0 -pkgrel=7 +pkgrel=8 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.gegl.org/" diff --git a/extra/gif2png/PKGBUILD b/extra/gif2png/PKGBUILD index 26ad7ed3b..d5269af36 100644 --- a/extra/gif2png/PKGBUILD +++ b/extra/gif2png/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 152849 2012-03-09 23:27:27Z giovanni $ +# $Id: PKGBUILD 184383 2013-05-06 19:37:29Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Andrew Rose <ody@netrux.com> pkgname=gif2png pkgver=2.5.8 -pkgrel=1.1 +pkgrel=2 pkgdesc="A GIF to PNG image format converter" arch=('i686' 'x86_64' 'mips64el') url="http://www.catb.org/~esr/gif2png/" diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD index 9a1a7d3f2..9e89aacba 100644 --- a/extra/gimp/PKGBUILD +++ b/extra/gimp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177592 2013-02-07 18:51:36Z daniel $ +# $Id: PKGBUILD 184384 2013-05-06 19:37:31Z foutrelis $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gimp pkgver=2.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gimp.org/" diff --git a/extra/glhack/PKGBUILD b/extra/glhack/PKGBUILD index bdd0a6a44..3e6d2a5c6 100644 --- a/extra/glhack/PKGBUILD +++ b/extra/glhack/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148744 2012-02-05 11:48:58Z ibiru $ +# $Id: PKGBUILD 184385 2013-05-06 19:37:33Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glhack pkgver=1.2 -pkgrel=6.1 +pkgrel=7 pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D" arch=('i686' 'x86_64' 'mips64el') url="http://glhack.sourceforge.net/" @@ -16,8 +16,8 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae' '4cf1a13e76cc1f1eb3708d42c74b85b7f321092d') -build(){ - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p0 -i ../glhack-libpng15.patch sed -i 's|/usr/lib/games|/usr/share|' include/config.h sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h @@ -25,22 +25,25 @@ build(){ sed -i -e 's|VARDIR = /var/lib/games/glhack|VARDIR = $(DESTDIR)/var/games/glhack|' Makefile sed -i -e 's|/usr/man/man6|$(DESTDIR)/usr/share/man/man6|' doc/Makefile sed -i -e 's|GAMEDIR = $(PREFIX)/lib/games/$(GAME)|GAMEDIR = $(PREFIX)/share/$(GAME)|' Makefile +} +build(){ + cd ${pkgname}-${pkgver} make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} install -d "${pkgdir}"/usr/share/man/man{5,6} make DESTDIR="$pkgdir" install install -D -m644 dat/license "${pkgdir}/usr/share/licenses/${pkgname}/license" # Renaming man pages which conflicts with nethack - cd "${pkgdir}/usr/share/man/man6" + pushd "${pkgdir}/usr/share/man/man6" for manpage in dgn_comp dlb lev_comp nethack recover; do mv $manpage.6 $manpage-glhack.6 done - cd "${srcdir}/${pkgname}-${pkgver}" + popd mv "${pkgdir}/usr/share/glhack/glhack" "${pkgdir}/usr/bin/glhack" mv "${pkgdir}/usr/share/glhack/recover_glhack" "${pkgdir}/usr/bin/recover_glhack" diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index fb2328f0a..6e74ca556 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183375 2013-04-21 22:09:45Z heftig $ +# $Id: PKGBUILD 184352 2013-05-06 17:20:30Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.8.1 +pkgver=3.8.1.5 pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) @@ -13,7 +13,8 @@ depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop gnome-menu libgtop network-manager-applet sound-theme-freedesktop upower libpwquality gnome-color-manager smbclient modemmanager) makedepends=(gnome-doc-utils intltool docbook-xsl) -optdepends=('gnome-user-share: Bluetooth and WebDAV file sharing' +optdepends=('system-config-printer: Printer settings' + 'gnome-user-share: Bluetooth and WebDAV file sharing' 'rygel: media sharing' 'vino: screen sharing' 'openssh: remote login') @@ -21,8 +22,8 @@ groups=(gnome) url="http://www.gnome.org" install=gnome-control-center.install options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('07d7d8e08af6a9ef01754814ecf2d006c58b94a096f0c6ad549c9d0051e4e57a') +source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha256sums=('6756a97eb8e89fe16bd5e50ab85d7f0e4e0fb7fa4e9df5ab49a97de03033d211') build() { cd $pkgname-$pkgver diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index d0a89d6e4..7490ad804 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183237 2013-04-19 00:40:14Z tomegun $ +# $Id: PKGBUILD 184760 2013-05-07 23:25:13Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Giacomo Rizzo <alt@free-os.it> pkgname=gpsd -pkgver=3.8 +pkgver=3.9 pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64' 'mips64el') @@ -74,6 +74,6 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -md5sums=('1a3177b907f25c0ce6d1a0aa22597270' +md5sums=('53a88f24a0973d23427e82e9a8914f19' 'SKIP' '3e963df3f9f7ef3572ecc648ae829315') diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index 7f2a55af9..eadbb0559 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179903 2013-03-11 15:24:45Z bisson $ +# $Id: PKGBUILD 184386 2013-05-06 19:37:35Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgname=graphicsmagick pkgver=1.3.18 -pkgrel=1 +pkgrel=2 pkgdesc='Image processing system' url='http://www.graphicsmagick.org/' arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 1a2728ae0..197b40c88 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180579 2013-03-23 23:09:33Z td123 $ +# $Id: PKGBUILD 184387 2013-05-06 19:37:39Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.30.1 -pkgrel=2.1 +pkgrel=3 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') @@ -34,9 +34,8 @@ sha1sums=('96739220c4bbcf1bd3bd52e7111f4e60497185c6' options=('!libtool') install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - sed \ -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-2.0.0/{$CARCH-linux,ruby/backward,})"'":' \ -e '/CONFIG/s:site:vendor:' \ @@ -45,7 +44,10 @@ build() { -e 's:ruby-1.9:ruby-2.0:g' \ -e '/LIBPOSTFIX="64"/d' \ -i configure +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=python2 export LUA=lua5.1 diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD index 1ead8c8ef..ed95af3df 100644 --- a/extra/gst-plugins-good/PKGBUILD +++ b/extra/gst-plugins-good/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183687 2013-04-26 16:06:47Z heftig $ +# $Id: PKGBUILD 184388 2013-05-06 19:37:41Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-good pkgver=1.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Good Plugins" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD index eca4778b8..157a4b8a9 100644 --- a/extra/gstreamer0.10-good/PKGBUILD +++ b/extra/gstreamer0.10-good/PKGBUILD @@ -1,22 +1,31 @@ -# $Id: PKGBUILD 153259 2012-03-12 16:05:31Z jgc $ +# $Id: PKGBUILD 184390 2013-05-06 19:37:46Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') pkgver=0.10.31 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') +makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev' 'gtk-doc') url="http://gstreamer.freedesktop.org/" options=(!libtool !emptydirs) -source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz) -sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64') +source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz + linux-3.6.patch) +sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64' + 'd14a9ebfdbff69a3dd27057d764ad0c68f62aa6ae9f20bb62a0d09b29c0c2cfe') -build() { +prepare() { cd "${srcdir}/gst-plugins-good-${pkgver}" + # https://bugzilla.gnome.org/show_bug.cgi?id=681491 + patch -Np1 -i "${srcdir}/linux-3.6.patch" sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + ./autogen.sh +} + +build() { + cd "${srcdir}/gst-plugins-good-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --disable-schemas-install \ diff --git a/extra/gstreamer0.10-good/linux-3.6.patch b/extra/gstreamer0.10-good/linux-3.6.patch new file mode 100644 index 000000000..aad179198 --- /dev/null +++ b/extra/gstreamer0.10-good/linux-3.6.patch @@ -0,0 +1,31 @@ +From bfb1ac952b4c3caaba0297bbe7dc73ea92f9b292 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Thu, 09 Aug 2012 07:35:23 +0000 +Subject: v4l2: fix build with recent kernels, the v4l2_buffer input field was removed + +This was unused apparently and removed in the kernel in commit: + + From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001 + From: Sakari Ailus <sakari.ailus@iki.fi> + Date: Wed, 2 May 2012 09:40:03 -0300 + Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT + + Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which + tells the former is valid. The flag is used by no driver currently. + +https://bugzilla.gnome.org/show_bug.cgi?id=681491 +--- +diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c +index 2e3a563..5aaed5a 100644 +--- a/sys/v4l2/gstv4l2bufferpool.c ++++ b/sys/v4l2/gstv4l2bufferpool.c +@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps) + GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", + ret->vbuffer.m.offset); + GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); +- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); + + ret->mmap_length = ret->vbuffer.length; + data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index ada1ec556..1f755c466 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183415 2013-04-21 22:10:51Z heftig $ +# $Id: PKGBUILD 184391 2013-05-06 19:37:48Z foutrelis $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb pkgver=3.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64 mips64el) license=(GPL) diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 5ad82dddc..7f91356de 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183285 2013-04-20 16:41:18Z heftig $ +# $Id: PKGBUILD 184392 2013-05-06 19:37:52Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -6,7 +6,7 @@ pkgname=hugin pkgver=2012.0.0 -pkgrel=5 +pkgrel=6 pkgdesc='Panorama photo stitcher' url='http://hugin.sourceforge.net/' license=('GPL') diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index 64ad7fd10..eee6629cf 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.3.2 +pkgver=1.4 pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" @@ -11,7 +11,7 @@ license=('GPL2') makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) -md5sums=('94ce02c42c1e4d1411357fb3c1014f67') +sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 86f548a60..3dc5e716c 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183287 2013-04-20 16:41:21Z heftig $ +# $Id: PKGBUILD 184393 2013-05-06 19:37:55Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.4.10 +pkgver=6.8.5.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -13,18 +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=('8d5529f35f624b83ad925958c977a381ab30c0f7' +sha1sums=('84be2c2fa42cefdf1d7e6cb3a6c73163e2007653' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + cd 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##*.} + cd 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 \ @@ -35,7 +35,7 @@ build() { } check() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + cd ImageMagick-${pkgver%.*}-${pkgver##*.} make check } @@ -64,7 +64,7 @@ package_imagemagick() { "etc/ImageMagick-${pkgver%%.*}/type-windows.xml") options=('!docs' 'libtool' '!emptydirs') - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + cd ImageMagick-${pkgver%.*}-${pkgver##*.} make -j1 DESTDIR="${pkgdir}" install install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" @@ -76,7 +76,7 @@ package_imagemagick() { package_imagemagick-doc() { pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + cd ImageMagick-${pkgver%.*}-${pkgver##*.} make DESTDIR="${pkgdir}" install-data-html install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE" install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE" diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD index 18f4c9140..d81c0360f 100644 --- a/extra/imlib/PKGBUILD +++ b/extra/imlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148786 2012-02-05 11:50:28Z ibiru $ +# $Id: PKGBUILD 184394 2013-05-06 19:37:57Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=imlib pkgver=1.9.15 -pkgrel=11.2 +pkgrel=12 pkgdesc="General image handling library for X11 and Gtk" arch=('i686' 'x86_64' 'mips64el') url="http://freshmeat.net/projects/imlib/" @@ -19,8 +19,8 @@ sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' 'af54cb1ee0c8c6122b277284ebdd1022e31df3b5' '33c3aaa43eb624f2a6ab0406285a8515903333e3') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/debian-bug448360.patch" patch -p1 -i "${srcdir}/CAN-2004-1026.patch" patch -p0 -i "${srcdir}/aclocal-fixes.patch" @@ -28,6 +28,10 @@ build() { sed '/AC_PATH_XTRA/d' -i configure.in libtoolize --force cp /usr/bin/libtool . +} + +build() { + cd ${pkgname}-${pkgver} autoreconf --force --install ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm --disable-static sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool @@ -35,6 +39,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD index dd77dbdac..f042719d0 100644 --- a/extra/imlib2/PKGBUILD +++ b/extra/imlib2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148788 2012-02-05 11:50:31Z ibiru $ +# $Id: PKGBUILD 184395 2013-05-06 19:37:59Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Arjan Timmerman <arjan.archlinux.org> # Contributor: Tom Newsom <Jeepster.gmx.co.uk> pkgname=imlib2 pkgver=1.4.5 -pkgrel=2.2 +pkgrel=4 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index fe21db8e1..7b2777482 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183288 2013-04-20 16:41:22Z heftig $ +# $Id: PKGBUILD 184396 2013-05-06 19:38:01Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> pkgname=inkscape pkgver=0.48.4 -pkgrel=6 +pkgrel=7 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') @@ -20,38 +20,36 @@ 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 - inkscape-0.48.4-spuriouscomma.patch) +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'spuriouscomma.patch') sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' '7d1d5a6d1d2b0926721a994d5889c52890fc57c1') install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - - # fix FTBS, patch taken from FC - patch -Np0 -i ${srcdir}/inkscape-0.48.4-spuriouscomma.patch - + patch -p0 -i ../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 sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py sed -i 's|"python"|"python2"|g' src/main.cpp +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --with-python \ --with-perl \ --enable-lcms \ --enable-poppler-cairo \ - --disable-dependency-tracking \ - + --disable-dependency-tracking make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install } diff --git a/extra/inkscape/inkscape-0.48.4-spuriouscomma.patch b/extra/inkscape/spuriouscomma.patch index bc538068f..bc538068f 100644 --- a/extra/inkscape/inkscape-0.48.4-spuriouscomma.patch +++ b/extra/inkscape/spuriouscomma.patch diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index b73b5eedc..564bd8f5e 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183615 2013-04-25 15:56:01Z andyrtr $ +# $Id: PKGBUILD 184397 2013-05-06 19:38:04Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index f31ea3cfc..c8b334049 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181887 2013-04-05 08:54:31Z svenstaro $ +# $Id: PKGBUILD 184398 2013-05-06 19:38:08Z foutrelis $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -14,8 +14,8 @@ groups=('kde') # note on libxdamage: # not detected by namcap because libgl depends on it # but nvidia providing libgl does not depend on libxdamage -depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' - 'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage' +depends=("kdelibs>=${pkgver}" 'kdepim-runtime' 'lm_sensors' 'libraw1394' + 'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage' 'libqalculate' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'xorg-xrdb' 'libxres' 'xorg-xrandr' 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork' 'xcb-util-renderutil' 'xcb-util-image' 'ttf-font') diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index cf66051ce..926783b65 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181972 2013-04-05 08:56:32Z svenstaro $ +# $Id: PKGBUILD 184399 2013-05-06 19:38:10Z foutrelis $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview pkgver=4.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,6 @@ source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz" sha1sums=('6872a50b2fda3bed717e0fc1b367b02ad80550dd') build() { - cd "${srcdir}" mkdir build cd build cmake ../gwenview-${pkgver} \ @@ -28,6 +27,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/lbreakout2/PKGBUILD b/extra/lbreakout2/PKGBUILD index fef07448e..03144c063 100644 --- a/extra/lbreakout2/PKGBUILD +++ b/extra/lbreakout2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162793 2012-06-30 14:10:06Z giovanni $ +# $Id: PKGBUILD 184401 2013-05-06 19:38:14Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=lbreakout2 pkgver=2.6.4 -pkgrel=1.1 +pkgrel=2 pkgdesc="A breakout game with nice effects, graphics, and sounds" arch=('i686' 'x86_64' 'mips64el') url="http://lgames.sourceforge.net" diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD index 50688d4a1..8a6d1e1eb 100644 --- a/extra/libgdiplus/PKGBUILD +++ b/extra/libgdiplus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171478 2012-11-18 00:00:45Z eric $ +# $Id: PKGBUILD 184402 2013-05-06 19:38:19Z foutrelis $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=libgdiplus pkgver=2.10 -pkgrel=3.1 +pkgrel=4 pkgdesc="An Open Source Implementation of the GDI+ API" arch=(i686 x86_64 'mips64el') license=('MPL' 'LGPL') diff --git a/extra/libgxps/PKGBUILD b/extra/libgxps/PKGBUILD index bb661a5b8..9ef1a03ab 100644 --- a/extra/libgxps/PKGBUILD +++ b/extra/libgxps/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179109 2013-03-03 17:28:36Z dreisner $ +# $Id: PKGBUILD 184403 2013-05-06 19:38:20Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libgxps pkgver=0.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="XPS Documents library" arch=(i686 x86_64 'mips64el') url="https://live.gnome.org/libgxps" diff --git a/extra/libkate/PKGBUILD b/extra/libkate/PKGBUILD index 8212c746c..3e2f79409 100644 --- a/extra/libkate/PKGBUILD +++ b/extra/libkate/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151102 2012-02-24 21:57:31Z giovanni $ +# $Id: PKGBUILD 184404 2013-05-06 19:38:23Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: N30N <archlinux@alunamation.com> # Contributor: linkmauve <linkmauve@linkmauve.fr> @@ -6,7 +6,7 @@ pkgname=libkate pkgver=0.4.1 -pkgrel=3.2 +pkgrel=4 pkgdesc="A karaoke and text codec for embedding in ogg" url="http://libkate.googlecode.com/" license=('BSD') diff --git a/extra/libpano13/PKGBUILD b/extra/libpano13/PKGBUILD index d716e70a2..e40504be1 100644 --- a/extra/libpano13/PKGBUILD +++ b/extra/libpano13/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 148830 2012-02-05 11:52:01Z ibiru $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id: PKGBUILD 184405 2013-05-06 19:38:25Z foutrelis $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libpano13 pkgver=2.9.18 -pkgrel=2 -pkgdesc="Basic library to calculate panoramical pictures - core functions of the panotools" -arch=('i686' 'x86_64' 'mips64el') -url="http://panotools.sourceforge.net/" +pkgrel=3 +pkgdesc='Basic library to calculate panoramical pictures - core functions of the panotools' +url='http://panotools.sourceforge.net/' +arch=('i686' 'x86_64') license=('GPL2') depends=('libpng' 'libtiff') -makedepends=('openjdk6') +makedepends=('jdk7-openjdk') +source=("http://downloads.sourceforge.net/sourceforge/panotools/${pkgname}-${pkgver}.tar.gz") +sha1sums=('23849bdbdfc9176a2b53d157e58bd24aa0e7276e') + options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/panotools/${pkgname}-${pkgver}.tar.gz) -md5sums=('9c3a4fce8b6f1d79e395896ce5d8776e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --with-java=${JAVA_HOME} - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man --with-java=${JAVA_HOME} + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch b/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch new file mode 100644 index 000000000..e67728051 --- /dev/null +++ b/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch @@ -0,0 +1,106 @@ +From 56d6bc2e8855d25e03816509a0137c3a70410ae6 Mon Sep 17 00:00:00 2001 +From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net> +Date: Mon, 29 Apr 2013 08:57:14 -0500 +Subject: [PATCH 06/10] [libpng16] Avoid dereferencing NULL pointer possibly + returned from + +png_create_write_struct() (Andrew Church). +--- + ANNOUNCE | 6 ++++-- + CHANGES | 4 +++- + pngwrite.c | 65 +++++++++++++++++++++++++++++++------------------------------- + 3 files changed, 39 insertions(+), 36 deletions(-) + + (foutrelis: pruned non-code changes to apply cleanly to libpng 1.6.2.) + +diff --git a/pngwrite.c b/pngwrite.c +index 33924aa..b71a3d3 100644 +--- a/pngwrite.c ++++ b/pngwrite.c +@@ -494,51 +494,50 @@ png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr, + png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr, + error_fn, warn_fn, mem_ptr, malloc_fn, free_fn); + #endif /* PNG_USER_MEM_SUPPORTED */ ++ if (png_ptr != NULL) ++ { ++ /* Set the zlib control values to defaults; they can be overridden by the ++ * application after the struct has been created. ++ */ ++ png_ptr->zbuffer_size = PNG_ZBUF_SIZE; + +- /* Set the zlib control values to defaults; they can be overridden by the +- * application after the struct has been created. +- */ +- png_ptr->zbuffer_size = PNG_ZBUF_SIZE; +- +- /* The 'zlib_strategy' setting is irrelevant because png_default_claim in +- * pngwutil.c defaults it according to whether or not filters will be used, +- * and ignores this setting. +- */ +- png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY; +- png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION; +- png_ptr->zlib_mem_level = 8; +- png_ptr->zlib_window_bits = 15; +- png_ptr->zlib_method = 8; ++ /* The 'zlib_strategy' setting is irrelevant because png_default_claim in ++ * pngwutil.c defaults it according to whether or not filters will be ++ * used, and ignores this setting. ++ */ ++ png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY; ++ png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION; ++ png_ptr->zlib_mem_level = 8; ++ png_ptr->zlib_window_bits = 15; ++ png_ptr->zlib_method = 8; + + #ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED +- png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY; +- png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION; +- png_ptr->zlib_text_mem_level = 8; +- png_ptr->zlib_text_window_bits = 15; +- png_ptr->zlib_text_method = 8; ++ png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY; ++ png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION; ++ png_ptr->zlib_text_mem_level = 8; ++ png_ptr->zlib_text_window_bits = 15; ++ png_ptr->zlib_text_method = 8; + #endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */ + +- /* This is a highly dubious configuration option; by default it is off, but +- * it may be appropriate for private builds that are testing extensions not +- * conformant to the current specification, or of applications that must not +- * fail to write at all costs! +- */ +-# ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED ++ /* This is a highly dubious configuration option; by default it is off, ++ * but it may be appropriate for private builds that are testing ++ * extensions not conformant to the current specification, or of ++ * applications that must not fail to write at all costs! ++ */ ++#ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED + png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN; + /* In stable builds only warn if an application error can be completely + * handled. + */ +-# endif ++#endif + +- /* App warnings are warnings in release (or release candidate) builds but +- * are errors during development. +- */ +-# if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC ++ /* App warnings are warnings in release (or release candidate) builds but ++ * are errors during development. ++ */ ++#if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC + png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN; +-# endif ++#endif + +- if (png_ptr != NULL) +- { + /* TODO: delay this, it can be done in png_init_io() (if the app doesn't + * do it itself) avoiding setting the default function if it is not + * required. +-- +1.8.2.2 + diff --git a/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch b/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch new file mode 100644 index 000000000..0a305c150 --- /dev/null +++ b/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch @@ -0,0 +1,133 @@ +From 127b08a265f99ce517ea31ec7988a91fc17da4d9 Mon Sep 17 00:00:00 2001 +From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net> +Date: Sun, 5 May 2013 22:13:47 -0500 +Subject: [PATCH 09/10] [libpng16] Calculate our own zlib windowBits when + decoding rather than + +trusting the CMF bytes in the PNG datastream. +--- + ANNOUNCE | 6 +++-- + CHANGES | 5 +++- + pngrutil.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- + 3 files changed, 88 insertions(+), 10 deletions(-) + + (foutrelis: pruned non-code changes to apply cleanly to libpng 1.6.2.) + +diff --git a/pngrutil.c b/pngrutil.c +index 01c3679..9c10e26 100644 +--- a/pngrutil.c ++++ b/pngrutil.c +@@ -18,8 +18,6 @@ + + #ifdef PNG_READ_SUPPORTED + +-#define png_strtod(p,a,b) strtod(a,b) +- + png_uint_32 PNGAPI + png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf) + { +@@ -4165,6 +4163,75 @@ png_read_finish_row(png_structrp png_ptr) + } + #endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ + ++#ifdef PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED ++/* This is the code to to select a windowBits value to match the smallest ++ * possible sliding window needed to contain the entire uncompressed image. ++ */ ++static unsigned int ++required_window_bits(png_alloc_size_t data_size) ++{ ++ unsigned int windowBits = 15; ++ if (data_size <= 16384) /* else windowBits must be 15 */ ++ { ++ unsigned int half_z_window_size = 1U << (windowBits-1); /* 16384 */ ++ ++ do ++ { ++ half_z_window_size >>= 1; ++ --windowBits; ++ } ++ while (windowBits > 8 && data_size <= half_z_window_size); ++ } ++ return windowBits; ++} ++/* This is used below to find the size of an image to pass to png_deflate_claim, ++ * so it only needs to be accurate if the size is less than 16384 bytes (the ++ * point at which a lower LZ window size can be used.) ++ * ++ * To do: merge this with png_image_size() in pngwutil.c and put the result ++ * in png.c as a PNG_INTERNAL_FUNCTION. ++ */ ++static png_alloc_size_t ++png_read_image_size(png_structrp png_ptr) ++{ ++ /* Only return sizes up to the maximum of a png_uint_32, do this by limiting ++ * the width and height used to 15 bits. ++ */ ++ png_uint_32 h = png_ptr->height; ++ ++ if (png_ptr->rowbytes < 32768 && h < 32768) ++ { ++ if (png_ptr->interlaced) ++ { ++ /* Interlacing makes the image larger because of the replication of ++ * both the filter byte and the padding to a byte boundary. ++ */ ++ png_uint_32 w = png_ptr->width; ++ unsigned int pd = png_ptr->pixel_depth; ++ png_alloc_size_t cb_base; ++ int pass; ++ ++ for (cb_base=0, pass=0; pass<=6; ++pass) ++ { ++ png_uint_32 pw = PNG_PASS_COLS(w, pass); ++ ++ if (pw > 0) ++ cb_base += (PNG_ROWBYTES(pd, pw)+1) * PNG_PASS_ROWS(h, pass); ++ } ++ ++ return cb_base; ++ } ++ ++ else ++ return (png_ptr->rowbytes+1) * h; ++ } ++ ++ else ++ return 0xffffffffU; ++} ++ ++#endif /* PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED */ ++ + void /* PRIVATE */ + png_read_start_row(png_structrp png_ptr) + { +@@ -4449,14 +4516,20 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) + png_free(png_ptr, buffer); + } + +- /* Finally claim the zstream for the inflate of the IDAT data, use the bits +- * value from the stream (note that this will result in a fatal error if the +- * IDAT stream has a bogus deflate header window_bits value, but this should +- * not be happening any longer!) ++ /* Finally claim the zstream for the inflate of the IDAT data, using the ++ * windowBts predicted from the uncompressed data size, not the value from ++ * the stream. If READ_OPTIMIZE_WINDOWBITS_SUPPORTED is not defined, then ++ * simply use a 32kbyte window (windowBits=15). + */ +- if (png_inflate_claim(png_ptr, png_IDAT, 0) != Z_OK) ++#ifdef PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED ++ if (png_inflate_claim(png_ptr, png_IDAT, ++ required_window_bits(png_read_image_size(png_ptr))) != Z_OK) ++#else ++ if (png_inflate_claim(png_ptr, png_IDAT, 15) != Z_OK) ++#endif + png_error(png_ptr, png_ptr->zstream.msg); + + png_ptr->flags |= PNG_FLAG_ROW_INIT; + } ++ + #endif /* PNG_READ_SUPPORTED */ +-- +1.8.2.2 + diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index 90581e839..bf803f20e 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 182372 2013-04-09 18:14:06Z ioni $ +# $Id: PKGBUILD 184406 2013-05-06 19:38:28Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.5.15 -_apngver=1.5.15 -pkgrel=1 +pkgver=1.6.2 +_apngver=1.6.2 +pkgrel=3 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64' 'mips64el') url="http://www.libpng.org/pub/png/libpng.html" @@ -15,16 +15,31 @@ license=('custom') depends=('zlib' 'sh') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" - "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz") -md5sums=('e3122e7b5b5c36c034a4624c65f8a9d8' - '3ae9ea7e4bd201f0b25e25cd6049b094') + "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz" + 0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch + 0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch + adjust-apng-patch-for-libpng16-git-changes.patch) +md5sums=('9d838f6fca9948a9f360a0cc1b516d5f' + '7d0c9f4b9a7f45dd5d1088e54b623c98' + '59b83234f60a7d1d179d9b0b6a0ebc01' + 'b1f7922b6678305bdb7c23d5bd1763f3' + 'f87704c3fb6d29f09b52178e89a42e2e') -build() { +prepare() { cd $pkgname-$pkgver + # Add fixes from libpng16 branch + patch -Np1 -i ../0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch + patch -Np1 -i ../0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch + # Add animated PNG (apng) support # see http://sourceforge.net/projects/libpng-apng/ - patch -p1 -i ../libpng-$_apngver-apng.patch + patch -d .. -Np0 -i adjust-apng-patch-for-libpng16-git-changes.patch + patch -Np1 -i ../libpng-$_apngver-apng.patch +} + +build() { + cd $pkgname-$pkgver ./configure --prefix=/usr make diff --git a/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch b/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch new file mode 100644 index 000000000..26ac1c1cf --- /dev/null +++ b/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch @@ -0,0 +1,19 @@ +--- libpng-1.6.2-apng.patch.orig 2013-05-06 12:09:16.000000000 +0300 ++++ libpng-1.6.2-apng.patch 2013-05-06 12:12:14.000000000 +0300 +@@ -1034,7 +1034,7 @@ diff -Naru libpng-1.6.2.org/pngrutil.c l + + if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) + png_chunk_benign_error(png_ptr, "Extra compressed data"); +-@@ -4459,4 +4671,80 @@ ++@@ -4459,5 +4671,81 @@ + + png_ptr->flags |= PNG_FLAG_ROW_INIT; + } +@@ -1114,6 +1114,7 @@ diff -Naru libpng-1.6.2.org/pngrutil.c l + +} + +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ + +#endif /* PNG_READ_APNG_SUPPORTED */ ++ + #endif /* PNG_READ_SUPPORTED */ + diff -Naru libpng-1.6.2.org/pngset.c libpng-1.6.2/pngset.c + --- libpng-1.6.2.org/pngset.c 2013-04-29 17:31:42.000000000 +0900 diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index e3be4a21c..eca20ebf2 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183292 2013-04-20 16:41:28Z heftig $ +# $Id: PKGBUILD 184407 2013-05-06 19:38:32Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> 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=3 +pkgrel=4 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index 86a7df1e0..d0b9a8f08 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183436 2013-04-21 22:11:30Z heftig $ +# $Id: PKGBUILD 184408 2013-05-06 19:38:35Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg pkgver=2.37.0 -pkgrel=1 +pkgrel=2 pkgdesc="A SVG viewing library" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD index dfb345317..ae57ce964 100644 --- a/extra/libwebp/PKGBUILD +++ b/extra/libwebp/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 181251 2013-04-02 15:58:04Z heftig $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# $Id: PKGBUILD 184409 2013-05-06 19:38:39Z foutrelis $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=libwebp pkgver=0.3.0 -pkgrel=1 +pkgrel=3 pkgdesc="WebP library and conversion tools" arch=('x86_64' 'i686' 'mips64el') url="https://developers.google.com/speed/webp/" -license=('BSD') -depends=('libpng' 'libjpeg') +license=(BSD) +depends=(libpng libjpeg libtiff giflib) options=('!libtool') source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz") sha256sums=('8903fca40ece603b9cb20d32105168da7e2a33bebbd4d89001a3c8741ef03ddb') @@ -17,7 +18,13 @@ sha256sums=('8903fca40ece603b9cb20d32105168da7e2a33bebbd4d89001a3c8741ef03ddb') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr \ + --enable-swap-16bit-csp \ + --enable-experimental \ + --enable-libwebpmux \ + --enable-libwebpdemux \ + --enable-libwebpdecoder \ + --disable-static make } diff --git a/extra/libwmf/PKGBUILD b/extra/libwmf/PKGBUILD index e191aa27f..59f1f85ba 100644 --- a/extra/libwmf/PKGBUILD +++ b/extra/libwmf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148846 2012-02-05 11:52:43Z ibiru $ +# $Id: PKGBUILD 184410 2013-05-06 19:38:42Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libwmf pkgver=0.2.8.4 -pkgrel=9.2 +pkgrel=10 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)" arch=('i686' 'x86_64' 'mips64el') url="http://wvware.sourceforge.net/libwmf.html" @@ -19,19 +19,23 @@ sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' '42aa4c2a82e4e14044c875a7f439baea732a355a' 'ea6d28880840e86c96f9079bfd591da54dcffa5c') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/libwmf-0.2.8.4-libpng-1.5.patch" patch -p1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch" +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --with-gsfontdir=/usr/share/fonts/Type1 \ --with-fontdir=/usr/share/fonts/Type1 \ - --with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS + --with-gsfontmap=/usr/share/ghostscript/9.07/Resource/Init/Fontmap.GS make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install #Remove fonts, these are in gsfonts rm -rf "${pkgdir}/usr/share/fonts" diff --git a/extra/libwmf/libwmf.install b/extra/libwmf/libwmf.install index 9c99a901b..e5b846fc7 100644 --- a/extra/libwmf/libwmf.install +++ b/extra/libwmf/libwmf.install @@ -1,5 +1,6 @@ post_install() { if [ -x usr/bin/gdk-pixbuf-query-loaders ]; then + install -d etc/gtk-2.0 gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders fi } diff --git a/extra/libxslt/PKGBUILD b/extra/libxslt/PKGBUILD index e2795a53a..b441e2306 100644 --- a/extra/libxslt/PKGBUILD +++ b/extra/libxslt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149384 2012-02-07 12:34:45Z jgc $ +# $Id: PKGBUILD 184790 2013-05-08 14:12:44Z bpiotrowski $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=libxslt -pkgver=1.1.26 -pkgrel=3.2 +pkgver=1.1.28 +pkgrel=1 pkgdesc="XML stylesheet transformation library" arch=('i686' 'x86_64' 'mips64el') url="http://xmlsoft.org/XSLT/" @@ -13,14 +13,11 @@ depends=('libxml2' 'libgcrypt') makedepends=('python2') checkdepends=('docbook-xml') options=('!libtool') -source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz - CVE-2011-1202.patch) -md5sums=('e61d0364a30146aaa3001296f853b2b9' - 'ce9744943575efaa6b5501668899b753') +source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz) +md5sums=('9667bf6f9310b957254fdcf6596600b7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/CVE-2011-1202.patch" sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py ./configure --prefix=/usr --with-python=/usr/bin/python2 make diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD index 2aa2477d9..f2a4f89ac 100644 --- a/extra/mjpegtools/PKGBUILD +++ b/extra/mjpegtools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148854 2012-02-05 11:52:58Z ibiru $ +# $Id: PKGBUILD 184411 2013-05-06 19:38:45Z foutrelis $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Maintainer: Roberto Carvajal <roberto@archlinux.org> pkgname=mjpegtools pkgver=2.0.0 -pkgrel=2.2 +pkgrel=3 pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -15,20 +15,27 @@ optdepends=('gtk2: glav GUI') options=('!makeflags' '!libtool') install=mjpegtools.install source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz - mjpegtools-v4l-2.6.38.patch) + mjpegtools-v4l-2.6.38.patch + mjpegtools-2.0.0-gcc470.patch) md5sums=('903e1e3b967eebcc5fe5626d7517dc46' - '44006d6f844017fe57aa123aa43f4508') + '44006d6f844017fe57aa123aa43f4508' + '7c9b3d4a1f3a10e3263a6a110b0f55cc') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch" + patch -Np1 -i "${srcdir}/mjpegtools-2.0.0-gcc470.patch" sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --enable-largefile CXXFLAGS="$CXXFLAGS -fpermissive" make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/" } diff --git a/extra/mjpegtools/mjpegtools-2.0.0-gcc470.patch b/extra/mjpegtools/mjpegtools-2.0.0-gcc470.patch new file mode 100644 index 000000000..050b33feb --- /dev/null +++ b/extra/mjpegtools/mjpegtools-2.0.0-gcc470.patch @@ -0,0 +1,11 @@ +--- a/y4mdenoise/MotionSearcher.hh ++++ b/y4mdenoise/MotionSearcher.hh +@@ -2196,7 +2196,7 @@ + { + // This region is too small to be bothered with. + // Just get rid of it. +- DeleteRegion (a_pRegion); ++ this->DeleteRegion (a_pRegion); + } + else + { diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index de3dcfc85..4830eb61f 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168399 2012-10-10 22:19:40Z tomegun $ +# $Id: PKGBUILD 184799 2013-05-08 17:55:32Z bpiotrowski $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Brice Carpentier <brice@dlfp.org> pkgname=mono -pkgver=2.10.8 -pkgrel=2 +pkgver=2.10.9 +pkgrel=1 pkgdesc="Free implementation of the .NET platform including runtime and compiler" arch=(i686 x86_64) license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11') @@ -14,39 +14,39 @@ makedepends=('pkgconfig') options=('!libtool' '!makeflags') provides=('monodoc') conflicts=('monodoc') -source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 mono.binfmt.d) +md5sums=('bbbff9d3d0c36b904437ada36a27eb9e' + 'b9ef8a65fea497acf176cca16c1e2402') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} # build mono ./configure --prefix=/usr --sysconfdir=/etc \ --with-libgdiplus=installed - make || return 1 + make # build jay - cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay - make || return 1 + cd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install # install jay - cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay - make DESTDIR=${pkgdir} prefix=/usr INSTALL=../../install-sh install - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay + make DESTDIR="${pkgdir}" prefix=/usr INSTALL=../../install-sh install + cd "${srcdir}"/${pkgname}-${pkgver} # install binfmt conf file and pathes - install -D -m644 ${srcdir}/mono.binfmt.d ${pkgdir}/usr/lib/binfmt.d/mono.conf + install -D -m644 "${srcdir}"/mono.binfmt.d "${pkgdir}"/usr/lib/binfmt.d/mono.conf #install license - mkdir -p ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 mcs/MIT.X11 ${pkgdir}/usr/share/licenses/${pkgname}/ + mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname} + install -m644 mcs/MIT.X11 "${pkgdir}"/usr/share/licenses/${pkgname}/ #fix .pc file to be able to request mono on what it depends, fixes #go-oo build - sed -i -e "s:#Requires:Requires:" ${pkgdir}/usr/lib/pkgconfig/mono.pc + sed -i -e "s:#Requires:Requires:" "${pkgdir}"/usr/lib/pkgconfig/mono.pc } -md5sums=('411a2d9bcfc37a61eb9aedba88b40533' - 'b9ef8a65fea497acf176cca16c1e2402') diff --git a/extra/muparser/PKGBUILD b/extra/muparser/PKGBUILD index 8f80cc463..43d2aa26f 100644 --- a/extra/muparser/PKGBUILD +++ b/extra/muparser/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 143909 2011-11-30 20:28:47Z andrea $ +# $Id: PKGBUILD 184801 2013-05-08 19:46:08Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir.archlinux.org> pkgname=muparser -pkgver=1.34 -pkgrel=2 +pkgver=2.2.3 +pkgrel=1 pkgdesc="A fast math parser library" arch=('i686' 'x86_64' 'mips64el') url="http://muparser.sourceforge.net/" depends=('gcc-libs') license=('custom') options=('!makeflags') -source=("http://downloads.sourceforge.net/$pkgname/${pkgname}_v134.tar.gz") -md5sums=('0c4f4bf86aa2a5a737adc0e08cb77737') +source=("http://downloads.sourceforge.net/$pkgname/${pkgname}_v${pkgver//./_}.zip") +md5sums=('9de40ec1dab5bd2787ee344fce5846ad') build() { - cd $srcdir/${pkgname}_v134 + cd $srcdir/${pkgname}_v${pkgver//./_} ./configure --prefix=/usr make } package() { - cd $srcdir/${pkgname}_v134 + cd $srcdir/${pkgname}_v${pkgver//./_} make DESTDIR=$pkgdir install # license diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD index 8eca87d59..3b8897594 100644 --- a/extra/netpbm/PKGBUILD +++ b/extra/netpbm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178515 2013-02-24 21:47:43Z eric $ +# $Id: PKGBUILD 184413 2013-05-06 19:38:51Z foutrelis $ # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=netpbm pkgver=10.61.02 -pkgrel=1 +pkgrel=2 pkgdesc="A toolkit for manipulation of graphic images" arch=('i686' 'x86_64' 'mips64el') license=('custom' 'BSD' 'GPL' 'LGPL') @@ -33,8 +33,9 @@ mksource() { rm -r advanced } -build() { +prepare() { cd "${srcdir}/advanced" + patch -p1 < ../netpbm-CAN-2005-2471.patch patch -p1 < ../netpbm-security-code.patch patch -p1 < ../netpbm-security-scripts.patch @@ -48,10 +49,14 @@ build() { echo 'JPEGLIB = libjpeg.so' >> config.mk echo 'PNGLIB = libpng.so' >> config.mk echo 'ZLIB = libz.so' >> config.mk - + sed -i 's|misc|share/netpbm|' common.mk sed -i 's|/link|/lib|' lib/Makefile sed -i 's|install.manweb install.man|install.man|' GNUmakefile +} + +build() { + cd "${srcdir}/advanced" make diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD index a2c8d0df7..9c0612f0f 100644 --- a/extra/neverball/PKGBUILD +++ b/extra/neverball/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183160 2013-04-18 02:16:47Z eric $ +# $Id: PKGBUILD 184414 2013-05-06 19:38:55Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=neverball pkgver=1.5.4 -pkgrel=5 +pkgrel=6 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness" arch=('i686' 'x86_64' 'mips64el') url="http://neverball.org/" @@ -12,13 +12,16 @@ depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs' \ 'hicolor-icon-theme' 'xdg-utils') makedepends=('mesa') install=neverball.install -source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz neverball-1.5.4-underlink.patch) +source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz \ + neverball-1.5.4-underlink.patch neverball-1.5.4-libpng.patch) sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7' - 'f71982b7187d569c57b30c4c40fedd6c0e72baca') + 'f71982b7187d569c57b30c4c40fedd6c0e72baca' + '02e68c17e851e85414ce5649b6b77273846bdb67') prepare() { cd ${pkgname}-${pkgver} patch -p0 -i ../neverball-1.5.4-underlink.patch + patch -p1 -i ../neverball-1.5.4-libpng.patch } build() { diff --git a/extra/neverball/neverball-1.5.4-libpng.patch b/extra/neverball/neverball-1.5.4-libpng.patch new file mode 100644 index 000000000..d7b224673 --- /dev/null +++ b/extra/neverball/neverball-1.5.4-libpng.patch @@ -0,0 +1,21 @@ +Index: neverball-1.5.4/share/base_image.c +=================================================================== +--- neverball-1.5.4.orig/share/base_image.c ++++ neverball-1.5.4/share/base_image.c +@@ -15,6 +15,7 @@ + #include <png.h> + #include <jpeglib.h> + #include <stdlib.h> ++#include <string.h> + #include <assert.h> + + #include "glext.h" +@@ -94,7 +95,7 @@ static void *image_load_png(const char * + default: longjmp(png_jmpbuf(readp), -1); + } + +- if (!(bytep = png_malloc(readp, h * png_sizeof(png_bytep)))) ++ if (!(bytep = png_malloc(readp, h * sizeof(png_bytep)))) + longjmp(png_jmpbuf(readp), -1); + + /* Allocate the final pixel buffer and read pixels there. */ diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index cfd784f4f..edaaa9464 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 173322 2012-12-18 22:53:36Z bisson $ +# $Id: PKGBUILD 184344 2013-05-06 10:28:53Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=13.1 +pkgrel=14 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') arch=('i686' 'x86_64' 'mips64el') -depends=('openssl' 'libcap') -optdepends=('libedit: ntpdc, ntpq') -makedepends=('perl-html-parser' 'libedit') +makedepends=('perl-html-parser') +depends=('openssl' 'libcap' 'libedit') backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf') source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" 'ntpd' @@ -39,6 +38,7 @@ build() { --prefix=/usr \ --mandir=/usr/share/man \ --enable-linuxcaps \ + --enable-ntp-signd \ make } diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index b618238ab..ab2c5fb44 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180978 2013-03-29 10:06:34Z andyrtr $ +# $Id: PKGBUILD 184415 2013-05-06 19:38:57Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers') pkgver=3.5.0.20 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://wiki.x2go.org/" license=('GPL') diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 65bf06372..4d760971d 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183293 2013-04-20 16:41:29Z heftig $ +# $Id: PKGBUILD 184416 2013-05-06 19:39:00Z foutrelis $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=opencv pkgname=('opencv' 'opencv-samples') _realname=OpenCV pkgver=2.4.5 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD index f42151c26..17a5926d3 100644 --- a/extra/opengtl/PKGBUILD +++ b/extra/opengtl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183549 2013-04-23 00:30:16Z eric $ +# $Id: PKGBUILD 184417 2013-05-06 19:39:02Z foutrelis $ # Maintainer: # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Andries Radu <admiral0@live.it> pkgname=opengtl pkgver=0.9.18 -pkgrel=1 +pkgrel=2 pkgdesc="A set of libraries for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" url="http://www.opengtl.org" arch=('i686' 'x86_64' 'mips64el') @@ -13,13 +13,18 @@ license=('GPL') depends=('gcc-libs' 'llvm') makedepends=('cmake' 'libpng') optdepends=('libpng: for using the png extension') -source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2) -sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8') +source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2 + opengtl-0.9.18-memcpy.patch) +sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8' + '357cc2e538bbaaffe7d58956959d8a7fbae09741d4a87488a5a8c51ec645d23a') -build() { - cd "$srcdir" +prepare() { mkdir build - cd build + patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-memcpy.patch" +} + +build() { + cd "$srcdir/build" cmake ../OpenGTL-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/opengtl/opengtl-0.9.18-memcpy.patch b/extra/opengtl/opengtl-0.9.18-memcpy.patch new file mode 100644 index 000000000..3e6ecd557 --- /dev/null +++ b/extra/opengtl/opengtl-0.9.18-memcpy.patch @@ -0,0 +1,11 @@ +diff -r 99a2017746c0 Extensions/PngDC/PngDC.cpp +--- a/Extensions/PngDC/PngDC.cpp Wed Jan 30 05:28:12 2013 +1100 ++++ b/Extensions/PngDC/PngDC.cpp Tue Apr 16 01:59:10 2013 +1000 +@@ -20,6 +20,7 @@ + #include "PngDC.h" + + #include <png.h> ++#include <string.h> + + #include <config-endian.h> + diff --git a/extra/openjpeg/PKGBUILD b/extra/openjpeg/PKGBUILD index d32fc971e..6f98310af 100644 --- a/extra/openjpeg/PKGBUILD +++ b/extra/openjpeg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156266 2012-04-16 14:12:28Z jgc $ +# $Id: PKGBUILD 184788 2013-05-08 13:56:11Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=openjpeg -pkgver=1.5.0 -pkgrel=1.1 +pkgver=1.5.1 +pkgrel=1 pkgdesc="An open source JPEG 2000 codec" arch=(i686 x86_64 'mips64el') license=('BSD') @@ -11,12 +11,12 @@ url="http://www.openjpeg.org" depends=('zlib') options=('!libtool') source=(http://openjpeg.googlecode.com/files/openjpeg-${pkgver}.tar.gz) -sha1sums=('dce705ae45f137e4698a8cf39d1fbf22bc434fa8') +sha1sums=('1b0b74d1af4c297fd82806a9325bb544caf9bb8b') build() { cd "${srcdir}/${pkgname}-${pkgver}" # make sure we use system libs - rm -rf thirtparty + rm -rf thirdparty ./configure --prefix=/usr \ --disable-static --disable-silent-rules make diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index 41e704775..7fabe3a9c 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160561 2012-06-02 10:28:31Z bluewind $ +# $Id: PKGBUILD 184418 2013-05-06 19:39:04Z foutrelis $ # Maintainer: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-tk _cpanname=Tk pkgver=804.030 -pkgrel=3 +pkgrel=4 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_cpanname}" diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 990b706f0..307f7fc1b 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182657 2013-04-12 07:45:16Z pierre $ +# $Id: PKGBUILD 184419 2013-05-06 19:39:07Z foutrelis $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -22,7 +22,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.4.14 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' diff --git a/extra/plotutils/PKGBUILD b/extra/plotutils/PKGBUILD index d70ad52e3..2ad9a9bc7 100644 --- a/extra/plotutils/PKGBUILD +++ b/extra/plotutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171506 2012-11-18 08:51:56Z eric $ +# $Id: PKGBUILD 184421 2013-05-06 19:39:11Z foutrelis $ # Maintainer: damir <damir@archlinux.org> # Packager: Maksim Sipos (maxsipos at gmail dot com) pkgname=plotutils pkgver=2.6 -pkgrel=3.1 +pkgrel=5 arch=('x86_64' 'i686' 'mips64el') pkgdesc="Set of utilities and libraries for plotting." url="http://directory.fsf.org/graphics/plotutils.html" diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 02121f66d..378e331cb 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183295 2013-04-20 16:41:31Z heftig $ +# $Id: PKGBUILD 184422 2013-05-06 19:39:13Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') pkgver=0.22.3 -pkgrel=2 +pkgrel=3 arch=(i686 x86_64 mips64el) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu') diff --git a/extra/python-pygame/PKGBUILD b/extra/python-pygame/PKGBUILD index be5f23b2e..14edd3999 100644 --- a/extra/python-pygame/PKGBUILD +++ b/extra/python-pygame/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167958 2012-10-04 06:29:37Z eric $ +# $Id: PKGBUILD 184423 2013-05-06 19:39:15Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=python-pygame pkgname=python2-pygame pkgver=1.9.1 -pkgrel=7 +pkgrel=8 pkgdesc="Python game library" arch=('i686' 'x86_64' 'mips64el') url="http://www.pygame.org/" @@ -17,14 +17,15 @@ sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa' '285815e28705d5a2aea53c9d952d35fddf10dd13' '7e693fb2ef5ef636f9965ba1a4eb854f8b0b5070') -build() { - cd "${srcdir}/pygame-${pkgver}release" - patch -Np0 -i "${srcdir}/config.patch" - patch -Np1 -i "${srcdir}/pygame-v4l.patch" +prepare() { + cd pygame-${pkgver}release + find . -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} + + patch -p0 -i "${srcdir}/config.patch" + patch -p1 -i "${srcdir}/pygame-v4l.patch" } package_python2-pygame() { - cd "${srcdir}/pygame-${pkgver}release" + cd pygame-${pkgver}release python2 config.py -auto python2 setup.py install --root="${pkgdir}" --prefix=/usr @@ -32,8 +33,6 @@ package_python2-pygame() { cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame" cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests" - find "${pkgdir}" -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} + - # Fixing permissions chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/* } diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index f915357f2..4c039e8f4 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182925 2013-04-16 07:40:13Z tpowa $ +# $Id: PKGBUILD 184424 2013-05-06 19:39:18Z foutrelis $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD index 1b003445a..6e22ba1d6 100644 --- a/extra/qrencode/PKGBUILD +++ b/extra/qrencode/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 178990 2013-03-01 10:24:41Z bluewind $ +# $Id: PKGBUILD 184425 2013-05-06 19:39:20Z foutrelis $ # Maintainer: Florian Pritz< flo@xinu.at> # Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=qrencode pkgver=3.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="C library for encoding data in a QR Code symbol." arch=(i686 x86_64 mips64el) -depends=('libpng>=1.5.0') +depends=('libpng') makedepends=(sdl) url="http://megaui.net/fukuchi/works/qrencode/index.en.html" license=('GPL') diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index 835e5f3b8..cb1eee34b 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182387 2013-04-09 21:20:53Z eric $ +# $Id: PKGBUILD 184426 2013-05-06 19:39:25Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=qt3 pkgver=3.3.8b -pkgrel=4 +pkgrel=5 epoch=1 pkgdesc="A cross-platform application and UI framework" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 62851cbea..55f2b86c8 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180689 2013-03-25 19:15:41Z bpiotrowski $ +# $Id: PKGBUILD 184427 2013-05-06 19:39:27Z foutrelis $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.4 -pkgrel=16 +pkgrel=17 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index 67e7f8647..1de3bee15 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182619 2013-04-11 11:34:49Z andrea $ +# $Id: PKGBUILD 184428 2013-05-06 19:39:31Z foutrelis $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 @@ -18,7 +18,7 @@ pkgname=('qt5-base' 'qt5-tools' 'qt5-translations') pkgver=5.0.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -104,9 +104,9 @@ if [ "$CARCH" != "mips64el" ]; then for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \ qtwebkit-examples-and-demos qtxmlpatterns; do cd ${m}/examples - ${QTDIR}/qmake + ${QTDIR}/qtbase/bin/qmake make - cd ../../ + cd ../../ done fi } diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD index 8dc4082fa..254b6f88b 100644 --- a/extra/qtiplot/PKGBUILD +++ b/extra/qtiplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168610 2012-10-13 11:49:18Z andyrtr $ +# $Id: PKGBUILD 184429 2013-05-06 19:39:34Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir.archlinux.org> # Contributor: Gergely Imreh <imrehg@gmail.com> pkgname=qtiplot pkgver=0.9.8.9 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://soft.proindependent.com/qtiplot.html" pkgdesc="Data analysis and scientific plotting - free clone of Origin" @@ -57,14 +57,14 @@ build() { sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch" cd ./3rdparty/qwt - qmake + qmake-qt4 make # Make qwtplot3d cd ../qwtplot3d patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch" patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch" - qmake + qmake-qt4 make # Make qtiplot @@ -75,7 +75,7 @@ build() { sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp - qmake qtiplot.pro QMAKESPEC=linux-g++ + qmake-qt4 qtiplot.pro QMAKESPEC=linux-g++ make QTDIR=/usr/ QMAKESPEC=linux-g++ } diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index 430b2aae0..f752b84cb 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183523 2013-04-22 10:48:39Z andrea $ +# $Id: PKGBUILD 184430 2013-05-06 19:39:36Z foutrelis $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit pkgver=2.3.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 68c6465d0..b6cb2551c 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180808 2013-03-26 11:49:39Z foutrelis $ +# $Id: PKGBUILD 184431 2013-05-06 19:39:38Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r -pkgver=2.15.3 +pkgver=3.0.0 pkgrel=1 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64' 'mips64el') @@ -15,28 +15,28 @@ depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' 'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils') makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk') optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files') -backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') +backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories' 'etc/R/javaconf') options=('!makeflags' '!emptydirs') install=r.install -source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" +source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz" 'r.desktop' 'r.png' 'R.conf') -sha1sums=('a05b68f31b00d8038d9f0a8562cfc0c8e32d9621' +sha1sums=('0cb1d1b815af4ce640ceafd5402a2eb94924c945' '13aa29219bcaa102e575de8c1c8e0833d233e836' 'a69a07ec363440efc18ce0a7f2af103375dea978' '43668da6cfd1b4455a99f23e79e2059294dddac9') -build() { - cd "${srcdir}/R-${pkgver}" - sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c - - # set texmf dir correctly in makefile - sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in - +prepare() { + cd R-${pkgver} +# set texmf dir correctly in makefile + sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in # fix for texinfo 5.X - sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure + sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure +} +build() { + cd R-${pkgver} ./configure --prefix=/usr \ --libdir=/usr/lib \ --sysconfdir=/etc/R \ @@ -58,7 +58,7 @@ build() { } package() { - cd "${srcdir}/R-${pkgver}" + cd R-${pkgver} make DESTDIR="${pkgdir}" install # install libRmath.so diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 3a6655758..b28e1b2ed 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180584 2013-03-23 23:09:38Z td123 $ +# $Id: PKGBUILD 184432 2013-05-06 19:39:40Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool pkgver=1.4.7 -pkgrel=5 +pkgrel=6 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64' 'mips64el') url="http://www.rrdtool.org" @@ -18,12 +18,14 @@ options=('!libtool' '!emptydirs' '!makeflags') source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) sha1sums=('faab7df7696b69f85d6f89dd9708d7cf0c9a273b') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - +prepare() { + cd ${pkgname}-${pkgver} # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in +} +build() { + cd ${pkgname}-${pkgver} PYTHON=python2 LUA=/usr/bin/lua5.1 \ LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \ ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ @@ -34,7 +36,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" includedir=/usr/include install install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 447980d9b..82d460c35 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -15,7 +15,7 @@ pkgver=4.0.5 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=4.0.5 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') @@ -26,6 +26,8 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba.logrotate swat.xinetd samba.pam + samba.service + samba.conf.d smbd.service smbd.socket nmbd.service @@ -208,10 +210,12 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # install systemd files install -d -m755 ${pkgdir}/usr/lib/systemd/system - for i in smbd nmbd swat winbindd; do - install -m644 ${srcdir}/*.service ${pkgdir}/usr/lib/systemd/system/ - install -m644 ${srcdir}/*.socket ${pkgdir}/usr/lib/systemd/system/ - done + #for i in smbd nmbd swat winbindd; do + install -m644 ${srcdir}/*.service ${pkgdir}/usr/lib/systemd/system/ + install -m644 ${srcdir}/*.socket ${pkgdir}/usr/lib/systemd/system/ + install -d -m755 ${pkgdir}/etc/conf.d + install -m644 ${srcdir}/samba.conf.d ${pkgdir}/etc/conf.d/samba + #done # create ephemeral dirs via tmpfiles rather than shipping them in package install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf # install sample smb.conf @@ -240,10 +244,13 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } + md5sums=('58ec2fec08872b72f8fd526f2da20a9e' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' '96f82c38f3f540b53f3e5144900acf17' + '5602ba59bc60502c99e6d5a5ae16aecf' + '6c447748a064d631435dbef0a3dcf32f' 'd0b18dd7f5fafc8d25cb3a7c37c6d920' 'a78b9aa93eb14b0ac445897395693225' '90845b89f2321cb19c0b13f385f1782a' diff --git a/extra/samba/samba.conf.d b/extra/samba/samba.conf.d index 8721f956a..760742648 100644 --- a/extra/samba/samba.conf.d +++ b/extra/samba/samba.conf.d @@ -1,7 +1,18 @@ -# -# Configuration for the samba init script -# - -# space separated list of daemons to launch -SAMBA_DAEMONS=(smbd nmbd) -#SAMBA_DAEMONS=(smbd nmbd winbindd) +## Path: Network/Samba +## Description: Samba process options +## Type: string +## Default: "" +## ServiceRestart: samba +SAMBAOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: smb +SMBDOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: nmb +NMBDOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: winbind +WINBINDOPTIONS="" diff --git a/extra/samba/samba.service b/extra/samba/samba.service new file mode 100644 index 000000000..e423a7d2d --- /dev/null +++ b/extra/samba/samba.service @@ -0,0 +1,14 @@ +[Unit] +Description=Samba AD Daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/samba.pid +LimitNOFILE=16384 +EnvironmentFile=-/etc/conf.d/samba +ExecStart=/usr/sbin/samba $SAMBAOPTIONS +ExecReload=/usr/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/sdl_image/PKGBUILD b/extra/sdl_image/PKGBUILD index 1c5aa97c8..0df38e920 100644 --- a/extra/sdl_image/PKGBUILD +++ b/extra/sdl_image/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148924 2012-02-05 11:56:07Z ibiru $ +# $Id: PKGBUILD 184433 2013-05-06 19:39:41Z foutrelis $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sdl_image pkgver=1.2.12 -pkgrel=2.1 +pkgrel=3 pkgdesc="A simple library to load images of various formats as SDL surfaces" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -16,13 +16,13 @@ source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.g md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb') build() { - cd "$srcdir/SDL_image-$pkgver" + cd SDL_image-$pkgver ./configure --prefix=/usr --disable-static make } package() { - cd "$srcdir/SDL_image-$pkgver" + cd SDL_image-$pkgver make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 48b0963aa..3303def70 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179969 2013-03-13 15:12:30Z foutrelis $ +# $Id: PKGBUILD 184434 2013-05-06 19:39:43Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> @@ -7,7 +7,7 @@ pkgname=slim pkgver=1.3.5 -pkgrel=2 +pkgrel=3 pkgdesc="Desktop-independent graphical login manager for X11" arch=('i686' 'x86_64' 'mips64el') url="http://slim.berlios.de/" diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index cfb0ab785..ae128ab19 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178141 2013-02-16 22:48:58Z ioni $ +# $Id: PKGBUILD 184435 2013-05-06 19:39:45Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64' 'mips64el') url="http://sox.sourceforge.net/" @@ -23,21 +23,25 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9' '2f92bcaebcaf300782396f106cdd27c72048a851') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/sox-ffmpeg0.11.patch" sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc \ --with-dyn-default --with-distro="Parabola" make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make bindir=. installcheck } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 47da491d8..262f68908 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,37 +1,34 @@ -# $Id: PKGBUILD 178008 2013-02-13 13:30:36Z andrea $ +# $Id: PKGBUILD 184759 2013-05-07 22:59:56Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=system-config-printer -pkgver=1.3.12 -pkgrel=2 +pkgver=1.4.0 +pkgrel=1 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' - 'gnome-icon-theme' 'python2-notify') +depends=('systemd' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' + 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'dbus-glib' 'gtk3') makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils') optdepends=('gnome-keyring: password management') replaces=('system-config-printer-common' 'system-config-printer-gnome') conflicts=('system-config-printer-common' 'system-config-printer-gnome') -source=(http://cyberelk.net/tim/data/${pkgname}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig} - 'fix-typo-in-service.patch') -md5sums=('0775647e1c34ef25364de3c178a4ed36' - '1aa2246047b424e2d23473749368b8c6' - 'd30d14aeb6d2bfeac0679d28704473ec') +source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('3267c2eac454f470c0659034196d2668' + 'SKIP') -build() { +prepare() { cd ${pkgname}-${pkgver} - - # Fixed upstream - patch -p1 -i "${srcdir}"/fix-typo-in-service.patch - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer +} +build() { + cd ${pkgname}-${pkgver} PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sbindir=/usr/bin \ --sysconfdir=/etc \ diff --git a/extra/system-config-printer/fix-typo-in-service.patch b/extra/system-config-printer/fix-typo-in-service.patch deleted file mode 100644 index 56f17dcec..000000000 --- a/extra/system-config-printer/fix-typo-in-service.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 1e48d0a6404c6660bbf3f456e5ec48bed8fe7b80 Mon Sep 17 00:00:00 2001 -From: Tim Waugh <twaugh@redhat.com> -Date: Tue, 23 Oct 2012 13:55:12 +0000 -Subject: Fixed typo in systemd config file. - ---- -diff --git a/udev/configure-printer@.service.in b/udev/configure-printer@.service.in -index 8a20967..5898c79 100644 ---- a/udev/configure-printer@.service.in -+++ b/udev/configure-printer@.service.in -@@ -4,4 +4,4 @@ Requires=cups.socket - After=cups.socket - - [Service] --ExecStart=@udevhelperdir@/configure-printer add "%i" -+ExecStart=@udevhelperdir@/udev-configure-printer add "%i" --- -cgit v0.9.1 diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 358071391..22f32357e 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 183324 2013-04-21 22:06:43Z heftig $ +# $Id: PKGBUILD 184438 2013-05-06 19:39:53Z foutrelis $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.16.0 +pkgver=0.16.1 _tver=${pkgver%.*} -pkgrel=4 +pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" arch=(i686 x86_64 mips64el) license=(GPL) @@ -19,7 +19,7 @@ makedepends=(libgee libsecret upower libexif exempi url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('299c6a180370522d1d794c184aaef8d8222d3f737d564b8e5ca25b8751470c4f') +sha256sums=('fbb94144826b00da0b427dc6f37d2679bd8dfec1dc992e857a47a0b453f0b771') build() { cd $pkgbase-$pkgver diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 171ed5edf..6082f4cf4 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180315 2013-03-20 02:35:36Z eric $ +# $Id: PKGBUILD 184439 2013-05-06 19:39:55Z foutrelis $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=8 +pkgrel=9 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64' 'mips64el') url="http://tcforge.berlios.de/" diff --git a/extra/transfig/PKGBUILD b/extra/transfig/PKGBUILD index 50dde5722..5aec31a4a 100644 --- a/extra/transfig/PKGBUILD +++ b/extra/transfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148944 2012-02-05 11:57:10Z ibiru $ +# $Id: PKGBUILD 184440 2013-05-06 19:39:57Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=transfig pkgver=3.2.5d -pkgrel=1 +pkgrel=2 pkgdesc="Format conversion utility that can be used with xfig" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfig.org" @@ -16,20 +16,22 @@ sha1sums=('90ff277cc9b3fa0d0313052fcf5e3ffad8652abc' 'b8b712871615308b8b6add92f86d218437d652f2' '9f9f332b0b31e58e59542bc1568df9617b71710a') -build() { - cd "${srcdir}/${pkgname}.${pkgver}" +prepare() { + cd ${pkgname}.${pkgver} sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/' transfig/Imakefile sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile patch -p1 -i ../transfig-3.2.5d-libpng-1.5.patch +} +build() { + cd ${pkgname}.${pkgver} xmkmf make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig } package() { - cd "${srcdir}/${pkgname}.${pkgver}" - + cd ${pkgname}.${pkgver} make DESTDIR="${pkgdir}" XFIGLIBDIR=/usr/share/xfig \ FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \ install install.man diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index e2f69c635..2567af35f 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175134 2013-01-15 01:39:25Z foutrelis $ +# $Id: PKGBUILD 184441 2013-05-06 19:39:59Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan Jezek <honzin.jezek@gmail.com> pkgname=tumbler -pkgver=0.1.27 -pkgrel=2 +pkgver=0.1.29 +pkgrel=1 pkgdesc="D-Bus service for applications to request thumbnails" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -21,7 +21,7 @@ optdepends=('ffmpegthumbnailer: for video thumbnails' 'freetype2: for font thumbnails') options=('!libtool') source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2) -sha256sums=('4c60b3b92877257fcc54d18acbbe4ad73c84a7ff7608a430ad5a05b452923869') +sha256sums=('c3bac4ee609e22be6c7f01a4fdf6086bc6b57940d82f99570a2d9d547a32fc93') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/tuxpuck/PKGBUILD b/extra/tuxpuck/PKGBUILD index f9b7fc1c8..edbcbe3b4 100644 --- a/extra/tuxpuck/PKGBUILD +++ b/extra/tuxpuck/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148948 2012-02-05 11:57:19Z ibiru $ +# $Id: PKGBUILD 184442 2013-05-06 19:40:00Z foutrelis $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=tuxpuck pkgver=0.8.2 -pkgrel=5 +pkgrel=6 pkgdesc="Airhockey with tux" arch=('i686' 'x86_64' 'mips64el') url="http://home.no.net/munsuun/tuxpuck/" diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD index d4f257971..a2d47808f 100644 --- a/extra/ucommon/PKGBUILD +++ b/extra/ucommon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184150 2013-05-02 19:39:51Z eric $ +# $Id: PKGBUILD 184356 2013-05-06 19:20:44Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ucommon -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=1 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" arch=('i686' 'x86_64' 'mips64el') @@ -10,9 +10,8 @@ url="http://www.gnutelephony.org/index.php/GNU_uCommon_C++" license=('GPL3' 'LGPL3') depends=('openssl') options=('!libtool') -#source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) -source=("http://www.gnutelephony.org/dist/tarballs/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('c6025b339417e817b6d5ac21b5334823' +source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('b20a43a8cba901c2145778b3d653eef6' 'SKIP') build() { diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD index 2789c8cfa..4b23230fe 100644 --- a/extra/vice/PKGBUILD +++ b/extra/vice/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170377 2012-11-06 19:33:54Z giovanni $ +# $Id: PKGBUILD 184443 2013-05-06 19:40:02Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vice pkgver=2.4 -pkgrel=2.1 +pkgrel=3 pkgdesc="The Versatile Commodore 8-bit Emulator" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -24,7 +24,7 @@ md5sums=('b017647a0c159bbe43cdb81762d1c577' '877f93db1550ea81386aae7c3b578442' '9d9f62f05a967a5926df496e86404148') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/vice-2.4-x11video.patch" @@ -34,7 +34,12 @@ build() { sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in - autoreconf + autoreconf -vi +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ --enable-ethernet \ --with-alsa \ diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index f4ebc938b..2a0673dad 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181129 2013-03-31 19:16:58Z stephane $ +# $Id: PKGBUILD 184444 2013-05-06 19:40:04Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgbase=vigra pkgname=('vigra' 'vigra-doc') pkgver=1.9.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://hci.iwr.uni-heidelberg.de/vigra/" license=('custom:MIT') @@ -22,8 +22,7 @@ build() { cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DWITH_VIGRANUMPY=1 \ - -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \ - -DDOCINSTALL=share/doc + -DDOCINSTALL=share/doc make } diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index a8ab46e88..0b5a3ed0e 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182353 2013-04-08 21:34:41Z giovanni $ +# $Id: PKGBUILD 184445 2013-05-06 19:40:05Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -70,6 +70,8 @@ build() { sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp [ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc" + + CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \ ./configure --prefix=/usr \ --sysconfdir=/etc \ --disable-rpath \ diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index 6e907c355..aaf6b12e2 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183326 2013-04-21 22:06:45Z heftig $ +# $Id: PKGBUILD 184446 2013-05-06 19:40:06Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=webkitgtk pkgname=('webkitgtk3') pkgver=2.0.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://webkitgtk.org/" license=('custom') diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD index c62f1250c..035ad7e92 100644 --- a/extra/webkitgtk2/PKGBUILD +++ b/extra/webkitgtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183468 2013-04-21 22:12:24Z heftig $ +# $Id: PKGBUILD 184447 2013-05-06 19:40:08Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=webkitgtk2 pkgver=1.10.2 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') url="http://webkitgtk.org/" license=('custom') diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD index 42e4bb5e9..e694e615c 100644 --- a/extra/windowmaker/PKGBUILD +++ b/extra/windowmaker/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175070 2013-01-12 14:16:01Z daniel $ +# $Id: PKGBUILD 184448 2013-05-06 19:40:10Z foutrelis $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=windowmaker pkgver=0.95.4 -pkgrel=1 +pkgrel=2 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" arch=(i686 x86_64 'mips64el') url="http://www.windowmaker.org/" diff --git a/extra/wv/PKGBUILD b/extra/wv/PKGBUILD index 455e8033a..bcee31fbb 100644 --- a/extra/wv/PKGBUILD +++ b/extra/wv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148964 2012-02-05 11:58:08Z ibiru $ +# $Id: PKGBUILD 184449 2013-05-06 19:40:11Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=wv pkgver=1.2.9 -pkgrel=1.1 +pkgrel=2 pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/wvware" @@ -15,7 +15,7 @@ source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pk md5sums=('dbccf2e9f747e50c913b7e3d126b73f7') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --mandir=/usr/share/man @@ -23,7 +23,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD index 322e9315f..741d5601c 100644 --- a/extra/wxgtk/PKGBUILD +++ b/extra/wxgtk/PKGBUILD @@ -1,37 +1,33 @@ -# $Id: PKGBUILD 171304 2012-11-17 03:08:29Z eric $ +# $Id: PKGBUILD 184450 2013-05-06 19:40:13Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxgtk pkgver=2.8.12.1 -pkgrel=4.1 +pkgrel=5 pkgdesc="GTK+ implementation of wxWidgets API for GUI" arch=('i686' 'x86_64' 'mips64el') url="http://wxwidgets.org" license=('custom:wxWindows') -depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm' 'sdl') -makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa' 'glu' 'libxt') +depends=('gtk2' 'gstreamer0.10-base' 'sdl') +makedepends=('gstreamer0.10-base-plugins' 'gconf') #source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2) source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) sha1sums=('05688dc03d61631750f5904273122bb40a2115f5') build() { - cd "${srcdir}/wxPython-src-${pkgver}" -# cd "${srcdir}/wxGTK-${pkgver}" + cd wx*-${pkgver} ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ --enable-graphics_ctx --disable-optimize --enable-mediactrl --with-regex=builtin \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ --with-sdl --disable-precomp-headers make make -C locale allmo - cd contrib/src - make + make -C contrib/src } package() { - cd "${srcdir}/wxPython-src-${pkgver}" -# cd "${srcdir}/wxGTK-${pkgver}" - make DESTDIR="${pkgdir}" install - cd contrib/src + cd wx*-${pkgver} make DESTDIR="${pkgdir}" install - install -D -m644 ../../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + make -C contrib/src DESTDIR="${pkgdir}" install + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/xaos/PKGBUILD b/extra/xaos/PKGBUILD index 057088ba5..f964132bf 100644 --- a/extra/xaos/PKGBUILD +++ b/extra/xaos/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148968 2012-02-05 11:58:17Z ibiru $ +# $Id: PKGBUILD 184451 2013-05-06 19:40:17Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xaos pkgver=3.5 -pkgrel=5.2 +pkgrel=6 pkgdesc="A fast portable real-time interactive fractal zoomer" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/xaos/" @@ -11,18 +11,27 @@ license=('GPL') depends=('gsl' 'libpng' 'aalib') options=('!makeflags') install=xaos.install -source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz xaos-3.5-libpng15.patch) +source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz \ + xaos-3.5-libpng15.patch xaos-3.5-build-fix-i686.patch) sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801' - '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33') + '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33' + 'd2ea8f0460c79c47fb289a4c2f87fe5c44057f9d') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p0 -i ../xaos-3.5-libpng15.patch + if [[ $CARCH == "i686" ]]; then + patch -p1 -i ../xaos-3.5-build-fix-i686.patch + fi +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --with-gsl --with-aa-driver make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/xaos/xaos-3.5-build-fix-i686.patch b/extra/xaos/xaos-3.5-build-fix-i686.patch new file mode 100644 index 000000000..4736dd389 --- /dev/null +++ b/extra/xaos/xaos-3.5-build-fix-i686.patch @@ -0,0 +1,20 @@ +--- xaos-3.5/src/engine/zoomd.c.orig 2009-07-18 00:50:31.000000000 +0100 ++++ xaos-3.5/src/engine/zoomd.c 2012-05-20 19:04:55.891065437 +0100 +@@ -280,6 +280,7 @@ dosymetry2(void /*@unused@ */ *data, str + #endif + #undef bpp1 + ++REGISTERS(0) + static INLINE void fillline(int line) + { + register unsigned char *RESTRICT vbuff = cimage.currlines[line]; +--- xaos-3.5/src/engine/zoom.c.fix-build 2009-07-18 00:50:31.000000000 +0100 ++++ xaos-3.5/src/engine/zoom.c 2012-05-20 19:11:53.625083113 +0100 +@@ -933,6 +933,7 @@ static /*INLINE */ void preparemoveoldpo + } + + #ifndef USE_i386ASM ++REGISTERS(0) + static /*INLINE */ void + moveoldpoints(void /*@unused@ */ *data1, + struct taskinfo /*@unused@ */ *task, diff --git a/extra/xawtv/PKGBUILD b/extra/xawtv/PKGBUILD index e0f28c26d..d7a039cc0 100644 --- a/extra/xawtv/PKGBUILD +++ b/extra/xawtv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148970 2012-02-05 11:58:22Z ibiru $ +# $Id: PKGBUILD 184452 2013-05-06 19:40:18Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Jason Chu <jason@archlinux.org> pkgname=xawtv -pkgver=3.101 -pkgrel=2 +pkgver=3.103 +pkgrel=1 pkgdesc="A simple Xaw-based TV program which uses the bttv driver or video4linux" arch=('i686' 'x86_64' 'mips64el') url="http://git.linuxtv.org/xawtv3.git" @@ -14,12 +14,10 @@ depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' ' [ "$CARCH" != "mips64el" ] && depends+=('lirc-utils') makedepends=('mesa') source=(http://linuxtv.org/downloads/xawtv/xawtv-${pkgver}.tar.bz2) -md5sums=('330ce1789595e370be34ad4cae3dc3fa') - +md5sums=('18822bb3660540fa9ea8b643a5b30d6b') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - autoconf - autoheader ./configure --prefix=/usr --disable-motif --disable-quicktime make } diff --git a/extra/xerces-c/PKGBUILD b/extra/xerces-c/PKGBUILD index 85a3e1222..1038744a1 100644 --- a/extra/xerces-c/PKGBUILD +++ b/extra/xerces-c/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179593 2013-03-07 13:22:22Z andrea $ +# $Id: PKGBUILD 184762 2013-05-08 07:12:02Z andrea $ # Maintainer: # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> @@ -6,7 +6,7 @@ pkgname=xerces-c pkgver=3.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="A validating XML parser written in a portable subset of C++" arch=('i686' 'x86_64' 'mips64el') url="http://xerces.apache.org/xerces-c/" @@ -18,8 +18,11 @@ md5sums=('6a8ec45d83c8cfb1584c5a5345cb51ae') build() { cd ${pkgname}-${pkgver} + + [[ "${CARCH}" = "i686" ]] && SSE2="--disable-sse2" + ./configure --prefix=/usr \ - --sysconfdir=/etc + --sysconfdir=/etc ${SSE2} make } diff --git a/extra/xfce4-notifyd/PKGBUILD b/extra/xfce4-notifyd/PKGBUILD index 17ca807bb..1119b7cef 100644 --- a/extra/xfce4-notifyd/PKGBUILD +++ b/extra/xfce4-notifyd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183310 2013-04-21 17:16:07Z foutrelis $ +# $Id: PKGBUILD 184796 2013-05-08 16:11:31Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-notifyd -pkgver=0.2.3 +pkgver=0.2.4 pkgrel=1 pkgdesc="Notification daemon for the Xfce desktop" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ provides=('notification-daemon') options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2) -sha256sums=('dd40f64c9db22b0b971e81e8e74a4ab6afe6d0bb819ab5d0badee89e13faa63b') +sha256sums=('8c7ed62f9496816d1391281f77d1b32216f9bf6fd22fbe4f6f3f4e07a6bbced0') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/xfig/PKGBUILD b/extra/xfig/PKGBUILD index cfbb4d3b2..cf25f6713 100644 --- a/extra/xfig/PKGBUILD +++ b/extra/xfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155348 2012-04-02 00:26:21Z eric $ +# $Id: PKGBUILD 184453 2013-05-06 19:40:21Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xfig pkgver=3.2.5b -pkgrel=8 +pkgrel=9 pkgdesc="An interactive drawing tool" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfig.org/userman/" @@ -31,8 +31,8 @@ sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542' '31edf4cfab708820ea3f114d095dfef5aa88e5aa' '9011b8fa6143e37525b28cc9800a3bf2d6b008d2') -build() { - cd "${srcdir}/${pkgname}.${pkgver}" +prepare() { + cd ${pkgname}.${pkgver} patch -p1 < ../xfig-3.2.4-redhat.patch patch -p1 < ../xfig-3.2.5-fhs.patch patch -p1 < ../xfig.3.2.5-modularX.patch @@ -43,13 +43,16 @@ build() { patch -p1 < ../xfig-3.2.5b-libpng-1.5.patch sed -i 's/#define XAW3D/XCOMM #define XAW3D/' Imakefile chmod 755 Libraries +} +build() { + cd ${pkgname}.${pkgver} xmkmf make DOCDIR=/usr/share/doc } package() { - cd "${srcdir}/${pkgname}.${pkgver}" + cd ${pkgname}.${pkgver} make DESTDIR="${pkgdir}" DOCDIR=/usr/share/doc install.all rm "${pkgdir}/usr/lib/X11/app-defaults" diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD index db9587850..e63309034 100644 --- a/extra/xine-ui/PKGBUILD +++ b/extra/xine-ui/PKGBUILD @@ -1,30 +1,28 @@ -# $Id: PKGBUILD 161816 2012-06-15 02:09:04Z eric $ +# $Id: PKGBUILD 184454 2013-05-06 19:40:24Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-ui pkgver=0.99.7 -pkgrel=1 +pkgrel=2 pkgdesc="A free video player for Unix" arch=('i686' 'x86_64') license=('GPL') url="http://www.xine-project.org" -depends=('xine-lib' 'curl' 'libpng' 'libjpeg' 'libxft' 'libxxf86vm' - 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme' - 'desktop-file-utils' 'lirc-utils') -makedepends=('libxt') +depends=('xine-lib' 'curl' 'libpng' 'libxft' 'xdg-utils' 'shared-mime-info' + 'hicolor-icon-theme' 'desktop-file-utils' 'lirc-utils') options=('!strip') install=xine-ui.install source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz) sha1sums=('ca82e09cf8245d038813bc4dbd8384ba79cbf197') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man \ --with-x --enable-lirc --without-aalib --enable-debug make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" desktopdir=/usr/share/applications install } diff --git a/extra/xorg-xcursorgen/PKGBUILD b/extra/xorg-xcursorgen/PKGBUILD index 89ed2e4dc..b08bd5fc5 100644 --- a/extra/xorg-xcursorgen/PKGBUILD +++ b/extra/xorg-xcursorgen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154152 2012-03-23 19:18:20Z andyrtr $ +# $Id: PKGBUILD 184455 2013-05-06 19:40:25Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xcursorgen pkgver=1.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="Create an X cursor file from PNG images" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD index cad28724a..7f8e8f99b 100644 --- a/extra/xsane/PKGBUILD +++ b/extra/xsane/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148984 2012-02-05 11:58:59Z ibiru $ +# $Id: PKGBUILD 184456 2013-05-06 19:40:28Z foutrelis $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgbase=xsane pkgname=('xsane' 'xsane-gimp') pkgver=0.998 -pkgrel=2 +pkgrel=4 arch=(i686 x86_64 mips64el) url="http://www.xsane.org" license=('GPL2') @@ -21,7 +21,9 @@ build() { patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch" sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c - ./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-gimp make mv src/xsane src/xsane-gimp diff --git a/extra/xsane/xsane.install b/extra/xsane/xsane.install index aa3e3b8f8..7e376517f 100644 --- a/extra/xsane/xsane.install +++ b/extra/xsane/xsane.install @@ -9,6 +9,7 @@ post_install() { echo "" echo " \$ rm -rf ~/.sane/xsane" echo "" + echo "Xsane only supports creation of pdf files in 8bit colour depth!" } post_upgrade() { diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index e68d8b5ed..ea101c1b6 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182413 2013-04-10 13:01:03Z foutrelis $ +# $Id: PKGBUILD 184457 2013-05-06 19:40:30Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner pkgver=20.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') diff --git a/extra/zvbi/PKGBUILD b/extra/zvbi/PKGBUILD index e21ddf8d5..c07603a1c 100644 --- a/extra/zvbi/PKGBUILD +++ b/extra/zvbi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148988 2012-02-05 11:59:13Z ibiru $ +# $Id: PKGBUILD 184458 2013-05-06 19:40:33Z foutrelis $ # Maintainer: # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=zvbi pkgver=0.2.33 -pkgrel=4.2 +pkgrel=5 pkgdesc="VBI capture and decoding library" url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome" arch=('i686' 'x86_64' 'mips64el') |