diff options
Diffstat (limited to 'extra')
27 files changed, 442 insertions, 161 deletions
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 947b841d3..f41d6245c 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203346 2014-01-08 13:17:00Z giovanni $ + $Id: PKGBUILD 203489 2014-01-11 20:07:05Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> @@ -6,8 +6,8 @@ # Contributor: Anatol Pomozov <anatol.pomozov@gmail.com> pkgname=amule -pkgver=10830 -pkgrel=1 +pkgver=10832 +pkgrel=2 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') url="http://www.amule.org" @@ -17,7 +17,7 @@ install=amule.install source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2" 'amuled.systemd' 'amuleweb.systemd') -md5sums=('8ba572ed1c87909ee24652d96f93dc40' +md5sums=('6ffd3a308a4f8802b3fc035ae2d0d3e5' '59772c41860e238f1c822feb8ca8d47f' '05975c5d94bfc41fddb894d98b1115d5') diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD index 444a3763c..8c541c759 100644 --- a/extra/audacity/PKGBUILD +++ b/extra/audacity/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 197206 2013-10-23 23:57:14Z eric $ +# $Id: PKGBUILD 203490 2014-01-11 20:07:06Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=audacity pkgver=2.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=('i686' 'x86_64') url="http://audacity.sourceforge.net/" license=('GPL') -depends=('libmad' 'libid3tag' 'wxgtk' 'lame' 'hicolor-icon-theme' +depends=('libmad' 'libid3tag' 'wxgtk2.8' 'lame' 'hicolor-icon-theme' 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg-compat') makedepends=('cmake') options=('!makeflags') @@ -18,7 +18,7 @@ sha1sums=('f63cafb81f29e7f3813dc9f80fb1dfdbcfe46b33') build() { cd ${pkgname}-src-${pkgver} - PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \ + WX_CONFIG=/usr/bin/wx-config-2.8 PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \ ./configure --prefix=/usr make } diff --git a/extra/fribidi/PKGBUILD b/extra/fribidi/PKGBUILD index f36a819e0..c44b32106 100644 --- a/extra/fribidi/PKGBUILD +++ b/extra/fribidi/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 197964 2013-10-30 11:57:39Z allan $ +# $Id: PKGBUILD 203466 2014-01-11 09:29:09Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Nezmer <Nezmer@gmail.com> pkgname=fribidi -pkgver=0.19.5 +pkgver=0.19.6 pkgrel=1 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm" arch=('i686' 'x86_64') license=('LGPL') url="http://fribidi.org" -depends=('glibc') +depends=('glib2') source=("http://fribidi.org/download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('925bafb97afee8a2fc2d0470c072a155') +md5sums=('ce93d862344991173dabb609bf93ca1d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index b0549dded..7196972d2 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 200325 2013-11-25 21:47:00Z eric $ +# $Id: PKGBUILD 203491 2014-01-11 20:07:07Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuplot pkgver=4.6.4 -pkgrel=2 +pkgrel=4 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64') url="http://www.gnuplot.info" license=('custom') -depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua' 'qt4') +depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua' 'qt4' 'gnutls') makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra') options=('!makeflags') install=gnuplot.install diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 4ecd76aea..1cc75c60f 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 201259 2013-12-07 10:34:58Z bpiotrowski $ +# $Id: PKGBUILD 203492 2014-01-11 20:07:08Z eric $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -6,14 +6,15 @@ pkgname=hugin pkgver=2013.0.0 -pkgrel=3 +pkgrel=4 pkgdesc='Panorama photo stitcher' url='http://hugin.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64') +optdepends=('python2: bindings and plugins') +makedepends=('cmake' 'boost' 'tclap' 'mesa' 'python2' 'swig') depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'libpano13' 'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils') -makedepends=('cmake' 'boost' 'tclap' 'mesa') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2") sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d') @@ -24,8 +25,7 @@ build() { cmake . \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_LAPACK=yes \ - -DBUILD_HSI=no + -DENABLE_LAPACK=yes make } diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD index 428acd0f5..0a8ad5462 100644 --- a/extra/ibus/PKGBUILD +++ b/extra/ibus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 203380 2014-01-09 06:32:23Z fyan $ +# $Id: PKGBUILD 203458 2014-01-11 02:11:21Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgbase=ibus pkgname=(ibus libibus) pkgver=1.5.4 -pkgrel=2 +pkgrel=3 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64') url="http://ibus.googlecode.com" @@ -31,7 +31,7 @@ build() { } package_ibus() { - depends+=("libibus=$pkgver") + depends+=("libibus=$pkgver" 'python2-gobject') install=ibus.install cd ${pkgbase}-${pkgver} diff --git a/extra/libevdev/0001-Revert-Drop-deprecated-functions.patch b/extra/libevdev/0001-Revert-Drop-deprecated-functions.patch new file mode 100644 index 000000000..e4857e7ad --- /dev/null +++ b/extra/libevdev/0001-Revert-Drop-deprecated-functions.patch @@ -0,0 +1,163 @@ +From 51bf0ead89df5c1ddaa22d2f7fc0e04cedbdc590 Mon Sep 17 00:00:00 2001 +From: Adam Williamson <awilliam@redhat.com> +Date: Thu, 26 Dec 2013 18:58:23 -0800 +Subject: [PATCH] Revert "Drop deprecated functions" + +This reverts commit 7a38f4abc3ed1df368d5bad32a1d72559acdc234. It is incorrect and dangerous to drop functions without an soname bump. This broke GNOME. +--- + libevdev/libevdev.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ + libevdev/libevdev.h | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 79 insertions(+) + +diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c +index 8a37204..02e4f78 100644 +--- a/libevdev/libevdev.c ++++ b/libevdev/libevdev.c +@@ -162,6 +162,14 @@ libevdev_free(struct libevdev *dev) + free(dev); + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT void ++libevdev_set_log_handler(struct libevdev *dev, libevdev_log_func_t logfunc) ++{ ++ /* Can't be backwards compatible to this yet, so don't even try */ ++ fprintf(stderr, "libevdev: ABI change. Log function will not be honored.\n"); ++} ++ + LIBEVDEV_EXPORT void + libevdev_set_log_function(libevdev_log_func_t logfunc, void *data) + { +@@ -1244,6 +1252,12 @@ libevdev_disable_event_code(struct libevdev *dev, unsigned int type, unsigned in + } + + LIBEVDEV_EXPORT int ++libevdev_kernel_set_abs_value(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) ++{ ++ return libevdev_kernel_set_abs_info(dev, code, abs); ++} ++ ++LIBEVDEV_EXPORT int + libevdev_kernel_set_abs_info(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) + { + int rc; +@@ -1296,12 +1310,22 @@ libevdev_grab(struct libevdev *dev, enum libevdev_grab_mode grab) + return rc < 0 ? -errno : 0; + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT int ++libevdev_is_event_type(const struct input_event *ev, unsigned int type) ++ALIAS(libevdev_event_is_type); ++ + LIBEVDEV_EXPORT int + libevdev_event_is_type(const struct input_event *ev, unsigned int type) + { + return type < EV_CNT && ev->type == type; + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT int ++libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code) ++ALIAS(libevdev_event_is_code); ++ + LIBEVDEV_EXPORT int + libevdev_event_is_code(const struct input_event *ev, unsigned int type, unsigned int code) + { +@@ -1314,6 +1338,11 @@ libevdev_event_is_code(const struct input_event *ev, unsigned int type, unsigned + return (max > -1 && code <= (unsigned int)max && ev->code == code); + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT const char* ++libevdev_get_event_type_name(unsigned int type) ++ALIAS(libevdev_event_type_get_name); ++ + LIBEVDEV_EXPORT const char* + libevdev_event_type_get_name(unsigned int type) + { +@@ -1323,6 +1352,11 @@ libevdev_event_type_get_name(unsigned int type) + return ev_map[type]; + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT const char* ++libevdev_get_event_code_name(unsigned int type, unsigned int code) ++ALIAS(libevdev_event_code_get_name); ++ + LIBEVDEV_EXPORT const char* + libevdev_event_code_get_name(unsigned int type, unsigned int code) + { +@@ -1334,6 +1368,16 @@ libevdev_event_code_get_name(unsigned int type, unsigned int code) + return event_type_map[type][code]; + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT const char* ++libevdev_get_input_prop_name(unsigned int prop) ++ALIAS(libevdev_property_get_name); ++ ++/* DEPRECATED */ ++LIBEVDEV_EXPORT const char* ++libevdev_get_property_name(unsigned int prop) ++ALIAS(libevdev_property_get_name); ++ + LIBEVDEV_EXPORT const char* + libevdev_property_get_name(unsigned int prop) + { +@@ -1343,6 +1387,11 @@ libevdev_property_get_name(unsigned int prop) + return input_prop_map[prop]; + } + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT int ++libevdev_get_event_type_max(unsigned int type) ++ALIAS(libevdev_event_type_get_max); ++ + LIBEVDEV_EXPORT int + libevdev_event_type_get_max(unsigned int type) + { +diff --git a/libevdev/libevdev.h b/libevdev/libevdev.h +index 37ca2f4..c89f4ad 100644 +--- a/libevdev/libevdev.h ++++ b/libevdev/libevdev.h +@@ -1642,6 +1642,36 @@ int libevdev_get_repeat(const struct libevdev *dev, int *delay, int *period); + #define LIBEVDEV_DEPRECATED + #endif + ++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_SYNC; ++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_NORMAL; ++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_FORCE_SYNC; ++LIBEVDEV_DEPRECATED extern const enum libevdev_read_flag LIBEVDEV_READ_BLOCKING; ++ ++/* replacement: libevdev_kernel_set_abs_info */ ++int libevdev_kernel_set_abs_value(struct libevdev *dev, unsigned int code, const struct input_absinfo *abs) LIBEVDEV_DEPRECATED; ++ ++ ++/* replacement: libevdev_set_log_function */ ++void libevdev_set_log_handler(struct libevdev *dev, libevdev_log_func_t logfunc) LIBEVDEV_DEPRECATED; ++ ++/** replacement: libevdev_event_type_get_max */ ++int libevdev_get_event_type_max(unsigned int type) LIBEVDEV_DEPRECATED; ++ ++/** replacement: libevdev_property_get_name */ ++const char* libevdev_get_property_name(unsigned int prop) LIBEVDEV_DEPRECATED; ++ ++/** replacement: libevdev_event_type_get_name */ ++const char * libevdev_get_event_type_name(unsigned int type) LIBEVDEV_DEPRECATED; ++/** replacement: libevdev_event_code_get_name */ ++const char * libevdev_get_event_code_name(unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED; ++ ++/** replacement: libevdev_event_is_type */ ++int libevdev_is_event_type(const struct input_event *ev, unsigned int type) LIBEVDEV_DEPRECATED; ++ ++/** replacement: libevdev_event_is_code */ ++int libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED; ++/**************************************/ ++ + #ifdef __cplusplus + } + #endif +-- +1.8.5.2 + diff --git a/extra/libevdev/0001-Revert-Drop-some-leftover-deprecated-constants.patch b/extra/libevdev/0001-Revert-Drop-some-leftover-deprecated-constants.patch new file mode 100644 index 000000000..250be8505 --- /dev/null +++ b/extra/libevdev/0001-Revert-Drop-some-leftover-deprecated-constants.patch @@ -0,0 +1,30 @@ +From 9ee61912a356bb8c1995cf262428196e5e4f179d Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Fri, 3 Jan 2014 08:30:04 +1000 +Subject: [PATCH libevdev] Revert "Drop some leftover deprecated constants." + +This reverts commit a612ee753e8c40d2d1fff6da516d278064e27d86. +--- + libevdev/libevdev.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c +index 8a37204..432aeff 100644 +--- a/libevdev/libevdev.c ++++ b/libevdev/libevdev.c +@@ -36,6 +36,12 @@ + + #define MAXEVENTS 64 + ++/* DEPRECATED */ ++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_SYNC = LIBEVDEV_READ_FLAG_SYNC; ++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_NORMAL = LIBEVDEV_READ_FLAG_NORMAL; ++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_FORCE_SYNC = LIBEVDEV_READ_FLAG_FORCE_SYNC; ++LIBEVDEV_EXPORT const enum libevdev_read_flag LIBEVDEV_READ_BLOCKING = LIBEVDEV_READ_FLAG_BLOCKING; ++ + static int sync_mt_state(struct libevdev *dev, int create_events); + + static int +-- +1.8.4.2 + diff --git a/extra/libevdev/PKGBUILD b/extra/libevdev/PKGBUILD index 551f90a53..8f669ce1a 100644 --- a/extra/libevdev/PKGBUILD +++ b/extra/libevdev/PKGBUILD @@ -2,19 +2,29 @@ # Maintainer: Jan de Groot pkgname=libevdev -pkgver=0.4 -pkgrel=2 +pkgver=0.6 +pkgrel=1 pkgdesc="Wrapper library for evdev devices" arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/libevdev/" license=(custom:X11) depends=('glibc') makedepends=('python') -source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('ba6becd3f41430aa290ddf53694909fb46b9a65d5fe264e5fc2a4f5169484f42') +source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz + 0001-Revert-Drop-deprecated-functions.patch + 0001-Revert-Drop-some-leftover-deprecated-constants.patch) +sha256sums=('1c562ed32252ef9c14aa61e03b38acb886cb3edbbdafbb5181762ff16e010d93' + '783ba5edf7c9525e8cac46c8c4c981c98395ff3c68ed7a162190ef9e8f13b149' + '24d52811732b3335eb363416e4862c6152bfe6ebc8c372a298126221f754f041') build() { cd $pkgname-$pkgver + + # Fix libevdev 0.6 missing symbol that breaks clutter, patches from Fedora + # https://bugzilla.redhat.com/show_bug.cgi?id=1046426 + patch -Np1 -i ../0001-Revert-Drop-deprecated-functions.patch + patch -Np1 -i ../0001-Revert-Drop-some-leftover-deprecated-constants.patch + ./configure --prefix=/usr --disable-static --disable-gcov make } diff --git a/extra/libotr/PKGBUILD b/extra/libotr/PKGBUILD index 7b6ed5843..87ede8fa3 100644 --- a/extra/libotr/PKGBUILD +++ b/extra/libotr/PKGBUILD @@ -1,22 +1,29 @@ -# $Id: PKGBUILD 198216 2013-10-30 13:31:00Z allan $ +# $Id: PKGBUILD 203477 2014-01-11 10:56:47Z andrea $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Bug <Bug2000@gmail.com> pkgname=libotr pkgver=4.0.0 -pkgrel=1 +pkgrel=4 pkgdesc='Off-the-Record Messaging Library and Toolkit' url='http://www.cypherpunks.ca/otr/' license=('GPL' 'LGPL') arch=('i686' 'x86_64') depends=('libgcrypt') -source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz") -sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc') +source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz" + 'kopete.patch') +sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc' + '55988c4f11b6852491a758ea7a5b7071e8959c55') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../kopete.patch # FS#38326 +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --disable-static + ./configure --prefix=/usr --mandir=/usr/share/man make } diff --git a/extra/libotr/kopete.patch b/extra/libotr/kopete.patch new file mode 100644 index 000000000..110e4eec2 --- /dev/null +++ b/extra/libotr/kopete.patch @@ -0,0 +1,12 @@ +diff -Naur old/src/message.c new/src/message.c +--- old/src/message.c 2012-08-31 02:15:35.000000000 -1000 ++++ new/src/message.c 2014-01-06 01:22:43.316831758 -1000 +@@ -441,7 +441,7 @@ + /* Fragment and send according to policy */ + if (!err && messagep && *messagep) { + if (context) { +- err = fragment_and_send(ops, NULL, context, *messagep, ++ err = fragment_and_send(ops, opdata, context, *messagep, + fragPolicy, messagep); + } + } diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index 401156852..4a288f8fe 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 200788 2013-12-05 08:49:59Z giovanni $ +# $Id: PKGBUILD 203468 2014-01-11 09:48:53Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=link-grammar -pkgver=4.8.2 +pkgver=4.8.5 pkgrel=1 pkgdesc="A Grammar Checking library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('aspell') options=('!makeflags') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('57eb0738c57a177e2e76f0b398af811d') +md5sums=('2059342ce25d610428dfda6c8f65a06f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 287b4824b..c51f92acc 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 200849 2013-12-06 11:57:53Z giovanni $ +# $Id: PKGBUILD 203470 2014-01-11 09:55:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.12.05 +pkgver=2014.01.07 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://live555.com/liveMedia" depends=('gcc-libs') options=('staticlibs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('7f3d0e17b6d894a3140c35f9091a8a70') +md5sums=('691421f4c3c6c8a40bd6045d76103e98') build() { cd ${srcdir}/live diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index b1f2a3602..60851eb7b 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 201265 2013-12-07 10:35:05Z bpiotrowski $ +# $Id: PKGBUILD 203493 2014-01-11 20:07:09Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: xduugu <xduugu@gmx.com> pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=6.6.0 -pkgrel=3 +pkgver=6.7.0 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz") -md5sums=('1e952a3196b0c43150801eeaecba68ed') +md5sums=('27bb6b0a10b3bb2fcf1c3e520c300207') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 4259a905c..34997d0cb 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191962 2013-08-02 03:24:15Z bisson $ +# $Id: PKGBUILD 203483 2014-01-11 16:49:37Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=17 +pkgrel=18 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -19,7 +19,7 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" 'ntpdate.service') sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' 'd3496dbeb7d531dd6ab071dbce3262c3c9618d8b' - 'ff8370719f003f184563b7d6068c03086678482f' + 'dd24216e8333e12d5080965696602591c72537b1' 'e1c48cba549b7d21501aadf513926e463884c090' ) diff --git a/extra/ntp/ntpd.service b/extra/ntp/ntpd.service index 45239877f..cfd965a6b 100644 --- a/extra/ntp/ntpd.service +++ b/extra/ntp/ntpd.service @@ -5,7 +5,8 @@ After=network.target nss-lookup.target [Service] Type=forking PrivateTmp=true -ExecStart=/usr/bin/ntpd -g -u ntp:ntp +PIDFile=/run/ntpd.pid +ExecStart=/usr/bin/ntpd -g -u ntp:ntp -p /run/ntpd.pid Restart=always [Install] diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index 2af6b4d09..626cd3c9d 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 202666 2013-12-23 21:05:04Z ronald $ +# $Id: PKGBUILD 203485 2014-01-11 17:11:51Z bisson $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave pkgver=3.6.4 -pkgrel=5 +pkgrel=6 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" @@ -36,7 +36,7 @@ build() { ./configure --prefix=/usr --libexecdir=/usr/lib \ --enable-shared --disable-static \ - --with-quantum-depth=32 \ + --with-quantum-depth=16 \ --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html LANG=C make diff --git a/extra/openbabel/PKGBUILD b/extra/openbabel/PKGBUILD index bfa2c97c1..5380ff276 100644 --- a/extra/openbabel/PKGBUILD +++ b/extra/openbabel/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 198351 2013-10-30 14:20:21Z allan $ +# $Id: PKGBUILD 203494 2014-01-11 20:07:10Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=openbabel pkgver=2.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="A library designed to interconvert between many file formats used in molecular modeling and computational chemistry" arch=('i686' 'x86_64') url="http://openbabel.org/wiki/Main_Page" license=('GPL') -depends=('gcc-libs' 'libxml2') +depends=('gcc-libs' 'libxml2' 'libsm') makedepends=('cmake' 'eigen2' 'wxgtk') optdepends=('eigen2: to use bindings' - 'wxgtk: GUI interface') + 'wxgtk: GUI interface') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('9b0007560d9d838b40ab4ad06daf5610') diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index 00938d9d0..0beb2d676 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198600 2013-10-30 17:27:07Z giovanni $ +# $Id: PKGBUILD 203472 2014-01-11 10:10:43Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.55 -pkgrel=2 +pkgver=1.56 +pkgrel=1 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64') license=('custom:BSD') @@ -15,7 +15,7 @@ options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('473b8d66ca69d5784bb0e428721f58e0') +md5sums=('1a5258167ad0ac6a2b695a6fdc0c6e60') prepare() { cd ${srcdir}/${_cpanname}-${pkgver} diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 14d0125d6..84c40b675 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 199073 2013-11-08 10:00:05Z giovanni $ +# $Id: PKGBUILD 203474 2014-01-11 10:30:22Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com> pkgname=smb4k -pkgver=1.0.9 +pkgver=1.1.0 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=smb4k.install source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7a27698842663c6197228ff3c282a079') +md5sums=('2ccd1f4eda732654460ff03b77738a96') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD index 0b8c6fcf9..4c539c847 100644 --- a/extra/wxgtk/PKGBUILD +++ b/extra/wxgtk/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 184450 2013-05-06 19:40:13Z foutrelis $ +# $Id: PKGBUILD 203497 2014-01-11 20:07:13Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxgtk -pkgver=2.8.12.1 -pkgrel=5 +pkgver=3.0.0 +pkgrel=2 pkgdesc="GTK+ implementation of wxWidgets API for GUI" arch=('i686' 'x86_64') url="http://wxwidgets.org" license=('custom:wxWindows') -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') +depends=('gtk2' 'gstreamer0.10-base') +makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu') +optdepends=('webkitgtk2: for webview support') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2) +sha1sums=('756a9c54d1f411e262f03bacb78ccef085a9880a') build() { - cd wx*-${pkgver} + cd wxWidgets-${pkgver} ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --disable-optimize --enable-mediactrl --with-regex=builtin \ + --enable-graphics_ctx --enable-mediactrl --enable-webview --enable-stl --with-regex=builtin \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --with-sdl --disable-precomp-headers + --disable-precomp-headers make make -C locale allmo - make -C contrib/src } package() { - cd wx*-${pkgver} + cd wxWidgets-${pkgver} make DESTDIR="${pkgdir}" install - make -C contrib/src DESTDIR="${pkgdir}" install install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/wxgtk2.8/PKGBUILD b/extra/wxgtk2.8/PKGBUILD new file mode 100644 index 000000000..a10905131 --- /dev/null +++ b/extra/wxgtk2.8/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 203498 2014-01-11 20:07:14Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=wxgtk2.8 +pkgver=2.8.12.1 +pkgrel=1 +pkgdesc="GTK+ implementation of wxWidgets API for GUI" +arch=('i686' 'x86_64') +url="http://wxwidgets.org" +license=('custom:wxWindows') +depends=('gtk2' 'gstreamer0.10-base' 'sdl') +makedepends=('gstreamer0.10-base-plugins' 'gconf' 'glu') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 wxGTK-collision.patch) +sha1sums=('05688dc03d61631750f5904273122bb40a2115f5' + '575fb4688051c246777988332f55703df403d6b9') + +prepare() { + cd wx*-${pkgver} + patch -p1 -i ../wxGTK-collision.patch +} + +build() { + 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 + make -C contrib/src +} + +package() { + cd wx*-${pkgver} + make DESTDIR="${pkgdir}" install + make -C contrib/src DESTDIR="${pkgdir}" install + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/wxgtk2.8/wxGTK-collision.patch b/extra/wxgtk2.8/wxGTK-collision.patch new file mode 100644 index 000000000..f6e02d876 --- /dev/null +++ b/extra/wxgtk2.8/wxGTK-collision.patch @@ -0,0 +1,82 @@ +diff -Naur wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl wxPython-src-2.8.12.1/build/bakefiles/wx.bkl +--- wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl 2014-01-04 22:28:16.491774907 -0500 ++++ wxPython-src-2.8.12.1/build/bakefiles/wx.bkl 2014-01-04 22:37:39.610020870 -0500 +@@ -128,7 +128,7 @@ + <using module="gettext"/> + <gettext-catalogs id="locale"> + <srcdir>$(SRCDIR)/locale</srcdir> +- <catalog-name>wxstd</catalog-name> ++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> + <linguas> + ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk + zh zh_CN zh_TW +diff -Naur wxPython-src-2.8.12.1.orig/Makefile.in wxPython-src-2.8.12.1/Makefile.in +--- wxPython-src-2.8.12.1.orig/Makefile.in 2014-01-04 22:28:16.545107766 -0500 ++++ wxPython-src-2.8.12.1/Makefile.in 2014-01-04 22:40:27.191813403 -0500 +@@ -11695,10 +11695,11 @@ + all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) + + install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) +- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal +- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) ++ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets +- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets) ++ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ ++ for i in wx.bkl wx_unix.bkl wx_win32.bkl ; do \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx + for f in setup.h $(RCDEFS_H); do \ + if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \ +@@ -12455,7 +12456,8 @@ + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config + $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config +- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) ++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \ ++ && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) + + locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale +@@ -12463,7 +12465,8 @@ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ + if test -f $(srcdir)/locale/$$l.mo ; then \ +- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ ++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo \ ++ $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ + fi ; \ + done + +@@ -12480,7 +12483,7 @@ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ + if test -f $(srcdir)/locale/msw/$$l.mo ; then \ +- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \ ++ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \ + fi ; \ + done + +diff -Naur wxPython-src-2.8.12.1.orig/src/common/intl.cpp wxPython-src-2.8.12.1/src/common/intl.cpp +--- wxPython-src-2.8.12.1.orig/src/common/intl.cpp 2014-01-04 22:28:16.675106608 -0500 ++++ wxPython-src-2.8.12.1/src/common/intl.cpp 2014-01-04 22:47:49.523526232 -0500 +@@ -1597,7 +1597,7 @@ + bool bOk = true; + if ( bLoadDefault ) + { +- bOk = AddCatalog(wxT("wxstd")); ++ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))); + + // there may be a catalog with toolkit specific overrides, it is not + // an error if this does not exist +diff -Naur wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in wxPython-src-2.8.12.1/utils/wxrc/Makefile.in +--- wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in 2014-01-04 22:28:16.335109635 -0500 ++++ wxPython-src-2.8.12.1/utils/wxrc/Makefile.in 2014-01-04 22:37:34.410068493 -0500 +@@ -120,7 +120,6 @@ + @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) + @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) + @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) +-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) + + @COND_USE_XRC_1@uninstall_wxrc: + @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD index c6102c3ba..3c4a112ce 100644 --- a/extra/wxmaxima/PKGBUILD +++ b/extra/wxmaxima/PKGBUILD @@ -5,18 +5,19 @@ pkgname=wxmaxima pkgver=13.04.2 -pkgrel=1 +pkgrel=2 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima" arch=('i686' 'x86_64') url="http://wxmaxima.sourceforge.net/" license=('GPL2') -depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils') +depends=('maxima' 'libxml2' 'wxgtk2.8' 'shared-mime-info' 'desktop-file-utils') source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz) install=wxmaxima.install sha1sums=('9508d3badb6c339f34e73e01c5065f679329a17c') build() { cd "${srcdir}/wxMaxima-${pkgver}" + export WX_CONFIG_PATH=/usr/bin/wx-config-2.8 ./configure --prefix=/usr make } diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD index af7659559..c15f815e1 100644 --- a/extra/wxpython/PKGBUILD +++ b/extra/wxpython/PKGBUILD @@ -1,32 +1,33 @@ -# $Id: PKGBUILD 168112 2012-10-06 03:24:39Z eric $ +# $Id: PKGBUILD 203500 2014-01-11 20:07:15Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxpython -pkgver=2.8.12.1 -pkgrel=4 +pkgver=3.0.0.0 +_editraver=0.7.20 +pkgrel=1 pkgdesc="A wxWidgets GUI toolkit for Python" arch=('i686' 'x86_64') license=('custom:wxWindows') url="http://www.wxpython.org" depends=('wxgtk' 'python2') -makedepends=('mesa') -source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 - wxpython-cairo.patch wxpython-fpb_default_style.patch) -sha1sums=('05688dc03d61631750f5904273122bb40a2115f5' - '420700b0a216b853352ffafd054f406a82a30bb3' - 'b832d628b8ff38ea598f404d133899f40d687a22') +makedepends=('mesa' 'glu') +source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 + http://editra.org/uploads/src/Editra-${_editraver}.tar.gz) +sha1sums=('48451763275cfe4e5bbec49ccd75bc9652cba719' + 'f439f4aa2cb90b8348cebb1670df9cf47ba341ab') + +prepare() { + cd "${srcdir}" + find . -type f -exec sed -i 's/env python/env python2/' {} \; + sed -i 's/sys.exit(1)//' Editra-${_editraver}/setup.py +} build() { cd "${srcdir}/wxPython-src-${pkgver}" - find . -type f -exec sed -i 's/env python/env python2/' {} \; - mv wxPython/wx/tools/Editra/editra wxPython/wx/tools/Editra/Editra ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --disable-optimize --enable-mediactrl \ - --with-regex=sys --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --disable-precomp-headers - cd "${srcdir}/wxPython-src-${pkgver}/wxPython" - patch -p2 -i "${srcdir}/wxpython-cairo.patch" - patch -p1 -i "${srcdir}/wxpython-fpb_default_style.patch" + --enable-graphics_ctx --enable-mediactrl --disable-precomp-headers \ + --with-regex=sys --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys + cd wxPython python2 setup.py WXPORT=gtk2 UNICODE=1 build } @@ -34,4 +35,8 @@ package() { cd "${srcdir}/wxPython-src-${pkgver}/wxPython" python2 setup.py WXPORT=gtk2 UNICODE=1 install --root="${pkgdir}" install -D -m644 ../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + cd "${srcdir}/Editra-${_editraver}" + python2 setup.py install --root="${pkgdir}" + rm -r "${pkgdir}/usr/lib/python2.7/site-packages/wx-3.0-gtk2/wx/tools/Editra" } diff --git a/extra/wxpython/wxpython-cairo.patch b/extra/wxpython/wxpython-cairo.patch deleted file mode 100644 index f3fc6fba0..000000000 --- a/extra/wxpython/wxpython-cairo.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- wxPython/trunk/wx/lib/wxcairo.py 2011/08/25 18:50:02 68894 -+++ wxPython/trunk/wx/lib/wxcairo.py 2011/09/22 00:30:25 69181 -@@ -401,6 +401,48 @@ - ctypes.py_object)), - ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))] - -+ # This structure is known good with pycairo 1.10.0. The keep adding stuff -+ # to the middle of the structure instead of only adding to the end! -+ elif cairo.version_info < (1,11): -+ _fields_ = [ -+ ('Context_Type', ctypes.py_object), -+ ('Context_FromContext', ctypes.PYFUNCTYPE(ctypes.py_object, -+ ctypes.c_void_p, -+ ctypes.py_object, -+ ctypes.py_object)), -+ ('FontFace_Type', ctypes.py_object), -+ ('ToyFontFace_Type', ctypes.py_object), #** new in 1.8.4 -+ ('FontFace_FromFontFace', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), -+ ('FontOptions_Type', ctypes.py_object), -+ ('FontOptions_FromFontOptions', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), -+ ('Matrix_Type', ctypes.py_object), -+ ('Matrix_FromMatrix', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), -+ ('Path_Type', ctypes.py_object), -+ ('Path_FromPath', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), -+ ('Pattern_Type', ctypes.py_object), -+ ('SolidPattern_Type', ctypes.py_object), -+ ('SurfacePattern_Type', ctypes.py_object), -+ ('Gradient_Type', ctypes.py_object), -+ ('LinearGradient_Type', ctypes.py_object), -+ ('RadialGradient_Type', ctypes.py_object), -+ ('Pattern_FromPattern', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p, -+ ctypes.py_object)), #** changed in 1.8.4 -+ ('ScaledFont_Type', ctypes.py_object), -+ ('ScaledFont_FromScaledFont', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), -+ ('Surface_Type', ctypes.py_object), -+ ('ImageSurface_Type', ctypes.py_object), -+ ('PDFSurface_Type', ctypes.py_object), -+ ('PSSurface_Type', ctypes.py_object), -+ ('SVGSurface_Type', ctypes.py_object), -+ ('Win32Surface_Type', ctypes.py_object), -+ ('Win32PrintingSurface_Type', ctypes.py_object), -+ ('XCBSurface_Type', ctypes.py_object), -+ ('XlibSurface_Type', ctypes.py_object), -+ ('Surface_FromSurface', ctypes.PYFUNCTYPE(ctypes.py_object, -+ ctypes.c_void_p, -+ ctypes.py_object)), -+ ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))] -+ - - def _loadPycairoAPI(): - global pycairoAPI diff --git a/extra/wxpython/wxpython-fpb_default_style.patch b/extra/wxpython/wxpython-fpb_default_style.patch deleted file mode 100644 index 906d3444d..000000000 --- a/extra/wxpython/wxpython-fpb_default_style.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- wxPython/wx/tools/XRCed/plugins/xh_wxlib.py (revision 50185) -+++ wxPython/wx/tools/XRCed/plugins/xh_wxlib.py (revision 69431) -@@ -18,5 +18,4 @@ - self.AddWindowStyles() - # Custom styles -- self.AddStyle('FPB_DEFAULT_STYLE', fpb.FPB_DEFAULT_STYLE) - self.AddStyle('FPB_SINGLE_FOLD', fpb.FPB_SINGLE_FOLD) - self.AddStyle('FPB_COLLAPSE_TO_BOTTOM', fpb.FPB_COLLAPSE_TO_BOTTOM) ---- wxPython/wx/tools/XRCed/plugins/wxlib.py (revision 57250) -+++ wxPython/wx/tools/XRCed/plugins/wxlib.py (revision 69431) -@@ -20,5 +20,5 @@ - implicit_attributes=['label', 'collapsed'], - implicit_params={'collapsed': params.ParamBool}) --c.addStyles('FPB_DEFAULT_STYLE', 'FPB_SINGLE_FOLD', 'FPB_COLLAPSE_TO_BOTTOM', -+c.addStyles('FPB_SINGLE_FOLD', 'FPB_COLLAPSE_TO_BOTTOM', - 'FPB_EXCLUSIVE_FOLD', 'FPB_HORIZONTAL', 'FPB_VERTICAL') - component.Manager.register(c) |