diff options
-rw-r--r-- | community/apvlv/PKGBUILD | 16 | ||||
-rw-r--r-- | community/apvlv/apvlv-poppler015.patch | 12 | ||||
-rw-r--r-- | community/apvlv/poppler-gdk.patch | 150 | ||||
-rw-r--r-- | community/gearmand/PKGBUILD | 6 | ||||
-rw-r--r-- | community/gradm/PKGBUILD | 6 | ||||
-rw-r--r-- | community/gradm/policy | 2 | ||||
-rw-r--r-- | community/gtk-chtheme/PKGBUILD | 18 | ||||
-rw-r--r-- | community/hiredis/PKGBUILD | 33 | ||||
-rw-r--r-- | community/openmw/PKGBUILD | 4 | ||||
-rw-r--r-- | community/subtle/PKGBUILD | 6 | ||||
-rw-r--r-- | core/s-nail/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/cups/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/docker-tray/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/licq/PKGBUILD | 25 | ||||
-rw-r--r-- | extra/python-pycurl/PKGBUILD | 35 | ||||
-rw-r--r-- | extra/v4l-utils/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/xterm/PKGBUILD | 6 |
17 files changed, 120 insertions, 231 deletions
diff --git a/community/apvlv/PKGBUILD b/community/apvlv/PKGBUILD index 065bf30fa..91cd3259b 100644 --- a/community/apvlv/PKGBUILD +++ b/community/apvlv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88809 2013-04-22 20:09:44Z jsteel $ +# $Id: PKGBUILD 115831 2014-07-17 17:30:07Z jsteel $ # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -7,17 +7,17 @@ pkgname=apvlv pkgver=0.1.4.20121023 -pkgrel=3 -pkgdesc='A PDF Viewer, which behaves like Vim' +pkgrel=4 +pkgdesc='PDF/DJVU/TXT viewer which behaves like Vim' arch=('i686' 'x86_64') url="http://naihe2010.github.com/apvlv/" license=('GPL') -depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre' 'desktop-file-utils') -makedepends=('cmake' 'libwebkit') +depends=('gtk2' 'poppler-glib' 'djvulibre' 'desktop-file-utils') +makedepends=('cmake' 'webkitgtk2') install=$pkgname.install source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz $pkgname.desktop) -backup=(etc/apvlvrc) +backup=('etc/apvlvrc') md5sums=('f222fc4b09b15358eb4e7f996ba810d6' '54478fecb54f36d1c44d8fdc233ddbac') @@ -27,8 +27,8 @@ build() { mkdir -p build cd build - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \ + -DAPVLV_WITH_DJVU=yes -DAPVLV_WITH_TXT=yes \ -DAPVLV_WITH_UMD=no .. make diff --git a/community/apvlv/apvlv-poppler015.patch b/community/apvlv/apvlv-poppler015.patch deleted file mode 100644 index 0a261b1db..000000000 --- a/community/apvlv/apvlv-poppler015.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur apvlv-0.1.2-Source.orig//src/ApvlvFile.cpp apvlv-0.1.2-Source.new//src/ApvlvFile.cpp ---- apvlv-0.1.2-Source.orig//src/ApvlvFile.cpp 2011-07-29 17:19:13.000000000 +0200 -+++ apvlv-0.1.2-Source.new//src/ApvlvFile.cpp 2011-07-29 17:22:22.000000000 +0200 -@@ -304,7 +304,7 @@ - { - PopplerRectangle rect = { x1, y1, x2, y2 }; - PopplerPage *page = poppler_document_get_page (mDoc, pn); -- *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect); -+ *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect); - if (*out != NULL) - { - return true; diff --git a/community/apvlv/poppler-gdk.patch b/community/apvlv/poppler-gdk.patch deleted file mode 100644 index ab487cf1c..000000000 --- a/community/apvlv/poppler-gdk.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff -ruN apvlv-0.1.2-Source/src/ApvlvFile.cpp apvlv-0.1.2-Source.new/src/ApvlvFile.cpp ---- apvlv-0.1.2-Source/src/ApvlvFile.cpp 2011-10-10 14:23:19.205606984 +0200 -+++ apvlv-0.1.2-Source.new/src/ApvlvFile.cpp 2011-10-10 14:21:50.870952455 +0200 -@@ -29,6 +29,10 @@ - #include "ApvlvUtil.hpp" - #include "ApvlvView.hpp" - -+#ifndef POPPLER_WITH_GDK -+#include "poppler-gdk.h" -+#endif -+ - #ifdef HAVE_LIBUMD - #define LIBUMD_ENABLE_GTK - #include <umd.h> -diff -ruN apvlv-0.1.2-Source/src/poppler-gdk.h apvlv-0.1.2-Source.new/src/poppler-gdk.h ---- apvlv-0.1.2-Source/src/poppler-gdk.h 1970-01-01 01:00:00.000000000 +0100 -+++ apvlv-0.1.2-Source.new/src/poppler-gdk.h 2011-10-10 14:22:06.077846565 +0200 -@@ -0,0 +1,132 @@ -+#include <goo/gtypes.h> -+ -+static void -+copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, -+ GdkPixbuf *pixbuf) -+{ -+ int cairo_width, cairo_height, cairo_rowstride; -+ unsigned char *pixbuf_data, *dst, *cairo_data; -+ int pixbuf_rowstride, pixbuf_n_channels; -+ unsigned int *src; -+ int x, y; -+ -+ cairo_width = cairo_image_surface_get_width (surface); -+ cairo_height = cairo_image_surface_get_height (surface); -+ cairo_rowstride = cairo_image_surface_get_stride (surface); -+ cairo_data = cairo_image_surface_get_data (surface); -+ -+ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf); -+ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf); -+ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf); -+ -+ if (cairo_width > gdk_pixbuf_get_width (pixbuf)) -+ cairo_width = gdk_pixbuf_get_width (pixbuf); -+ if (cairo_height > gdk_pixbuf_get_height (pixbuf)) -+ cairo_height = gdk_pixbuf_get_height (pixbuf); -+ for (y = 0; y < cairo_height; y++) -+ { -+ src = (unsigned int *) (cairo_data + y * cairo_rowstride); -+ dst = pixbuf_data + y * pixbuf_rowstride; -+ for (x = 0; x < cairo_width; x++) -+ { -+ dst[0] = (*src >> 16) & 0xff; -+ dst[1] = (*src >> 8) & 0xff; -+ dst[2] = (*src >> 0) & 0xff; -+ if (pixbuf_n_channels == 4) -+ dst[3] = (*src >> 24) & 0xff; -+ dst += pixbuf_n_channels; -+ src++; -+ } -+ } -+} -+ -+static void -+_poppler_page_render_to_pixbuf (PopplerPage *page, -+ int src_x, int src_y, -+ int src_width, int src_height, -+ double scale, -+ int rotation, -+ GBool printing, -+ GdkPixbuf *pixbuf) -+{ -+ cairo_t *cr; -+ cairo_surface_t *surface; -+ -+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, -+ src_width, src_height); -+ cr = cairo_create (surface); -+ cairo_save (cr); -+ switch (rotation) { -+ case 90: -+ cairo_translate (cr, src_x + src_width, -src_y); -+ break; -+ case 180: -+ cairo_translate (cr, src_x + src_width, src_y + src_height); -+ break; -+ case 270: -+ cairo_translate (cr, -src_x, src_y + src_height); -+ break; -+ default: -+ cairo_translate (cr, -src_x, -src_y); -+ } -+ -+ if (scale != 1.0) -+ cairo_scale (cr, scale, scale); -+ -+ if (rotation != 0) -+ cairo_rotate (cr, rotation * G_PI / 180.0); -+ -+ if (printing) -+ poppler_page_render_for_printing (page, cr); -+ else -+ poppler_page_render (page, cr); -+ cairo_restore (cr); -+ -+ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); -+ cairo_set_source_rgb (cr, 1., 1., 1.); -+ cairo_paint (cr); -+ -+ cairo_destroy (cr); -+ -+ copy_cairo_surface_to_pixbuf (surface, pixbuf); -+ cairo_surface_destroy (surface); -+} -+ -+/** -+ * poppler_page_render_to_pixbuf: -+ * @page: the page to render from -+ * @src_x: x coordinate of upper left corner -+ * @src_y: y coordinate of upper left corner -+ * @src_width: width of rectangle to render -+ * @src_height: height of rectangle to render -+ * @scale: scale specified as pixels per point -+ * @rotation: rotate the document by the specified degree -+ * @pixbuf: pixbuf to render into -+ * -+ * First scale the document to match the specified pixels per point, -+ * then render the rectangle given by the upper left corner at -+ * (src_x, src_y) and src_width and src_height. -+ * This function is for rendering a page that will be displayed. -+ * If you want to render a page that will be printed use -+ * poppler_page_render_to_pixbuf_for_printing() instead -+ * -+ * Deprecated: 0.16 -+ **/ -+void -+poppler_page_render_to_pixbuf (PopplerPage *page, -+ int src_x, int src_y, -+ int src_width, int src_height, -+ double scale, -+ int rotation, -+ GdkPixbuf *pixbuf) -+{ -+ g_return_if_fail (POPPLER_IS_PAGE (page)); -+ g_return_if_fail (scale > 0.0); -+ g_return_if_fail (pixbuf != NULL); -+ -+ _poppler_page_render_to_pixbuf (page, src_x, src_y, -+ src_width, src_height, -+ scale, rotation, -+ gFalse, -+ pixbuf); -+} diff --git a/community/gearmand/PKGBUILD b/community/gearmand/PKGBUILD index 894a79528..48a7bba5b 100644 --- a/community/gearmand/PKGBUILD +++ b/community/gearmand/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 105677 2014-02-13 14:56:45Z mtorromeo $ +# $Id: PKGBUILD 115823 2014-07-17 10:01:01Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Lev Lybin <lev.lybin@gmail.com> # Contributor: Vadym Abramchuk <abramm@gmail.com> @@ -6,10 +6,10 @@ pkgname=gearmand pkgver=1.1.12 -pkgrel=1 +pkgrel=2 pkgdesc="Distributed job queue server." arch=('i686' 'x86_64') -depends=('libevent' 'boost-libs' 'libmariadbclient' 'postgresql-libs' 'sqlite') +depends=('libevent' 'boost-libs' 'libmariadbclient' 'postgresql-libs' 'sqlite' 'hiredis') makedepends=('boost' 'gperf' 'python-sphinx') conflicts=('gearman') replaces=('gearman') diff --git a/community/gradm/PKGBUILD b/community/gradm/PKGBUILD index 0df9b8c45..f7ad64f4b 100644 --- a/community/gradm/PKGBUILD +++ b/community/gradm/PKGBUILD @@ -7,7 +7,7 @@ pkgname=gradm _version=3.0 -_timestamp=201405281853 +_timestamp=201407162022 pkgver=3.0.$_timestamp pkgrel=1 pkgdesc="Administration utility for grsecurity's Role Based Access Control (RBAC)" @@ -19,10 +19,10 @@ source=(https://grsecurity.net/stable/$pkgname-$_version-$_timestamp.tar.gz https://grsecurity.net/stable/$pkgname-$_version-$_timestamp.tar.gz.sig learn_config policy) -sha256sums=('4ee8a4e3a658f14b58c55fb8c5a9d3234e0ec87cf90a886499918553a15c557a' +sha256sums=('300d119f584644a4698cf6c9125fa0cd17a7ff00b4f7885fe782828b93881e1b' 'SKIP' '704ea6ba7f748761735cbe1cf52ef04f53eab1a1e9ea1bdcb6abaaf4a641e44d' - 'c2fb8e696969530c4dc707c59cdc608df6c21d6226979dfeadef92c51deabc5e') + '0d069e28845f789d0e9da82fc6dffa368ab71b2ca4ab37e0d3e3c6951e82d98a') prepare() { cd $pkgname diff --git a/community/gradm/policy b/community/gradm/policy index 395eec321..9d97a2a99 100644 --- a/community/gradm/policy +++ b/community/gradm/policy @@ -385,6 +385,7 @@ subject /usr/bin/sshd dpo /root /proc r /proc/*/oom_adj rw + /proc/*/oom_score_adj rw /proc/kcore h /proc/sys h /proc/sys/kernel/ngroups_max r @@ -412,6 +413,7 @@ subject /usr/bin/sshd dpo +CAP_SYS_RESOURCE +CAP_SYS_TTY_CONFIG +CAP_AUDIT_WRITE + +CAP_KILL # to access user keys +CAP_DAC_OVERRIDE diff --git a/community/gtk-chtheme/PKGBUILD b/community/gtk-chtheme/PKGBUILD index fbce248ad..1fa83fed4 100644 --- a/community/gtk-chtheme/PKGBUILD +++ b/community/gtk-chtheme/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 63616 2012-02-05 12:00:48Z ibiru $ +# $Id: PKGBUILD 115833 2014-07-17 18:34:00Z jsteel $ +# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gtk-chtheme pkgver=0.3.1 -pkgrel=7 -pkgdesc="This little program lets you change your Gtk+ 2.0 theme. A better alternative to switch2" +pkgrel=8 +pkgdesc="A little program to change your gtk+ 2.0 theme" arch=('i686' 'x86_64') license=('GPL') url="http://plasmasturm.org/programs/gtk-chtheme/" depends=('gtk2') -source=("http://plasmasturm.org/programs/gtk-chtheme/${pkgname}-${pkgver}.tar.bz2") +source=(http://plasmasturm.org/programs/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('f688053bf26dd6c4f1cd0bf2ee33de2a') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir"/$pkgname-$pkgver # Fix xdg compliancy sed -i 's|-DGTK.*||' Makefile sed -i 's|theme_list(g_.*|&\n\tread_theme_list(g_strconcat(g_get_user_data_dir(), "/themes", NULL));|' main.c + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir"/$pkgname-$pkgver - install -Dm755 gtk-chtheme ${pkgdir}/usr/bin/gtk-chtheme + install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname } diff --git a/community/hiredis/PKGBUILD b/community/hiredis/PKGBUILD new file mode 100644 index 000000000..7a6550fd3 --- /dev/null +++ b/community/hiredis/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 115821 2014-07-17 09:57:15Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Vladimir Tsanev <tsachev@gmail.com> + +pkgname=hiredis +pkgver=0.11.0 +pkgrel=4 +pkgdesc='Minimalistic C client library for Redis' +arch=('x86_64' 'i686') +url="https://github.com/redis/hiredis/" +license=('BSD') +depends=('glibc') +checkdepends=('redis') +source=(hiredis-$pkgver.tar.gz::https://github.com/redis/$pkgname/archive/v$pkgver.tar.gz) +sha256sums=('ff7b2849e55bf3589eecced7125934feb9645c36a4d490d001dc08c93553eafd') + +build() { + cd "$srcdir"/$pkgname-$pkgver + make +} + +check() { + cd "$srcdir"/$pkgname-$pkgver + sed -r 's|echo \\|echo -e \\|' -i Makefile + make check +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make PREFIX="$pkgdir"/usr install + + install -Dm 644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} diff --git a/community/openmw/PKGBUILD b/community/openmw/PKGBUILD index 80a703fbb..022745df0 100644 --- a/community/openmw/PKGBUILD +++ b/community/openmw/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Sandy Carter <bwrsandman@gmail.com> pkgname=openmw -pkgver=0.30.0 +pkgver=0.31.0 pkgrel=1 pkgdesc="An open-source engine reimplementation for the role-playing game Morrowind" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL3' 'MIT' 'custom') depends=('openal' 'ogre' 'mygui' 'bullet' 'qt4' 'ffmpeg' 'sdl2' 'unshield') makedepends=('cmake' 'boost') source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz") -sha1sums=('1331ad33ae1ba2b83e0eb6a525df804ceee351cf') +sha1sums=('c3551a52d6d4a8499286856cbc96f38dc91eec0c') build() { cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}" diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD index 73bc390bc..61c4a7a4a 100644 --- a/community/subtle/PKGBUILD +++ b/community/subtle/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106073 2014-02-21 23:10:38Z anatolik $ +# $Id: PKGBUILD 115797 2014-07-16 23:28:39Z anatolik $ # Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -12,7 +12,7 @@ pkgname=subtle _hg_revision=3243 _hg_hash=43d1d0478c46 pkgver=0.11.r$_hg_revision -pkgrel=1 +pkgrel=2 pkgdesc='Grid-based manual tiling window manager' arch=(x86_64 i686) url='http://subtle.subforge.org/' @@ -48,4 +48,6 @@ package() { # regenerate config with proper $pkgdir, revision and cppflags are not needed at this step rake config destdir="$pkgdir" rake install + + install -D -m644 data/subtle.desktop "$pkgdir"/usr/share/applications/subtle.desktop } diff --git a/core/s-nail/PKGBUILD b/core/s-nail/PKGBUILD index ef978bde4..081c98716 100644 --- a/core/s-nail/PKGBUILD +++ b/core/s-nail/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 215502 2014-06-27 11:40:20Z bisson $ +# $Id: PKGBUILD 216954 2014-07-17 20:24:11Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com> # Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de> pkgname=s-nail -pkgver=14.7.1 +pkgver=14.7.4 pkgrel=1 pkgdesc='Mail processing system with a command syntax reminiscent of ed' url='http://sdaoden.users.sourceforge.net/code.html#s-nail' license=('custom:BSD') arch=('i686' 'x86_64') -depends=('openssl') +depends=('openssl' 'krb5') optdepends=('smtp-forwarder: for sending mail') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.xz") -sha1sums=('190d531b86ca633c4292472e89b46c3351f2475e') +sha1sums=('703246285b4b2cd846807fa43733e75e0632a8df') groups=('base') backup=('etc/mail.rc') @@ -24,12 +24,14 @@ conflicts=('mailx' 'mailx-heirloom' 'heirloom-mailx') build() { cd "${srcdir}/${pkgname}-${pkgver}" + CFLAGS+=" $CPPFLAGS" make \ PREFIX=/usr \ SYSCONFDIR=/etc \ MANDIR=/usr/share/man \ MAILSPOOL=/var/spool/mail \ SID= NAIL=mail \ + WANT_AUTOCC=0 \ config make build diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 88299910c..4618ee4a0 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 216036 2014-07-01 13:09:58Z fyan $ +# $Id: PKGBUILD 216947 2014-07-17 14:38:44Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.7.3 -pkgrel=4 +pkgver=1.7.4 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" @@ -31,7 +31,7 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch get-ppd-file-for-statically-configured-ipp-shared-queues.patch ppd-poll-with-client-conf.patch) -md5sums=('d498c3020acda0904ab0c13b6389a1ec' +md5sums=('1a2295c2b2d2f422db2e50f40ed2fb99' 'SKIP' '26e9b4e65c0a4d76db5737c9b156fd80' '96f82c38f3f540b53f3e5144900acf17' @@ -120,8 +120,6 @@ build() { check() { cd ${pkgbase}-${pkgver} -#./run-stp-tests.sh: line 782: 6307 Aborted (core dumped) $VALGRIND ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f > /tmp/cups-$user/log/debug_log 2>&1 -#FAIL: 87 error messages, expected 33. make -k check || /bin/true } diff --git a/extra/docker-tray/PKGBUILD b/extra/docker-tray/PKGBUILD index 68309c6fc..0894f5f7c 100644 --- a/extra/docker-tray/PKGBUILD +++ b/extra/docker-tray/PKGBUILD @@ -1,16 +1,14 @@ -# $Id: PKGBUILD 200798 2013-12-05 11:49:45Z bpiotrowski $ +# $Id: PKGBUILD 216953 2014-07-17 18:48:18Z svenstaro $ # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=docker-tray pkgver=1.5 -pkgrel=1 +pkgrel=2 pkgdesc="Docker is a docking application (WindowMaker dock app) which acts as a system tray for KDE and GNOME2." arch=('i686' 'x86_64') url="http://icculus.org/openbox/2/docker/" license=('GPL') depends=('glibc' 'glib2' 'libx11') -replaces=("docker<=1.5") -conflicts=("docker") source=("http://icculus.org/openbox/2/docker/docker-$pkgver.tar.gz") md5sums=('349320bebd43babb8b43e11c7aae0293') diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD index b110a3650..e603e78fb 100644 --- a/extra/licq/PKGBUILD +++ b/extra/licq/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 216875 2014-07-14 06:25:36Z fyan $ +# $Id: PKGBUILD 216951 2014-07-17 16:03:17Z fyan $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=licq pkgver=1.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced graphical ICQ clone and more for Unix" arch=('i686' 'x86_64') url="http://www.licq.org" @@ -16,7 +16,7 @@ md5sums=('46af2bc95865ee61a103d27812fe6e6a') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - mkdir {,plugins/qt4-gui/}build + mkdir build # Fix invalid PNG images to work with libpng 1.6 # https://github.com/licq-im/licq/pull/32 @@ -26,21 +26,20 @@ prepare() { build() { cd "${srcdir}/${pkgname}-${pkgver}" - # licq - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make + local licq_plugins="auto-reply icq rms msn qt4-gui" # osd jabber aosd + + local plugins="" _plugin + for _plugin in ${licq_plugins}; do + plugins+=" ${_plugin}\/CMakeLists.txt" + done + sed -i -e "s/file(GLOB cmake_plugins.*$/set(cmake_plugins ${plugins})/" plugins/CMakeLists.txt - # qt4-gui - cd ../plugins/qt4-gui/build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake" .. + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_FIFO=ON -DBUILD_PLUGINS=ON .. make } package() { cd "${srcdir}/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install - - cd ../plugins/qt4-gui/build - make DESTDIR="${pkgdir}" install } diff --git a/extra/python-pycurl/PKGBUILD b/extra/python-pycurl/PKGBUILD index de88e58cd..1f642fe78 100644 --- a/extra/python-pycurl/PKGBUILD +++ b/extra/python-pycurl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 208855 2014-03-27 14:43:37Z fyan $ +# $Id: PKGBUILD 216937 2014-07-17 06:56:13Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -6,40 +6,55 @@ _pypiname=pycurl pkgbase=python-$_pypiname pkgname=('python-pycurl' 'python2-pycurl') -pkgver=7.19.3.1 -pkgrel=2 +pkgver=7.19.5 +pkgrel=1 arch=('i686' 'x86_64') url="http://pycurl.sourceforge.net/" license=('LGPL' 'MIT') makedepends=('python' 'python2' 'curl' 'git') +checkdepends=('python-bottle' 'python2-bottle' 'python-nose' 'python2-nose' 'vsftpd') source=("git+https://github.com/pycurl/pycurl.git#tag=REL_${pkgver//./_}") sha1sums=('SKIP') prepare() { - cp -r ${_pypiname} python2-${_pypiname} + cp -r $_pypiname{,-py2} - cd "${srcdir}/${_pypiname}" + cd "$srcdir/$_pypiname" find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python3|" {} + sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python-pycurl"/' setup.py + sed -i "s/nosetests/nosetests3/" Makefile - cd "${srcdir}/python2-${_pypiname}" + cd "$srcdir/$_pypiname-py2" find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python2|" {} + sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python2-pycurl"/' setup.py + sed -i "s/nosetests/nosetests2/" Makefile } build() { - cd "${srcdir}/${_pypiname}" + cd "$srcdir/$_pypiname" + make python3 setup.py build --with-ssl - cd "${srcdir}/python2-${_pypiname}" + cd "$srcdir/$_pypiname-py2" + make python2 setup.py build --with-ssl } +check() { + export PYCURL_VSFTPD_PATH=vsftpd + + cd "$srcdir/$_pypiname" + PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.4:$PYTHONPATH" make test || warning "Tests failed" + + cd "$srcdir/$_pypiname-py2" + PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH" make test || warning "Tests failed" +} + package_python-pycurl() { pkgdesc="A Python 3.x interface to libcurl" depends=('python' 'curl') - cd ${_pypiname} + cd $_pypiname python setup.py install -O1 --root="${pkgdir}" install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } @@ -48,7 +63,7 @@ package_python2-pycurl() { pkgdesc="A Python 2.x interface to libcurl" depends=('python2' 'curl') - cd python2-${_pypiname} + cd $_pypiname-py2 python2 setup.py install -O1 --root="${pkgdir}" install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index 1e6f146ea..f587322e9 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 204968 2014-02-02 11:52:21Z thomas $ +# $Id: PKGBUILD 216938 2014-07-17 06:56:15Z fyan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils -pkgver=1.0.1 +pkgver=1.2.1 pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('qt4') depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2 http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc) -sha256sums=('fc0132e82a18dfad9619be3abf50c206e2f449b1c14440cde36f25874fdce7df' +sha256sums=('9b658fbcaaf8127115316e07fea314aebc21dd6dc3491cd8753a768521c4b9af' 'SKIP') build() { diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 713829bdb..c41cd5f3c 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 215362 2014-06-23 17:04:03Z andyrtr $ +# $Id: PKGBUILD 216943 2014-07-17 13:56:28Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=308 +pkgver=309 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz{,.asc} LICENSE) -md5sums=('1ec76c1a79a70de4f82c24c527ef4626' +md5sums=('6d494f7a31ce579aac0e7b71e8b7d68f' 'SKIP' '10ecc3f8ee91e3189863a172f68282d2') |