From 1a04b89cbb8e27e4622005c896745498af51ef45 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 23 Jan 2014 03:40:09 +0000 Subject: Thu Jan 23 03:35:13 UTC 2014 --- community/ruby-gtk2/PKGBUILD | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'community/ruby-gtk2/PKGBUILD') diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 259ba3cdd..1fd92eacf 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92390 2013-06-04 13:59:53Z arodseth $ +# $Id: PKGBUILD 104548 2014-01-22 17:19:25Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -8,17 +8,17 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=2.0.2 +pkgver=2.1.0 pkgrel=1 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('3a009bde5f4c684214d7860cce5763db4d862cfdeafaa84578117dc723b7e1e5') +sha256sums=('939251c1f82b41c3cf657552396cf4e1198365316904957cfb7167d1298db204') prepare() { - cd "$srcdir/ruby-gtk2-$pkgver" + cd "ruby-gtk2-$pkgver" LANG="en_US.UTF-8" \ ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --vendor @@ -33,8 +33,7 @@ prepare() { } build() { - cd "$srcdir/ruby-gtk2-$pkgver" - make + make -C "ruby-gtk2-$pkgver" } package_ruby-atk() { @@ -42,7 +41,7 @@ package_ruby-atk() { depends=("ruby-glib2=$pkgver" 'atk') cd "$srcdir/ruby-gtk2-$pkgver/atk" - make includedir="/usr/include" DESTDIR="$pkgdir" install + make includedir="/usr/include" DESTDIR="$pkgdir" install -j1 } package_ruby-gdkpixbuf2() { @@ -50,7 +49,7 @@ package_ruby-gdkpixbuf2() { depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2') cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2" - make includedir="/usr/include" DESTDIR="$pkgdir" install + make includedir="/usr/include" DESTDIR="$pkgdir" install -j1 } package_ruby-gio2() { @@ -58,7 +57,7 @@ package_ruby-gio2() { depends=("ruby-glib2=$pkgver") cd "$srcdir/ruby-gtk2-$pkgver/gio2" - make includedir="/usr/include" DESTDIR="$pkgdir/" install + make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1 } package_ruby-glib2() { @@ -66,7 +65,7 @@ package_ruby-glib2() { depends=('glib2' 'ruby') cd "$srcdir/ruby-gtk2-$pkgver/glib2" - make includedir="/usr/include" DESTDIR="$pkgdir/" install + make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1 } package_ruby-gtk2() { @@ -75,7 +74,7 @@ package_ruby-gtk2() { "ruby-gdkpixbuf2=$pkgver") cd "$srcdir/ruby-gtk2-$pkgver/gtk2" - make includedir="/usr/include" DESTDIR="$pkgdir/" install + make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1 } package_ruby-pango() { @@ -83,7 +82,7 @@ package_ruby-pango() { depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango') cd "$srcdir/ruby-gtk2-$pkgver/pango" - make includedir="/usr/include" DESTDIR="$pkgdir/" install + make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1 } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 58a72e3d6c07ca57231ada1576ba86af346197d4 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Fri, 24 Jan 2014 03:49:02 +0000 Subject: Fri Jan 24 03:41:27 UTC 2014 --- community/clanlib/PKGBUILD | 8 +- community/galculator/PKGBUILD | 40 ++++-- community/galculator/galculator.install | 4 +- community/jemalloc/PKGBUILD | 10 +- community/liblogging/PKGBUILD | 34 +++++ community/luminancehdr/PKGBUILD | 10 +- community/luminancehdr/luminancehdr.changelog | 3 + community/nomacs/PKGBUILD | 4 +- .../05ba23be296085313abd8d7d5075d962084f5d38.patch | 26 ++++ .../0cc65e2f420af45f78d190ac2af64810a148bb31.patch | 41 ++++++ community/planner/PKGBUILD | 54 +++++++ .../cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch | 147 +++++++++++++++++++ .../f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch | 114 +++++++++++++++ .../fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch | 41 ++++++ community/planner/planner.install | 26 ++++ community/processing/PKGBUILD | 14 +- community/rsyslog/PKGBUILD | 11 +- community/ruby-gtk2/PKGBUILD | 8 +- community/ruby-gtk3/PKGBUILD | 6 +- community/shotwell/PKGBUILD | 4 +- community/subtle/PKGBUILD | 42 ------ community/subtle/subtle.install | 7 - community/the_silver_searcher/PKGBUILD | 6 +- core/dialog/PKGBUILD | 6 +- core/sudo/PKGBUILD | 6 +- ...p3-remove-backchannel-event-if-we-get-eof.patch | 35 +++++ extra/evas_generic_loaders/PKGBUILD | 4 +- extra/ffmpeg-compat/PKGBUILD | 8 +- extra/libkdcraw/PKGBUILD | 4 +- extra/libpaper/PKGBUILD | 29 +++- extra/libraw/PKGBUILD | 8 +- extra/lm_sensors/PKGBUILD | 33 ++--- extra/lm_sensors/fancontrol.service | 9 -- extra/lm_sensors/healthd.conf | 2 +- extra/lm_sensors/linux_3.0.patch | 11 -- extra/lm_sensors/sensord.conf | 9 ++ extra/lm_sensors/sensord.service | 9 -- extra/purple-plugin-pack/PKGBUILD | 6 +- extra/visualvm/PKGBUILD | 6 +- kernels/linux-libre-rt/PKGBUILD | 7 +- ...mers-do-not-raise-softirq-unconditionally.patch | 156 +++++++++++++++++++++ libre/gloobus-preview-libre/PKGBUILD | 17 ++- ...bus-preview-configuration-pygobject3-port.patch | 124 ++++++++++++++++ .../gloobus-sushi-pygobject3-port.patch | 21 +++ pcr/emacs-lucid/PKGBUILD | 3 +- pcr/hunspell-pt-br/PKGBUILD | 6 +- pcr/youtube-dl-current/PKGBUILD | 4 +- 47 files changed, 991 insertions(+), 192 deletions(-) create mode 100644 community/liblogging/PKGBUILD create mode 100644 community/planner/05ba23be296085313abd8d7d5075d962084f5d38.patch create mode 100644 community/planner/0cc65e2f420af45f78d190ac2af64810a148bb31.patch create mode 100644 community/planner/PKGBUILD create mode 100644 community/planner/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch create mode 100644 community/planner/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch create mode 100644 community/planner/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch create mode 100644 community/planner/planner.install delete mode 100644 community/subtle/PKGBUILD delete mode 100644 community/subtle/subtle.install create mode 100644 core/sudo/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch delete mode 100644 extra/lm_sensors/fancontrol.service delete mode 100644 extra/lm_sensors/linux_3.0.patch create mode 100644 extra/lm_sensors/sensord.conf delete mode 100644 extra/lm_sensors/sensord.service create mode 100644 kernels/linux-libre-rt/timers-do-not-raise-softirq-unconditionally.patch create mode 100644 libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch create mode 100644 libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch (limited to 'community/ruby-gtk2/PKGBUILD') diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index 2da9f9d7e..cc3611ace 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99713 2013-10-30 23:11:42Z allan $ +# $Id: PKGBUILD 104636 2014-01-23 16:30:34Z svenstaro $ # Maintainer: Sven-Hendrik Haase pkgname=clanlib -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64') @@ -10,8 +10,8 @@ url="http://clanlib.org/" license=('zlib') depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite' 'libgl') makedepends=('doxygen' 'graphviz' 'mesa') -source=(clanlib-${pkgver}.tar.gz::https://github.com/sphair/ClanLib/archive/3.0.0.tar.gz) -md5sums=('bfbfd7cc89be12f02c3994d4fcdd49f3') +source=(http://www.clanlib.org/download/releases-3.0/ClanLib-${pkgver}.tgz) +md5sums=('29f2ce542019c6d5d8793cdf4811e4f9') build() { cd ${srcdir}/ClanLib-${pkgver} diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD index 210ce954f..3efb0ea56 100644 --- a/community/galculator/PKGBUILD +++ b/community/galculator/PKGBUILD @@ -1,31 +1,51 @@ -# $Id: PKGBUILD 92890 2013-06-18 08:47:35Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 104578 2014-01-23 04:23:17Z bgyorgy $ +# Maintainer: Balló György +# Contributor: Bartłomiej Piotrowski # Contributor: SpepS # Contributor: Alexander Fehr -pkgname=galculator +pkgbase=galculator +pkgname=(galculator galculator-gtk2) pkgver=2.1.2 -pkgrel=1 +pkgrel=2 pkgdesc='GTK+ based scientific calculator' arch=('i686' 'x86_64') url='http://galculator.sourceforge.net/' license=('GPL') -depends=('gtk3' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') +depends=('gtk3' 'gtk2') makedepends=('intltool') install=$pkgname.install source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2) sha256sums=('23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b') build() { + # GTK3 version + cd $pkgname-$pkgver + [ -e gtk3 ] || mkdir gtk3 + cd gtk3 + ../configure --prefix=/usr + make + + # GTK2 version cd $srcdir/$pkgname-$pkgver - - LDFLAGS+=' -lm' - ./configure --prefix=/usr + [ -e gtk2 ] || mkdir gtk2 + cd gtk2 + ../configure --prefix=/usr --disable-gtk3 make } -package() { - cd $srcdir/$pkgname-$pkgver +package_galculator() { + depends=('gtk3') + + cd $pkgbase-$pkgver/gtk3 + make DESTDIR="$pkgdir" install +} + +package_galculator-gtk2() { + pkgdesc+=' (GTK2 version)' + depends=('gtk2') + conflicts=('galculator') + cd $pkgbase-$pkgver/gtk2 make DESTDIR="$pkgdir" install } diff --git a/community/galculator/galculator.install b/community/galculator/galculator.install index fe845ffb1..1a05f573e 100644 --- a/community/galculator/galculator.install +++ b/community/galculator/galculator.install @@ -1,11 +1,11 @@ post_install() { - update-desktop-database -q - [[ -e /usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { post_install } + post_remove() { post_install } diff --git a/community/jemalloc/PKGBUILD b/community/jemalloc/PKGBUILD index 7884b01a8..8ed1666a7 100644 --- a/community/jemalloc/PKGBUILD +++ b/community/jemalloc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99648 2013-10-30 17:30:37Z mtorromeo $ +# $Id: PKGBUILD 104634 2014-01-23 14:58:20Z mtorromeo $ # Maintainer: Massimiliano Torromeo # Contributor: Kovivchak Evgen pkgname=jemalloc -pkgver=3.4.1 -pkgrel=2 +pkgver=3.5.0 +pkgrel=1 pkgdesc="General-purpose scalable concurrent malloc implementation" arch=('i686' 'x86_64') license=('BSD') @@ -18,7 +18,7 @@ source=(http://www.canonware.com/download/jemalloc/$pkgname-$pkgver.tar.bz2) build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + CFLAGS="$CFLAGS -std=gnu11" ./configure --prefix=/usr make } @@ -30,4 +30,4 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -sha256sums=('7341953fe9f21342b005b6c7e798631678ae713293a64d5fa61dea7449fc10fb') +sha256sums=('5b13dbef27c46e9efbe19b5eef574e298409ed9dbbde85ec805e29d04c05e473') diff --git a/community/liblogging/PKGBUILD b/community/liblogging/PKGBUILD new file mode 100644 index 000000000..e6f747d2c --- /dev/null +++ b/community/liblogging/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 104586 2014-01-23 09:47:05Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Denis Wernert + +pkgname=liblogging +pkgver=1.0.0pre +pkgrel=1 +pkgdesc="easy to use, portable, open source library for system logging" +url="http://www.liblogging.org/" +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('git') +options=('strip' 'zipman' '!libtool') +#source=("http://download.rsyslog.com/$pkgname/$pkgname-$pkgver.tar.gz") +source=("git://git.adiscon.com/git/liblogging.git") +md5sums=('SKIP') + +build() { + cd ${srcdir}/${pkgname} + + libtoolize --force --copy + aclocal + autoheader + automake --add-missing --copy + autoconf + + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname} + make install DESTDIR=${pkgdir} +} diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index 1815ec67f..0db157114 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92941 2013-06-19 21:09:46Z bpiotrowski $ +# $Id: PKGBUILD 104604 2014-01-23 13:18:25Z andrea $ # Maintainer: Jaroslav Lichtblau # Contributor: Lukas Jirkovsky # Contributor: Dmitry N. Shilov pkgname=luminancehdr pkgver=2.3.1 -pkgrel=3 +pkgrel=4 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64') url='http://qtpfsgui.sourceforge.net/' @@ -17,17 +17,17 @@ install=$pkgname.install changelog=$pkgname.changelog options=('!emptydirs') source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/luminance-hdr-${pkgver}.tar.bz2) -sha256sums=('7a2a81cd0f2da6b6780bdd47e5f902c9dfaeb8107d763ea63007b6fcdcb4d23b') +sha256sums=('c2a4764986bf8860d448530f3c8d76143d7504cebb07b3e58e37eb0db5347722') build() { - cd "${srcdir}" + cd "${srcdir}/luminance-hdr-${pkgver}" cmake -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}" + cd "${srcdir}/luminance-hdr-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog index ab6898db8..c2fcea924 100644 --- a/community/luminancehdr/luminancehdr.changelog +++ b/community/luminancehdr/luminancehdr.changelog @@ -1,3 +1,6 @@ +2014-01-20 Jaroslav Lichtblau + * luminancehdr 2.3.1-4 libraw rebuild + 2013-06-15 Jaroslav Lichtblau * luminancehdr 2.3.1-3 libraw rebuild diff --git a/community/nomacs/PKGBUILD b/community/nomacs/PKGBUILD index ce73fca29..9822a7cf2 100644 --- a/community/nomacs/PKGBUILD +++ b/community/nomacs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102808 2013-12-20 19:30:50Z speps $ +# $Id: PKGBUILD 104605 2014-01-23 13:18:26Z andrea $ # Maintainer: speps pkgname=nomacs pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="A Qt image viewer" arch=(i686 x86_64) url="http://www.nomacs.org/" diff --git a/community/planner/05ba23be296085313abd8d7d5075d962084f5d38.patch b/community/planner/05ba23be296085313abd8d7d5075d962084f5d38.patch new file mode 100644 index 000000000..591b2f20d --- /dev/null +++ b/community/planner/05ba23be296085313abd8d7d5075d962084f5d38.patch @@ -0,0 +1,26 @@ +From 05ba23be296085313abd8d7d5075d962084f5d38 Mon Sep 17 00:00:00 2001 +From: Alexandre Franke +Date: Wed, 14 Mar 2012 10:52:25 +0000 +Subject: Better use of fields in the .desktop file + +https://bugzilla.gnome.org/show_bug.cgi?id=672033 +--- +diff --git a/data/planner.desktop.in.in b/data/planner.desktop.in.in +index af61d34..30eb921 100644 +--- a/data/planner.desktop.in.in ++++ b/data/planner.desktop.in.in +@@ -1,6 +1,10 @@ + [Desktop Entry] +-_Name=Project Management +-_Comment=Planner Project Management ++Version=1.0 ++_Name=Planner ++_GenericName=Project Management ++_X-GNOME-FullName=Planner Project Management ++_Comment=Handle the tasks, resources, and cost of your projects ++_Keywords=Gantt;Chart;Critical path;Relationship;Dependency;WBS; + Exec=planner %F + Icon=gnome-planner.png + Terminal=false +-- +cgit v0.9.2 diff --git a/community/planner/0cc65e2f420af45f78d190ac2af64810a148bb31.patch b/community/planner/0cc65e2f420af45f78d190ac2af64810a148bb31.patch new file mode 100644 index 000000000..de5a64c37 --- /dev/null +++ b/community/planner/0cc65e2f420af45f78d190ac2af64810a148bb31.patch @@ -0,0 +1,41 @@ +From 0cc65e2f420af45f78d190ac2af64810a148bb31 Mon Sep 17 00:00:00 2001 +From: Luis Menina +Date: Mon, 11 Mar 2013 00:00:44 +0000 +Subject: Don't crash on an empty print preview, just provide an empty preview. + +https://bugzilla.gnome.org/show_bug.cgi?id=581282 +--- +diff --git a/src/planner-print-job.c b/src/planner-print-job.c +index 6334037..96267a0 100644 +--- a/src/planner-print-job.c ++++ b/src/planner-print-job.c +@@ -237,17 +237,7 @@ print_job_draw_page (GtkPrintOperation *operation, + + l = priv->views; + +- /* Abort if there is nothing to print. +- * +- * A better solution would be to set the number of pages to print to 0 +- * in print_job_begin_print, but 0 is not a valid value for +- * gtk_print_operation_set_n_pages. +- */ +- if(!l) { +- return; +- } +- +- while (!page_found) { ++ while (! page_found && l != NULL) { + v = PLANNER_VIEW (l->data); + + pages_in_view = planner_view_print_get_n_pages (v); +@@ -258,8 +248,6 @@ print_job_draw_page (GtkPrintOperation *operation, + } else { + page_nr -= pages_in_view; + l = l->next; +- +- g_assert (l != NULL); + } + } + } +-- +cgit v0.9.2 diff --git a/community/planner/PKGBUILD b/community/planner/PKGBUILD new file mode 100644 index 000000000..5aef75dd1 --- /dev/null +++ b/community/planner/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 104580 2014-01-23 07:08:15Z bgyorgy $ +# Maintainer: Balló György +# Contributor: herb +# Contributor: Jan de Groot + +pkgname=planner +pkgver=0.14.6 +pkgrel=3 +pkgdesc='Project management application for GNOME' +arch=('i686' 'x86_64') +license=('GPL') +url='https://wiki.gnome.org/Apps/Planner' +depends=('libgnomecanvas' 'libxslt' 'gconf' 'desktop-file-utils') +makedepends=('intltool' 'gtk-doc' 'pygtk') +options=('!emptydirs') +install=planner.install +source=(http://ftp.gnome.org/pub/GNOME/sources/planner/${pkgver%.*}/planner-$pkgver.tar.xz + f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch + 05ba23be296085313abd8d7d5075d962084f5d38.patch + 0cc65e2f420af45f78d190ac2af64810a148bb31.patch + cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch + fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch) +sha256sums=('130d29e6d6b8c1994017deba2acca05a4bf83ba1e169635ec8c5c7878abe0696' + 'bc4455b318bb26f44fe50a8e07292b7654c795ff2a1629a788ea749f6c8bac81' + '88a34bb93bca4ae5865f6c70d7d73f3a0009e5137ba2346a8446c6e206e51b20' + '0cde21948f01baaa31a9a5f8af76444c7151ad39a0bc45d8e04de8b07837f0ad' + '1644550a9be35253fe0a353fc004bd8576de3b85a6b21b92cbb0a87c03f37894' + '4275689c2d4493ddcda3a40309a6bbdcdf6323bed80ca2e011138cdcd88da852') + +prepare() { + cd $pkgname-$pkgver + # Upstream fixes + patch -Np1 -i ../f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch + patch -Np1 -i ../05ba23be296085313abd8d7d5075d962084f5d38.patch + patch -Np1 -i ../0cc65e2f420af45f78d190ac2af64810a148bb31.patch + + # Remove deprecated libgnomeui dependency + patch -Np1 -i ../cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch + patch -Np1 -i ../fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch +} + +build() { + cd $pkgname-$pkgver + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-update-mimedb --disable-schemas-install \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/community/planner/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch b/community/planner/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch new file mode 100644 index 000000000..722c59ec3 --- /dev/null +++ b/community/planner/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch @@ -0,0 +1,147 @@ +From cd2b658e83d47e8f49d1bbaf54be6433a21d3758 Mon Sep 17 00:00:00 2001 +From: Luis Menina +Date: Mon, 04 Mar 2013 17:10:26 +0000 +Subject: Remove deprecated GnomeEntry. + +It is replaced by GtkEntry. This means we lose the history +functionality, but that could be reimplemented using GtkComboBoxText +with an entry. + +https://bugzilla.gnome.org/show_bug.cgi?id=589045 +--- +diff --git a/data/glade/sql.glade b/data/glade/sql.glade +index 2b12b85..f673ae0 100644 +--- a/data/glade/sql.glade ++++ b/data/glade/sql.glade +@@ -165,24 +165,16 @@ + + + +- ++ + True +- database_server +- 10 +- +- +- +- True +- True +- True +- True +- 0 +- +- True +- * +- True +- +- ++ True ++ True ++ True ++ 0 ++ ++ True ++ * ++ True + + + 1 +@@ -194,24 +186,16 @@ + + + +- ++ + True +- database_user +- 10 +- +- +- +- True +- True +- True +- True +- 0 +- +- True +- * +- True +- +- ++ True ++ True ++ True ++ 0 ++ ++ True ++ * ++ True + + + 1 +@@ -248,24 +232,16 @@ + + + +- ++ + True +- database_name +- 10 +- +- +- +- True +- True +- True +- True +- 0 +- +- True +- * +- True +- +- ++ True ++ True ++ True ++ 0 ++ ++ True ++ * ++ True + + + 1 +diff --git a/src/planner-sql-plugin.c b/src/planner-sql-plugin.c +index 14a088c..ea2f46a 100644 +--- a/src/planner-sql-plugin.c ++++ b/src/planner-sql-plugin.c +@@ -27,7 +27,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -950,12 +949,9 @@ sql_plugin_retrieve_db_values (PlannerPlugin *plugin, + + gtk_window_set_title (GTK_WINDOW (dialog), title); + +- server_entry = gnome_entry_gtk_entry ( +- GNOME_ENTRY (glade_xml_get_widget (gui, "server_entry"))); +- db_entry = gnome_entry_gtk_entry ( +- GNOME_ENTRY (glade_xml_get_widget (gui, "db_entry"))); +- user_entry = gnome_entry_gtk_entry ( +- GNOME_ENTRY (glade_xml_get_widget (gui, "user_entry"))); ++ server_entry = glade_xml_get_widget (gui, "server_entry"); ++ db_entry = glade_xml_get_widget (gui, "db_entry"); ++ user_entry = glade_xml_get_widget (gui, "user_entry"); + password_entry = glade_xml_get_widget (gui, "password_entry"); + + str = planner_conf_get_string (CONF_SERVER, NULL); +-- +cgit v0.9.2 diff --git a/community/planner/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch b/community/planner/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch new file mode 100644 index 000000000..1ee60f528 --- /dev/null +++ b/community/planner/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch @@ -0,0 +1,114 @@ +From f9840c342e4b5767ee35f0d326b7f7eaf56850ed Mon Sep 17 00:00:00 2001 +From: Alexandre Franke +Date: Mon, 05 Mar 2012 17:22:56 +0000 +Subject: Fix for broken "open file on startup" behaviour + +Switch to gtk_init_with_args from GnomeProgam broke opening of files from command line and when double clicking on file in file browser. + +Based on patches 193670 and 193835 by Maxim Zakharov. + +https://bugzilla.gnome.org/show_bug.cgi?id=656373 +--- +diff --git a/src/planner-main.c b/src/planner-main.c +index cdeb8ea..c0aabd2 100644 +--- a/src/planner-main.c ++++ b/src/planner-main.c +@@ -37,7 +37,7 @@ static gchar **args_remaining = NULL; + + static GOptionEntry options[] = { + { "geometry", 'g', 0, G_OPTION_ARG_STRING, &geometry, N_("Create the initial window with the given geometry."), N_("GEOMETRY")}, +- { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &args_remaining, NULL, N_("FILES") }, ++ { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &args_remaining, NULL, N_("FILES|URIs") }, + { NULL } + }; + +@@ -92,26 +92,27 @@ main (int argc, char **argv) + + gtk_widget_show_all (main_window); + +- if (argc > 1) { +- i = 1; +- while (argv[i]) { +- if (g_str_has_prefix (argv[i], "file:")) { ++ if (args_remaining != NULL) { ++ for (i = 0; args_remaining[i]; i++) { ++ gchar *scheme = g_uri_parse_scheme(args_remaining[i]); ++ if (scheme != NULL) { + planner_window_open_in_existing_or_new ( +- PLANNER_WINDOW (main_window), argv[i], FALSE); ++ PLANNER_WINDOW (main_window), args_remaining[i], FALSE); ++ g_free(scheme); + } else { + gchar *uri; + +- if (!g_path_is_absolute (argv[i])) { ++ if (!g_path_is_absolute (args_remaining[i])) { + /* Relative path. */ + gchar *cwd, *tmp; + + cwd = g_get_current_dir (); +- tmp = g_build_filename (cwd, argv[i], NULL); ++ tmp = g_build_filename (cwd, args_remaining[i], NULL); + uri = g_filename_to_uri (tmp, NULL, NULL); + g_free (tmp); + g_free (cwd); + } else { +- uri = g_filename_to_uri (argv[i], NULL, NULL); ++ uri = g_filename_to_uri (args_remaining[i], NULL, NULL); + } + + if (uri) { +@@ -120,8 +121,6 @@ main (int argc, char **argv) + g_free (uri); + } + } +- +- i++; + } + } + +diff --git a/src/planner-window.c b/src/planner-window.c +index 73f1766..b0536c3 100644 +--- a/src/planner-window.c ++++ b/src/planner-window.c +@@ -1726,36 +1726,24 @@ planner_window_open_in_existing_or_new (PlannerWindow *window, + { + PlannerWindowPriv *priv; + GtkWidget *new_window; +- gchar *filename; + gboolean ret; + + priv = window->priv; +- +- filename = g_filename_from_uri (uri, NULL, NULL); +- if (!filename) { +- return FALSE; +- } +- + if (mrp_project_is_empty (priv->project)) { +- ret = planner_window_open (window, filename, internal); +- g_free (filename); ++ ret = planner_window_open (window, uri, internal); + return ret; + } else { + new_window = planner_application_new_window (priv->application); +- if (planner_window_open (PLANNER_WINDOW (new_window), filename, internal)) { +- g_free (filename); ++ if (planner_window_open (PLANNER_WINDOW (new_window), uri, internal)) { + gtk_widget_show_all (new_window); + return TRUE; + } else { +- g_free (filename); + g_signal_emit (new_window, signals[CLOSED], 0, NULL); + gtk_widget_destroy (new_window); + return FALSE; + } + } + +- g_free (filename); +- + return FALSE; + } + +-- +cgit v0.9.2 diff --git a/community/planner/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch b/community/planner/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch new file mode 100644 index 000000000..7c1b1d5ef --- /dev/null +++ b/community/planner/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch @@ -0,0 +1,41 @@ +From fd8da8994f7006b9fcefc90d2fe5c2b484c7871e Mon Sep 17 00:00:00 2001 +From: Luis Menina +Date: Mon, 04 Mar 2013 13:42:22 +0000 +Subject: Remove deprecated libgnomeui. + +https://bugzilla.gnome.org/show_bug.cgi?id=589045 +--- +diff --git a/README b/README +index e6d5c31..b2489ef 100644 +--- a/README ++++ b/README +@@ -59,7 +59,6 @@ Dependencies: + GLIB 2.6.0 + GTK 2.14.0 + LIBGNOMECANVAS 2.10.0 +-LIBGNOMEUI 2.10.0 + LIBGLADE 2.3.0 + GNOME_VFS 2.10.0 + GCONF 2.10.0 +diff --git a/configure.in b/configure.in +index 9f3d112..06568fd 100644 +--- a/configure.in ++++ b/configure.in +@@ -67,7 +67,6 @@ dnl it too, or it will never make it into the spec file! + GLIB_REQUIRED=2.6.0 + GTK_REQUIRED=2.14.0 + LIBGNOMECANVAS_REQUIRED=2.10.0 +-LIBGNOMEUI_REQUIRED=2.10.0 + LIBGLADE_REQUIRED=2.3.0 + GNOME_VFS_REQUIRED=2.10.0 + GCONF_REQUIRED=2.10.0 +@@ -116,7 +115,6 @@ PKG_CHECK_MODULES(PLANNER, + gobject-2.0 gmodule-2.0 + gtk+-2.0 >= $GTK_REQUIRED + libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED +- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 >= $GCONF_REQUIRED + ]) +-- +cgit v0.9.2 diff --git a/community/planner/planner.install b/community/planner/planner.install new file mode 100644 index 000000000..9d325dbb1 --- /dev/null +++ b/community/planner/planner.install @@ -0,0 +1,26 @@ +pkgname=planner + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index c2557b7d1..ecc0580c6 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99410 2013-10-28 11:54:28Z arodseth $ +# $Id: PKGBUILD 104598 2014-01-23 11:45:02Z arodseth $ # Maintainer: Alexander Rødseth pkgname=processing -pkgver=2.1 +pkgver=2.1.1 pkgrel=1 arch=('x86_64' 'i686') pkgdesc='Programming environment for creating images, animations and interactions' @@ -10,18 +10,18 @@ url='http://www.processing.org/' license=('GPL' 'LGPL') depends=('libgl' 'libxxf86vm') makedepends=('gendesk') -options=('!strip') # 'staticlibs') +options=('!strip') if [[ $CARCH == "x86_64" ]]; then source=("http://download.$pkgname.org/$pkgname-$pkgver-linux64.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('68a5fd3befeb951c57f3cfcf55e755fc2b8fbd22ad23deae01bd10d8460ce84a' - '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') + sha256sums=('e1799b9ec86633f4fd2c45905d6ac7897f14b1de4ea4913d7ad5b3b8956917d7' + '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') else source=("http://download.$pkgname.org/$pkgname-$pkgver-linux32.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('ccb026d685ddb7f28c3292c27ccffa6033a459d0d2dcaa703781736a26dde62f' - '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') + sha256sums=('9b4db11ea9b7b16a4c2c36987a1fadb4971e36023a7fa3259d7763e068b17284' + '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') fi prepare() { diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 932d90dac..eca4ff9be 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 103927 2014-01-13 17:17:01Z andyrtr $ +# $Id: PKGBUILD 104588 2014-01-23 09:47:24Z spupykin $ # Maintainer: Sergej Pupykin pkgname=rsyslog -pkgver=7.4.8 +pkgver=7.4.9 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') license=('GPL3') -depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd') +depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd' 'liblogging') makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls' 'python-docutils') optdepends=('postgresql-libs: PostgreSQL Database Support' @@ -16,13 +16,12 @@ optdepends=('postgresql-libs: PostgreSQL Database Support' 'net-snmp' 'gnutls') backup=('etc/rsyslog.conf' - 'etc/logrotate.d/rsyslog' - 'etc/conf.d/rsyslog') + 'etc/logrotate.d/rsyslog') options=('strip' 'zipman') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf') -md5sums=('20100bede92ce27778d426197b7caaac' +md5sums=('43c91cbc86b51979de61e868ff921f17' '0d990373f5c70ddee989296007b4df5b' 'd61dd424e660eb16401121eed20d98bc') diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 1fd92eacf..ec03643ef 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104548 2014-01-22 17:19:25Z arodseth $ +# $Id: PKGBUILD 104632 2014-01-23 14:12:04Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -8,14 +8,14 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=2.1.0 -pkgrel=1 +pkgver=2.0.0 +pkgrel=3 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('939251c1f82b41c3cf657552396cf4e1198365316904957cfb7167d1298db204') +sha256sums=('6a36d2d4212e65f23d1c174b03006ea7fecaad1f3b82151dbfbe7ddf4268579f') prepare() { cd "ruby-gtk2-$pkgver" diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD index ff3aff3a7..3a974c28a 100644 --- a/community/ruby-gtk3/PKGBUILD +++ b/community/ruby-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92836 2013-06-16 15:30:03Z arodseth $ +# $Id: PKGBUILD 104595 2014-01-23 10:58:45Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -6,7 +6,7 @@ # Contributor: kritoke pkgbase=ruby-gtk3 -pkgver=2.0.2 +pkgver=2.1.0 pkgrel=1 pkgname=('ruby-gtk3' 'ruby-gdk3') depends=("ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver" "ruby-glib2=$pkgver" "ruby-pango=$pkgver") @@ -15,7 +15,7 @@ url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz") -sha256sums=('cc55542b207899af2bc0489c004c394b2332656cbf25ef3ff0daceff39535047') +sha256sums=('436844cc9ab3bf5e5a3027e3276fc69ff9cae5cff88bc60179c416050d5e753d') prepare() { cd "$srcdir/ruby-gtk3-$pkgver" diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index f513762f9..4ebf7067a 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101260 2013-11-21 10:27:21Z spupykin $ +# $Id: PKGBUILD 104606 2014-01-23 13:18:27Z andrea $ # Maintainer: Sergej Pupykin # Maintainer : Ionut Biru # Contributor: Joeny Ang pkgname=shotwell pkgver=0.15.1 -pkgrel=1 +pkgrel=2 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD deleted file mode 100644 index fd908af5f..000000000 --- a/community/subtle/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 86887 2013-03-23 23:10:50Z td123 $ -# Maintainer: Alexander Rødseth -# Contributor: Angel Velasquez -# Contributor: unexist -# Contributor: Abakus -# Contributor: TDY -# Contributor: Xilon - -pkgname=subtle -pkgver=0.11.3224 -pkgrel=2 -pkgdesc='Grid-based manual tiling window manager' -arch=('x86_64' 'i686') -url='http://subtle.subforge.org/' -license=('GPL') -depends=('ruby' 'libxft' 'libxpm' 'libxrandr' 'libxft' 'libxpm' 'libxinerama' - 'libxtst') -makedepends=('pkg-config' 'libxinerama' 'libxrandr' 'libxft' 'libxpm') -backup=('etc/xdg/subtle/subtle.rb') -install=subtle.install -source=("http://subforge.org/attachments/download/81/$pkgname-$pkgver-xi.tbz2") -sha256sums=('a22ee94a70c1105a018e1c0a754597b4e3a87d1b915301a0b22888920fa0f8a2') - -build() { - cd "$srcdir/$pkgname-$pkgver-xi" - - # Disable the check for Ruby 1.9 - sed -i 's/ 1 != / 7 == /' Rakefile - sed -i 's/ 9 != / 7 == /' Rakefile - # Use vendor_ruby instead of site_ruby - sed -e \ - 's/RbConfig::CONFIG\["sitelibdir"\]/RbConfig::CONFIG\["vendorlibdir"\]/' \ - -i Rakefile -} - -package() { - cd "$srcdir/$pkgname-$pkgver-xi" - - rake destdir=$pkgdir install --trace -} - -# vim:set ts=2 sw=2 et: diff --git a/community/subtle/subtle.install b/community/subtle/subtle.install deleted file mode 100644 index cdb0d9469..000000000 --- a/community/subtle/subtle.install +++ /dev/null @@ -1,7 +0,0 @@ -post_upgrade() { - echo "In order to use sur you can install ruby-curb and ruby-minitar." - echo "If you have subtle on your system remember to upgrade with:" - echo " sur upgrade" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD index a7c79c544..457d0cc57 100644 --- a/community/the_silver_searcher/PKGBUILD +++ b/community/the_silver_searcher/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100581 2013-11-06 10:52:39Z arodseth $ +# $Id: PKGBUILD 104600 2014-01-23 12:22:43Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Jeff Horelick # Contributor: skydrome pkgname=the_silver_searcher -pkgver=0.18.1 +pkgver=0.19.1 pkgrel=1 pkgdesc='Code searching tool similar to Ack, but faster' url='https://github.com/ggreer/the_silver_searcher' @@ -12,7 +12,7 @@ license=('Apache') depends=('pcre' 'zlib' 'xz') arch=('x86_64' 'i686') source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz") -sha256sums=('1f5cdacf955d5707cdb60f3f46aab3aae7fe96f105f00ab2d6a5a52d0aad5dc5') +sha256sums=('698cde7a8170ef1623f594d251aac846e720dc257c170f9c21102b3f2f1d4448') prepare() { cd "$pkgname-$pkgver" diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD index 85f4c8542..58494ab7d 100644 --- a/core/dialog/PKGBUILD +++ b/core/dialog/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197224 2013-10-24 09:07:05Z foutrelis $ +# $Id: PKGBUILD 204572 2014-01-23 02:27:38Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Stéphane Gaudreault # Contributor: Allan McRae # Contributor: Andreas Radke pkgname=dialog -pkgver=1.2_20130928 +pkgver=1.2_20140112 pkgrel=1 epoch=1 pkgdesc="A tool to display dialog boxes from shell scripts" @@ -15,7 +15,7 @@ license=('LGPL2.1') depends=('ncurses') options=('staticlibs') source=(ftp://invisible-island.net/$pkgname/$pkgname-${pkgver/_/-}.tgz) -sha256sums=('6fcf8daa50335e4d08da9f4f5ea5e1025efe84c3a719a56e871eb83ed0fd2b4c') +sha256sums=('8d30043872c57d4d3b3b05e4390ece356843f2a71303c91a2f8a536b369e0077') build() { cd "$srcdir/$pkgname-${pkgver/_/-}" diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index 8adcf754b..4e5c7e5bf 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197841 2013-10-30 11:07:01Z allan $ +# $Id: PKGBUILD 204571 2014-01-23 02:27:37Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Allan McRae # Contributor: Tom Newsom pkgname=sudo -_sudover=1.8.8 +_sudover=1.8.9p4 pkgver=${_sudover/p/.p} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -16,7 +16,7 @@ depends=('glibc' 'pam') backup=('etc/sudoers' 'etc/pam.d/sudo') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} sudo.pam) -sha256sums=('9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9' +sha256sums=('1943f9e9409c6542935d2e2d862c48d0d69dcf27288b294b8b537c02f52ac7a7' 'SKIP' 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') diff --git a/core/sudo/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch b/core/sudo/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch new file mode 100644 index 000000000..684aedaec --- /dev/null +++ b/core/sudo/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch @@ -0,0 +1,35 @@ + +# HG changeset patch +# User Todd C. Miller +# Date 1389722096 25200 +# Node ID a204b69d91f786444899ce3fc95ed535b6e32d33 +# Parent 987087ce465828da121b9d67412f42feaea06d56 +If not logging I/O we may get EOF when the command is executed and +the other end of the backchannel is closed. Just remove the +backchannel event in this case or we will continue to receive +the event. Bug #631 + +diff -r 987087ce4658 -r a204b69d91f7 src/exec.c +--- a/src/exec.c Tue Jan 14 09:26:14 2014 -0700 ++++ b/src/exec.c Tue Jan 14 10:54:56 2014 -0700 +@@ -230,11 +230,14 @@ + /* Short read or EOF. */ + sudo_debug_printf(SUDO_DEBUG_ERROR, + "failed to read child status: %s", n ? "short read" : "EOF"); +- /* +- * If not logging I/O we may get EOF when the command is +- * executed and sv is closed. It is safe to ignore this. +- */ +- if (ec->log_io || n != 0) { ++ if (!ec->log_io && n == 0) { ++ /* ++ * If not logging I/O we may get EOF when the command is ++ * executed and the other end of the backchannel is closed. ++ * Just remove the event in this case. ++ */ ++ (void)sudo_ev_del(ec->evbase, backchannel_event); ++ } else { + /* XXX - need new CMD_ type for monitor errors. */ + errno = n ? EIO : ECONNRESET; + ec->cstat->type = CMD_ERRNO; + diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index d2a790e3f..a0e0f6e16 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204343 2014-01-17 09:42:39Z ronald $ +# $Id: PKGBUILD 204578 2014-01-23 13:18:51Z andrea $ # Maintainer: Ronald van Haren # Contributor: Gustavo Sverzut Barbieri pkgname=evas_generic_loaders pkgver=1.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') url="http://www.enlightenment.org" diff --git a/extra/ffmpeg-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD index 5231f60fc..1fb5e77f8 100644 --- a/extra/ffmpeg-compat/PKGBUILD +++ b/extra/ffmpeg-compat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 202972 2013-12-29 17:17:30Z bpiotrowski $ +# $Id: PKGBUILD 204592 2014-01-23 13:42:13Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Ionut Biru @@ -6,8 +6,8 @@ # Contributor: Paul Mattal pkgname=ffmpeg-compat -pkgver=0.10.10 -pkgrel=2 +pkgver=0.10.11 +pkgrel=1 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ depends=( makedepends=('libvdpau' 'yasm') source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 ffmpeg-0.10.10-freetype2.patch) -sha256sums=('936058d7579bfc431b13d47c3f63ee25a0160d4c73cc0fa04fef97cd2394cb91' +sha256sums=('99a81aa43325de9c670659c15496ef348b5c4c65306caa1ce0893ae5f4f636d0' '05cf516b292c3815ecaaf72f12c0c73891b62b47d83f5d81f09380949e691988') prepare() { diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 7fce3677f..0395eb72b 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 204105 2014-01-15 10:16:24Z svenstaro $ +# $Id: PKGBUILD 204579 2014-01-23 13:18:52Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkdcraw pkgver=4.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" arch=('i686' 'x86_64') diff --git a/extra/libpaper/PKGBUILD b/extra/libpaper/PKGBUILD index 67b0e0731..869f06b11 100644 --- a/extra/libpaper/PKGBUILD +++ b/extra/libpaper/PKGBUILD @@ -1,16 +1,19 @@ -# $Id: PKGBUILD 204542 2014-01-22 12:18:23Z andyrtr $ -# Maintainer: Alexander Rødseth +# $Id: PKGBUILD 204595 2014-01-23 16:54:36Z andyrtr $ +# Maintainer: AndyRTR + +# Contributor: Alexander Rødseth # Contributor: Mateusz Herych # Contributor: royrocks pkgname=libpaper pkgver=1.1.24 -pkgrel=6 +pkgrel=7 pkgdesc='Library for handling paper characteristics' arch=('x86_64' 'i686') url='http://packages.debian.org/unstable/source/libpaper' license=('GPL') depends=('sh') +backup=('etc/papersize') source=("http://ftp.de.debian.org/debian/pool/main/libp/$pkgname/${pkgname}_$pkgver+nmu2.tar.gz") sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96') @@ -25,7 +28,21 @@ build() { } package() { - make -C "$pkgname-$pkgver+nmu2" DESTDIR="$pkgdir" install -} + cd "$pkgname-$pkgver+nmu2" + make DESTDIR="$pkgdir" install + + # add systemwide default papersize read by many office applications + install -dm 755 $pkgdir/etc + echo '# Simply write the paper name. See papersize(5) for possible values' > $pkgdir/etc/papersize -# vim:set ts=2 sw=2 et: + # add libpaper.d directory other packages can use to store files + install -dm 755 $pkgdir/etc/libpaper.d + + # add localisation + pushd debian/po + for i in `ls *.po`; do + install -dm 755 ${pkgdir}/usr/share/locale/${i%.po}/LC_MESSAGES/; + msgfmt $i -o ${pkgdir}/usr/share/locale/${i%.po}/LC_MESSAGES/${pkgname}.mo; + done + popd +} diff --git a/extra/libraw/PKGBUILD b/extra/libraw/PKGBUILD index 32db74053..70e1c9964 100644 --- a/extra/libraw/PKGBUILD +++ b/extra/libraw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 199050 2013-11-07 23:03:25Z andrea $ +# $Id: PKGBUILD 204577 2014-01-23 13:18:50Z andrea $ # Maintainer: Andre Scarpino # Contributor: Jaroslav Lichtblau # Contributor: Ionut Biru @@ -6,15 +6,15 @@ # Contributor: Brad Fanella pkgname=libraw -pkgver=0.15.4 -pkgrel=3 +pkgver=0.16.0 +pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64') url="http://www.libraw.org/" license=('CDDL' 'LGPL' 'custom') depends=('lcms2' 'jasper') source=("http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz") -sha256sums=('b3fcfee33bc34ae5869a9741880e28a62f029f196cb1d1a007ab156f4a110f79') +sha256sums=('71f43871ec2535345c5c9b748f07813e49915170f9510b721a2be6478426cf96') build() { cd LibRaw-${pkgver} diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index eb29c5d5f..fe8795f58 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186563 2013-05-29 04:09:51Z eric $ +# $Id: PKGBUILD 204568 2014-01-22 23:53:58Z eric $ # Maintainer: Eric Bélanger pkgname=lm_sensors -pkgver=3.3.4 +pkgver=3.3.5 pkgrel=1 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64') @@ -11,27 +11,22 @@ license=('GPL' 'LGPL') depends=('perl' 'sysfsutils') makedepends=('rrdtool') optdepends=('rrdtool: for logging with sensord') -backup=('etc/sensors3.conf' 'etc/healthd.conf') -options=('!emptydirs') -source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \ - healthd healthd.conf fancontrol.service sensord.service healthd.service \ - linux_3.0.patch lm_sensors-fancontrol.patch) -sha1sums=('4e62538ca99973ff505f2eeb5b841bb402e996d8' +backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord') +source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} + healthd healthd.conf healthd.service sensord.conf + lm_sensors-fancontrol.patch) +sha1sums=('179989a52bae8f01ba8ed77e8a15af6ec653d89e' 'SKIP' '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5' - '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' - '73cd658f4a418197dc75f65d6d309701c72cfd81' - 'cea1ff07374a784cc4be1d28dc6c80641fcae99d' + '1edd4d72ade22adfc128fb8d670e85c633fd1d18' 'd72ec328e9303acef86342483b6f8537de6117d9' - '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c' + 'f4b5f21fdb3b2a55aa353afa1603f953b207b73b' 'b0bc977348610d6a008d75a43f65800251c4c9f7') prepare() { cd ${pkgname}-${pkgver} - sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/lm_sensors.service} - sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect + sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/{sensord,lm_sensors}.service} sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service - patch -p0 -i "${srcdir}/linux_3.0.patch" patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch" } @@ -44,10 +39,12 @@ package() { cd ${pkgname}-${pkgver} make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \ PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DESTDIR="${pkgdir}" install - install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service" + install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/bin/healthd" + install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf" - install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service" - install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service" + install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" + install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service" + install -D -m644 prog/init/*.service "${pkgdir}/usr/lib/systemd/system/" } diff --git a/extra/lm_sensors/fancontrol.service b/extra/lm_sensors/fancontrol.service deleted file mode 100644 index 813dbd60d..000000000 --- a/extra/lm_sensors/fancontrol.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Fan control daemon - -[Service] -PIDFile=/var/run/fancontrol.pid -ExecStart=/usr/bin/fancontrol - -[Install] -WantedBy=multi-user.target diff --git a/extra/lm_sensors/healthd.conf b/extra/lm_sensors/healthd.conf index a8b2c3fa3..8df3e399d 100644 --- a/extra/lm_sensors/healthd.conf +++ b/extra/lm_sensors/healthd.conf @@ -1,5 +1,5 @@ # -# /etc/conf.d/healthd +# /etc/healthd.conf # # reset any pending alarms on startup diff --git a/extra/lm_sensors/linux_3.0.patch b/extra/lm_sensors/linux_3.0.patch deleted file mode 100644 index da02a3d49..000000000 --- a/extra/lm_sensors/linux_3.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- prog/detect/sensors-detect 2011-08-02 10:23:46.000000000 +0200 -+++ prog/detect/sensors-detect 2011-08-02 10:24:04.000000000 +0200 -@@ -2472,7 +2472,7 @@ - - sub initialize_kernel_version - { -- `uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/; -+ `uname -r` =~ /(\d+)\.(\d+)(.*)/; - @kernel_version = ($1, $2, $3, $4); - chomp($kernel_arch = `uname -m`); - diff --git a/extra/lm_sensors/sensord.conf b/extra/lm_sensors/sensord.conf new file mode 100644 index 000000000..133783aa8 --- /dev/null +++ b/extra/lm_sensors/sensord.conf @@ -0,0 +1,9 @@ +# +# /etc/conf.d/sensord +# + +#Specify the interval between scanning for sensor alarms +INTERVAL=60s + +#Specify the interval between logging all sensor readings +LOG_INTERVAL=30m diff --git a/extra/lm_sensors/sensord.service b/extra/lm_sensors/sensord.service deleted file mode 100644 index 1d62ab9e8..000000000 --- a/extra/lm_sensors/sensord.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Sensor information logging daemon - -[Service] -PIDFile=/var/run/sensord.pid -ExecStart=/usr/bin/sensord - -[Install] -WantedBy=multi-user.target diff --git a/extra/purple-plugin-pack/PKGBUILD b/extra/purple-plugin-pack/PKGBUILD index 094b417b7..d2a17efdc 100644 --- a/extra/purple-plugin-pack/PKGBUILD +++ b/extra/purple-plugin-pack/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198380 2013-10-30 14:31:14Z allan $ +# $Id: PKGBUILD 204570 2014-01-23 02:24:11Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Alexander Fehr @@ -6,13 +6,13 @@ pkgname=purple-plugin-pack pkgver=2.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="Compilation of plugins for the libpurple family of IM clients" arch=('i686' 'x86_64') url="https://bitbucket.org/rekkanoryo/purple-plugin-pack" license=('GPL') depends=('libpurple') -makedepends=('intltool' 'gettext' 'python2' 'pidgin') +makedepends=('intltool' 'python2' 'pidgin') source=(https://bitbucket.org/rekkanoryo/$pkgname/downloads/$pkgname-$pkgver.tar.bz2) sha256sums=('2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c') diff --git a/extra/visualvm/PKGBUILD b/extra/visualvm/PKGBUILD index b75f938f5..3add21de3 100644 --- a/extra/visualvm/PKGBUILD +++ b/extra/visualvm/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: Guillaume ALAUX # Contributor: Kristof JOZSA pkgname=visualvm -pkgver=1.3.6 +pkgver=1.3.7 _shortver=${pkgver//\./} -pkgrel=3 +pkgrel=1 pkgdesc='Visual tool integrating several commandline JDK tools and lightweight profiling capabilities' arch=('i686' 'x86_64') url='http://visualvm.java.net/' @@ -12,7 +12,7 @@ depends=('java-environment') source=("https://java.net/projects/${pkgname}/downloads/download/release${_shortver}/${pkgname}_${_shortver}.zip" 'visualvm.desktop' 'icon.png') -sha256sums=('317f65b3fed7ea25638b6d35c6f95642b5662453b7841a9d32aac3cf3ff59616' +sha256sums=('b8ff7762d9f8bb940bab6ec2ec890657682adf85d833e7e89e9cc4feda717b53' 'e820807e8d78446cf156a3947d97856e24865bb0d8c957e9ce2fed309c737441' '452fbd85c968ec7176c5894bc4106b7e25310314d44278d807510675b6a5c864') diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index de65bc557..1f6b300ab 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -13,7 +13,7 @@ _releasever=6 _rtpatchver=rt9 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} -pkgrel=1 +pkgrel=2 _lxopkgver=${_basekernel}.6 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -32,6 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'criu-no-expert.patch' + 'timers-do-not-raise-softirq-unconditionally.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' '4b18ce60daff87504e6740670edf6b50' @@ -44,6 +45,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' '44260d2cb1a8b51c119d2ce1f83e457a' '98beb36f9b8cf16e58de2483ea9985e3' 'd50c1ac47394e9aec637002ef3392bd1' + 'a091e206b3cadcd9bcd807f3a0c98922' '71bbddd5f9799aa045660d92baa05845') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. @@ -64,6 +66,9 @@ prepare() { # add realtime patch patch -p1 -i "${srcdir}/patch-${_pkgver}-${_rtpatchver}.patch" + # revert patch, causing the kernel to hang on very early in the boot process + patch -p1 -R -i "${srcdir}/timers-do-not-raise-softirq-unconditionally.patch" + # add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" diff --git a/kernels/linux-libre-rt/timers-do-not-raise-softirq-unconditionally.patch b/kernels/linux-libre-rt/timers-do-not-raise-softirq-unconditionally.patch new file mode 100644 index 000000000..d8f01f2d6 --- /dev/null +++ b/kernels/linux-libre-rt/timers-do-not-raise-softirq-unconditionally.patch @@ -0,0 +1,156 @@ +From 35b6173e6176fc978c635f9e07f1778eff7b76e7 Mon Sep 17 00:00:00 2001 +From: Thomas Gleixner +Date: Thu, 7 Nov 2013 12:21:11 +0100 +Subject: [PATCH] timers: do not raise softirq unconditionally + +Mike, + +On Thu, 7 Nov 2013, Mike Galbraith wrote: + +> On Thu, 2013-11-07 at 04:26 +0100, Mike Galbraith wrote: +> > On Wed, 2013-11-06 at 18:49 +0100, Thomas Gleixner wrote: +> +> > > I bet you are trying to work around some of the side effects of the +> > > occasional tick which is still necessary despite of full nohz, right? +> > +> > Nope, I wanted to check out cost of nohz_full for rt, and found that it +> > doesn't work at all instead, looked, and found that the sole running +> > task has just awakened ksoftirqd when it wants to shut the tick down, so +> > that shutdown never happens. +> +> Like so in virgin 3.10-rt. Box is x3550 M3 booted nowatchdog +> rcu_nocbs=1-3 nohz_full=1-3, and CPUs1-3 are completely isolated via +> cpusets as well. + +well, that very same problem is in mainline if you add "threadirqs" to +the command line. But we can be smart about this. The untested patch +below should address that issue. If that works on mainline we can +adapt it for RT (needs a trylock(&base->lock) there). + +Though it's not a full solution. It needs some thought versus the +softirq code of timers. Assume we have only one timer queued 1000 +ticks into the future. So this change will cause the timer softirq not +to be called until that timer expires and then the timer softirq is +going to do 1000 loops until it catches up with jiffies. That's +anything but pretty ... + +What worries me more is this one: + + pert-5229 [003] d..h1.. 684.482618: softirq_raise: vec=9 [action=RCU] + +The CPU has no callbacks as you shoved them over to cpu 0, so why is +the RCU softirq raised? + +Thanks, + + tglx +------------------ +Message-id: +|CONFIG_NO_HZ_FULL + CONFIG_PREEMPT_RT_FULL = nogo +Signed-off-by: Sebastian Andrzej Siewior +--- + include/linux/hrtimer.h | 3 +-- + kernel/hrtimer.c | 31 +++++++------------------------ + kernel/timer.c | 23 ++++++++++++++++++++--- + 3 files changed, 28 insertions(+), 29 deletions(-) + +--- a/include/linux/hrtimer.h ++++ b/include/linux/hrtimer.h +@@ -461,9 +461,8 @@ extern int schedule_hrtimeout_range_cloc + unsigned long delta, const enum hrtimer_mode mode, int clock); + extern int schedule_hrtimeout(ktime_t *expires, const enum hrtimer_mode mode); + +-/* Soft interrupt function to run the hrtimer queues: */ ++/* Called from the periodic timer tick */ + extern void hrtimer_run_queues(void); +-extern void hrtimer_run_pending(void); + + /* Bootup initialization: */ + extern void __init hrtimers_init(void); +--- a/kernel/hrtimer.c ++++ b/kernel/hrtimer.c +@@ -1694,30 +1694,6 @@ static void run_hrtimer_softirq(struct s + } + + /* +- * Called from timer softirq every jiffy, expire hrtimers: +- * +- * For HRT its the fall back code to run the softirq in the timer +- * softirq context in case the hrtimer initialization failed or has +- * not been done yet. +- */ +-void hrtimer_run_pending(void) +-{ +- if (hrtimer_hres_active()) +- return; +- +- /* +- * This _is_ ugly: We have to check in the softirq context, +- * whether we can switch to highres and / or nohz mode. The +- * clocksource switch happens in the timer interrupt with +- * xtime_lock held. Notification from there only sets the +- * check bit in the tick_oneshot code, otherwise we might +- * deadlock vs. xtime_lock. +- */ +- if (tick_check_oneshot_change(!hrtimer_is_hres_enabled())) +- hrtimer_switch_to_hres(); +-} +- +-/* + * Called from hardirq context every jiffy + */ + void hrtimer_run_queues(void) +@@ -1730,6 +1706,13 @@ void hrtimer_run_queues(void) + if (hrtimer_hres_active()) + return; + ++ /* ++ * Check whether we can switch to highres mode. ++ */ ++ if (tick_check_oneshot_change(!hrtimer_is_hres_enabled()) ++ && hrtimer_switch_to_hres()) ++ return; ++ + for (index = 0; index < HRTIMER_MAX_CLOCK_BASES; index++) { + base = &cpu_base->clock_base[index]; + if (!timerqueue_getnext(&base->active)) +--- a/kernel/timer.c ++++ b/kernel/timer.c +@@ -1439,8 +1439,6 @@ static void run_timer_softirq(struct sof + { + struct tvec_base *base = __this_cpu_read(tvec_bases); + +- hrtimer_run_pending(); +- + if (time_after_eq(jiffies, base->timer_jiffies)) + __run_timers(base); + } +@@ -1450,8 +1448,27 @@ static void run_timer_softirq(struct sof + */ + void run_local_timers(void) + { ++ struct tvec_base *base = __this_cpu_read(tvec_bases); ++ + hrtimer_run_queues(); +- raise_softirq(TIMER_SOFTIRQ); ++ /* ++ * We can access this lockless as we are in the timer ++ * interrupt. If there are no timers queued, nothing to do in ++ * the timer softirq. ++ */ ++ if (!spin_do_trylock(&base->lock)) { ++ raise_softirq(TIMER_SOFTIRQ); ++ return; ++ } ++ if (!base->active_timers) ++ goto out; ++ ++ /* Check whether the next pending timer has expired */ ++ if (time_before_eq(base->next_timer, jiffies)) ++ raise_softirq(TIMER_SOFTIRQ); ++out: ++ rt_spin_unlock_after_trylock_in_irq(&base->lock); ++ + } + + #ifdef __ARCH_WANT_SYS_ALARM diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD index 5881a4c2e..0a7cf95d5 100644 --- a/libre/gloobus-preview-libre/PKGBUILD +++ b/libre/gloobus-preview-libre/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 91026 2013-05-18 11:44:23Z bgyorgy $ +# $Id: PKGBUILD 104564 2014-01-22 21:49:14Z bgyorgy $ # Maintainer: Balló György _pkgname=gloobus-preview pkgname=gloobus-preview-libre pkgver=0.4.5.290 _pkgver=0.4.5-ubuntu11~ppa290 -pkgrel=1.1 +pkgrel=2 pkgdesc="Gnome application designed to enable a full screen preview of any kind of file, with libarchive support" arch=('i686' 'x86_64') url="http://gloobus.net/" license=('GPL') -depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gconf' 'taglib' 'xdg-utils') +depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gobject' 'gconf' 'taglib' 'xdg-utils') makedepends=('boost' 'bzr' 'djvulibre' 'libspectre') replaces=$_pkgname conflicts=$_pkgname @@ -25,19 +25,22 @@ optdepends=('djvulibre: Preview DjVu documents' 'unoconv: Preview LibreOffice compatible documents' 'libarchive: View content of RAR archives' 'unzip: View content of .ZIP archives') -options=('!libtool') install=$_pkgname.install source=(https://launchpad.net/~gloobus-dev/+archive/$_pkgname/+files/${_pkgname}_$_pkgver.orig.tar.xz gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi fix-gtksource-include.patch fix-unoconv.patch use-xdg-open.patch + gloobus-preview-configuration-pygobject3-port.patch + gloobus-sushi-pygobject3-port.patch gloobus-preview-usr-bsdtar-for-rar.patch) md5sums=('27b3db2043ecaf47fa928940bbb4f32a' 'SKIP' 'ca15a3e31cec01d3d4fc5a4e1720f692' '03379c173e67ad1b6804bc609336451d' 'd6d9e2b3e001f0ea8440cccdf90480af' + '16e7a7d892dfde5fd40332fc41de97b0' + '7536f8fbbb2c6bbc0132a2fa25b296b7' 'eeab61846c861540bb16ca00fa14cdb6') prepare() { @@ -56,6 +59,9 @@ prepare() { # Use xdg-open patch -Np1 -i "$srcdir/use-xdg-open.patch" + # Port gloobus-preview-configuration to pygobject3 + patch -Np1 -i "$srcdir/gloobus-preview-configuration-pygobject3-port.patch" + # Use bsdtar (libarchive) if unrar is not found. patch -Np0 -i "$srcdir/gloobus-preview-usr-bsdtar-for-rar.patch" @@ -64,6 +70,9 @@ prepare() { # Python2 fix sed -i 's/python /python2 /' src/gloobus-sushi.in + + # Port gloobus-sushi to pygobject3 + patch -Np1 -i "$srcdir/gloobus-sushi-pygobject3-port.patch" } diff --git a/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch b/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch new file mode 100644 index 000000000..2c2540753 --- /dev/null +++ b/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch @@ -0,0 +1,124 @@ +diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-configuration gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-configuration +--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-configuration 2014-01-22 21:54:41.555697168 +0100 ++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-configuration 2014-01-22 21:34:36.867164953 +0100 +@@ -6,10 +6,9 @@ + import os + import sys + import glob +-import gtk ++from gi.repository import Gtk, GConf + import signal + import gettext +-import gconf + #import config + + #=========================== CLASS COLORS =======================================================# +@@ -69,54 +68,54 @@ + def __init__(self): + self.config = config_load() + +- self.client = gconf.client_get_default() ++ self.client = GConf.Client.get_default() + self.gconf_win_layout = self.client.get_string('/apps/metacity/general/button_layout') + + #================= Show In Taskbar ================= # +- self.entry1 = gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False) ++ self.entry1 = Gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False) + self.entry1.set_tooltip_markup(_("When enabled gloobus-preview will be\nshown in the taskbar")) + self.entry1.set_active(self.config.getboolean("Main","taskbar")) + + #================= Allways on top ================= # +- self.entry2 = gtk.CheckButton(label=_("Always on top"), use_underline=False) ++ self.entry2 = Gtk.CheckButton(label=_("Always on top"), use_underline=False) + self.entry2.set_tooltip_markup(_("When enabled gloobus-preview will be\nalways on top of the other windows")) + self.entry2.set_active(self.config.getboolean("Main","ontop")) + win.set_keep_above(self.config.getboolean("Main","ontop")) + + + #================= Quit on lose focus ================= # +- self.entry3 = gtk.CheckButton(label=_("Quit on lose focus"), use_underline=False) ++ self.entry3 = Gtk.CheckButton(label=_("Quit on lose focus"), use_underline=False) + self.entry3.set_tooltip_markup(_("When enabled, gloobus-preview will exit\nwhen it loses focus")) + self.entry3.set_active(self.config.getboolean("Main","focus")) + + #================= Win bar layout ================= # +- self.entry4 = gtk.CheckButton(label=_("Window Bar Layout inverted"), use_underline=False) ++ self.entry4 = Gtk.CheckButton(label=_("Window Bar Layout inverted"), use_underline=False) + self.entry4.set_tooltip_markup(_("Layout of the buttons\nclose button on the right/left?")) + self.entry4.set_active(self.config.getboolean("Main","winbar_layout")) + + #================= Use gtk theme ================= # +- self.theme_gtk_entry = gtk.CheckButton(label=_("Use gtk theme"), use_underline=False) ++ self.theme_gtk_entry = Gtk.CheckButton(label=_("Use gtk theme"), use_underline=False) + self.theme_gtk_entry.set_tooltip_markup(_("When enabled, gloobus-preview will use system GTK theme")) + self.theme_gtk_entry.set_active(self.config.getboolean("Theme","gtk")) + + #=================== BUTTONS ===================== # +- container0 = gtk.HBox(True,1) #Save and close buttons ++ container0 = Gtk.HBox(True,1) #Save and close buttons + +- ok_button = gtk.Button(_("Save")) +- cancel_button = gtk.Button(_("Cancel")) ++ ok_button = Gtk.Button(_("Save")) ++ cancel_button = Gtk.Button(_("Cancel")) + + container0.add(cancel_button) + container0.add(ok_button) +- cancel_button.connect('clicked', gtk.main_quit) ++ cancel_button.connect('clicked', Gtk.main_quit) + ok_button.connect('clicked', self.save_conf) + + #============ GENERAL CONTAINER ================== # + +- general_container = gtk.VBox(False,1) ++ general_container = Gtk.VBox(False,1) + +- title = gtk.Label() ++ title = Gtk.Label() + title.set_markup(_("Main settings")) +- align2 = gtk.Alignment(0,0,0,0) ++ align2 = Gtk.Alignment.new(0,0,0,0) + align2.set_padding(0,5,0,0) + align2.add(title) + +@@ -128,11 +127,11 @@ + if self.gconf_win_layout == None: + general_container.add(self.entry4) #Always on top + +- general_container.add(gtk.HSeparator()) +- general_container.add(gtk.Label()) #White Space ++ general_container.add(Gtk.HSeparator()) ++ general_container.add(Gtk.Label()) #White Space + general_container.add(container0) #Close & save buttons + +- align = gtk.Alignment(0,0,0,0); ++ align = Gtk.Alignment.new(0,0,0,0); + align.set_padding(10,5,10,10) + + align.add(general_container) +@@ -155,7 +154,7 @@ + + config_save(self.config) + +- gtk.main_quit() ++ Gtk.main_quit() + + + #==================================== GLOBAL FUNCTIONS ===============================================# +@@ -232,13 +231,13 @@ + g.debug("Path: " + abspath) + g.debug("Config File: " + CONFIG_PATH) + +-win = gtk.Window() ++win = Gtk.Window() + win.set_title(_("Gloobus-Preview Configuration")) + #win.set_default_size(400,150) +-win.connect('delete-event', gtk.main_quit) ++win.connect('delete-event', Gtk.main_quit) + + + gui = GUI() + +-gtk.main() ++Gtk.main() + diff --git a/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch b/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch new file mode 100644 index 000000000..f748da875 --- /dev/null +++ b/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch @@ -0,0 +1,21 @@ +diff -Naur gloobus-sushi.orig/src/gloobus-sushi.py gloobus-sushi/src/gloobus-sushi.py +--- gloobus-sushi.orig/src/gloobus-sushi.py 2014-01-22 21:54:41.297590000 +0100 ++++ gloobus-sushi/src/gloobus-sushi.py 2014-01-22 21:45:21.244184455 +0100 +@@ -16,7 +16,7 @@ + + import dbus + import dbus.service +-import gobject ++from gi.repository import GObject + import os + + from dbus.mainloop.glib import DBusGMainLoop +@@ -28,7 +28,7 @@ + def __init__(self): + bus_name = dbus.service.BusName(DBUS_NAME, bus=dbus.SessionBus()) + super(DBusWrapper, self).__init__(bus_name, DBUS_PATH) +- self.loop = gobject.MainLoop() ++ self.loop = GObject.MainLoop() + self.loop.run() + + @dbus.service.method(DBUS_NAME) diff --git a/pcr/emacs-lucid/PKGBUILD b/pcr/emacs-lucid/PKGBUILD index f88607e0a..1c87aaef4 100644 --- a/pcr/emacs-lucid/PKGBUILD +++ b/pcr/emacs-lucid/PKGBUILD @@ -1,4 +1,3 @@ -# $Id: PKGBUILD 192474 2013-08-12 20:25:41Z eric $ # Maintainer: Luke Shumaker # Maintainer (Arch): Juergen Hoetzel # Contributor: Renchi Raju @@ -6,7 +5,7 @@ _pkgname=emacs pkgname=emacs-lucid pkgver=24.3 -pkgrel=4 +pkgrel=5 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" diff --git a/pcr/hunspell-pt-br/PKGBUILD b/pcr/hunspell-pt-br/PKGBUILD index 0ae4e4e76..5c4ff0c3a 100644 --- a/pcr/hunspell-pt-br/PKGBUILD +++ b/pcr/hunspell-pt-br/PKGBUILD @@ -5,14 +5,14 @@ pkgname=hunspell-pt-br pkgver=3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Portuguese (Brazil) dictionary" arch=(any) url="http://pt-br.libreoffice.org/projetos/projeto-vero-verificador-ortografico" license=('LGPLv3' 'MPL') optdepends=('hunspell: the spell checking libraries and apps') -source=(http://pt-br.libreoffice.org/assets/VeroptBRV320AOG.oxt) -md5sums=('3b2f7291d486435cf6706b55e02da5b6') +source=(http://pt-br.libreoffice.org/assets/VeroptBRV320AOC.oxt) +md5sums=('9a9ac174c401406604bfcf101de2a7ba') package() { install -D -m644 ${srcdir}/pt_BR.dic ${pkgdir}/usr/share/hunspell/pt_BR.dic diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index a88d99bb6..856d909e2 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2014.01.22.3 +pkgver=2014.01.23.2 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -28,5 +28,5 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('16f30350b5de9f13174839670565eb4f' +md5sums=('4be7593dfe2a7d1db6c08e5543b0e2e0' 'SKIP') -- cgit v1.2.3-54-g00ecf From 0a521de4508e14363c59922ab2744ab699e30288 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 29 Jan 2014 03:30:04 +0000 Subject: Wed Jan 29 03:27:46 UTC 2014 --- community/bip/PKGBUILD | 39 ++++++++++ community/bip/bip.install | 27 +++++++ community/bip/bip.service | 13 ++++ community/clearsilver/PKGBUILD | 4 +- community/instead/PKGBUILD | 8 +-- community/libgit2-glib/PKGBUILD | 14 ++-- community/marisa/ChangeLog | 10 --- community/marisa/PKGBUILD | 8 +-- community/mate-calc/PKGBUILD | 12 ++-- community/mate-document-viewer/PKGBUILD | 11 ++- community/mate-file-archiver/PKGBUILD | 23 +++--- community/mate-nettool/PKGBUILD | 35 +++++++++ community/mate-nettool/mate-nettool.install | 13 ++++ community/notmuch/PKGBUILD | 6 +- community/obexftp/PKGBUILD | 4 +- community/passenger/PKGBUILD | 4 +- community/plan9port/PKGBUILD | 12 ++-- community/python-greenlet/PKGBUILD | 45 ++++++++++++ community/python-levenshtein/PKGBUILD | 8 +-- community/python-numexpr/PKGBUILD | 12 ++-- community/python-pybox2d/PKGBUILD | 35 +++++++++ community/python2-greenlet/PKGBUILD | 27 ------- community/python2-m2crypto/LICENSE | 26 +++++++ community/python2-m2crypto/PKGBUILD | 14 ++-- community/ruby-cairo/PKGBUILD | 8 +-- community/ruby-gtk2/PKGBUILD | 8 +-- community/ruby-gtk3/PKGBUILD | 4 +- community/ruby-iconv/PKGBUILD | 36 +++------- community/ruby-ncurses/PKGBUILD | 4 +- community/springlobby/PKGBUILD | 4 +- community/uwsgi/PKGBUILD | 4 +- community/weston/PKGBUILD | 6 +- community/xmms2/PKGBUILD | 4 +- extra/emacs/PKGBUILD | 6 +- extra/gtk3/PKGBUILD | 13 +--- extra/gtksourceview3/PKGBUILD | 6 +- extra/kdebindings-korundum/PKGBUILD | 4 +- extra/kdebindings-qtruby/PKGBUILD | 9 ++- extra/mysql-python/PKGBUILD | 8 +-- extra/pidgin/PKGBUILD | 17 ++--- .../pidgin-2.10.7-link-libirc-to-libsasl2.patch | 12 ---- extra/rrdtool/PKGBUILD | 4 +- ...alling-gem-from-file-without-dependencies.patch | 84 ++++++++++++++++++++++ extra/ruby/PKGBUILD | 33 +++++---- extra/subversion/PKGBUILD | 4 +- extra/vim/PKGBUILD | 2 +- extra/weechat/PKGBUILD | 4 +- 47 files changed, 470 insertions(+), 224 deletions(-) create mode 100644 community/bip/PKGBUILD create mode 100644 community/bip/bip.install create mode 100644 community/bip/bip.service delete mode 100644 community/marisa/ChangeLog create mode 100644 community/mate-nettool/PKGBUILD create mode 100644 community/mate-nettool/mate-nettool.install create mode 100644 community/python-greenlet/PKGBUILD create mode 100644 community/python-pybox2d/PKGBUILD delete mode 100644 community/python2-greenlet/PKGBUILD create mode 100644 community/python2-m2crypto/LICENSE delete mode 100644 extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch create mode 100644 extra/ruby/0001-Fix-installing-gem-from-file-without-dependencies.patch (limited to 'community/ruby-gtk2/PKGBUILD') diff --git a/community/bip/PKGBUILD b/community/bip/PKGBUILD new file mode 100644 index 000000000..52879dd91 --- /dev/null +++ b/community/bip/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 104918 2014-01-28 11:06:38Z flexiondotorg $ +# Maintainer: Martin Wimpress + +pkgname=bip +pkgver=0.8.9 +pkgrel=1 +pkgdesc="Multiuser IRC proxy that supports replaying of logged conversations." +arch=('i686' 'x86_64') +url="http://bip.milkypond.org/" +license=('GPL') +depends=('openssl') +source=("http://pkgs.fedoraproject.org/repo/pkgs/${pkgname}/${pkgname}-${pkgver}.tar.gz/04158ad020db221ed87cdc03660ef6c9//$pkgname-$pkgver.tar.gz" + ${pkgname}.service) +md5sums=('04158ad020db221ed87cdc03660ef6c9' + 'e9a445ed7b0cf12e57d77cf42021160c') +install=${pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # Don't treat warnings as errors. + sed -i 's/-Werror//g' Makefile.in + # Make the sample configuration reflect the PKGBUILD defaults + sed -i 's:/var/proxy/logs:/var/log/bip:' samples/$pkgname.conf +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m755 ${srcdir}/${pkgname}-${pkgver}/scripts/bipgenconfig "${pkgdir}"/usr/bin/bipgenconfig + install -D -m644 ${srcdir}/${pkgname}-${pkgver}/samples/$pkgname.conf "${pkgdir}"/usr/share/$pkgname/$pkgname.conf.sample + install -D -m644 ${srcdir}/${pkgname}-${pkgver}/samples/$pkgname.vim "${pkgdir}"/usr/share/vim/syntax/$pkgname.vim + install -D -m 0644 ../${pkgname}.service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" +} diff --git a/community/bip/bip.install b/community/bip/bip.install new file mode 100644 index 000000000..5c7857aff --- /dev/null +++ b/community/bip/bip.install @@ -0,0 +1,27 @@ +post_install() { + if ! getent passwd bip > /dev/null; then + echo "==> Creating bip user" + usr/bin/useradd --comment "Bip IRC Proxy" --shell /bin/sh --home /var/lib/bip --system --user-group bip + fi + + mkdir -p /var/run/bip 2 > /dev/null + chown -R bip:bip /var/run/bip + + mkdir -p /var/log/bip 2 > /dev/null + chown -R bip:bip /var/log/bip + systemctl daemon-reload +} + +post_upgrade() { + post_install +} + +pre_remove() { + systemctl stop bip + echo "==> Removing bip user and group" + userdel bip + if getent group bip > /dev/null; then + groupdel bip + fi + rm -rf /var/run/bip +} diff --git a/community/bip/bip.service b/community/bip/bip.service new file mode 100644 index 000000000..299866088 --- /dev/null +++ b/community/bip/bip.service @@ -0,0 +1,13 @@ +[Unit] +Description=Bip IRC Proxy Server +After=network.target +ConditionPathExists=/etc/bip.conf + +[Service] +User=bip +Type=forking +PIDFile=/var/run/bip/bip.pid +ExecStart=/usr/bin/bip -f /etc/bip.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/clearsilver/PKGBUILD b/community/clearsilver/PKGBUILD index 6113d7352..84a849fe2 100644 --- a/community/clearsilver/PKGBUILD +++ b/community/clearsilver/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102895 2013-12-23 15:16:31Z spupykin $ +# $Id: PKGBUILD 104882 2014-01-28 03:34:09Z td123 $ # Maintainer: Sergej Pupykin # Maintainer : Aaron Griffin # Contributor: William Rea pkgname=clearsilver pkgver=0.10.5 -pkgrel=12 +pkgrel=13 pkgdesc="clearsilver is a fast, powerful, and language-neutral HTML template system" arch=('i686' 'x86_64') url='http://www.clearsilver.net' diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD index e68815f34..2169587cd 100644 --- a/community/instead/PKGBUILD +++ b/community/instead/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 104835 2014-01-27 10:00:52Z spupykin $ +# $Id: PKGBUILD 104923 2014-01-28 11:19:00Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Peter Kosyh pkgname=instead -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="a quest interpreter" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua') optdepends=('instead-launcher: install and update INSTEAD games from net') source=(http://downloads.sourceforge.net/project/instead/instead/${pkgver}/instead_${pkgver}.tar.gz) -md5sums=('3b65855cc0aa5040c881f2830e154365') +md5sums=('28adadd80c3726ebd3856aa3fa372ea3') build() { cd "${srcdir}/instead-${pkgver}" @@ -24,5 +24,5 @@ package() { cd "${srcdir}/instead-${pkgver}" make DESTDIR="${pkgdir}" PREFIX=/usr install - cp -a doc/*.{html,txt,pdf} doc/examples $pkgdir/usr/share/doc/instead/ + cp -a doc/*.{html,pdf} doc/instead.txt doc/examples $pkgdir/usr/share/doc/instead/ } diff --git a/community/libgit2-glib/PKGBUILD b/community/libgit2-glib/PKGBUILD index bb1484a33..9cc31aa13 100644 --- a/community/libgit2-glib/PKGBUILD +++ b/community/libgit2-glib/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 99843 2013-10-31 02:02:27Z allan $ +# $Id: PKGBUILD 104880 2014-01-28 00:44:20Z eric $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=libgit2-glib -pkgver=0.0.6 +pkgver=0.0.10 pkgrel=1 pkgdesc="GLib wrapper for libgit2" -url="http://live.gnome.org/Libgit2-glib" +url="http://wiki.gnome.org/Projects/Libgit2-glib" license=(LGPL2.1) arch=(i686 x86_64) -depends=(glib2 libgit2 gobject-introspection) +depends=(glib2 libgit2) +makedepends=(gobject-introspection) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('bda84b5ab6fbe2922a4cf386b4e6d4401863dec7bea1879e86939d005cd521f6') +sha256sums=('3d9dc3c2ca7fab21aa005100b102e085f4d864e507c424d46de451e9d40bfeff') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/community/marisa/ChangeLog b/community/marisa/ChangeLog deleted file mode 100644 index b7f4b062d..000000000 --- a/community/marisa/ChangeLog +++ /dev/null @@ -1,10 +0,0 @@ -2013-05-28 ponsfoot - - * marisa 0.2.4-2 - - Separate bindings to another packages - -2013-05-27 ponsfoot - - * marisa 0.2.4-1 - - Initial release on AUR - diff --git a/community/marisa/PKGBUILD b/community/marisa/PKGBUILD index bceb59927..85b813490 100644 --- a/community/marisa/PKGBUILD +++ b/community/marisa/PKGBUILD @@ -1,15 +1,15 @@ +# $Id: PKGBUILD 104883 2014-01-28 03:34:13Z td123 $ # Maintainer: Felix Yan # Contributor: ponsfoot pkgbase=marisa pkgname=('marisa' 'perl-marisa' 'python2-marisa' 'ruby-marisa') pkgver=0.2.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="https://code.google.com/p/marisa-trie/" license=('BSD' 'LGPL') makedepends=('python2' 'ruby' 'perl') -changelog=ChangeLog source=(https://marisa-trie.googlecode.com/files/$pkgbase-$pkgver.tar.gz) sha1sums=('fb0ed7d993e84dff32ec456a79bd36a00022629d') @@ -95,8 +95,8 @@ package_ruby-marisa() { depends=('ruby' 'marisa') cd "${pkgbase}-${pkgver}/bindings/ruby" - _hdrdir=`pkg-config --variable=rubyhdrdir ruby-2.0` - _arch=`pkg-config --variable=arch ruby-2.0` + _hdrdir=`pkg-config --variable=rubyhdrdir ruby-2.1` + _arch=`pkg-config --variable=arch ruby-2.1` make DESTDIR="$pkgdir" install \ hdrdir="$_hdrdir" \ arch_hdrdir="${_hdrdir}/${_arch}" \ diff --git a/community/mate-calc/PKGBUILD b/community/mate-calc/PKGBUILD index b29109c66..d48ea6d52 100644 --- a/community/mate-calc/PKGBUILD +++ b/community/mate-calc/PKGBUILD @@ -1,11 +1,9 @@ -# $Id: PKGBUILD 104222 2014-01-16 17:33:47Z flexiondotorg $ +# $Id: PKGBUILD 104914 2014-01-28 10:51:00Z flexiondotorg $ # Maintainer : Martin Wimpress -# Contributor: Giovanni "Talorno" Ricciardi -# Contributor: Xpander pkgname=mate-calc -pkgver=1.6.0 -pkgrel=4 +pkgver=1.6.1 +pkgrel=1 pkgdesc="Calculator for the Mate desktop environment" url="http://mate-desktop.org" arch=('i686' 'x86_64') @@ -15,12 +13,12 @@ makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') options=('!emptydirs') groups=('mate-extra') source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") -sha1sums=('c793118595cd370ccca9875880e0e6760f6c5a08') +sha1sums=('dca1568748e42d4a019d7cf8effe1be80b20b82b') install=${pkgname}.install build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./autogen.sh \ + ./configure \ --prefix=/usr make } diff --git a/community/mate-document-viewer/PKGBUILD b/community/mate-document-viewer/PKGBUILD index 524ed6242..cb761aa84 100644 --- a/community/mate-document-viewer/PKGBUILD +++ b/community/mate-document-viewer/PKGBUILD @@ -1,11 +1,8 @@ -# $Id: PKGBUILD 104224 2014-01-16 17:39:19Z flexiondotorg $ # Maintainer : Martin Wimpress -# Contributor: Giovanni "Talorno" Ricciardi -# Contributor: Xpander pkgname=mate-document-viewer -pkgver=1.6.1 -pkgrel=5 +pkgver=1.6.2 +pkgrel=1 pkgdesc="Simply a document viewer" url="http://mate-desktop.org" arch=('i686' 'x86_64') @@ -23,12 +20,12 @@ optdepends=('djvulibre: DjVu support' options=('!emptydirs') groups=('mate-extra') source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") -sha1sums=('5b3d1643b7945d56214ec13dc38cb641dfb688e1') +sha1sums=('295a59e7b7babd86f42eebb2a9ac5405dd7b2997') install=${pkgname}.install build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./autogen.sh \ + ./configure \ --prefix=/usr \ --libexecdir=/usr/lib/${pkgname} \ --enable-gtk-doc \ diff --git a/community/mate-file-archiver/PKGBUILD b/community/mate-file-archiver/PKGBUILD index 33bf4e4d3..8f5f07026 100644 --- a/community/mate-file-archiver/PKGBUILD +++ b/community/mate-file-archiver/PKGBUILD @@ -1,13 +1,8 @@ -# $Id: PKGBUILD 104212 2014-01-16 17:08:48Z flexiondotorg $ # Maintainer : Martin Wimpress -# Contributor: Giovanni "Talorno" Ricciardi -# Contributor: Alessio Sergi -# Contributor: Xpander -# Contributor: hekel pkgname=mate-file-archiver -pkgver=1.6.0 -pkgrel=7 +pkgver=1.6.1 +pkgrel=1 pkgdesc="Archive manipulator for MATE" url="http://mate-desktop.org" arch=('i686' 'x86_64') @@ -15,15 +10,17 @@ license=('GPL') depends=('bzip2' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive' 'mate-file-manager' 'tar') makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') -optdepends=('unrar: for RAR uncompression' -'zip: for ZIP archives' 'unzip: for ZIP archives' -'p7zip: 7zip compression utility' 'arj: for ARJ archives' -'unace: extraction tool for the proprietary ace archive format') +optdepends=('arj: for ARJ support' + 'p7zip: for 7zip support' + 'unrar: for RAR extract support' + 'unace: for ACE extract support' + 'unzip: for ZIP extract support' + 'zip: for ZIP support') options=('!emptydirs') groups=('mate-extra') source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz" fr-rpm-bsdtar.patch) -sha1sums=('c7df115b532a14fb7be193113da32cda4a2218e8' +sha1sums=('53a28d6fb559151c0b8d6f9a658113c77cdb938a' '219b05a979bf6f249aaae27964f02345fd81168d') install=${pkgname}.install @@ -35,7 +32,7 @@ prepare() { build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./autogen.sh \ + ./configure \ --prefix=/usr \ --libexecdir=/usr/lib/${pkgname} \ --disable-static \ diff --git a/community/mate-nettool/PKGBUILD b/community/mate-nettool/PKGBUILD new file mode 100644 index 000000000..ca928d0e9 --- /dev/null +++ b/community/mate-nettool/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 104935 2014-01-28 14:00:49Z flexiondotorg $ +# Maintainer : Martin Wimpress + +pkgname=mate-nettool +pkgver=1.8.1 +pkgrel=6 +pkgdesc="MATE interface for various networking tools." +url="https://github.com/NiceandGently/mate-nettool" +arch=('i686' 'x86_64') +license=('GPL') +depends=('coreutils' 'gtk3' 'libgtop' 'net-tools') +makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools') +optdepends=('dnsutils: Required for DNS queries' + 'iputils: Required for ping, traceroute and finger' + 'nmap: Required for network discovery and security audits' + 'whois: Required for WHOIS queries' + 'yelp: for reading help documents') +options=('!emptydirs') +source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz") +md5sums=('c05c525fee4d70c03ebad7e9bb9b7e4c') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh \ + --prefix=/usr \ + --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-nettool/mate-nettool.install b/community/mate-nettool/mate-nettool.install new file mode 100644 index 000000000..bf6781f93 --- /dev/null +++ b/community/mate-nettool/mate-nettool.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD index 9d83aa738..3ea81f29b 100644 --- a/community/notmuch/PKGBUILD +++ b/community/notmuch/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95030 2013-08-03 23:12:06Z dwallace $ +# $Id: PKGBUILD 104884 2014-01-28 03:34:14Z td123 $ # Maintainer: Daniel Wallace # Contributor: fauno # Contributor: Olivier Ramonat @@ -6,7 +6,7 @@ pkgbase=notmuch pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime') -pkgver=0.16 +pkgver=0.17 pkgrel=1 arch=('i686' 'x86_64') url="http://notmuchmail.org/" @@ -14,7 +14,7 @@ license=('GPL3') makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc') options=(!distcc !makeflags) source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('9de9f8a91eb2323d8503872a059c7f11') +md5sums=('65a6a6f1fe912803b60d5870132e2006') prepare(){ #cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver" diff --git a/community/obexftp/PKGBUILD b/community/obexftp/PKGBUILD index 0ed07065a..c8f4847f0 100644 --- a/community/obexftp/PKGBUILD +++ b/community/obexftp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102177 2013-12-06 12:11:56Z giovanni $ +# $Id: PKGBUILD 104885 2014-01-28 03:34:16Z td123 $ # Maintainer: Giovanni Scafora # Contributor: Alessio 'mOLOk' Bolognino pkgname=obexftp pkgver=0.24 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for transfer files to/from any OBEX enabled device" arch=('i686' 'x86_64') url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index 79ac5f1f6..3954a612a 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100819 2013-11-11 12:06:03Z spupykin $ +# $Id: PKGBUILD 104886 2014-01-28 03:34:17Z td123 $ # Maintainer: Sergej Pupykin pkgname=passenger pkgver=4.0.21 -pkgrel=2 +pkgrel=3 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64') url="http://www.modrails.com" diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index d7082d675..cc69553ba 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102625 2013-12-16 21:54:40Z arodseth $ +# $Id: PKGBUILD 104876 2014-01-27 23:51:46Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: phrakture # Contributor: Fazlul Shahriar @@ -6,7 +6,7 @@ pkgname=plan9port pkgver=20131024 -pkgrel=2 +pkgrel=3 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems' arch=('x86_64' 'i686') url='http://swtch.com/plan9port/' @@ -45,10 +45,10 @@ package() { LICENSE # Fix hardcoded paths - #for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do - # echo -n "\t$f" - # [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true - #done + for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do + echo -n "\t$f" + [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true + done # Fix python scripts find "$pkgdir" -name '*.py' -print0 |xargs -0 \ diff --git a/community/python-greenlet/PKGBUILD b/community/python-greenlet/PKGBUILD new file mode 100644 index 000000000..5d123cf72 --- /dev/null +++ b/community/python-greenlet/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 104937 2014-01-28 14:10:19Z fyan $ +# Maintainer: Massimiliano Torromeo +# Maintainer: Felix Yan +# Contributor: Ralf Schmitt + +pkgbase=python-greenlet +pkgname=(python-greenlet python2-greenlet) +pkgver=0.4.2 +pkgrel=2 +pkgdesc="Lightweight in-process concurrent programming" +license=("MIT") +url="http://pypi.python.org/pypi/greenlet" +makedepends=('python' 'python2') +source=("http://pypi.python.org/packages/source/g/greenlet/greenlet-${pkgver}.zip") +arch=('i686' 'x86_64') + +prepare() { + cp -r greenlet-$pkgver greenlet-$pkgver-py2 +} + +build() { + cd greenlet-$pkgver + python setup.py build + + cd ../greenlet-$pkgver-py2 + python2 setup.py build +} + +package_python-greenlet() { + depends=('python') + + cd greenlet-$pkgver + python setup.py install -O1 --root="$pkgdir" + install -Dm0644 LICENSE.PSF "$pkgdir/usr/share/licenses/$pkgname/LICENSE.PSF" +} + +package_python2-greenlet() { + depends=('python2') + + cd greenlet-$pkgver-py2 + python2 setup.py install -O1 --root="$pkgdir" + install -Dm0644 LICENSE.PSF "$pkgdir/usr/share/licenses/$pkgname/LICENSE.PSF" +} + +sha512sums=('9596b740921e4a80bcb43adb725a7a4ea428dadc10ba55f8840837ba685b010c273a4a2bd62c5ba4bfdf27ce87c914a83714d762bacafb8e0a3cd7e2a9675992') diff --git a/community/python-levenshtein/PKGBUILD b/community/python-levenshtein/PKGBUILD index b8af20113..f38df5c3f 100644 --- a/community/python-levenshtein/PKGBUILD +++ b/community/python-levenshtein/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 104954 2014-01-28 15:04:34Z fyan $ # Maintainer: Felix Yan # Contributor: Thomas S Hatch # Contributor: shamrok @@ -7,7 +7,7 @@ pkgbase=python-levenshtein pkgname=(python-levenshtein python2-levenshtein) pkgver=0.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="Python extension for computing string edit distances and similarities" url="http://pypi.python.org/pypi/python-Levenshtein/" license=("GPL") @@ -26,14 +26,14 @@ package_python-levenshtein() { depends=('python') cd python-Levenshtein-$pkgver - python setup.py build install --prefix=/usr --root="$pkgdir" + python setup.py build install -O1 --prefix=/usr --root="$pkgdir" } package_python2-levenshtein() { depends=('python2') cd python2-Levenshtein-$pkgver - python2 setup.py build install --prefix=/usr --root="$pkgdir" + python2 setup.py build install -O1 --prefix=/usr --root="$pkgdir" } sha512sums=('335f29253ec7bba8d54881dfe093ac194626cdaad0cc6ed08327917d6187cdfe1fbb3d003744f991587f8dc800aa1d361e3aa0b276b31ecfe7a43d83ea0d660b') diff --git a/community/python-numexpr/PKGBUILD b/community/python-numexpr/PKGBUILD index eb00378bb..c8d884ee8 100644 --- a/community/python-numexpr/PKGBUILD +++ b/community/python-numexpr/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 96812 2013-09-05 18:53:58Z aginiewicz $ +# $Id: PKGBUILD 104927 2014-01-28 11:43:36Z aginiewicz $ # Maintainer: Andrzej Giniewicz # Contributor: Sebastien Binet pkgbase=python-numexpr pkgname=('python2-numexpr' 'python-numexpr') -pkgver=2.2 +pkgver=2.3 pkgrel=1 -pkgdesc="A JIT compiler for Python expressions" -url="http://code.google.com/p/numexpr/" +pkgdesc="Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas" +url="https://github.com/pydata/numexpr" arch=('i686' 'x86_64') license=('MIT') makedepends=('python2-setuptools' 'python-setuptools' 'python-numpy' 'python2-numpy') -source=(http://numexpr.googlecode.com/files/numexpr-$pkgver.tar.gz) -md5sums=('1d83b13e69fff897a5bc588b7119506c') +source=(https://github.com/pydata/numexpr/archive/$pkgver.tar.gz) +md5sums=('fc9b5765c8ceda4a4c2e974e565b98cf') build() { cd "$srcdir" diff --git a/community/python-pybox2d/PKGBUILD b/community/python-pybox2d/PKGBUILD new file mode 100644 index 000000000..e82a9703e --- /dev/null +++ b/community/python-pybox2d/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 104878 2014-01-28 00:06:26Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Sven-Hendrik Haase + +pkgbase=python-pybox2d +pkgname=('python2-pybox2d') +pkgver=370 +pkgrel=1 +arch=('x86_64' 'i686') +url='http://code.google.com/p/pybox2d' +license=('GPL') +makedepends=('subversion' 'python2' 'swig') +source=("$pkgbase::svn+http://pybox2d.googlecode.com/svn/trunk/") +md5sums=('SKIP') + +build() { + cd "$pkgbase" + + python2 setup.py build +} + +package_python2-pybox2d() { + depends=('python2') + pkgdesc='Python wrapper for Box2D' + + cd "$pkgbase" + + python2 setup.py install --root="$pkgdir" --optimize=1 + + # Fixes the warning about a missing dependency on python + sed -i 's:python:python2:g' \ + "$pkgdir/usr/lib/python2.7/site-packages/Box2D/__init__.py" +} + +# vim: sw=2 ts=2 et: diff --git a/community/python2-greenlet/PKGBUILD b/community/python2-greenlet/PKGBUILD deleted file mode 100644 index 5341f84a3..000000000 --- a/community/python2-greenlet/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 70305 2012-05-04 08:21:08Z mtorromeo $ -# Maintainer: Massimiliano Torromeo -# Maintainer: Felix Yan -# Contributor: Ralf Schmitt - -pkgname=python2-greenlet -pkgver=0.4.2 -pkgrel=1 -pkgdesc="Lightweight in-process concurrent programming" -license=("MIT") -url="http://pypi.python.org/pypi/greenlet" -depends=('python2') -source=(http://pypi.python.org/packages/source/g/greenlet/greenlet-$pkgver.zip) -arch=('i686' 'x86_64') - -build() { - cd greenlet-$pkgver - python2 setup.py build -} - -package() { - cd greenlet-$pkgver - python2 setup.py install --root="$pkgdir" - install -Dm0644 LICENSE.PSF "$pkgdir/usr/share/licenses/$pkgname/LICENSE.PSF" -} - -sha512sums=('9596b740921e4a80bcb43adb725a7a4ea428dadc10ba55f8840837ba685b010c273a4a2bd62c5ba4bfdf27ce87c914a83714d762bacafb8e0a3cd7e2a9675992') diff --git a/community/python2-m2crypto/LICENSE b/community/python2-m2crypto/LICENSE new file mode 100644 index 000000000..d2f636fdd --- /dev/null +++ b/community/python2-m2crypto/LICENSE @@ -0,0 +1,26 @@ +Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved. + +Portions copyright (c) 2004-2006 Open Source Applications Foundation. +All rights reserved. + +Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam. +All rights reserved. + +Copyright (c) 2008-2010 Heikki Toivonen. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation. + +THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/community/python2-m2crypto/PKGBUILD b/community/python2-m2crypto/PKGBUILD index a68c5a35d..e3d68981f 100644 --- a/community/python2-m2crypto/PKGBUILD +++ b/community/python2-m2crypto/PKGBUILD @@ -4,16 +4,18 @@ # Contributor: William Rea pkgname=python2-m2crypto -pkgver=0.21.1 -pkgrel=2 +pkgver=0.22.3 +pkgrel=1 pkgdesc="A crypto and SSL toolkit for Python" arch=('i686' 'x86_64') url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" license=('BSD') depends=('python2' 'openssl') -makedepends=('swig') -source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz") -md5sums=('f93d8462ff7646397a9f77a2fe602d17') +makedepends=('swig' 'python2-setuptools') +source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz" + "LICENSE") +md5sums=('573f21aaac7d5c9549798e72ffcefedd' + 'b0e1f0b7d0ce8a62c18b1287b991800e') build() { cd "${srcdir}/M2Crypto-${pkgver}" @@ -23,5 +25,5 @@ build() { package() { cd "${srcdir}/M2Crypto-${pkgver}" python2 setup.py install --root="${pkgdir}/" --optimize=1 - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD index e9c37cd9e..4687d69cb 100644 --- a/community/ruby-cairo/PKGBUILD +++ b/community/ruby-cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102505 2013-12-12 14:34:05Z arodseth $ +# $Id: PKGBUILD 104887 2014-01-28 03:34:18Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Brad Fanella # Contributor: Jeremy pkgname=ruby-cairo -pkgver=1.12.6 +pkgver=1.12.8 pkgrel=1 pkgdesc='Ruby bindings for cairo' arch=('x86_64' 'i686') @@ -13,7 +13,7 @@ license=('GPL') depends=('ruby' 'cairo') makedepends=('ruby-pkgconfig') source=("http://cairographics.org/releases/rcairo-$pkgver.tar.gz") -sha256sums=('e7ff8d49a730662b3f999187fde45ac0b8651996fe7f9a952496be8b6e45800e') +sha256sums=('8a6a73c9c67eb0a5b6502483c8c39ffb6acbcadd2574123a6597271c2c25736d') build() { cd "$srcdir/rcairo-$pkgver" @@ -27,7 +27,7 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 ext/cairo/cairo.so \ - "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux/cairo.so" + "$pkgdir/usr/lib/ruby/vendor_ruby/2.1.0/$CARCH-linux/cairo.so" } # vim:set ts=2 sw=2 et: diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index ec03643ef..4476268c9 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104632 2014-01-23 14:12:04Z arodseth $ +# $Id: PKGBUILD 104888 2014-01-28 03:34:19Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -8,14 +8,14 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=2.0.0 -pkgrel=3 +pkgver=2.1.0 +pkgrel=2 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('6a36d2d4212e65f23d1c174b03006ea7fecaad1f3b82151dbfbe7ddf4268579f') +sha256sums=('939251c1f82b41c3cf657552396cf4e1198365316904957cfb7167d1298db204') prepare() { cd "ruby-gtk2-$pkgver" diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD index 3a974c28a..4051be99e 100644 --- a/community/ruby-gtk3/PKGBUILD +++ b/community/ruby-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104595 2014-01-23 10:58:45Z arodseth $ +# $Id: PKGBUILD 104889 2014-01-28 03:34:19Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -7,7 +7,7 @@ pkgbase=ruby-gtk3 pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgname=('ruby-gtk3' 'ruby-gdk3') depends=("ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver" "ruby-glib2=$pkgver" "ruby-pango=$pkgver") arch=('x86_64' 'i686') diff --git a/community/ruby-iconv/PKGBUILD b/community/ruby-iconv/PKGBUILD index 528fa5c14..6d5b0c9b8 100755 --- a/community/ruby-iconv/PKGBUILD +++ b/community/ruby-iconv/PKGBUILD @@ -1,41 +1,27 @@ -# $Id: PKGBUILD 100391 2013-11-03 11:24:29Z alucryd $ +# $Id: PKGBUILD 104890 2014-01-28 03:34:20Z td123 $ # Maintainer: Maxime Gauduin pkgname=ruby-iconv -pkgver=1.0.3 -pkgrel=6 -pkgdesc="Wrapper library for iconv" +pkgver=1.0.4 +pkgrel=2 +pkgdesc='Wrapper library for iconv' arch=('i686' 'x86_64') -url="https://github.com/nurse/iconv" +url='https://github.com/nurse/iconv' license=('BSD') depends=('ruby') +options=('!emptydirs') source=("http://rubygems.org/downloads/${pkgname#*-}-${pkgver}.gem") noextract=("${pkgname#*-}-${pkgver}.gem") -sha256sums=('94a9b62a56c96226b62b787cd45fdc48c03f4517f1e36e64db113b010fb012da') - -prepare() { - gem install --no-{document,user-install} --ignore-dependencies -i . ${pkgname#*-}-${pkgver}.gem - sed "s|iconv/iconv.so|$CARCH-linux/iconv.so|" -i gems/${pkgname#*-}-${pkgver}/lib/iconv.rb -} +sha256sums=('5bd4e387a2e8070baf3ebf8d91f545200db25c08686f82cde66f118d9f914f9b') package() { - cd gems/${pkgname#*-}-${pkgver} - - local _rubyver="$(ruby --version | sed 's/.* \(.*\..*\..*\)p.*/\1/')" - - install -dm 755 "${pkgdir}"/usr/lib/ruby/{gems/${_rubyver},vendor_ruby} - mv lib "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver} - -# Native extension - install -dm 755 "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}/$CARCH-linux - mv "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}/{iconv,$CARCH-linux}/iconv.so + local _gemdir="$(ruby -e'puts Gem.default_dir')" -# Gem compatibility - mv ../../specifications "${pkgdir}"/usr/lib/ruby/gems/${_rubyver}/ + gem install --ignore-dependencies --no-user-install -N -i "${pkgdir}"/${_gemdir} ${pkgname#*-}-${pkgver}.gem + find "${pkgdir}" -type f -name *.gem -delete -# License install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname} - install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}BSDL + ln -s ${_gemdir}/gems/${pkgname#*-}-${pkgver}/BSDL "${pkgdir}"/usr/share/licenses/${pkgname}/ } # vim: ts=2 sw=2 et: diff --git a/community/ruby-ncurses/PKGBUILD b/community/ruby-ncurses/PKGBUILD index 4fa6eaac3..1feadffdb 100644 --- a/community/ruby-ncurses/PKGBUILD +++ b/community/ruby-ncurses/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92582 2013-06-09 08:55:46Z arodseth $ +# $Id: PKGBUILD 104893 2014-01-28 03:34:24Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Brad Fanella # Contributor: Jeff Mickey @@ -6,7 +6,7 @@ pkgname=ruby-ncurses pkgver=1.3.1 -pkgrel=5 +pkgrel=6 pkgdesc='Module for interactive text console applications (ncurses)' arch=('x86_64' 'i686') url='http://ncurses-ruby.berlios.de/' diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index 5f8e9a69a..02fda8147 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103804 2014-01-11 20:08:38Z eric $ +# $Id: PKGBUILD 104963 2014-01-28 18:12:41Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: DuGi pkgname=springlobby pkgver=0.180 -pkgrel=2 +pkgrel=3 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64') url="http://springlobby.info/" diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD index 2d2f92115..399502a8f 100644 --- a/community/uwsgi/PKGBUILD +++ b/community/uwsgi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104119 2014-01-16 05:24:03Z dwallace $ +# $Id: PKGBUILD 104902 2014-01-28 03:34:34Z td123 $ # Maintainer: Daniel Wallace # Contributor: Valentin Hăloiu # Contributor: Angel Velasquez @@ -24,7 +24,7 @@ pkgname=(uwsgi #uwsgi-plugin-erlang #uwsgi-plugin-admin pkgver=2.0 -pkgrel=1 +pkgrel=3 arch=(i686 x86_64) url="http://projects.unbit.it/$pkgbase" license=(GPL2) diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index 74d305e60..700cd7ec0 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104730 2014-01-25 02:24:17Z seblu $ +# $Id: PKGBUILD 104875 2014-01-27 23:38:12Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Joel Teichroeb pkgname=weston pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='Reference implementation of a Wayland compositor' arch=('i686' 'x86_64') url='http://wayland.freedesktop.org' @@ -18,7 +18,7 @@ build() { ./configure \ --prefix=/usr \ --libexecdir=/usr/lib/weston \ - --enable-demo-clients + --enable-demo-clients-install make } diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 692af5f31..571ed19af 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 104378 2014-01-19 16:29:43Z bpiotrowski $ +# $Id: PKGBUILD 104903 2014-01-28 03:34:35Z td123 $ # Maintainer: Sergej Pupykin pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=22 +pkgrel=23 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64') url="http://xmms2.org/" diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index e4414475b..b2149a2f1 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 204521 2014-01-22 01:48:51Z eric $ +# $Id: PKGBUILD 204839 2014-01-28 14:14:20Z juergen $ # Maintainer: Juergen Hoetzel # Contributor: Renchi Raju pkgname=emacs pkgver=24.3 -pkgrel=5 +pkgrel=6 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls') install=emacs.install source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} emacs-24.3-giflib5.patch) diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index aeaf9c5dc..9bfe06764 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 200800 2013-12-05 17:20:20Z heftig $ +# $Id: PKGBUILD 204833 2014-01-28 08:59:57Z heftig $ # Maintainer: Ionut Biru # Maintainer: Jan Alexander Steffens (heftig) pkgname=gtk3 -pkgver=3.10.6 +pkgver=3.10.7 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=(i686 x86_64) @@ -17,16 +17,9 @@ optdepends=('gnome-themes-standard: Default widget theme' license=(LGPL) source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini) -sha256sums=('3c24c57fc5cb7a5ea39d3a3ff7b12be63d7f21a52fd6f20f7b983e19b7b0268a' +sha256sums=('b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427' '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119') -prepare() { - cd "gtk+-$pkgver" - - # protocols too new; made with a wayland from git, not 1.3.0 - rm gdk/wayland/gtk-shell-{client-protocol.h,protocol.c} -} - build() { cd "gtk+-$pkgver" diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index 9d0fa5510..929ef11e7 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198083 2013-10-30 12:42:02Z allan $ +# $Id: PKGBUILD 204834 2014-01-28 09:00:12Z heftig $ # Maintainer: Ionut Biru pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('gtk3' 'libxml2') makedepends=('intltool' 'gobject-introspection' 'glade') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('38de44f832b4110a3442af2fce58fce0a54f4b22a763c490bcdc1b1db2fb0b01') +sha256sums=('045d244b1fd6a2d1b91a40712cbbfb18c6e44844c266a0a16ac5ec1800add8f5') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 646f5bec8..120fb180b 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 204124 2014-01-15 10:16:43Z svenstaro $ +# $Id: PKGBUILD 204820 2014-01-28 03:33:03Z td123 $ # Maintainer: Andrea Scarpino pkgname=kdebindings-korundum pkgver=4.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" arch=('i686' 'x86_64') diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index c2179c223..8ee4a1b63 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 204099 2014-01-15 10:16:16Z svenstaro $ +# $Id: PKGBUILD 204821 2014-01-28 03:33:04Z td123 $ # Maintainer: Andrea Scarpino pkgname=kdebindings-qtruby pkgver=4.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="Ruby bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby" arch=('i686' 'x86_64') @@ -15,8 +15,11 @@ conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") sha1sums=('c6a778cc4d5cdfc375f4121b03b5b44be9de158a') -build() { +prepare() { mkdir build +} + +build() { cd build cmake ../qtruby-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/mysql-python/PKGBUILD b/extra/mysql-python/PKGBUILD index 63b2e43e4..977f22f10 100644 --- a/extra/mysql-python/PKGBUILD +++ b/extra/mysql-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180685 2013-03-25 19:15:36Z bpiotrowski $ +# $Id: PKGBUILD 204827 2014-01-28 04:02:31Z angvp $ # Maintainer: Angel Velasquez # Contributor: damir pkgname=mysql-python -pkgver=1.2.4 -pkgrel=2 +pkgver=1.2.5 +pkgrel=1 pkgdesc="MySQL support for Python" arch=("i686" "x86_64") url="http://mysql-python.sourceforge.net/" @@ -12,7 +12,7 @@ license=('GPL2') depends=('python2' 'libmariadbclient') makedepends=('mariadb' 'python2-distribute') source=("http://pypi.python.org/packages/source/M/MySQL-python/MySQL-python-${pkgver}.zip") -md5sums=('ddf2386daf10a97af115ffad2ed4a9a0') +md5sums=('654f75b302db6ed8dc5a898c625e030c') package() { cd ${srcdir}/MySQL-python-${pkgver} diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 6308093e3..9c1638653 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198368 2013-10-30 14:26:41Z allan $ +# $Id: PKGBUILD 204842 2014-01-28 15:36:21Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Andrea Scarpino @@ -6,26 +6,21 @@ # Contributor: Lucien Immink pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.7 -pkgrel=4 +pkgver=2.10.8 +pkgrel=1 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - pidgin-2.10.7-link-libirc-to-libsasl2.patch) -sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192' - '063723d5dc5726c43137b4b383c9d07c2c008391f6a626faaf6cedd31a2f1e8f') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2{,.asc}) +sha256sums=('b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227' + 'SKIP') build() { cd "$srcdir/$pkgname-$pkgver" - # https://developer.pidgin.im/ticket/15517 - patch -Np1 -i "$srcdir/pidgin-2.10.7-link-libirc-to-libsasl2.patch" - autoreconf -vi - # Use Python 2 sed -i 's/env python$/&2/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} diff --git a/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch deleted file mode 100644 index abffa20b8..000000000 --- a/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am pidgin-2.10.7/libpurple/protocols/irc/Makefile.am ---- pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am 2013-02-14 02:44:47.000000000 +0200 -+++ pidgin-2.10.7/libpurple/protocols/irc/Makefile.am 2013-02-14 02:49:58.000000000 +0200 -@@ -27,7 +27,7 @@ else - st = - pkg_LTLIBRARIES = libirc.la - libirc_la_SOURCES = $(IRCSOURCES) --libirc_la_LIBADD = $(GLIB_LIBS) -+libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) - - endif - diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 63c931ff8..648e8a9f5 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197422 2013-10-25 19:15:13Z eric $ +# $Id: PKGBUILD 204822 2014-01-28 03:33:05Z td123 $ # Maintainer: Eric Bélanger pkgname=rrdtool pkgver=1.4.8 -pkgrel=2 +pkgrel=3 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" diff --git a/extra/ruby/0001-Fix-installing-gem-from-file-without-dependencies.patch b/extra/ruby/0001-Fix-installing-gem-from-file-without-dependencies.patch new file mode 100644 index 000000000..8fefb275d --- /dev/null +++ b/extra/ruby/0001-Fix-installing-gem-from-file-without-dependencies.patch @@ -0,0 +1,84 @@ +From f5bbf838c8b13369a61c6756355305388df5824f Mon Sep 17 00:00:00 2001 +From: Tim Moore +Date: Tue, 31 Dec 2013 17:39:45 +1100 +Subject: [PATCH] Fix installing gem from file without dependencies. + +Commit 9437ccc fixed the ability to install remote gems that was accidentally +broken by d97fba1, but in the process accidentally broke installing from local +files. + +This also changes the order to check for local first, to avoid unnecessary +network requests in the case where the gem is local. + +Closes #760. +--- + lib/rubygems/commands/install_command.rb | 20 ++++++++++++-------- + test/rubygems/test_gem_commands_install_command.rb | 14 ++++++++++++++ + 2 files changed, 26 insertions(+), 8 deletions(-) + +diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb +index 4485eb1..8219eef 100644 +--- a/lib/rubygems/commands/install_command.rb ++++ b/lib/rubygems/commands/install_command.rb +@@ -228,7 +228,18 @@ to write the specification by hand. For example: + def install_gem_without_dependencies name, req # :nodoc: + gem = nil + +- if remote? then ++ if local? then ++ if name =~ /\.gem$/ and File.file? name then ++ source = Gem::Source::SpecificFile.new name ++ spec = source.spec ++ else ++ source = Gem::Source::Local.new ++ spec = source.find_gem name, req ++ end ++ gem = source.download spec if spec ++ end ++ ++ if remote? and not gem then + dependency = Gem::Dependency.new name, req + dependency.prerelease = options[:prerelease] + +@@ -236,13 +247,6 @@ to write the specification by hand. For example: + gem = fetcher.download_to_cache dependency + end + +- if local? and not gem then +- source = Gem::Source::Local.new +- spec = source.find_gem name, req +- +- gem = source.download spec +- end +- + inst = Gem::Installer.new gem, options + inst.install + +diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb +index 76ea6b4..a5917c0 100644 +--- a/test/rubygems/test_gem_commands_install_command.rb ++++ b/test/rubygems/test_gem_commands_install_command.rb +@@ -560,6 +560,20 @@ ERROR: Possible alternatives: non_existent_with_hint + assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name } + end + ++ def test_install_gem_ignore_dependencies_specific_file ++ spec = quick_spec 'a', 2 ++ ++ util_build_gem spec ++ ++ FileUtils.mv spec.cache_file, @tempdir ++ ++ @cmd.options[:ignore_dependencies] = true ++ ++ @cmd.install_gem File.join(@tempdir, spec.file_name), nil ++ ++ assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name } ++ end ++ + def test_parses_requirement_from_gemname + spec_fetcher do |fetcher| + fetcher.gem 'a', 2 +-- +1.8.5.2 + diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index fc4fb1009..aa7ded71a 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,20 +4,28 @@ # Contributor: Jeramy Rutley pkgname=('ruby' 'ruby-docs') -pkgver=2.0.0_p353 -pkgrel=1 +pkgver=2.1.0 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' license=('BSD' 'custom') -makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') +# disable ruby tk since 1.9.3 it has caused a segfault on require 'tk' +# https://bugs.ruby-lang.org/issues/8000 +# wait for upstream to start supporting tk 8.6 +makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml') # 'tk' options=('!emptydirs' '!makeflags' 'staticlibs') -source=("http://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" - 'gemrc') -md5sums=('20eb8f067d20f6b76b7e16cce2a85a55' - '6fb8e7a09955e0f64be3158fb4a27e7a') +source=("http://cache.ruby-lang.org/pub/ruby/ruby-${pkgver}.tar.bz2" + 'gemrc' + '0001-Fix-installing-gem-from-file-without-dependencies.patch') +md5sums=('1546eeb763ac7754365664be763a1e8f' + '6fb8e7a09955e0f64be3158fb4a27e7a' + '61a1507f260866805fc6451c14733b25') build() { - cd ruby-${pkgver//_/-} + cd ruby-${pkgver} + + # fixes https://github.com/rubygems/rubygems/issues/760 + patch -Np1 -i ${srcdir}/0001-Fix-installing-gem-from-file-without-dependencies.patch PKG_CONFIG=/usr/bin/pkg-config ./configure \ --prefix=/usr \ @@ -30,7 +38,7 @@ build() { } check() { - cd ruby-${pkgver//_/-} + cd ruby-${pkgver} make test } @@ -38,14 +46,13 @@ check() { package_ruby() { pkgdesc='An object-oriented language for quick and easy programming' depends=('gdbm' 'openssl' 'libffi' 'libyaml') - optdepends=('tk: for Ruby/TK' - 'ruby-docs: Ruby documentation') + optdepends=('ruby-docs: Ruby documentation') # 'tk: for Ruby/TK' provides=('rubygems' 'rake') conflicts=('rake') backup=('etc/gemrc') install='ruby.install' - cd ruby-${pkgver//_/-} + cd ruby-${pkgver} make DESTDIR="${pkgdir}" install-nodoc @@ -58,7 +65,7 @@ package_ruby() { package_ruby-docs() { pkgdesc='Documentation files for ruby' - cd ruby-${pkgver//_/-} + cd ruby-${pkgver} make DESTDIR="${pkgdir}" install-doc install-capi diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 130811a26..f8664fb03 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 200590 2013-11-29 15:17:27Z angvp $ +# $Id: PKGBUILD 204824 2014-01-28 03:33:08Z td123 $ # Maintainer: Angel Velasquez # Contributor: Stéphane Gaudreault # Contributor: Paul Mattal @@ -6,7 +6,7 @@ pkgname=subversion pkgver=1.8.5 -pkgrel=1 +pkgrel=2 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') url="http://subversion.apache.org/" diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 0b3b99432..f58083a1f 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -10,7 +10,7 @@ _patchlevel=135 __hgrev=de28b1568fc2 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index 6556a85e2..bbd8ace05 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 203596 2014-01-13 17:12:31Z andyrtr $ +# $Id: PKGBUILD 204826 2014-01-28 03:33:10Z td123 $ # Maintainer: Giovanni Scafora # Contributor: lucke pkgname=weechat pkgver=0.4.2 -pkgrel=3 +pkgrel=4 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64') url="http://www.weechat.org/" -- cgit v1.2.3-54-g00ecf