diff options
152 files changed, 1950 insertions, 805 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD index c1a642e5f..d4aefca01 100644 --- a/community/0ad/PKGBUILD +++ b/community/0ad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87547 2013-04-02 21:52:23Z svenstaro $ +# $Id: PKGBUILD 87879 2013-04-08 12:35:31Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com> pkgname=0ad pkgver=a13 _pkgver=0.0.13-alpha -pkgrel=1 +pkgrel=2 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('i686' 'x86_64') url="http://play0ad.com/" @@ -21,10 +21,12 @@ build() { sed -i 's/unix_names = { "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" sed -i 's/unix_names = { "boost_signals-mt" },/unix_names = { "boost_signals" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" + unset CPPFLAGS + ./update-workspaces.sh \ --with-system-enet \ --bindir=/usr/bin \ - --libdir=/usr/lib \ + --libdir=/usr/lib/0ad \ --datadir=/usr/share/${pkgname}/data cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc" @@ -33,9 +35,9 @@ build() { } package() { - install -d "${pkgdir}"/usr/{bin,lib} + install -d "${pkgdir}"/usr/{bin,lib/0ad} install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/pyrogenesis "${pkgdir}/usr/bin" - install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib" + install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib/0ad" install -Dm755 "${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" diff --git a/community/avifile/PKGBUILD b/community/avifile/PKGBUILD index f04a93557..f2169a2af 100644 --- a/community/avifile/PKGBUILD +++ b/community/avifile/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75654 2012-08-28 09:59:19Z spupykin $ +# $Id: PKGBUILD 87987 2013-04-09 21:29:15Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -30,9 +30,9 @@ build() { ./configure \ --prefix=/usr \ --mandir=$pkgdir/usr/share/man \ - --with-qt-prefix=/opt/qt \ - --with-qt-includes=/opt/qt/include \ - --with-qt-libraries=/opt/qt/lib \ + --with-qt-prefix=/usr \ + --with-qt-includes=/usr/include/qt3 \ + --with-qt-libraries=/usr/lib \ --enable-oss make diff --git a/community/botan/PKGBUILD b/community/botan/PKGBUILD index 73ab39fbf..caf945b04 100644 --- a/community/botan/PKGBUILD +++ b/community/botan/PKGBUILD @@ -1,33 +1,36 @@ -# $Id: PKGBUILD 83128 2013-01-27 16:10:24Z pierre $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 87983 2013-04-09 20:48:46Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: d'Ronin <daronin@2600.com> pkgname=botan -pkgver=1.10.3 -pkgrel=1.1 -pkgdesc="Crypto library written in C++" +pkgver=1.10.5 +pkgrel=1 +pkgdesc='Crypto library written in C++' license=('BSD') -arch=('i686' 'x86_64' 'mips64el') -url="http://botan.randombit.net/" +arch=('x86_64' 'i686' 'mips64el') +url='http://botan.randombit.net/' depends=('gcc-libs' 'sh') makedepends=('python2') -source=(http://files.randombit.net/botan/Botan-${pkgver}.tbz{,.asc}) -sha1sums=('9f929101bf75c19432f49f57c80d2d26eec91dcb' - 'd03b220849e3d3b3a49363a0debc266b615d9fca') +source=("http://files.randombit.net/botan/Botan-${pkgver}.tbz") +sha256sums=('2934c00533847dc93c485081d3ce6aae4a110151a69b587b895241159da77cf3') build() { - cd "${srcdir}/Botan-${pkgver}" - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' configure.py + cd "$srcdir/Botan-$pkgver" + + sed -i 's:env python:env python2:' configure.py sed -i 's/mabi=64/mabi=n32/g' src/build-data/cc/gcc.txt ./configure.py --prefix=/usr make } package() { - cd "${srcdir}/Botan-${pkgver}" - make DESTDIR="${pkgdir}/usr" install - install -D -m644 doc/license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - find "${pkgdir}/usr/share/doc" -type f -exec chmod 0644 {} \; + cd "$srcdir/Botan-$pkgver" + + make DESTDIR="$pkgdir/usr" install + install -Dm644 doc/license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + find "$pkgdir/usr/share/doc" -type f -exec chmod 0644 {} \; } +# vim:set ts=2 sw=2 et: diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index aa0375e4b..cedc5afba 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87592 2013-04-03 15:19:45Z spupykin $ +# $Id: PKGBUILD 87877 2013-04-08 12:24:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger <m.fellinger@gmail.com> @@ -16,7 +16,7 @@ options=('!libtool') backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') -source=("http://apache-mirror.rbc.ru/pub/apache/couchdb/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} +source=("http://apache-mirror.rbc.ru/pub/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} "couchdb.service" "couchdb.tmpfiles" "couchdb.rc" diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index bf2509353..7042158ca 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86030 2013-03-11 13:36:02Z spupykin $ +# $Id: PKGBUILD 87838 2013-04-08 09:19:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.1.4 -_pkgver=1.1 +pkgver=1.2 +_pkgver=1.2 pkgrel=1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') @@ -19,12 +19,10 @@ optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) -md5sums=('49e376ca4b88f5351acacef177285c45') +md5sums=('31bfd13d4786aac4f99d5155a811602b') build() { cd "$srcdir/$pkgname-$pkgver" -# mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt - sed -i 's/-Werror//' src/CMakeLists.txt mkdir -p build cd build cmake \ @@ -42,6 +40,4 @@ package() { cd "$srcdir/$pkgname-$pkgver/build" make DESTDIR="$pkgdir" install mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" -# mkdir -p "${pkgdir}/usr/share/gconf/schemas/" -# mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/" } diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD index 832be424c..77e0be961 100644 --- a/community/denemo/PKGBUILD +++ b/community/denemo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76519 2012-09-21 13:30:51Z spupykin $ +# $Id: PKGBUILD 87840 2013-04-08 09:20:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> # Contributor: Gnud <ach.gnud@gmail.com> pkgname=denemo -pkgver=0.9.6 +pkgver=1.0.0 pkgrel=1 pkgdesc="A music score editor" arch=('i686' 'x86_64' 'mips64el') @@ -16,12 +16,15 @@ depends=('aubio' 'portaudio' 'lilypond' 'gtk3' 'libxml2' 'guile' 'fftw' options=('!libtool') backup=('etc/denemo/denemo.conf') source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('48dd1b0801dba574517bcaf0b86d714a') +md5sums=('92bfd2e661387f791e4aa6c23dc7d90b') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc -# sed -i 's|#include <glib/gmessages.h>|#include <glib.h>|' src/pitchrecog.c make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/ejabberd/2.1.12rc.diff.gz b/community/ejabberd/2.1.12rc.diff.gz Binary files differdeleted file mode 100644 index 69769d8a4..000000000 --- a/community/ejabberd/2.1.12rc.diff.gz +++ /dev/null diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index b7654e8f1..812a0255c 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86040 2013-03-11 15:56:20Z spupykin $ +# $Id: PKGBUILD 87844 2013-04-08 09:22:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd -pkgver=2.1.11 -pkgrel=9 +pkgver=2.1.12 +pkgrel=1 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686' 'mips64el') url="http://www.ejabberd.im/" @@ -18,17 +18,14 @@ install=$pkgname.install source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz" "$pkgname.logrotate" "$pkgname" - "ejabberd.service" - "2.1.12rc.diff.gz") -md5sums=('a70b040c4e7602f47718c8afe8780d50' + "ejabberd.service") +md5sums=('7d49242cf04282f3c4cebfafa2cc2f46' 'f97c8a96160f30e0aecc9526c12e6606' '2338a6230ce5f9f60be6dddcfa39bc7e' - 'df32aa17e40a7bc5d9946d3ba6fe5e16' - '688e99cdc1fc3a12501caabaec2293a4') + 'df32aa17e40a7bc5d9946d3ba6fe5e16') build() { cd "$srcdir/$pkgname-$pkgver/src" - patch -p2 <$srcdir/2.1.12rc.diff ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-pam --enable-odbc make diff --git a/extra/gnome-applets/PKGBUILD b/community/gnome-applets/PKGBUILD index 7ff3ec0d9..55bbd0ba4 100644 --- a/extra/gnome-applets/PKGBUILD +++ b/community/gnome-applets/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 170135 2012-11-03 12:57:39Z ibiru $ +# $Id: PKGBUILD 87904 2013-04-08 14:47:20Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-applets diff --git a/extra/gnome-applets/gnome-applets.install b/community/gnome-applets/gnome-applets.install index e3441e722..e3441e722 100644 --- a/extra/gnome-applets/gnome-applets.install +++ b/community/gnome-applets/gnome-applets.install diff --git a/community/gnome-media/PKGBUILD b/community/gnome-media/PKGBUILD new file mode 100644 index 000000000..2b60a714d --- /dev/null +++ b/community/gnome-media/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 87933 2013-04-08 20:25:18Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-media +pkgver=3.4.0 +pkgrel=2 +pkgdesc="Sound recorder and GStreamer 0.10 configuration tool for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libgnome-media-profiles' 'gstreamer0.10-good-plugins' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils') +optdepends=('gstreamer0.10-ugly-plugins: Record sound into mp3 format') +url="https://git.gnome.org/browse/gnome-media" +install=$pkgname.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz + grecord-add-PULSEPROPmediarole.patch + grecord-Should-call-gnome-control-center-sound-not.patch + grecord-send-eos-before-we-stop-record.patch) +sha256sums=('a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f' + '7abd86638ccde30232455ea66a7aff244f5c1cc5f3620b85f0215bf4bd07d546' + '6c8af4bf741d702ce3722cc2bfd1b7caa44f142776706157851184fb2bc55e04' + '5feb1e447f9ac575b282b05be9bfc946794635f98f63cf24603f931767ec8f9d') + +build() { + cd "$pkgname-$pkgver" + + # Upstream fixes + patch -Np1 -i "$srcdir/grecord-add-PULSEPROPmediarole.patch" + patch -Np1 -i "$srcdir/grecord-Should-call-gnome-control-center-sound-not.patch" + patch -Np1 -i "$srcdir/grecord-send-eos-before-we-stop-record.patch" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-install \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # Sound theme moved to gnome-control-center + rm -rf "$pkgdir"/usr/share/{gnome-media,sounds} +} diff --git a/community/gnome-media/gnome-media.install b/community/gnome-media/gnome-media.install new file mode 100644 index 000000000..0574e8765 --- /dev/null +++ b/community/gnome-media/gnome-media.install @@ -0,0 +1,26 @@ +pkgname=gnome-sound-recorder + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + if [ "$(vercmp 3.4.0-2 "$2")" -eq 1 ]; then + usr/sbin/gconfpkg --uninstall gnome-media + else + usr/sbin/gconfpkg --uninstall ${pkgname} + fi +} + +post_remove() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} diff --git a/community/gnome-media/grecord-Should-call-gnome-control-center-sound-not.patch b/community/gnome-media/grecord-Should-call-gnome-control-center-sound-not.patch new file mode 100644 index 000000000..e3908d3cc --- /dev/null +++ b/community/gnome-media/grecord-Should-call-gnome-control-center-sound-not.patch @@ -0,0 +1,35 @@ +From ea6fee0fbf8662a32a5cd2b5c96c1f75a9233813 Mon Sep 17 00:00:00 2001 +From: Sebastien Bacher <seb128@ubuntu.com> +Date: Thu, 07 Jun 2012 16:26:26 +0000 +Subject: grecord: Should call "gnome-control-center sound" not the old g-v-c + +Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net> + +https://bugzilla.gnome.org/show_bug.cgi?id=667402 +--- +diff --git a/grecord/src/gsr-window.c b/grecord/src/gsr-window.c +index bebb991..bd802d6 100644 +--- a/grecord/src/gsr-window.c ++++ b/grecord/src/gsr-window.c +@@ -805,16 +805,16 @@ run_mixer_cb (GtkAction *action, + GSRWindow *window) + { + char *mixer_path; +- char *argv[4] = {NULL, "--page", "recording", NULL}; ++ char *argv[4] = {NULL, "sound", "input", NULL}; + GError *error = NULL; + gboolean ret; + + /* Open the mixer */ +- mixer_path = g_find_program_in_path ("gnome-volume-control"); ++ mixer_path = g_find_program_in_path ("gnome-control-center"); + if (mixer_path == NULL) { + show_error_dialog (GTK_WINDOW (window), NULL, + _("%s is not installed in the path."), +- "gnome-volume-control"); ++ "gnome-control-center"); + return; + } + +-- +cgit v0.9.1 diff --git a/community/gnome-media/grecord-add-PULSEPROPmediarole.patch b/community/gnome-media/grecord-add-PULSEPROPmediarole.patch new file mode 100644 index 000000000..b75dd3c5c --- /dev/null +++ b/community/gnome-media/grecord-add-PULSEPROPmediarole.patch @@ -0,0 +1,26 @@ +From 5453719b61ada75f635f0c3ad3c78651102d7615 Mon Sep 17 00:00:00 2001 +From: Oleksij Rempel <bug-track@fisher-privat.net> +Date: Wed, 06 Jun 2012 11:50:04 +0000 +Subject: grecord: add "PULSE_PROP_media.role" + +For more details see: +http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/ApplicationProperties + +Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net> + +https://bugzilla.gnome.org/show_bug.cgi?id=644908 +--- +diff --git a/grecord/src/gnome-recorder.c b/grecord/src/gnome-recorder.c +index c6c7b7e..c7ec5cc 100644 +--- a/grecord/src/gnome-recorder.c ++++ b/grecord/src/gnome-recorder.c +@@ -190,6 +190,7 @@ main (int argc, + + g_option_context_free (ctx); + gtk_window_set_default_icon_name ("gnome-sound-recorder"); ++ g_setenv ("PULSE_PROP_media.role", "production", TRUE); + + /* use it like a singleton */ + gconf_client = gconf_client_get_default (); +-- +cgit v0.9.1 diff --git a/community/gnome-media/grecord-send-eos-before-we-stop-record.patch b/community/gnome-media/grecord-send-eos-before-we-stop-record.patch new file mode 100644 index 000000000..e760b7e3b --- /dev/null +++ b/community/gnome-media/grecord-send-eos-before-we-stop-record.patch @@ -0,0 +1,41 @@ +From 99e7a41b2e4c217aca7faffb7668b1ac84ae1ed2 Mon Sep 17 00:00:00 2001 +From: Oleksij Rempel <bug-track@fisher-privat.net> +Date: Thu, 07 Jun 2012 17:11:02 +0000 +Subject: grecord: send eos before we stop record. + +Current grecord produces files without EOS. This can be tested +with tool "ogginfo". + +accodrding to this documentation: +http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSrc.html +"Controlled shutdown of live sources in applications" +"Since GStreamer 0.10.16 an application may send an EOS event to a source element to make it perform the EOS logic". + +So this patch make sure we send EOS before we stop recording. + +Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net> + +https://bugzilla.gnome.org/show_bug.cgi?id=677644 +--- +diff --git a/grecord/src/gsr-window.c b/grecord/src/gsr-window.c +index bd802d6..850ebf0 100644 +--- a/grecord/src/gsr-window.c ++++ b/grecord/src/gsr-window.c +@@ -1279,8 +1279,14 @@ stop_cb (GtkAction *action, + GST_DEBUG ("Stopping play pipeline"); + set_pipeline_state_to_null (priv->play->pipeline); + } else if (priv->record && priv->record->state == GST_STATE_PLAYING) { ++ GstMessage *msg; ++ + GST_DEBUG ("Stopping recording source"); +- /* GstBaseSrc will automatically send an EOS when stopping */ ++ gst_element_send_event (priv->record->src, gst_event_new_eos ()); ++ /* wait one second for EOS message on the pipeline bus */ ++ msg = gst_bus_timed_pop_filtered (GST_ELEMENT_BUS (priv->record->pipeline), GST_SECOND, GST_MESSAGE_EOS | GST_MESSAGE_ERROR); ++ gst_message_unref (msg); ++ + gst_element_set_state (priv->record->src, GST_STATE_NULL); + gst_element_get_state (priv->record->src, NULL, NULL, -1); + gst_element_set_locked_state (priv->record->src, TRUE); +-- +cgit v0.9.1 diff --git a/extra/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD index bc6b5349d..5e251b8d5 100644 --- a/extra/gnome-panel/PKGBUILD +++ b/community/gnome-panel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 170862 2012-11-12 20:11:06Z heftig $ +# $Id: PKGBUILD 87902 2013-04-08 14:46:15Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-panel diff --git a/extra/gnome-panel/gnome-panel.install b/community/gnome-panel/gnome-panel.install index 0f9324937..0f9324937 100644 --- a/extra/gnome-panel/gnome-panel.install +++ b/community/gnome-panel/gnome-panel.install diff --git a/extra/gnome-phone-manager/PKGBUILD b/community/gnome-phone-manager/PKGBUILD index 6ecde393f..f2caf3889 100644 --- a/extra/gnome-phone-manager/PKGBUILD +++ b/community/gnome-phone-manager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169906 2012-10-30 22:34:29Z heftig $ +# $Id: PKGBUILD 87900 2013-04-08 14:45:13Z heftig $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-phone-manager diff --git a/extra/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch b/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch index 2a36de13a..2a36de13a 100644 --- a/extra/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch +++ b/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch diff --git a/extra/gnome-phone-manager/gnome-phone-manager.install b/community/gnome-phone-manager/gnome-phone-manager.install index 91212fa2e..91212fa2e 100644 --- a/extra/gnome-phone-manager/gnome-phone-manager.install +++ b/community/gnome-phone-manager/gnome-phone-manager.install diff --git a/extra/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD index a90034576..bcd23e3a1 100644 --- a/extra/gnome-screensaver/PKGBUILD +++ b/community/gnome-screensaver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169908 2012-10-30 22:34:33Z heftig $ +# $Id: PKGBUILD 87889 2013-04-08 14:39:56Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> diff --git a/extra/gnome-screensaver/gnome-screensaver.install b/community/gnome-screensaver/gnome-screensaver.install index d1a42c6ce..d1a42c6ce 100644 --- a/extra/gnome-screensaver/gnome-screensaver.install +++ b/community/gnome-screensaver/gnome-screensaver.install diff --git a/extra/gnome-screensaver/gnome-screensaver.pam b/community/gnome-screensaver/gnome-screensaver.pam index 453dae646..453dae646 100644 --- a/extra/gnome-screensaver/gnome-screensaver.pam +++ b/community/gnome-screensaver/gnome-screensaver.pam diff --git a/community/icewm-utils/PKGBUILD b/community/icewm-utils/PKGBUILD index 360a1f82f..cb8825e45 100644 --- a/community/icewm-utils/PKGBUILD +++ b/community/icewm-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58602 2011-11-16 15:27:25Z spupykin $ +# $Id: PKGBUILD 87991 2013-04-09 21:31:23Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Dominika Solarz <dominikasolarz@gmail.com> @@ -50,11 +50,6 @@ md5sums=('cb2afc6efaa0f9d77b0119b29d528667' '5116da930c0063dd8c478dd8e473b08f') build() { - mkdir -p $pkgdir/usr/bin - - . /etc/profile.d/qt3.sh - export PATH=/opt/qt/bin:$PATH - cd $srcdir # fix default global path to IceWM for file in icewoed-$_woedver/qcentralwidget.cpp \ @@ -73,40 +68,43 @@ build() { (cd icets-$_tsver && patch -p0 <$srcdir/icets-fix-icewmtray-crash.diff) cd $srcdir/icemc-$_mcver - qmake - make - cp icemc $pkgdir/usr/bin/ + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' cd $srcdir/icets-$_tsver - qmake - make - cp icets $pkgdir/usr/bin/ + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' cd $srcdir/icebgset-$_bgsetver - qmake - make - cp icebgset $pkgdir/usr/bin/ + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' cd $srcdir/iceked-$_kedver - qmake - make - cp iceked $pkgdir/usr/bin/ + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' cd $srcdir/icecc-$_ccver - qmake - make - cp icecc $pkgdir/usr/bin/ + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' cd $srcdir/icesndcfg-$_sndcfgver - qmake - make - cp icesndcfg $pkgdir/usr/bin/ + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' cd $srcdir/icewoed-$_woedver - qmake - make - cp icewoed $pkgdir/usr/bin/ + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' +} +package() { + mkdir -p $pkgdir/usr/bin + cp $srcdir/icemc-$_mcver/icemc $pkgdir/usr/bin/ + cp $srcdir/icets-$_tsver/icets $pkgdir/usr/bin/ + cp $srcdir/icebgset-$_bgsetver/icebgset $pkgdir/usr/bin/ + cp $srcdir/iceked-$_kedver/iceked $pkgdir/usr/bin/ + cp $srcdir/icecc-$_ccver/icecc $pkgdir/usr/bin/ + cp $srcdir/icesndcfg-$_sndcfgver/icesndcfg $pkgdir/usr/bin/ + cp $srcdir/icewoed-$_woedver/icewoed $pkgdir/usr/bin/ cp $srcdir/icecursorscfg-$_cursorscfgver/icecurcfg.py $pkgdir/usr/bin/icecurcfg cp $srcdir/iceiconcvt-$_iconcvtver/iceiconcvt.py $pkgdir/usr/bin/iceiconcvt cp $srcdir/icemergeprefs-$_mergeprefsver/icemergeprefs.py $pkgdir/usr/bin/icemergeprefs diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 5a3305dc1..002cba8ab 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83307 2013-01-29 09:59:04Z spupykin $ +# $Id: PKGBUILD 87846 2013-04-08 09:22:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive -pkgver=0.9.4 +pkgver=0.9.6 pkgrel=1 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ optdepends=('recordmydesktop: screen capture' install=kdenlive.install options=('docs') source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.bz2) -md5sums=('fed17b584aca6a9811a49f2348b4f6db') +md5sums=('3bd3a511b860490acc367e7c9d7ffa43') build() { export LDFLAGS="$LDFLAGS -lX11" diff --git a/community/libgnome-media-profiles/PKGBUILD b/community/libgnome-media-profiles/PKGBUILD new file mode 100644 index 000000000..6fc7c2a8f --- /dev/null +++ b/community/libgnome-media-profiles/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 87928 2013-04-08 18:08:07Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Ionut Biru <ibiru@archlinux.org> + +pkgname=libgnome-media-profiles +pkgver=3.0.0 +pkgrel=4 +pkgdesc="Library for management of audio recording profiles" +arch=('i686' 'x86_64') +url="https://git.gnome.org/browse/libgnome-media-profiles" +license=('GPL2') +depends=('gconf' 'gtk3' 'gstreamer0.10-base-plugins') +makedepends=('intltool' 'gnome-doc-utils') +options=('!libtool') +install=$pkgname.install +source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('ab1288e53a8fccca3e8fa59757ef586901e236e09a737a1178eeb8d74428c061') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-static --disable-schemas-install \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/libgnome-media-profiles/libgnome-media-profiles.install b/community/libgnome-media-profiles/libgnome-media-profiles.install new file mode 100644 index 000000000..1c2bfeac0 --- /dev/null +++ b/community/libgnome-media-profiles/libgnome-media-profiles.install @@ -0,0 +1,21 @@ +pkgname=gnome-media-profiles + +post_install(){ + usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + if [ "$(vercmp 3.0.0-4 "$2")" -eq 1 ]; then + usr/sbin/gconfpkg --uninstall libgnome-media-profiles + else + usr/sbin/gconfpkg --uninstall ${pkgname} + fi +} diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 6de777534..b8b421b6c 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83879 2013-02-06 10:39:46Z spupykin $ +# $Id: PKGBUILD 88045 2013-04-10 16:08:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -7,7 +7,7 @@ pkgname=libmicrohttpd pkgver=0.9.25 -pkgrel=1 +pkgrel=2 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libmicrohttpd/" @@ -32,6 +32,6 @@ package() { ${pkgdir}/usr/include/$pkgname/platform.h install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \ ${pkgdir}/usr/include/$pkgname/plibc.h - sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' \ + sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I${includedir}/libmicrohttpd#' \ $pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc } diff --git a/community/lshw/PKGBUILD b/community/lshw/PKGBUILD index cb6a00ee9..1d511ce1b 100644 --- a/community/lshw/PKGBUILD +++ b/community/lshw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87709 2013-04-05 10:27:37Z spupykin $ +# $Id: PKGBUILD 87848 2013-04-08 09:23:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com> # Contributor: Chuck Yang <Chuck.Yang@gmail.com> pkgname=lshw pkgver=B.02.16 -pkgrel=3 +pkgrel=4 pkgdesc="A small tool to provide detailed information on the hardware configuration of the machine." url="http://ezix.org/project/wiki/HardwareLiSter" license=('GPL') @@ -18,6 +18,7 @@ md5sums=('67479167add605e8f001097c30e96d0d') build() { cd $srcdir/$pkgname-$pkgver + sed -i 's|/usr/bin/gtk-lshw|/usr/sbin/gtk-lshw|' src/gui/integration/gtk-lshw.desktop make make gui } diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD index 618c70728..e5944628f 100644 --- a/community/lxc/PKGBUILD +++ b/community/lxc/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 80003 2012-11-15 11:55:57Z spupykin $ +# $Id: PKGBUILD 87850 2013-04-08 09:23:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Zucchelli <zukka77@gmail.com> # Contributor: Jonathan Liu <net147@gmail.com> # Maintainer: Jon Nordby <jononor@gmail.com> pkgname=lxc -pkgver=0.8.0 +pkgver=0.9.0 epoch=1 -pkgrel=2 +pkgrel=1 pkgdesc="Linux Containers" arch=('i686' 'x86_64' 'mips64el') url="http://lxc.sourceforge.net/" depends=('bash' 'perl') license=('LGPL') source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz") -md5sums=('7304fa57146ce687f749b5df876bb20d') +md5sums=('8552a4479090616f4bc04d8473765fc9') build() { cd "$srcdir/$pkgname-${pkgver/_/-}" diff --git a/community/madman/PKGBUILD b/community/madman/PKGBUILD index 2a6cc72c7..c5b08cbfc 100644 --- a/community/madman/PKGBUILD +++ b/community/madman/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56740 2011-10-11 17:41:27Z spupykin $ +# $Id: PKGBUILD 87994 2013-04-09 21:36:20Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Hugo Ideler <hugoideler@dse.nl> @@ -29,7 +29,6 @@ md5sums=('36e7a4619ebe83ed939c7ae09c16d535' '685a6fb13c861b82950dd6a77fd02120') build() { - . /etc/profile.d/qt3.sh cd $srcdir/$pkgname-$pkgver.orig patch -p1 -i $srcdir/madman_0.94beta1.20060611-2.diff @@ -42,11 +41,17 @@ build() { ,build/release/designer/tsetlistview.h sed -i '26,1i#include <memory>' utility/base.h sed -i 's|python|python2|' designer/make_imagedata httpd/make_webdata doc/update_format_tag - cp $srcdir/fake-g++.sh ./g++ + install -m755 $srcdir/fake-g++.sh ./g++ export PATH=.:$PATH - scons - scons install_to=$pkgdir/usr prefix=/usr install + scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3 +} + +package() { + cd $srcdir/$pkgname-$pkgver.orig + + scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3 \ + install_to=$pkgdir/usr prefix=/usr install install -Dm644 $srcdir/madman_logo.png $pkgdir/usr/share/icons/madman_logo.png install -Dm644 $srcdir/madman_logo_mini.png $pkgdir/usr/share/icons/mini/madman_logo_mini.png diff --git a/community/mandvd/PKGBUILD b/community/mandvd/PKGBUILD index 4c5abc0cc..3519ac8dd 100644 --- a/community/mandvd/PKGBUILD +++ b/community/mandvd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65689 2012-02-21 21:57:30Z jlichtblau $ +# $Id: PKGBUILD 87997 2013-04-09 21:40:35Z eric $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com> # Contributor: Jesus Lazaro Plaza <jesuslazaro84@gmail.com> @@ -12,16 +12,18 @@ url="http://www.kde-apps.org/content/show.php/ManDVD?content=83906" license=('GPL') depends=('dvd+rw-tools>=5.21.4' 'dvd-slideshow>=0.7.5' 'mjpegtools>=1.8.0' 'mplayer' 'qt3' 'xine-ui>=0.99.4') changelog=$pkgname.changelog -source=(http://ftp.sh.cvut.cz/MIRRORS/vector/veclinux-7.0/source/abs/xap/$pkgname/$pkgname-$pkgver-1.fc12.tar.gz) +source=(http://vectorlinux.osuosl.org/veclinux-7.0/source/abs/xap/$pkgname/$pkgname-$pkgver-1.fc12.tar.gz) sha256sums=('967fd66da31f0619001b3aaea494ab41579ab7ffdc6a1b0a51a4a4add012eb9c') build() { cd ${srcdir}/$pkgname-$pkgver - source /etc/profile.d/qt3.sh - ${QTDIR}/bin/qmake + qmake-qt3 sed -i "s|O2|O1|" ./Makefile - make + sed -i 's|-I$(QTDIR)/include|-I/usr/include/qt3|' Makefile + sed -i '55 i\#include <unistd.h>' main.cpp + sed -i '28 i\#include <unistd.h>' mandvd.cpp + make QTDIR=/usr MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 } package() { diff --git a/extra/metacity/PKGBUILD b/community/metacity/PKGBUILD index 1cd7292f7..0131d328f 100644 --- a/extra/metacity/PKGBUILD +++ b/community/metacity/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 170056 2012-10-31 10:19:33Z jgc $ +# $Id: PKGBUILD 87887 2013-04-08 14:38:04Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=metacity diff --git a/extra/metacity/fix_compositing_startup.patch b/community/metacity/fix_compositing_startup.patch index 56b218ae7..56b218ae7 100644 --- a/extra/metacity/fix_compositing_startup.patch +++ b/community/metacity/fix_compositing_startup.patch diff --git a/extra/metacity/metacity.install b/community/metacity/metacity.install index ba0feffc1..ba0feffc1 100644 --- a/extra/metacity/metacity.install +++ b/community/metacity/metacity.install diff --git a/community/opencollada/PKGBUILD b/community/opencollada/PKGBUILD index 3804e7621..a11e7afc8 100644 --- a/community/opencollada/PKGBUILD +++ b/community/opencollada/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 84701 2013-02-22 15:29:30Z svenstaro $ +# $Id: PKGBUILD 87935 2013-04-08 20:59:14Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=opencollada -pkgver=20130222 +pkgver=20130408 pkgrel=1 pkgdesc="Stream based reader and writer library for COLLADA files" arch=(i686 x86_64) @@ -9,40 +9,27 @@ url="https://github.com/KhronosGroup/OpenCOLLADA" license=('GPL') depends=('libxml2' 'pcre') makedepends=('git' 'cmake') -source=('opencollada.conf') -md5sums=('5f7e9d79ab86756648b648ee5ed6ce1d') - -_gitroot=git://github.com/KhronosGroup/OpenCOLLADA.git -_gitname=opencollada +source=('opencollada.conf' + 'git://github.com/KhronosGroup/OpenCOLLADA.git') +md5sums=('5f7e9d79ab86756648b648ee5ed6ce1d' + 'SKIP') build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin - msg "The local files are updated." - else - git clone "$_gitroot" "$_gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" + cd "$srcdir"/OpenCOLLADA [[ -d build ]] && rm -r build mkdir build && cd build +# Activate these once pr#124 is merged +# -DUSE_SHARED=ON \ +# -DUSE_STATIC=OFF \ cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "$srcdir/$_gitname-build/build" + cd "$srcdir"/OpenCOLLADA/build make DESTDIR=$pkgdir install diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index 16d8f8e99..39bafce1c 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87649 2013-04-05 01:44:23Z allan $ +# $Id: PKGBUILD 87881 2013-04-08 12:41:31Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt2' 'python2-packagekit') pkgver=0.7.6 -pkgrel=6 +pkgrel=9 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64' 'mips64el') url="http://www.packagekit.org" @@ -18,7 +18,7 @@ source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz" 'libarchive.patch') sha256sums=('82c0a553075d49add3c4f58e6e93f7f3613938809a4b8e36f46476e86981b45d' 'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8' - '067f39917f5442b8146c793b62f86f66fc8a4c7e391c0f3219d13f98d45ba630' + 'd27c77d3c0e2932fff2916fedcae011bd283904ef7c329dd0dc05163b58d7415' '0d3798c8992afdc0930aa271b3e44deb55c046ab4adee25b4ec4c33bcdd950e2') build() { diff --git a/community/packagekit/alpm.patch b/community/packagekit/alpm.patch index aeba9c347..8b972b291 100644 --- a/community/packagekit/alpm.patch +++ b/community/packagekit/alpm.patch @@ -40,7 +40,7 @@ index 5c6b629..a4cd197 100644 alpm_strerror (errno)); } diff --git a/backends/alpm/pk-backend-config.c b/backends/alpm/pk-backend-config.c -index c8fd13b..1a82637 100644 +index c8fd13b..03adb47 100644 --- a/backends/alpm/pk-backend-config.c +++ b/backends/alpm/pk-backend-config.c @@ -33,35 +33,32 @@ @@ -357,14 +357,14 @@ index c8fd13b..1a82637 100644 + + return g_strcmp0 (section->name, name); +} -+ + +- if (alpm_list_find_str (config->repos, repo) == NULL) { +- config->repos = alpm_list_add (config->repos, g_strdup (repo)); +static PkBackendConfigSection * +pk_backend_config_enter_section (PkBackendConfig *config, const gchar *name) +{ + PkBackendConfigSection *section; - -- if (alpm_list_find_str (config->repos, repo) == NULL) { -- config->repos = alpm_list_add (config->repos, g_strdup (repo)); ++ + g_return_val_if_fail (config != NULL, NULL); + g_return_val_if_fail (name != NULL, NULL); + @@ -426,8 +426,8 @@ index c8fd13b..1a82637 100644 { - alpm_siglevel_t *level; - - g_return_val_if_fail (config != NULL, FALSE); - g_return_val_if_fail (section != NULL, FALSE); +- g_return_val_if_fail (config != NULL, FALSE); +- g_return_val_if_fail (section != NULL, FALSE); - g_return_val_if_fail (list != NULL, FALSE); - - level = g_hash_table_lookup (config->levels, section); @@ -439,8 +439,7 @@ index c8fd13b..1a82637 100644 - - while (TRUE) { - gboolean package = TRUE, database = TRUE; -+ g_return_val_if_fail (words != NULL, FALSE); - +- - if (g_str_has_prefix (list, "Package")) { - database = FALSE; - list += 7; @@ -506,7 +505,10 @@ index c8fd13b..1a82637 100644 - ++list; - } - } -- ++ g_return_if_fail (config != NULL); ++ g_return_if_fail (section != NULL); ++ g_return_if_fail (words != NULL); + - return TRUE; + section->siglevels = alpm_list_add_words (section->siglevels, words); } diff --git a/community/pdfedit/PKGBUILD b/community/pdfedit/PKGBUILD index 4da652f91..b46eff23f 100644 --- a/community/pdfedit/PKGBUILD +++ b/community/pdfedit/PKGBUILD @@ -19,15 +19,11 @@ md5sums=('80502ee7f08cdfb867ffdaa92d160a23' 'c0572c2dd54065322321718aa49ed6b8') build() { - . /etc/profile.d/qt3.sh - export PATH="$QTDIR/bin:$PATH" - export QMAKESPEC="$QTDIR/mkspecs/linux-g++" - cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' src/xpdf/xpdf/GlobalParams.cc - ./configure --prefix=/usr --with-qmake=/opt/qt/bin/qmake - make + QTDIR=/usr ./configure --prefix=/usr + make CXXFLAGS+="-I/usr/include/qt3" MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 QTDIR=/usr } package() { diff --git a/community/php-memcache/PKGBUILD b/community/php-memcache/PKGBUILD index 5e91965e1..5e5d3dd39 100644 --- a/community/php-memcache/PKGBUILD +++ b/community/php-memcache/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86563 2013-03-19 15:14:56Z foutrelis $ +# $Id: PKGBUILD 87836 2013-04-08 08:42:56Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=php-memcache -pkgver=3.0.7 -pkgrel=2 +pkgver=3.0.8 +pkgrel=1 pkgdesc="Memcache module for PHP" arch=('i686' 'x86_64' 'mips64el') url="http://pecl.php.net/package/memcache" @@ -11,17 +11,12 @@ license=('PHP') depends=('php') backup=('etc/php/conf.d/memcache.ini') install=php-memcache.install -source=(http://pecl.php.net/get/memcache-$pkgver.tgz - php-memcache-3.0.7-fix-segfault-with-object-serialization.patch) -sha256sums=('f34e2ef42dd8f1f7e6a2cfbb9417a9e58e3bfd7f5db7227ca5afab686cefdd1f' - '100bffed22ad537de1cb03653e2dbb6768617ba3b8b49b1cf05c59554270c25b') +source=(http://pecl.php.net/get/memcache-$pkgver.tgz) +sha256sums=('2cae5b423ffbfd33a259829849f6000d4db018debe3e29ecf3056f06642e8311') build() { cd "$srcdir/memcache-$pkgver" - # https://bugs.php.net/bug.php?id=63142 - patch -Np0 -i "$srcdir/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch" - phpize ./configure --prefix=/usr make diff --git a/community/php-memcache/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch b/community/php-memcache/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch deleted file mode 100644 index f3909746b..000000000 --- a/community/php-memcache/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch +++ /dev/null @@ -1,162 +0,0 @@ -Index: memcache.c -=================================================================== ---- memcache.c (revision 329831) -+++ memcache.c (working copy) -@@ -1529,15 +1529,13 @@ - unsigned int flags, unsigned long cas, void *param TSRMLS_DC) /* - receives a multiple values, param is a zval** array to store value and flags in {{{ */ - { -- zval *arrval, **result = (zval **)param; -- ALLOC_ZVAL(arrval); -- *((zval *)arrval) = *value; -+ zval **result = (zval **)param; - - /* add value to result */ - if (Z_TYPE_P(result[0]) != IS_ARRAY) { - array_init(result[0]); - } -- add_assoc_zval_ex(result[0], (char *)key, key_len + 1, arrval); -+ add_assoc_zval_ex(result[0], (char *)key, key_len + 1, value); - - /* add flags to result */ - if (result[1] != NULL) { -@@ -1565,7 +1563,7 @@ - receives a single value, param is a zval pointer to store value to {{{ */ - { - zval **result = (zval **)param; -- *(result[0]) = *value; -+ ZVAL_ZVAL(result[0], value, 1, 1); - - if (result[1] != NULL) { - ZVAL_LONG(result[1], flags); -Index: memcache_ascii_protocol.c -=================================================================== ---- memcache_ascii_protocol.c (revision 329831) -+++ memcache_ascii_protocol.c (working copy) -@@ -122,7 +122,7 @@ - line_len = mmc_stream_get_line(request->io, &line TSRMLS_CC); - if (line_len > 0) { - long lval; -- zval value; -+ zval *value; - - int response = mmc_request_check_response(line, line_len); - if (response != MMC_RESPONSE_UNKNOWN) { -@@ -132,10 +132,10 @@ - if (sscanf(line, "%lu", &lval) < 1) { - return mmc_server_failure(mmc, request->io, "Malformed VALUE header", 0 TSRMLS_CC); - } -- -- INIT_PZVAL(&value); -- ZVAL_LONG(&value, lval); -- return request->value_handler(request->key, request->key_len, &value, 0, 0, request->value_handler_param TSRMLS_CC); -+ -+ MAKE_STD_ZVAL(value); -+ ZVAL_LONG(value, lval); -+ return request->value_handler(request->key, request->key_len, value, 0, 0, request->value_handler_param TSRMLS_CC); - } - - return MMC_REQUEST_MORE; -Index: memcache_binary_protocol.c -=================================================================== ---- memcache_binary_protocol.c (revision 329831) -+++ memcache_binary_protocol.c (working copy) -@@ -225,14 +225,14 @@ - header = (mmc_mutate_response_header_t *)mmc_stream_get(request->io, sizeof(*header) TSRMLS_CC); - if (header != NULL) { - int result; -- zval *key, value; -+ zval *key, *value; - - /* convert remembered key to string and unpack value */ - key = (zval *)mmc_queue_item(&(req->keys), req->command.reqid); -+ -+ MAKE_STD_ZVAL(value); -+ ZVAL_LONG(value, ntohll(header->value)); - -- INIT_PZVAL(&value); -- ZVAL_LONG(&value, ntohll(header->value)); -- - if (Z_TYPE_P(key) != IS_STRING) { - zval keytmp = *key; - -@@ -241,14 +241,14 @@ - convert_to_string(&keytmp); - - result = request->value_handler( -- Z_STRVAL(keytmp), Z_STRLEN(keytmp), &value, -+ Z_STRVAL(keytmp), Z_STRLEN(keytmp), value, - req->value.flags, req->value.cas, request->value_handler_param TSRMLS_CC); - - zval_dtor(&keytmp); - } - else { - result = request->value_handler( -- Z_STRVAL_P(key), Z_STRLEN_P(key), &value, -+ Z_STRVAL_P(key), Z_STRLEN_P(key), value, - req->value.flags, req->value.cas, request->value_handler_param TSRMLS_CC); - } - -Index: memcache_pool.c -=================================================================== ---- memcache_pool.c (revision 329831) -+++ memcache_pool.c (working copy) -@@ -428,8 +428,8 @@ - unsigned long data_len; - int rv; - -- zval value; -- INIT_ZVAL(value); -+ zval *object; -+ MAKE_STD_ZVAL(object); - - if (flags & MMC_COMPRESSED) { - if (mmc_uncompress(buffer->value.c, bytes, &data, &data_len) != MMC_OK) { -@@ -445,8 +445,6 @@ - if (flags & MMC_SERIALIZED) { - php_unserialize_data_t var_hash; - const unsigned char *p = (unsigned char *)data; -- zval *object = &value; -- - char key_tmp[MMC_MAX_KEY_LEN + 1]; - mmc_request_value_handler value_handler; - void *value_handler_param; -@@ -501,7 +499,7 @@ - long val; - data[data_len] = '\0'; - val = strtol(data, NULL, 10); -- ZVAL_LONG(&value, val); -+ ZVAL_LONG(object, val); - break; - } - -@@ -509,17 +507,17 @@ - double val = 0; - data[data_len] = '\0'; - sscanf(data, "%lg", &val); -- ZVAL_DOUBLE(&value, val); -+ ZVAL_DOUBLE(object, val); - break; - } - - case MMC_TYPE_BOOL: -- ZVAL_BOOL(&value, data_len == 1 && data[0] == '1'); -+ ZVAL_BOOL(object, data_len == 1 && data[0] == '1'); - break; - - default: - data[data_len] = '\0'; -- ZVAL_STRINGL(&value, data, data_len, 0); -+ ZVAL_STRINGL(object, data, data_len, 0); - - if (!(flags & MMC_COMPRESSED)) { - /* release buffer because it's now owned by the zval */ -@@ -528,7 +526,7 @@ - } - - /* delegate to value handler */ -- return request->value_handler(key, key_len, &value, flags, cas, request->value_handler_param TSRMLS_CC); -+ return request->value_handler(key, key_len, object, flags, cas, request->value_handler_param TSRMLS_CC); - } - } - /* }}}*/ diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD index 45d87f49e..f2a5b88f0 100644 --- a/community/python-psycopg2/PKGBUILD +++ b/community/python-psycopg2/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 82158 2013-01-09 17:03:59Z spupykin $ +# $Id: PKGBUILD 87852 2013-04-08 09:24:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=python-psycopg2 pkgname=('python-psycopg2' 'python2-psycopg2') -pkgver=2.4.6 +pkgver=2.5 pkgrel=1 pkgdesc="A PostgreSQL database adapter for the Python programming language." arch=('i686' 'x86_64' 'mips64el') url="http://initd.org/psycopg/" license=('LGPL3') makedepends=('python2' 'python' 'postgresql-libs>=8.4.1') -source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-$pkgver.tar.gz) -md5sums=('79d7f05e67bf70a0ecc6e9103ccece5f') +source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-$pkgver.tar.gz) +md5sums=('facd82faa067e99b80146a0ee2f842f6') build() { cd "$srcdir/psycopg2-$pkgver" diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index a0426cee3..e850f3867 100644 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -6,15 +6,16 @@ # Contributor: Andrzej Giniewicz <gginiu@gmail.com> pkgname=('python-scipy' 'python2-scipy') -pkgver=0.11.0 -pkgrel=4 +pkgver=0.12.0 +pkgrel=1 pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64' 'mips64el') url="http://www.scipy.org/" license=('BSD') makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy') checkdepends=('python-nose' 'python2-nose') -source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz" "http://pkgbuild.com/~jelle/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch.xz") +source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz" ) +# "http://pkgbuild.com/~jelle/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch.xz") build() { unset LDFLAGS @@ -29,7 +30,7 @@ build() { # build for python3 cd scipy-${pkgver} - patch -Np1 -i $srcdir/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch +#patch -Np1 -i $srcdir/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch python3 setup.py config_fc --fcompiler=gnu95 build # build for python2 @@ -80,5 +81,4 @@ package_python2-scipy() { } # vim:set ts=2 sw=2 et: -md5sums=('842c81d35fd63579c41a8ca21a2419b9' - '20d41a597ebfb260d777597e431a7a20') +md5sums=('8fb4da324649f655e8557ea92b998786') diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 453b8ee2d..21712eeef 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77657 2012-10-13 11:44:42Z allan $ +# $Id: PKGBUILD 88003 2013-04-09 21:45:04Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> @@ -19,17 +19,14 @@ source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community QCad.desktop qcad-intptr.patch qcad.patch) - # http://ghost1227.com/files/misc/qm.tar.gz) md5sums=('96b6a56027782aec953c9c4e64c5998c' 'da32fec0d2fb85d96126bf28bb0ab9ff' 'b4d1eb6724b4b41f191f1ab6fd859c39' '92f900fe1fd3a8f841232b587b49c7da' '7e6779b1e3b10da1eb4daf36d93f8479') +# http://ghost1227.com/files/misc/qm.tar.gz) build() { - export PATH="/opt/qt/bin:$PATH" - export QTDIR=/opt/qt - cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src [ "$CARCH" = "x86_64" ] && { @@ -40,7 +37,11 @@ build() { sed -i "s:"-pedantic"::g" mkspecs/defs.pro cd scripts - ./build_qcad.sh notrans + sed -i "s|INCLUDEPATH += ../include|INCLUDEPATH += ../include /usr/include/qt3|" ../*/src/*.pro + sed -i "s|../../qcadlib/include|../../qcadlib/include /usr/include/qt3|" ../qcad/src/qcad.pro + sed -i "s/qmake/qmake-qt3/" build_qcad.sh + sed -i 's|eval $MAKE|sed -i "s/-lqt/-lqt-mt/" ../qcad/src/Makefile;eval $MAKE|' build_qcad.sh + QTDIR=/usr/lib/qt3 ./build_qcad.sh notrans } package() { diff --git a/community/qgo/PKGBUILD b/community/qgo/PKGBUILD index d015bc085..c66c167b3 100644 --- a/community/qgo/PKGBUILD +++ b/community/qgo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64872 2012-02-18 19:23:28Z arodseth $ +# $Id: PKGBUILD 88006 2013-04-09 21:47:09Z eric $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> @@ -20,10 +20,9 @@ sha256sums=('ddfb66ada7027b844838895061f266bda03b327e8dfec2ee2782e14748bac104' build() { cd "$srcdir/$pkgname-$pkgver" - . /etc/profile.d/qt3.sh patch -Np1 -i "$srcdir/gcc43.patch" patch -Np1 -i "$srcdir/gcc45.patch" - ./configure --prefix=/usr --build=$CHOST + ./configure --prefix=/usr --build=$CHOST --with-qt-includes=/usr/include/qt3 make } diff --git a/community/qscintilla-qt3/PKGBUILD b/community/qscintilla-qt3/PKGBUILD index 8de84ddb2..403a4d100 100644 --- a/community/qscintilla-qt3/PKGBUILD +++ b/community/qscintilla-qt3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55531 2011-09-14 07:43:04Z andrea $ +# $Id: PKGBUILD 88009 2013-04-09 21:48:46Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: red_over_blue,Ben <ben@benmazer.net>,Kritoke <kritoke@gamebox.net> @@ -11,27 +11,22 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro/" license=('GPL2') depends=('qt3') -source=("http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla1/QScintilla-1.71-gpl-$pkgver.tar.gz") +source=("http://downloads.sourceforge.net/pyqt/QScintilla-1.71-gpl-$pkgver.tar.gz") md5sums=('dfa047b45d4f09ae8d4a8a431ba88a5a') build() { - . /etc/profile.d/qt3.sh cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver cd qt - sed -i "s%DESTDIR.*%DESTDIR=$pkgdir/opt/qt/lib%g" qscintilla.pro - /opt/qt/bin/qmake qscintilla.pro - make + sed -i "s%DESTDIR.*%DESTDIR=$pkgdir/usr/lib%g" qscintilla.pro + qmake-qt3 qscintilla.pro + sed -i 's|$(QTDIR)/include|/usr/include/qt3|' Makefile + make MOC=/usr/bin/moc-qt3 } package() { cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver/qt # installind includes for i in qextscintilla*.h; do - install -m 644 -D $i "${pkgdir}"/opt/qt/include/$i + install -m 644 -D $i "${pkgdir}"/usr/include/qt3/$i done - - #for i in qscintilla*.qm - #do - #install -m 644 -D $i "${pkgdir}"/opt/qt/translations/$i - #done } diff --git a/community/qucs/PKGBUILD b/community/qucs/PKGBUILD index 9ab19a4c7..d6b4d0285 100644 --- a/community/qucs/PKGBUILD +++ b/community/qucs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65495 2012-02-21 06:38:19Z spupykin $ +# $Id: PKGBUILD 88012 2013-04-09 21:50:26Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Víctor Martínez Romanos <vmromanos@gmail.com> @@ -21,11 +21,14 @@ md5sums=('c916502171d422ab168fe5fc681b29d8' build() { cd $srcdir/$pkgname-$pkgver - . /etc/profile.d/qt3.sh export PATH=$QTDIR/bin:$PATH [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/qucs-gcc-4.5.1.patch [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/ragel/PKGBUILD b/community/ragel/PKGBUILD index 5f3a72978..12bfb4ef3 100644 --- a/community/ragel/PKGBUILD +++ b/community/ragel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 60639 2011-12-16 00:03:11Z tredaelli $ +# $Id: PKGBUILD 87968 2013-04-09 16:09:00Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Michael P <ptchinster@archlinux.us> # Contributor: Roberto Alsina <ralsina@kde.org> @@ -7,21 +7,18 @@ # Contributor: Gustavo Alvarez <sl1pkn07@gmail.com> pkgname=ragel -pkgver=6.7 +pkgver=6.8 pkgrel=1 pkgdesc="Compiles finite state machines from regular languages into executable C, C++, Objective-C, or D code." arch=('i686' 'x86_64' 'mips64el') url="http://www.complang.org/ragel/" license=('GPL') depends=('gcc-libs') -source=("http://www.complang.org/$pkgname/$pkgname-$pkgver.tar.gz" - "ragel-6.7-gcc-4.7.patch") -md5sums=('f4423e0d8a6538dd4e61498fcfad3cec' - 'bcbc047873e09eef04900142fefa75f1') +source=("http://www.complang.org/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('1bb39745ac23da449019f9f2cb4b0d01') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i ${srcdir}/ragel-6.7-gcc-4.7.patch ./configure --prefix=/usr make } @@ -31,4 +28,3 @@ package() { make DESTDIR="$pkgdir/" install } - diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index bcbe6580d..53e40af15 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86021 2013-03-11 10:38:45Z spupykin $ +# $Id: PKGBUILD 87868 2013-04-08 10:05:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Coolen <mark.coolen@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -6,7 +6,7 @@ pkgname=squid pkgver=3.3.2 -pkgrel=1 +pkgrel=2 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686' 'mips64el') url='http://www.squid-cache.org' @@ -76,7 +76,8 @@ build() { --enable-arp-acl \ --with-default-user=proxy \ --enable-async-io \ - --enable-truncate + --enable-truncate \ + --enable-icap-client make } diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index c5252d4ea..c9e0357c4 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86306 2013-03-14 22:48:33Z bisson $ +# $Id: PKGBUILD 87924 2013-04-08 17:07:36Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound -pkgver=1.4.19 -pkgrel=2 +pkgver=1.4.20 +pkgrel=1 pkgdesc='Validating, recursive, and caching DNS resolver' url='http://unbound.net/' license=('custom:BSD') @@ -19,7 +19,7 @@ source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz" 'unbound.service' 'unbound.conf' 'rc.d') -sha1sums=('ccf0d465fc0045d59ceca11ecde688edebd28ec1' +sha1sums=('1752976533be2a4f0c9cdbab9d2cbb67d4f27c43' 'a2493cb105ff6aa23d756514badb13b02d37f319' '5d473ec2943fd85367cdb653fcd58e186f07383f' 'dc96e772f467b32555df21d16fdb15e98194c228') diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index 47ecda95a..2f9772d2d 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86635 2013-03-20 19:41:25Z bpiotrowski $ +# $Id: PKGBUILD 87866 2013-04-08 09:34:56Z tpowa $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Sébastien Luttringer @@ -6,7 +6,7 @@ pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') pkgver=4.2.10 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 70e11b45c..e36fd36e4 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87621 2013-04-04 06:32:48Z foutrelis $ +# $Id: PKGBUILD 87865 2013-04-08 09:34:55Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer @@ -6,7 +6,7 @@ pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.10 _extramodules=extramodules-3.8-ARCH -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index 110042ad7..3e61f3447 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -2,16 +2,16 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.7-ARCH' + EXTRAMODULES='extramodules-3.8-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.7-ARCH' + EXTRAMODULES='extramodules-3.8-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.7-ARCH' + EXTRAMODULES='extramodules-3.8-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index b32e5c46e..378dab975 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -3,17 +3,17 @@ cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.7-ARCH' + EXTRAMODULES='extramodules-3.8-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.7-ARCH' + EXTRAMODULES='extramodules-3.8-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - EXTRAMODULES='extramodules-3.7-ARCH' + EXTRAMODULES='extramodules-3.8-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/vyqchat/PKGBUILD b/community/vyqchat/PKGBUILD index fc504490d..1f353b46c 100644 --- a/community/vyqchat/PKGBUILD +++ b/community/vyqchat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65377 2012-02-21 02:28:00Z spupykin $ +# $Id: PKGBUILD 88015 2013-04-09 21:51:55Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -12,10 +12,10 @@ license=('GPL') depends=('qt3' 'libao' 'libxi') source=(http://www.uic.unn.ru/~soed/programs/chat/$pkgname-$pkgver.tar.gz build-fix.patch) -md5sums=('67974bc5df1ed0d63785d04325444d4f' 'de3af70da3743c27929f04f72c837412') +md5sums=('67974bc5df1ed0d63785d04325444d4f' + 'de3af70da3743c27929f04f72c837412') build() { - . /etc/profile.d/qt3.sh cd $srcdir/$pkgname-${pkgver} patch -Np1 <../build-fix.patch # Use _LDADD to properly compile with --as-needed @@ -23,7 +23,11 @@ build() { # Correct acinclude.m4 to avoid empty else block sed -i 's:# Leave bnv_qt_lib_dir defined:/bin/true:' acinclude.m4 autoreconf -v - ./configure --prefix=/usr + ./configure --prefix=/usr --with-Qt-bin-dir=/usr/lib/qt3/bin --with-Qt-include-dir=/usr/include/qt3 --with-Qt-lib-dir=/usr/lib make +} + +package() { + cd $srcdir/$pkgname-${pkgver} make DESTDIR=$pkgdir install } diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index 274db783a..67fe2ec4e 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,18 +1,21 @@ -# $Id: PKGBUILD 87443 2013-03-31 19:19:06Z stephane $ +# $Id: PKGBUILD 88025 2013-04-10 08:22:45Z svenstaro $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> +# TODO: Remove this note and change back to gcc once gcc 4.8.1 is out +# It fixes a segfault while building the examples. + pkgname=wt -pkgver=3.2.3 -_pkgver=3.2.3 -pkgrel=6 +pkgver=3.3.0 +_pkgver=3.3.0 +pkgrel=1 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.webtoolkit.eu/" license=('GPL') depends=('boost-libs' 'libharu') -makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt5-base') +makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt4' 'clang') optdepends=('openssl: for SSL support in built-in webserver' 'zlib: for compression in HTTP protocol' 'fcgi: for FastCGI support' @@ -21,17 +24,17 @@ optdepends=('openssl: for SSL support in built-in webserver' 'graphicsmagick: for raster image support (WRasterImage)' 'pango: for advanced font rendering (WRasterImage)' 'mysql++: for the hangman example' - 'qt: for the Wt/Qt interopability example (wtwithqt)') + 'qt4: for the Wt/Qt interopability example (wtwithqt)') backup=('etc/wt/wt_config.xml') source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz) -md5sums=('58922ba5d68104880adbe2e022132fb5') +md5sums=('b2331942ad01c4fda376abf30c6a503a') build() { cd ${srcdir}/${pkgname}-${_pkgver} [[ -d build ]] && rm -r build mkdir -p build && cd build - cmake \ + CXX=clang++ cmake \ -DCONNECTOR_HTTP=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWEBUSER=http \ diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 7f4e3b8eb..19aeaca50 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86891 2013-03-23 23:10:55Z td123 $ +# $Id: PKGBUILD 87966 2013-04-09 15:45:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=10 +pkgrel=11 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" @@ -56,7 +56,7 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' 'af13c937bf3c86b77ae6820107aab9b8' '31ab8c0980966dbe3e9f5e80b7b82612' - '19167aa54e4745853689abad72443b3e' + '47e68461589578e8a99857746c5b6f29' 'e176971ef96807f72fa8fc17d260c20a') build() { diff --git a/community/xmms2/xmms2d.service b/community/xmms2/xmms2d.service index a38584df1..6adcf207f 100644 --- a/community/xmms2/xmms2d.service +++ b/community/xmms2/xmms2d.service @@ -5,8 +5,8 @@ After=network.target remote-fs.target nss-lookup.target [Service] Type=forking EnvironmentFile=/etc/conf.d/xmms2d.conf -ExecStart=su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS &>/dev/null' - $XMMS2_USER -ExecStop=su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER +ExecStart=/bin/su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS &>/dev/null' - $XMMS2_USER +ExecStop=/bin/su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER [Install] WantedBy=multi-user.target diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD index c16ef04d2..d11cfdb2b 100644 --- a/community/zathura-pdf-mupdf/PKGBUILD +++ b/community/zathura-pdf-mupdf/PKGBUILD @@ -5,7 +5,7 @@ pkgname=zathura-pdf-mupdf pkgver=0.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="Adds pdf support to zathura by using the mupdf library" arch=('i686' 'x86_64' 'mips64el') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/" diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 9bb6b8d77..357f0ce46 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181168 2013-04-02 06:48:58Z allan $ +# $Id: PKGBUILD 182400 2013-04-10 06:04:12Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.17 -pkgrel=4 +pkgrel=5 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" @@ -21,13 +21,17 @@ options=('!strip') install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} glibc-2.17-sync-with-linux37.patch + glibc-2.17-getaddrinfo-stack-overflow.patch + glibc-2.17-regexp-matcher-overrun.patch nscd.service nscd.tmpfiles locale.gen.txt locale-gen) md5sums=('87bf675c8ee523ebda4803e8e1cec638' - '6db4d1661cf34282755dc90330465f6d' + 'SKIP' 'fb99380d94598cc76d793deebf630022' + '56d5f2c09503a348281a20ae404b7de3' + '200acc05961b084ee00dde919e64f82d' 'c1e07c0bec0fe89791bfd9d13fc85edf' 'bccbe5619e75cf1d97312ec3681c605c' '07ac979b6ab5eeb778d55f041529d623' @@ -40,6 +44,12 @@ build() { # combination of upstream commits 318cd0b, b540704 and fc1abbe patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch + # CVE-2013-1914 - upstream commit 1cef1b19 + patch -p1 -i ${srcdir}/glibc-2.17-getaddrinfo-stack-overflow.patch + + # CVE-2013-0242 - upstream commit a445af0b + patch -p1 -i ${srcdir}/glibc-2.17-regexp-matcher-overrun.patch + cd ${srcdir} mkdir -p glibc-build cd glibc-build @@ -55,9 +65,9 @@ build() { echo "slibdir=/usr/lib" >> configparms - # remove hardening options from CFLAGS for building libraries + # remove hardening options for building libraries CFLAGS=${CFLAGS/-fstack-protector/} - CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/} ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \ --host=${CHOST} --build=${CHOST} \ diff --git a/core/glibc/glibc-2.17-getaddrinfo-stack-overflow.patch b/core/glibc/glibc-2.17-getaddrinfo-stack-overflow.patch new file mode 100644 index 000000000..aa916ac2c --- /dev/null +++ b/core/glibc/glibc-2.17-getaddrinfo-stack-overflow.patch @@ -0,0 +1,47 @@ +diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c +index d95c2d1..2309281 100644 +--- a/sysdeps/posix/getaddrinfo.c ++++ b/sysdeps/posix/getaddrinfo.c +@@ -2489,11 +2489,27 @@ getaddrinfo (const char *name, const char *service, + __typeof (once) old_once = once; + __libc_once (once, gaiconf_init); + /* Sort results according to RFC 3484. */ +- struct sort_result results[nresults]; +- size_t order[nresults]; ++ struct sort_result *results; ++ size_t *order; + struct addrinfo *q; + struct addrinfo *last = NULL; + char *canonname = NULL; ++ bool malloc_results; ++ ++ malloc_results ++ = !__libc_use_alloca (nresults * (sizeof (*results) + sizeof (size_t))); ++ if (malloc_results) ++ { ++ results = malloc (nresults * (sizeof (*results) + sizeof (size_t))); ++ if (results == NULL) ++ { ++ __free_in6ai (in6ai); ++ return EAI_MEMORY; ++ } ++ } ++ else ++ results = alloca (nresults * (sizeof (*results) + sizeof (size_t))); ++ order = (size_t *) (results + nresults); + + /* Now we definitely need the interface information. */ + if (! check_pf_called) +@@ -2664,6 +2680,9 @@ getaddrinfo (const char *name, const char *service, + + /* Fill in the canonical name into the new first entry. */ + p->ai_canonname = canonname; ++ ++ if (malloc_results) ++ free (results); + } + + __free_in6ai (in6ai); +-- +1.7.1 + diff --git a/core/glibc/glibc-2.17-regexp-matcher-overrun.patch b/core/glibc/glibc-2.17-regexp-matcher-overrun.patch new file mode 100644 index 000000000..b108f9d42 --- /dev/null +++ b/core/glibc/glibc-2.17-regexp-matcher-overrun.patch @@ -0,0 +1,137 @@ +diff --git a/posix/Makefile b/posix/Makefile +index 88d409f..2cacd21 100644 +--- a/posix/Makefile ++++ b/posix/Makefile +@@ -86,7 +86,7 @@ tests := tstgetopt testfnm runtests runptests \ + tst-rfc3484-3 \ + tst-getaddrinfo3 tst-fnmatch2 tst-cpucount tst-cpuset \ + bug-getopt1 bug-getopt2 bug-getopt3 bug-getopt4 \ +- bug-getopt5 tst-getopt_long1 ++ bug-getopt5 tst-getopt_long1 bug-regex34 + xtests := bug-ga2 + ifeq (yes,$(build-shared)) + test-srcs := globtest +@@ -199,5 +199,6 @@ bug-regex26-ENV = LOCPATH=$(common-objpfx)localedata + bug-regex30-ENV = LOCPATH=$(common-objpfx)localedata + bug-regex32-ENV = LOCPATH=$(common-objpfx)localedata + bug-regex33-ENV = LOCPATH=$(common-objpfx)localedata ++bug-regex34-ENV = LOCPATH=$(common-objpfx)localedata + tst-rxspencer-ARGS = --utf8 rxspencer/tests + tst-rxspencer-ENV = LOCPATH=$(common-objpfx)localedata +diff --git a/posix/bug-regex34.c b/posix/bug-regex34.c +new file mode 100644 +index 0000000..bb3b613 +--- /dev/null ++++ b/posix/bug-regex34.c +@@ -0,0 +1,46 @@ ++/* Test re_search with multi-byte characters in UTF-8. ++ Copyright (C) 2013 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <http://www.gnu.org/licenses/>. */ ++ ++#define _GNU_SOURCE 1 ++#include <stdio.h> ++#include <string.h> ++#include <locale.h> ++#include <regex.h> ++ ++static int ++do_test (void) ++{ ++ struct re_pattern_buffer r; ++ /* áá»á½ááºá¯ááºx */ ++ const char *s = "\xe1\x80\x80\xe1\x80\xbb\xe1\x80\xbd\xe1\x80\x94\xe1\x80\xba\xe1\x80\xaf\xe1\x80\x95\xe1\x80\xbax"; ++ ++ if (setlocale (LC_ALL, "en_US.UTF-8") == NULL) ++ { ++ puts ("setlocale failed"); ++ return 1; ++ } ++ memset (&r, 0, sizeof (r)); ++ ++ re_compile_pattern ("[^x]x", 5, &r); ++ /* This was triggering a buffer overflow. */ ++ re_search (&r, s, strlen (s), 0, strlen (s), 0); ++ return 0; ++} ++ ++#define TEST_FUNCTION do_test () ++#include "../test-skeleton.c" +diff --git a/posix/regexec.c b/posix/regexec.c +index 7f2de85..5ca2bf6 100644 +--- a/posix/regexec.c ++++ b/posix/regexec.c +@@ -197,7 +197,7 @@ static int group_nodes_into_DFAstates (const re_dfa_t *dfa, + static int check_node_accept (const re_match_context_t *mctx, + const re_token_t *node, int idx) + internal_function; +-static reg_errcode_t extend_buffers (re_match_context_t *mctx) ++static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len) + internal_function; + + /* Entry point for POSIX code. */ +@@ -1160,7 +1160,7 @@ check_matching (re_match_context_t *mctx, int fl_longest_match, + || (BE (next_char_idx >= mctx->input.valid_len, 0) + && mctx->input.valid_len < mctx->input.len)) + { +- err = extend_buffers (mctx); ++ err = extend_buffers (mctx, next_char_idx + 1); + if (BE (err != REG_NOERROR, 0)) + { + assert (err == REG_ESPACE); +@@ -1738,7 +1738,7 @@ clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx) + && mctx->input.valid_len < mctx->input.len)) + { + reg_errcode_t err; +- err = extend_buffers (mctx); ++ err = extend_buffers (mctx, next_state_log_idx + 1); + if (BE (err != REG_NOERROR, 0)) + return err; + } +@@ -2792,7 +2792,7 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx) + if (bkref_str_off >= mctx->input.len) + break; + +- err = extend_buffers (mctx); ++ err = extend_buffers (mctx, bkref_str_off + 1); + if (BE (err != REG_NOERROR, 0)) + return err; + +@@ -4102,7 +4102,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node, + + static reg_errcode_t + internal_function __attribute_warn_unused_result__ +-extend_buffers (re_match_context_t *mctx) ++extend_buffers (re_match_context_t *mctx, int min_len) + { + reg_errcode_t ret; + re_string_t *pstr = &mctx->input; +@@ -4111,8 +4111,10 @@ extend_buffers (re_match_context_t *mctx) + if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0)) + return REG_ESPACE; + +- /* Double the lengthes of the buffers. */ +- ret = re_string_realloc_buffers (pstr, MIN (pstr->len, pstr->bufs_len * 2)); ++ /* Double the lengthes of the buffers, but allocate at least MIN_LEN. */ ++ ret = re_string_realloc_buffers (pstr, ++ MAX (min_len, ++ MIN (pstr->len, pstr->bufs_len * 2))); + if (BE (ret != REG_NOERROR, 0)) + return ret; + +-- +1.7.1 + diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD index be800b961..6d6721b47 100644 --- a/core/isl/PKGBUILD +++ b/core/isl/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 173325 2012-12-19 01:16:30Z allan $ +# $Id: PKGBUILD 182142 2013-04-08 05:56:24Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=isl pkgver=0.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" arch=('i686' 'x86_64' 'mips64el') url="http://www.kotnet.org/~skimo/isl/" +depends=('gmp') license=('MIT') options=('!libtool') source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 0d737eb1b..917572ea5 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179825 2013-03-10 01:22:10Z eric $ +# $Id: PKGBUILD 182592 2013-04-10 20:23:35Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') -pkgver=2.4.34 +pkgver=2.4.35 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.openldap.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') options=('!makeflags') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd.service slapd.tmpfiles ntlm.patch) -sha1sums=('39c81f32b8c7af1e20047535f0b9ea894235c588' +sha1sums=('db02243150b050baac6a8ea4145ad73a1f6d2266' '9c7f3441e6a6ee13cdcfe8d965081c7a574c3393' 'f86a82e35ebe15026980467c9dee4007e686b795' 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef') diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 93140516c..7682e6db2 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178950 2013-03-01 10:19:30Z andrea $ +# $Id: PKGBUILD 182390 2013-04-09 21:23:22Z eric $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> @@ -49,10 +49,8 @@ build() { [ "$CARCH" = "mips64el" ] && \ extra="--disable-mono" - export MOC_QT3=/opt/qt/bin/moc - export MOC_QT4=/usr/lib/qt4/bin/moc - source /etc/profile.d/qt3.sh - source /etc/profile.d/qt4.sh + export MOC_QT3=/usr/bin/moc-qt3 + export MOC_QT4=/usr/bin/moc-qt4 # pygtk requires python2; make it explicit in case other python are installed: FS#21865 PYTHON=python2 \ diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 77eb99a84..bc4d2a92d 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179999 2013-03-14 02:05:50Z dan $ +# $Id: PKGBUILD 182157 2013-04-08 13:21:41Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.2 +pkgver=1.8.2.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -107,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('210834d73c857931c3da34a65eb3e597' - '425e9421a1b128cfb46fa46d94cad919' +md5sums=('3f6ebca116c627490e4ee1f1324d5e65' + '8ec6ab4d8c868305e9a679f5c3d2ccfa' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD index f4db99a74..fda87ac94 100644 --- a/extra/java-commons-daemon/PKGBUILD +++ b/extra/java-commons-daemon/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> pkgname=('java-commons-daemon' 'java-jsvc') pkgbase=java-commons-daemon -pkgver=1.0.12 +pkgver=1.0.15 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://commons.apache.org/daemon/' license=('APACHE') _libname=commons-daemon source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz) -sha256sums=('09135e4f3a26ebdd6d3035e2e7f631568af06beae32808527217373e3e31a9d0') +sha256sums=('11ee57d2c6b281589c1497b2f88180553f06d5ac1560ce1841e05f89f0342432') makedepends=('apache-ant' 'docbook2x' 'docbook-xsl') build() { diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD index ff6cd1239..9f21d9a2d 100644 --- a/extra/kdelibs3/PKGBUILD +++ b/extra/kdelibs3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178619 2013-02-25 20:45:02Z andyrtr $ +# $Id: PKGBUILD 182393 2013-04-09 21:34:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -38,7 +38,6 @@ sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82' build() { cd "$srcdir"/kdelibs-${pkgver} - . /etc/profile.d/qt3.sh . "$srcdir"/kde3.profile patch -p0 -i "$srcdir"/kde-3.5-1074156.patch diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 7eff22114..e10c14e1f 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181992 2013-04-05 08:57:03Z svenstaro $ +# $Id: PKGBUILD 182386 2013-04-09 20:40:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -21,7 +21,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktnef' 'kdepim-libkdepim') pkgver=4.10.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -29,12 +29,15 @@ groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592") + "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592" + 'fix-completion.patch') sha1sums=('61b74cb3bf541040e09252d4dcfaea8a876a2859' - '61a7e31e7daee3358c442d3ac5f74171b45ae2c9') + '61a7e31e7daee3358c442d3ac5f74171b45ae2c9' + '92a44c7b1697de519b09265a3b68e7d73d4c024e') build() { patch -Np1 -d ${pkgbase}-${pkgver} < ${srcdir}/kleopatra-build-fix.patch + patch -Np1 -d ${pkgbase}-${pkgver} < ${srcdir}/fix-completion.patch mkdir build cd build diff --git a/extra/kdepim/fix-completion.patch b/extra/kdepim/fix-completion.patch new file mode 100644 index 000000000..c2edefe00 --- /dev/null +++ b/extra/kdepim/fix-completion.patch @@ -0,0 +1,182 @@ +commit 6a06c57f52a00018d607085efa7570deb91dc707 +Author: David Faure <faure@kde.org> +Date: Mon Apr 8 17:41:39 2013 +0200 + + Fix kmail autocompletion from akonadi. + + My commit 02f5f0214e made autocompletion from nepomuk work better, but broke + completion from akonadi. I kept the "keywords" based code, but now it's only + used for the special case of nickname-based search (because the nickname shouldn't + appear in the completion item). For everything else it really doesn't make sense + to have a search engine (akonadi/nepomuk) on top of a search engine + (the one inside KCompletion). + + This time I verified that: + * nepomuk search still works + * contacts from akonadi work again + * contact groups from akonadi work (after previous commit) + * nickname-search in akonadi still doesn't work, but it didn't before. More work + needed for that one. This is the only reason to keep KMailCompletion around btw, + everything else would work without it. + + BUG: 259949 + FIXED-IN: 4.10.3 + +diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp +index b7b11be..ec4caf9 100644 +--- a/libkdepim/addresseelineedit.cpp ++++ b/libkdepim/addresseelineedit.cpp +@@ -30,6 +30,8 @@ + #include "completionordereditor.h" + #endif + ++#include "kmailcompletion.h" ++ + #include <Akonadi/Contact/ContactSearchJob> + #include <Akonadi/Contact/ContactGroupSearchJob> + #include <Akonadi/CollectionFetchJob> +@@ -77,6 +79,10 @@ + + using namespace KPIM; + ++namespace KPIM { ++ typedef QMap< QString, QPair<int,int> > CompletionItemsMap; ++} ++ + class AddresseeLineEditStatic + { + public: +@@ -496,11 +502,9 @@ void AddresseeLineEdit::Private::addCompletionItem( const QString &string, int w + s_static->completionItemMap.insert( string, qMakePair( weight, completionItemSource ) ); + } + +- if ( keyWords == 0 ) { +- s_static->completion->addItem( string, weight ); +- } else { +- s_static->completion->addItemWithKeys( string, weight, keyWords ); +- } ++ s_static->completion->addItem(string, weight); ++ if (keyWords && !keyWords->isEmpty()) ++ s_static->completion->addItemWithKeys(string, weight, keyWords); // see kmailcompletion.cpp + } + + const QStringList KPIM::AddresseeLineEdit::Private::adjustedCompletionItems( bool fullSearch ) +@@ -1348,17 +1352,13 @@ void AddresseeLineEdit::addItem( const Akonadi::Item &item, int weight, int sour + void AddresseeLineEdit::addContactGroup( const KABC::ContactGroup &group, int weight, int source ) + { + d->addCompletionItem( group.name(), weight, source ); +- QStringList keyWords; +- keyWords.append( group.name() ); +- d->addCompletionItem( group.name(), weight, source, &keyWords ); + } + + void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int source ) + { + const QStringList emails = addr.emails(); + QStringList::ConstIterator it; +- const int prefEmailWeight = 1; //increment weight by prefEmailWeight +- int isPrefEmail = prefEmailWeight; //first in list is preferredEmail ++ int isPrefEmail = 1; //first in list is preferredEmail + QStringList::ConstIterator end( emails.constEnd() ); + for ( it = emails.constBegin(); it != end; ++it ) { + //TODO: highlight preferredEmail +@@ -1368,40 +1368,6 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int + const QString nickName = addr.nickName(); + QString fullEmail = addr.fullEmail( email ); + +- // Prepare keywords (for CompletionShell, CompletionPopup) +- QStringList keyWords; +- const QString realName = addr.realName(); +- +- if ( !givenName.isEmpty() && !familyName.isEmpty() ) { +- keyWords.append( givenName + QLatin1Char( ' ' ) + familyName ); +- keyWords.append( familyName + QLatin1Char( ' ' ) + givenName ); +- keyWords.append( familyName + QLatin1String( ", " ) + givenName ); +- } else if ( !givenName.isEmpty() ) { +- keyWords.append( givenName ); +- } else if ( !familyName.isEmpty() ) { +- keyWords.append( familyName ); +- } +- +- if ( !nickName.isEmpty() ) { +- keyWords.append( nickName ); +- } +- +- if ( !realName.isEmpty() ) { +- keyWords.append( realName ); +- } +- +- keyWords.append( email ); +- +- /* KMailCompletion does not have knowledge about identities, it stores emails and +- * keywords for each email. KMailCompletion::allMatches does a lookup on the +- * keywords and returns an ordered list of emails. In order to get the preferred +- * email before others for each identity we use this little trick. +- * We remove the <blank> in adjustedCompletionItems. +- */ +- if ( isPrefEmail == prefEmailWeight ) { +- fullEmail.replace( QLatin1String( " <" ), QLatin1String( " <" ) ); +- } +- + // Prepare "givenName" + ' ' + "familyName" + QString fullName = givenName; + if (!familyName.isEmpty()) { +@@ -1413,12 +1379,16 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int + // Finally, we can add the completion items + if (!fullName.isEmpty()) { + const QString address = KPIMUtils::normalizedAddress(fullName, email, QString()); +- d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords); ++ if (fullEmail != address) { ++ // This happens when fullEmail contains a middle name, while our own fullName+email only has "first last". ++ // Let's offer both, the fullEmail with 3 parts, looks a tad formal. ++ d->addCompletionItem(address, weight + isPrefEmail, source); ++ } + } + +- if ( !nickName.isEmpty() ) { +- const QString address = KPIMUtils::normalizedAddress(nickName, email, QString()); +- d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords); ++ QStringList keyWords; ++ if (!nickName.isEmpty()) { ++ keyWords.append(nickName); + } + + d->addCompletionItem( fullEmail, weight + isPrefEmail, source, &keyWords ); +diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h +index 4e6784b..b2af4a9 100644 +--- a/libkdepim/addresseelineedit.h ++++ b/libkdepim/addresseelineedit.h +@@ -27,7 +27,6 @@ + #ifndef KDEPIM_ADDRESSEELINEEDIT_H + #define KDEPIM_ADDRESSEELINEEDIT_H + +-#include "kmailcompletion.h" + #include "kdepim_export.h" + + #include "ldap/ldapclient.h" +@@ -50,10 +49,6 @@ namespace KABC { + class ContactGroup; + } + +-namespace KPIM { +- typedef QMap< QString, QPair<int,int> > CompletionItemsMap; +-} +- + namespace Nepomuk2 { + namespace Query { + class Result; +diff --git a/libkdepim/kmailcompletion.h b/libkdepim/kmailcompletion.h +index e8574cc..93771d3 100644 +--- a/libkdepim/kmailcompletion.h ++++ b/libkdepim/kmailcompletion.h +@@ -32,7 +32,9 @@ namespace KPIM { + + /** + * KMailCompletion allows lookup of email addresses by keyword. +- * Typically a keywods would be firstname, lastname, nickname or domain. ++ * This is used for lookup by nickname, since we don't want the nickname to appear in the final email. ++ * E.g. you have a nickname "idiot" for your boss, you want to type "idiot" but you want the completion ++ * to offer "Full Name <email@domain>", without the nickname being visible. + */ + class KMailCompletion : public KCompletion + { diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD index 7c50cd51c..335458d4b 100644 --- a/extra/kexec-tools/PKGBUILD +++ b/extra/kexec-tools/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 170845 2012-11-12 15:18:26Z tpowa $ +# $Id: PKGBUILD 182155 2013-04-08 13:04:10Z tpowa $ # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kexec-tools -pkgver=2.0.3 -pkgrel=2 +pkgver=2.0.4 +pkgrel=1 pkgdesc="Load another kernel from the currently executing Linux kernel" arch=('i686' 'x86_64' 'mips64el') url="http://kernel.org/pub/linux/utils/kernel/kexec/" source=("ftp://ftp.archlinux.org/other/kexec-tools/kexec-tools-${pkgver}.tar.bz2" + # upstream tarballs broken with bsdtar! #"http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.tar.bz2" - 'kexec' - 'kexec.conf.d') + ) depends=('gawk' 'zlib' 'xz') backup=('etc/conf.d/kexec') license=('GPL2') @@ -29,9 +29,5 @@ package() { mv $pkgdir/usr/sbin $pkgdir/sbin install -D -m644 kexec/kexec.8 $pkgdir/usr/share/man/man8/kexec.8 - install -D -m644 $srcdir/kexec.conf.d $pkgdir/etc/conf.d/kexec - install -D -m755 $srcdir/kexec $pkgdir/etc/rc.d/kexec } -md5sums=('3d9ff82e8e16165b9e79ded271c08348' - 'be059a103e5989519d22fca99f860a64' - '9ca7e31d2c5c66c436a9a2baf20ad9b2') +md5sums=('4713026758923f5f3968905291b991ee') diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index ac0fdfbca..90581e839 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 178758 2013-02-26 18:11:18Z ioni $ +# $Id: PKGBUILD 182372 2013-04-09 18:14:06Z ioni $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.5.14 -_apngver=1.5.14 +pkgver=1.5.15 +_apngver=1.5.15 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ depends=('zlib' 'sh') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz") -md5sums=('94284b01d62ca43c5eb3f6702db08ed8' - '89fbc11f19ec1f181587bdde1dd9402f') +md5sums=('e3122e7b5b5c36c034a4624c65f8a9d8' + '3ae9ea7e4bd201f0b25e25cd6049b094') build() { cd $pkgname-$pkgver diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD index daebd5ba6..e822af1bc 100644 --- a/extra/libva-intel-driver/PKGBUILD +++ b/extra/libva-intel-driver/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170694 2012-11-09 19:58:58Z ibiru $ +# $Id: PKGBUILD 182376 2013-04-09 18:36:11Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva-intel-driver -pkgver=1.0.19 +pkgver=1.0.20 pkgrel=1 pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family." arch=('i686' 'x86_64') @@ -12,11 +12,11 @@ depends=('libva') options=('!libtool') replaces=('libva-driver-intel') source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('9b1c92ca2b59b3b150fd45cb01775e0c114a41a7') +sha1sums=('0aeba2d78f02c4f2c13b519c468e04fa88b2ae3e') build() { cd $pkgname-$pkgver - ./autogen.sh --prefix=/usr + ./configure --prefix=/usr make } diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD index d472b7288..5542ce890 100644 --- a/extra/libva/PKGBUILD +++ b/extra/libva/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168381 2012-10-09 16:30:41Z ibiru $ +# $Id: PKGBUILD 182375 2013-04-09 18:35:29Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva -pkgver=1.1.0 -pkgrel=2.1 +pkgver=1.1.1 +pkgrel=1 pkgdesc="Video Acceleration (VA) API for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://freedesktop.org/wiki/Software/vaapi" @@ -13,14 +13,11 @@ makedepends=('mesa') optdepends=('libva-vdpau-driver: vdpau back-end for nvidia' 'libva-intel-driver: back-end for intel cards') options=('!libtool') -source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2 - libva-1.1.0-wayland1.patch) -sha1sums=('af6e912ea86a6378992f5783390ab9cb8e5cadf9' - '0807d1ea5aee22af8eddb9d623fa324ded7fa3f4') +source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('755e488677a196c9ac18b8c0d11aa2a56e050306') build() { cd "$pkgname-$pkgver" - patch -Np1 -i ${srcdir}/libva-1.1.0-wayland1.patch ./configure --prefix=/usr make } diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index 985cd5b24..72701a12b 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170860 2012-11-12 20:09:16Z heftig $ +# $Id: PKGBUILD 182596 2013-04-10 21:34:12Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.4.4 -pkgrel=1.1 +pkgver=3.4.5 +pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('a545a23ea7681fafae033b4f68b69ef022d446a9325286291bb8882b9016a130') +sha256sums=('560f9709405fb33500c2f79efabdb1c4056866dec281f354ad3da97181fbf381') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index a389ac636..d059e659e 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182095 2013-04-06 19:27:44Z giovanni $ +# $Id: PKGBUILD 182366 2013-04-09 15:06:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.04.06 +pkgver=2013.04.08 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('1cd8e5181a1ddd29537cb16ad3cb0138') +md5sums=('25ff9f7bf9e47c699878e58c7789ee13') build() { cd ${srcdir}/live diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 3cf05fd7a..7b45f3125 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179489 2013-03-05 16:36:25Z giovanni $ +# $Id: PKGBUILD 182356 2013-04-08 21:42:10Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.5.2 +pkgver=2.5.4 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('6b467f41a262e2537cf927ed42d0fdda' +md5sums=('f3c64086519c32ba7e892b6215b0fcbc' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD index 64352bd03..c1af1911b 100644 --- a/extra/mtr/PKGBUILD +++ b/extra/mtr/PKGBUILD @@ -1,30 +1,25 @@ -# $Id: PKGBUILD 178764 2013-02-26 18:56:25Z ioni $ +# $Id: PKGBUILD 182370 2013-04-09 18:07:19Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mtr pkgname=(mtr mtr-gtk) -pkgver=0.83 +pkgver=0.84 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') makedepends=('ncurses' 'gtk2') -source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz - mtr-glib2.patch) +source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz) url="http://www.bitwizard.nl/mtr/" -md5sums=('2e3a40f2da47748ad0053a5d678b9b4a' - '6bce08e1de7c6835bdda893847981bc8') +md5sums=('df61096ae1b18b27f915feeb907ae48c') build() { - patch -Np0 -i mtr-glib2.patch cp -r $pkgbase-$pkgver $pkgbase-cli cd mtr-cli - ./bootstrap.sh ./configure --prefix=/usr --without-gtk make cd "$srcdir/$pkgbase-$pkgver" - ./bootstrap.sh ./configure --prefix=/usr make } diff --git a/extra/mtr/mtr-glib2.patch b/extra/mtr/mtr-glib2.patch deleted file mode 100644 index 76a53fa6f..000000000 --- a/extra/mtr/mtr-glib2.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up mtr-0.83/configure.in.glib2 mtr-0.83/configure.in ---- mtr-0.83/configure.in.glib2 2013-02-18 20:10:00.767417356 +0100 -+++ mtr-0.83/configure.in 2013-02-18 20:10:53.549513018 +0100 -@@ -59,6 +59,8 @@ else - GTK_OBJ="" - fi - -+PKG_CHECK_MODULES([GLIB2], [glib-2.0]) -+ - AC_CHECK_FUNC(socket, , - AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found))) - -diff -up mtr-0.83/Makefile.am.glib2 mtr-0.83/Makefile.am ---- mtr-0.83/Makefile.am.glib2 2013-02-18 20:13:54.635841512 +0100 -+++ mtr-0.83/Makefile.am 2013-02-18 20:16:17.877101679 +0100 -@@ -19,8 +19,9 @@ mtr_SOURCES = mtr.c \ - mtr-gtk.h - EXTRA_mtr_SOURCES = curses.c \ - gtk.c -+AM_CFLAGS = $(GLIB2_CFLAGS) - mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ) --mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ) -+mtr_LDFLAGS = $(GTK_OBJ) $(GLIB2_LIBS) $(CURSES_OBJ) - - EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist - distclean-local: diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index 9965977de..e4a3d09eb 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 178768 2013-02-26 20:04:47Z ioni $ +# $Id: PKGBUILD 182378 2013-04-09 18:38:44Z ioni $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr -pkgver=4.9.5 +pkgver=4.9.6 pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=('zip') options=(!emptydirs) source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz nspr.pc.in) -md5sums=('b6ccfa8fcbbeb17ebeb19a3edff612bd' +md5sums=('62b1e9d376d503d972f90c3c0031d879' 'bce1611f3117b53fc904cab549c09967') build() { diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD index d255faed6..6305e6ed3 100644 --- a/extra/orc/PKGBUILD +++ b/extra/orc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 149305 2012-02-06 18:30:33Z ibiru $ +# $Id: PKGBUILD 182380 2013-04-09 18:42:44Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=orc -pkgver=0.4.16 -pkgrel=1.2 +pkgver=0.4.17 +pkgrel=1 pkgdesc="The Oild Runtime Compiler" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -10,7 +10,7 @@ url="http://code.entropywave.com/projects/orc/" depends=('glibc') options=('!libtool') source=(http://code.entropywave.com/download/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('e482932e544c847761449b106ecbc483') +md5sums=('af1bf3dab9e69f3c36f389285e2a12a1') build () { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 6a0a5d153..0696da080 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 178116 2013-02-16 16:58:25Z angvp $ +# $Id: PKGBUILD 182348 2013-04-08 19:02:16Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> pkgbase=python-lxml pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs') -pkgver=3.1.0 +pkgver=3.1.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('BSD' 'custom') url="http://lxml.de/" makedepends=('python2' 'python' 'libxslt') source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -md5sums=('df70163fb581bbe45fdcd6069a503273' - 'e84737c92c90c9f71a5118b5e1ad5e91') +md5sums=('3f185d8cdcd6b8934c67f9b0356aab33' + 'b90760fa4bf235a1f0e1a8252e1c8545') check() { cd lxml-$pkgver diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index bd363b1d6..5ebc686fd 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173845 2012-12-25 00:34:33Z foutrelis $ +# $Id: PKGBUILD 182150 2013-04-08 10:27:25Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python -pkgver=3.3.0 -pkgrel=3.1 +pkgver=3.3.1 +pkgrel=1 _pybasever=3.3 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ provides=('python3') replaces=('python3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a') +sha1sums=('393d7302c48bc911cd7faa7fa9b5fbcb9919bddc') build() { cd "${srcdir}/Python-${pkgver}" diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 29fddd125..11562e06f 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173846 2012-12-25 00:34:35Z foutrelis $ +# $Id: PKGBUILD 182151 2013-04-08 10:27:26Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 -pkgver=2.7.3 -pkgrel=4.1 +pkgver=2.7.4 +pkgrel=1 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) -sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357') +sha1sums=('08e78ebeb6d9c799644f6d787ca424291c0fe03e') build() { cd "${srcdir}/Python-${pkgver}" @@ -32,6 +32,9 @@ build() { # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py + sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \ + Lib/distutils/tests/test_install_scripts.py Tools/scripts/gprof2html.py + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball rm -r Modules/expat @@ -50,21 +53,23 @@ package() { cd "${srcdir}/Python-${pkgver}" make DESTDIR="${pkgdir}" altinstall maninstall - ln -sf python${_pybasever} "${pkgdir}/usr/bin/python2" - ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config" - ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1" + rm "${pkgdir}"/usr/share/man/man1/python.1 + + ln -sf python${_pybasever} "${pkgdir}"/usr/bin/python2 + ln -sf python${_pybasever}-config "${pkgdir}"/usr/bin/python2-config + ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python2.1 + + # FS#33954 + ln -sf python-${_pybasever}.pc "${pkgdir}"/usr/lib/pkgconfig/python2.pc - ln -sf ../../libpython${_pybasever}.so \ - "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so" + ln -sf ../../libpython${_pybasever}.so "${pkgdir}"/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so - mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/" + mv "${pkgdir}"/usr/bin/smtpd.py "${pkgdir}"/usr/lib/python${_pybasever}/ # some useful "stuff" install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts} - install -m755 Tools/i18n/{msgfmt,pygettext}.py \ - "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/" - install -m755 Tools/scripts/{README,*py} \ - "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/" + install -m755 Tools/i18n/{msgfmt,pygettext}.py "${pkgdir}"/usr/lib/python${_pybasever}/Tools/i18n/ + install -m755 Tools/scripts/{README,*py} "${pkgdir}"/usr/lib/python${_pybasever}/Tools/scripts/ # fix conflicts with python mv "${pkgdir}"/usr/bin/idle{,2} @@ -72,13 +77,12 @@ package() { mv "${pkgdir}"/usr/bin/2to3{,-2.7} # clean up #!s - find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \ + find "${pkgdir}"/usr/lib/python${_pybasever}/ -name '*.py' | \ xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" # clean-up reference to build directory - sed -i "s#${srcdir}/Python-${pkgver}:##" \ - "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile" + sed -i "s#${srcdir}/Python-${pkgver}:##" "${pkgdir}"/usr/lib/python${_pybasever}/config/Makefile # license - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index 5adeb9906..835e5f3b8 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 180688 2013-03-25 19:15:40Z bpiotrowski $ +# $Id: PKGBUILD 182387 2013-04-09 21:20:53Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=qt3 pkgver=3.3.8b -pkgrel=3 +pkgrel=4 epoch=1 -pkgdesc="The QT3 gui toolkit" +pkgdesc="A cross-platform application and UI framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.trolltech.com/products/qt/index.html" license=('GPL') depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft' 'libxrandr' 'libmng') makedepends=('mariadb' 'postgresql' 'unixodbc' 'sqlite' 'mesa') -optdepends=('libmariadbclient' 'postgresql-libs' 'unixodbc') -options=('!libtool') -install=qt.install +optdepends=('libmariadbclient: MariaDB driver' + 'postgresql-libs: PostgreSQL driver' + 'unixodbc: ODBC driver') +options=('!libtool' '!docs') source=(ftp://ftp.qt-project.org/qt/source/qt-x11-free-${pkgver}.tar.gz - qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 + qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' - 'd2e257a9011208b2cb81b9cf47915b9a2f9dab83' '3d19510c46016a1a211d97bf8f82b01498b1b33c' '33418e5b117458af23c72cdbffc0c339bc34bdc4' '116afa0e737bdf27ea27f9b3653aeb56db9ec151' @@ -31,11 +31,11 @@ sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' # other qt-patches come from fedora and gentoo build() { - unset QMAKESPEC export QTDIR="${srcdir}"/qt-x11-free-${pkgver} export PATH=${QTDIR}/bin:${PATH} export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} export QMAKESPEC=$QTDIR/mkspecs/linux-g++ + cd "${srcdir}"/qt-x11-free-${pkgver} # apply qt patches from kde.org for i in ../qt-copy-kde-patches/*; do @@ -51,27 +51,25 @@ build() { patch -p1 -i "${srcdir}"/qt-odbc.patch # fix build with gcc 4.6.0 patch -p1 -i "${srcdir}"/gcc-4.6.patch - patch -p0 -i "${srcdir}"/qt3-png15.patch - # start compiling qt - sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix - rm -rf doc/html examples tutorial - sed -i "s|sub-tutorial sub-examples||" Makefile - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf + + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++{,-32,-64}/qmake.conf sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix sed -i "s|read acceptance|acceptance=yes|" configure - # remove unwanted mkspecs - rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} - if [ "$CARCH" = "x86_64" ]; then export ARCH="-64" else unset ARCH fi - ./configure -prefix /opt/qt \ + ./configure \ + -prefix /usr \ + -bindir /usr/lib/qt3/bin \ + -headerdir /usr/include/qt3 \ + -plugindir /usr/lib/qt3/plugins \ + -datadir /usr/share/qt3 \ + -translationdir /usr/share/qt3/translations \ + -I/usr/include/mysql -I/usr/include/postgresql/server \ -platform linux-g++$ARCH \ -system-zlib \ -qt-gif \ @@ -85,40 +83,26 @@ build() { -no-g++-exceptions \ -plugin-sql-{mysql,psql,sqlite,odbc} - # fix /opt/qt/lib path - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile - - cd "${srcdir}"/qt-x11-free-${pkgver} - make -C qmake - cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql - "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro - cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql - "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro - - cd "${srcdir}"/qt-x11-free-${pkgver} - # fix the broken makefiles - #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile make } package() { cd "${srcdir}"/qt-x11-free-${pkgver} make INSTALL_ROOT="${pkgdir}" install - rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations} - sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl - install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake - install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh - ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config - rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH + sed -i -e "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" -e "s|${srcdir}/||g" "${pkgdir}"/usr/lib/*.prl + rm -rf "${pkgdir}"/usr/share/qt3/{phrasebooks,templates,translations} + rm -rf "${pkgdir}"/usr/share/qt3/mkspecs/{aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,linux-g++$ARCH/linux-g++$ARCH,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} - # install man pages - install -d -m755 "${pkgdir}"/opt/qt/man - cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/ +# install man pages + install -d -m755 "${pkgdir}"/usr/share/man + cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/usr/share/man/ + for i in "${pkgdir}"/usr/share/man/man1/*; do + mv $i ${i%.*}-qt3.1 + done - install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ - echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf +# Useful symlinks for cmake and configure scripts + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt3/bin/*; do + ln -s /usr/lib/qt3/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt3 + done } diff --git a/extra/qt3/qt.install b/extra/qt3/qt.install deleted file mode 100644 index 6d042daae..000000000 --- a/extra/qt3/qt.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - post_remove -} - -post_upgrade() { - post_remove -} - -post_remove() { - # this can be removed in future versions - sed -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf -} diff --git a/extra/qt3/qt.profile b/extra/qt3/qt.profile deleted file mode 100644 index ed4d232ae..000000000 --- a/extra/qt3/qt.profile +++ /dev/null @@ -1,4 +0,0 @@ -export QTDIR=/opt/qt -export QT_XFT=true -export PATH=$PATH:$QTDIR/bin -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index eabd02224..a8fc7e654 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178746 2013-02-26 16:27:02Z tpowa $ +# $Id: PKGBUILD 182410 2013-04-10 07:43:35Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,14 +6,13 @@ pkgname=sane pkgver=1.0.23 -pkgrel=3 +pkgrel=4 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') makedepends=('texlive-latexextra') -install=$pkgname.install backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'sane.xinetd' @@ -23,13 +22,17 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'network.patch') options=(!libtool) -build() { +prepare() { cd "${srcdir}/${pkgname}-backends-${pkgver}" # fix FS#33657 patch -Np0 -i ${srcdir}/kodakaio.c.patch # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186 patch -Np1 -i ${srcdir}/network.patch +} + +build() { + cd "${srcdir}/${pkgname}-backends-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/sane/sane.install b/extra/sane/sane.install deleted file mode 100644 index 5ec361eea..000000000 --- a/extra/sane/sane.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - /bin/cat <<THEEND -NOTE ----- -Add your user to group 'scanner' to use scanner devices. -THEEND -} diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index 2ea8d4ec2..7a8e1502c 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182013 2013-04-05 09:10:49Z andrea $ +# $Id: PKGBUILD 182124 2013-04-08 00:32:17Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> @@ -18,7 +18,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('4cf25b693b2eee1a053c6f664cd21954b8b85eba') +sha1sums=('8951573b54d5d940687c3c2b7b77fb441b0fddd9') build() { mkdir build diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index dc52f5e1f..f05c8b861 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182014 2013-04-05 09:10:51Z andrea $ +# $Id: PKGBUILD 182126 2013-04-08 00:43:14Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> @@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('e2495dea55af94dc6cbc41ae37690126e595d614') +sha1sums=('340cd26c37297540c0f70e75adbb43bcab0889c7') build() { mkdir build diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index 3cf838be0..8947bb6ca 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182015 2013-04-05 09:10:53Z andrea $ +# $Id: PKGBUILD 182128 2013-04-08 00:45:51Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-auth-handler @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('18817f0dfb506bc2800e7179ca184ff7929f558d') +sha1sums=('392ee2e0146e445950ecad1b0cae27ece77b7a3e') build() { mkdir build diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD index 22dc8ea66..c6c601506 100644 --- a/extra/telepathy-kde-common-internals/PKGBUILD +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182016 2013-04-05 09:10:55Z andrea $ +# $Id: PKGBUILD 182129 2013-04-08 00:46:52Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-common-internals @@ -13,7 +13,7 @@ depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('b5201215a068a46457d07c6c01365cc5df15c6c8') +sha1sums=('93ef0f8498c44b86dc25539f0b4f55354dc566ec') build() { mkdir build diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index 30162f1a1..bae5f452d 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182017 2013-04-05 09:10:57Z andrea $ +# $Id: PKGBUILD 182131 2013-04-08 00:47:59Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('763aa6d32bd780fc82cb64737232d8afaef6d895') +sha1sums=('2cb4bf8f7b5df1660027eab606d513b9cccebad5') build() { mkdir build diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD index 346126b6a..0f62878a2 100644 --- a/extra/telepathy-kde-contact-runner/PKGBUILD +++ b/extra/telepathy-kde-contact-runner/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182018 2013-04-05 09:10:59Z andrea $ +# $Id: PKGBUILD 182133 2013-04-08 00:48:26Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-contact-runner @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('6d89ffbcbec4390f7bfcec42bdaa1c732efae1a2') +sha1sums=('576642c35f2d03b7859e15a004590ed6cc321ebd') build() { mkdir build diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index b653a261f..4e240e467 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182020 2013-04-05 09:11:03Z andrea $ +# $Id: PKGBUILD 182135 2013-04-08 00:49:01Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-filetransfer-handler @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('2e41fa30b936360bf65cb9c256527878f1ef2305') +sha1sums=('6c061a13f483fd14d3ef184d1008e4f8002e46a8') build() { mkdir build diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index 91031f197..7b9f3f293 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182021 2013-04-05 09:11:05Z andrea $ +# $Id: PKGBUILD 182137 2013-04-08 00:49:44Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-integration-module @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('8d0c37001aec7dfa01349ae943ff28a8270dfbac') +sha1sums=('eb1fc514199587b018036bc307d385766fc40094') build() { mkdir build diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index be3c70de2..775bf6534 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182022 2013-04-05 09:11:06Z andrea $ +# $Id: PKGBUILD 182139 2013-04-08 00:50:17Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-send-file @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('91673a581d50dde9ad41d8e32d08f69d7410a5a6') +sha1sums=('bc3b7832c88a866b396d5358c20c3a1f3a0048d2') build() { mkdir build diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index 652d7f60c..ebe0e20a5 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182023 2013-04-05 09:11:08Z andrea $ +# $Id: PKGBUILD 182141 2013-04-08 00:51:21Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> @@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('bd55810ebe781319c5427f6d4eae4a1cb7d1fadd') +sha1sums=('87a519f132cc338b7f1f47aa8997e89f9f566bfd') build() { mkdir build diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD index 8a743571a..cef6f3c74 100644 --- a/extra/twisted/PKGBUILD +++ b/extra/twisted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174290 2013-01-03 23:54:14Z eric $ +# $Id: PKGBUILD 182404 2013-04-10 06:49:54Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=twisted -pkgver=12.3.0 +pkgver=13.0.0 pkgrel=1 pkgdesc="Asynchronous networking framework written in Python" arch=('i686' 'x86_64' 'mips64el') @@ -18,20 +18,23 @@ optdepends=('python2-pyopenssl' 'tk: for using tkconch') install=twisted.install source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2) -sha1sums=('921bef9a560edd14ea2b559ac0d674f4dac4fd65') +sha1sums=('5c66a4f231a5f3e17860a41498ac80e76a156dca') + +prepare() { + cd "Twisted-$pkgver" + sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \ + twisted/python/test/pullpipe.py \ + twisted/mail/test/pop3testserver.py \ + twisted/trial/test/scripttest.py +} build() { - cd "$srcdir/Twisted-$pkgver" + cd "Twisted-$pkgver" python2 setup.py build } package() { - cd "$srcdir/Twisted-$pkgver" + cd "Twisted-$pkgver" python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py } diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index a06a7b34e..a8ab46e88 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180898 2013-03-27 20:10:16Z guillaume $ +# $Id: PKGBUILD 182353 2013-04-08 21:34:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.0.5 -pkgrel=5 +pkgver=2.0.6 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -61,7 +61,7 @@ backup=('usr/share/vlc/lua/http/.hosts' options=('!libtool' '!emptydirs') install=vlc.install source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('4f959c0766ada8cea5a72c65fce94ebe') +md5sums=('b45be633c71dca04ca7d6c3d64dd728b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 9fa9d3913..19c5ed42f 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180518 2013-03-22 13:51:11Z andyrtr $ +# $Id: PKGBUILD 182343 2013-04-08 15:23:26Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.5 +pkgver=2.21.6 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('0fd8265039bee8f8533e8bac4df8ba8f67a65a4e78763a4982980309b05fd954') +sha256sums=('c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD new file mode 100644 index 000000000..e68d8b5ed --- /dev/null +++ b/extra/xulrunner/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 182413 2013-04-10 13:01:03Z foutrelis $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> +pkgname=xulrunner +pkgver=20.0 +pkgrel=1 +pkgdesc="Mozilla Runtime Environment" +arch=('i686' 'x86_64') +license=('MPL' 'GPL' 'LGPL') +depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13') +url="http://wiki.mozilla.org/XUL:Xul_Runner" +source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2 + mozconfig + mozilla-pkgconfig.patch + shared-libs.patch) +options=('!emptydirs') +replaces=('xulrunner-oss') +md5sums=('1b8a1907919eb805f390a05216f2d8d0' + 'f26710bcf3e65699a0646c47155cb147' + '27271ce647a83906ef7a24605e840d61' + '52e52f840a49eb1d14be1c0065b03a93') + +prepare() { + cd "$srcdir/mozilla-release" + cp "$srcdir/mozconfig" .mozconfig + + #fix libdir/sdkdir - fedora + patch -Np1 -i ../mozilla-pkgconfig.patch + patch -Np1 -i ../shared-libs.patch + + # WebRTC build tries to execute "python" and expects Python 2 + # Workaround taken from chromium PKGBUILD + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure +} + +build() { + cd "$srcdir/mozilla-release" + + export PATH="$srcdir/python2-path:$PATH" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd "$srcdir/mozilla-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" + + # add xulrunner library path to ld.so.conf + install -d $pkgdir/etc/ld.so.conf.d + echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf + + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \ + "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py +} diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig new file mode 100644 index 000000000..6679dac21 --- /dev/null +++ b/extra/xulrunner/mozconfig @@ -0,0 +1,29 @@ +. $topsrcdir/xulrunner/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +#ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-startup-notification +#ac_add_options --enable-gstreamer + +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-installer diff --git a/extra/xulrunner/mozilla-pkgconfig.patch b/extra/xulrunner/mozilla-pkgconfig.patch new file mode 100644 index 000000000..037d4aee0 --- /dev/null +++ b/extra/xulrunner/mozilla-pkgconfig.patch @@ -0,0 +1,40 @@ +diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 ++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 +@@ -6,5 +6,6 @@ + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% ++Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lxpcomglue -ldl + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% +diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + idldir=%idldir% + +diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in +--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 +@@ -108,6 +108,7 @@ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%idldir%|$(idldir)|" \ + -e "s|%sdkdir%|$(sdkdir)|" \ ++ -e "s|%libdir%|$(installdir)|" \ + -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ +diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in +--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 +@@ -7,4 +7,4 @@ + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib %MOZ_JS_LINK% +-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE ++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE diff --git a/extra/xulrunner/shared-libs.patch b/extra/xulrunner/shared-libs.patch new file mode 100644 index 000000000..1f22b2b0d --- /dev/null +++ b/extra/xulrunner/shared-libs.patch @@ -0,0 +1,12 @@ +diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in +--- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 ++++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 +@@ -50,7 +50,7 @@ + MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in + # Some files have been already bundled with xulrunner + ifndef SYSTEM_LIBXUL +-MOZ_PKG_FATAL_WARNINGS = 1 ++MOZ_PKG_FATAL_WARNINGS = 0 + endif + + MOZ_NONLOCALIZED_PKG_LIST = \ diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 67494dd01..f003a128a 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181027 2013-03-29 20:15:42Z tpowa $ +# $Id: PKGBUILD 182057 2013-04-06 06:50:23Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.5 +pkgver=${_basekernel}.6 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '0439191aaca9f09786f7ab70a080a8f9' - 'cbba928fbe4bc917929c05d633ddad52' + '1b3cd03d2add3bfe74e98a953f28c8d0' + '6294513cfa9830d48ad1915ff7053a98' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index 9f367b509..11b5bb531 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -5548,7 +5548,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index f15f0e466..c8ba6a356 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.5-1-LIBRE-PAE +KERNEL_VERSION=3.8.6-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 2007d3831..8d112b6ab 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181027 2013-03-29 20:15:42Z tpowa $ +# $Id: PKGBUILD 182057 2013-04-06 06:50:23Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.5 +pkgver=${_basekernel}.6 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '0439191aaca9f09786f7ab70a080a8f9' - 'a803a7f37290dbfd7a657e9b18bc2332' + '1b3cd03d2add3bfe74e98a953f28c8d0' + '2708b6f03f827e2c94ecbd050df4286d' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index efbfa6030..3464a1814 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -5586,7 +5586,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 7cdf644f1..2b4029b64 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.5-1-LIBRE-XEN +KERNEL_VERSION=3.8.6-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 4f4b5fd44..2b3d37e0b 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.6 _extramodules=extramodules-3.8-LIBRE # Don't forget to update bbswitch.install -pkgrel=2 +pkgrel=3 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD new file mode 100644 index 000000000..6c6e19ef4 --- /dev/null +++ b/libre/bfgminer-libre/PKGBUILD @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Andy Weidenbaum <archbaum@gmail.com> + +_pkgname=bfgminer +pkgname=bfgminer-libre +pkgver=3.0.0 +pkgrel=1 +pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation." +arch=('i686' 'x86_64' 'mips64el') +depends=('curl' 'jansson') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +url='https://bitcointalk.org/index.php?topic=168174.0' +license=('GPL3') +options=(!libtool) +source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2 + change-kernel-path.patch + remove-dangerous-rpath.patch) +sha256sums=('86f7f977ed57b8d61c728f88a3e5962aa1df0723d667c45b1e1bfa5152292400' + 'a551f73a430809a9b13bb535a503d24f8fd6d35a07bc579b5616d270a1bbf369' + '2c6d09a5e567f5099c9b117415013bf28e7b7aa75c436515d28bc7640f905db2') + +[[ "$CARCH" == "x86_64" ]] && makedepends+=('yasm') + +build() { + cd "$srcdir"/$_pkgname-$pkgver + + patch -p0 < "${srcdir}"/change-kernel-path.patch + patch -p0 < "${srcdir}"/remove-dangerous-rpath.patch + autoreconf -fi + ./configure --prefix=/usr --enable-cpumining --enable-scrypt + make +} + +package() { + cd "$srcdir"/$_pkgname-$pkgver + + make DESTDIR="$pkgdir" install +} diff --git a/libre/bfgminer-libre/change-kernel-path.patch b/libre/bfgminer-libre/change-kernel-path.patch new file mode 100644 index 000000000..9dd124ab4 --- /dev/null +++ b/libre/bfgminer-libre/change-kernel-path.patch @@ -0,0 +1,98 @@ +--- /dev/null ++++ m4/as-ac-expand.m4 +@@ -0,0 +1,49 @@ ++dnl as-ac-expand.m4 0.2.1 ++dnl autostars m4 macro for expanding directories using configure's prefix ++dnl thomas@apestaart.org ++ ++dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) ++dnl example ++dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) ++dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local ++dnl Note: when using $prefix or $exec_prefix, avoid it expanding to NONE ++dnl by calling it like this: ++dnl AS_AC_EXPAND(PYTHONLIBDIR, "\${exec_prefix}/lib/python$PYVER/site-packages") ++ ++AC_DEFUN([AS_AC_EXPAND], ++[ ++ EXP_VAR=[$1] ++ FROM_VAR=[$2] ++ ++ dnl echo DEBUG: expand FROM_VAR $FROM_VAR ++ ++ dnl first expand prefix and exec_prefix if necessary ++ prefix_save=$prefix ++ exec_prefix_save=$exec_prefix ++ ++ dnl if no prefix given, then use /usr/local, the default prefix ++ if test "x$prefix" = "xNONE"; then ++ prefix="$ac_default_prefix" ++ fi ++ dnl if no exec_prefix given, then use prefix ++ if test "x$exec_prefix" = "xNONE"; then ++ exec_prefix=$prefix ++ fi ++ ++ full_var="$FROM_VAR" ++ dnl loop until it doesn't change anymore ++ while true; do ++ dnl echo DEBUG: full_var: $full_var ++ new_full_var="`eval echo $full_var`" ++ if test "x$new_full_var" = "x$full_var"; then break; fi ++ full_var=$new_full_var ++ done ++ ++ dnl clean up ++ full_var=$new_full_var ++ AC_SUBST([$1], "$full_var") ++ ++ dnl restore prefix and exec_prefix ++ prefix=$prefix_save ++ exec_prefix=$exec_prefix_save ++]) +--- configure.ac.orig ++++ configure.ac +@@ -655,7 +655,8 @@ + prefix=/usr/local + fi + +-AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$prefix/bin"], [Path to bfgminer install]) ++AS_AC_EXPAND(DATAROOTDIR, $datarootdir) ++AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$DATAROOTDIR/bfgminer"], [Path to bfgminer install]) + + AC_DEFINE_UNQUOTED([PHATK_KERNNAME], ["phatk121016"], [Filename for phatk kernel]) + AC_DEFINE_UNQUOTED([POCLBM_KERNNAME], ["poclbm121016"], [Filename for poclbm kernel]) +--- Makefile.am.orig ++++ Makefile.am +@@ -13,7 +13,7 @@ + + bin_PROGRAMS = bfgminer + +-bin_SCRIPTS = *.cl ++pkgdata_SCRIPTS = *.cl + + bfgminer_LDFLAGS = $(PTHREAD_FLAGS) + bfgminer_LDADD = $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ \ +@@ -117,19 +117,19 @@ + + if HAS_MODMINER + bfgminer_SOURCES += driver-modminer.c +-bitstreamsdir = $(bindir)/bitstreams ++bitstreamsdir = $(pkgdatadir)/bitstreams + dist_bitstreams_DATA = bitstreams/* + endif + + if HAS_X6500 + bfgminer_SOURCES += driver-x6500.c ft232r.c ft232r.h jtag.c jtag.h +-bitstreamsdir = $(bindir)/bitstreams ++bitstreamsdir = $(pkgdatadir)/bitstreams + dist_bitstreams_DATA = bitstreams/* + endif + + if HAS_ZTEX + bfgminer_SOURCES += driver-ztex.c libztex.c libztex.h +-bitstreamsdir = $(bindir)/bitstreams ++bitstreamsdir = $(pkgdatadir)/bitstreams + dist_bitstreams_DATA = bitstreams/* + endif + diff --git a/libre/bfgminer-libre/remove-dangerous-rpath.patch b/libre/bfgminer-libre/remove-dangerous-rpath.patch new file mode 100644 index 000000000..a2bcfc87b --- /dev/null +++ b/libre/bfgminer-libre/remove-dangerous-rpath.patch @@ -0,0 +1,11 @@ +--- Makefile.am.orig ++++ Makefile.am +@@ -38,7 +38,7 @@ + if NEED_LIBBLKMAKER + SUBDIRS += libblkmaker + bfgminer_CPPFLAGS += -Ilibblkmaker +-bfgminer_LDFLAGS += -Llibblkmaker/.libs -Wl,-rpath,libblkmaker/.libs ++bfgminer_LDFLAGS += -Llibblkmaker/.libs + bfgminer_LDADD += -lblkmaker_jansson-0.1 -lblkmaker-0.1 + + if HAVE_CYGWIN diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD index aff067a94..8805ff9d1 100644 --- a/libre/bumblebee-libre/PKGBUILD +++ b/libre/bumblebee-libre/PKGBUILD @@ -4,10 +4,11 @@ _pkgname=bumblebee pkgname=bumblebee-libre pkgver=3.1 -pkgrel=5.1 +pkgrel=6.2 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support" arch=('i686' 'x86_64') -depends=('virtualgl' 'libbsd' 'glib2' 'mesa-libgl') +depends=('virtualgl' 'glib2' 'mesa-libgl') +makedepends=('help2man') optdepends=('xf86-video-nouveau: nouveau driver' 'nouveau-dri: 3D acceleration features of nouveau' 'bbswitch: switch on/off discrete card' @@ -16,9 +17,9 @@ if [ "$CARCH" = "x86_64" ]; then optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun' optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun' fi -replaces=('bumblebee') +replaces=('bumblebee' 'nvidia-libgl') conflicts=('bumblebee' 'nvidia-libgl') -provides=("bumblebee=$pkgver"'nvidia-libgl') +provides=("bumblebee=$pkgver" 'nvidia-libgl') url="http://www.bumblebee-project.org" license=("GPL3") install='bumblebee.install' @@ -42,7 +43,8 @@ build() { ./configure \ CONF_DRIVER=nouveau \ --prefix=/usr \ - --sysconfdir=/etc + --sysconfdir=/etc \ + --without-pidfile make } diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index c519fb4a1..cbf479d1c 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 _extramodules=extramodules-3.8-LIBRE # Don't forget to update cdfs.install -pkgrel=39 +pkgrel=40 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index e9ca63637..cc3749800 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -7,10 +7,10 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=2.11.3 +pkgver=2.11.4 _build= pkgrel=1 -pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, with free OpenCL support." +pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' license=('GPL3') arch=('i686' 'x86_64' 'mips64el') @@ -36,7 +36,7 @@ build() { # Here you may want to use custom CFLAGS #export CFLAGS="-O2 -march=native -mtune=native -msse2" - ./configure --prefix=/usr --enable-cpumining --disable-adl + ./configure --prefix=/usr --enable-cpumining --enable-scrypt --disable-adl make } @@ -52,6 +52,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -md5sums=('fd2c69f943353fbc9723a5526d82c1b6' +md5sums=('535ca85b504bd408d1eeddf4962ed685' 'fe4a243fabe24608f5c05e40f0f118f6' 'bd76fc92fedce18c59ccea2aa79cc664') diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD index d8fc4308a..c9f22703d 100644 --- a/libre/iceape-l10n/PKGBUILD +++ b/libre/iceape-l10n/PKGBUILD @@ -23,11 +23,11 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=4 pkgdesc="Language packs for Debian Iceape." -arch=('i686' 'x86_64' 'mips64el') -url="http://packages.debian.org/source/sid/iceape" +arch=('any') +url="http://packages.debian.org/sid/iceape" license=('MPL' 'GPL') depends=("iceape-libre>=$pkgver") makedepends=('unzip' 'zip') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 1dff5d2dd..b86107e16 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -11,17 +11,17 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=4 +pkgrel=5 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-ply' 'librsvg' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') -replaces=('mozilla' 'seamonkey') +replaces=('seamonkey') conflicts=('seamonkey') provides=('seamonkey') install=$_pkgname.install -url="http://packages.debian.org/source/sid/${_pkgname}" +url="http://packages.debian.org/sid/${_pkgname}" source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" mozconfig @@ -93,6 +93,11 @@ build() { rsvg-convert -w 128 -h 128 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape128.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg cp "${srcdir}/mozconfig" .mozconfig + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" } diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 35b6b0e16..cd38710e8 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -138,6 +138,10 @@ build() { chmod +x build/unix/run-icecat.sh # fix bug for bad file permition + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + if $_pgo; then LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index fd24630fe..5b102846c 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -11,10 +11,10 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Icedove." -arch=('i686' 'x86_64' 'mips64el') -url="http://packages.debian.org/source/experimental/icedove" +arch=('any') +url="http://packages.debian.org/experimental/icedove" license=('MPL' 'GPL') depends=("icedove-libre>=$pkgver") makedepends=('unzip' 'zip') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index c727fb2ce..90aa96d1a 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -11,11 +11,11 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') -url="http://packages.debian.org/source/experimental/${_pkgname}" +url="http://packages.debian.org/experimental/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') @@ -65,7 +65,7 @@ build() { install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png" done - # This patch has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh + # This patch fixes a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh rm -v debian/patches/debian-hacks/Icedove-branding.patch || true quilt push -av @@ -75,6 +75,11 @@ build() { patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version cp "${srcdir}/mozconfig" .mozconfig + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" } diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index af600985c..625995ecd 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -23,11 +23,11 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Iceweasel." arch=('any') -url="http://www.geticeweasel.org/" +url="http://packages.debian.org/experimental/iceweasel" license=('MPL' 'GPL') depends=("iceweasel-libre>=$pkgver") makedepends=('unzip' 'zip') @@ -66,9 +66,9 @@ for lang in ${_langpacks[@]} do eval " package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { - replaces=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z)) - conflicts=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z)) - provides=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z) firefox-i18n-$(echo $lang | tr A-Z a-z)) + replaces=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z)) + conflicts=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z)) + provides=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z)) install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" } " diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 6dc52a213..0c9520b17 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') @@ -36,8 +36,10 @@ if $_pgo; then fi optdepends=('networkmanager: Location detection via available WiFi networks') -url="http://www.geticeweasel.org/" +url="http://packages.debian.org/experimental/${_pkgname}" install=iceweasel.install +replaces=('firefox') +conflicts=('firefox') provides=('firefox') source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz" @@ -141,6 +143,10 @@ build() { echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + if $_pgo; then LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index 75d81567f..07fa48b1a 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -23,7 +23,7 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') pkgver=4.10.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -31,12 +31,15 @@ groups=('kde' 'kdepim-libre') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz" - "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592") + "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592" + 'fix-completion.patch') sha1sums=('61b74cb3bf541040e09252d4dcfaea8a876a2859' - '61a7e31e7daee3358c442d3ac5f74171b45ae2c9') + '61a7e31e7daee3358c442d3ac5f74171b45ae2c9' + '92a44c7b1697de519b09265a3b68e7d73d4c024e') build() { patch -Np1 -d ${_pkgbase}-${pkgver} < ${srcdir}/kleopatra-build-fix.patch + patch -Np1 -d ${_pkgbase}-${pkgver} < ${srcdir}/fix-completion.patch mkdir build cd build diff --git a/libre/kdepim-libre/fix-completion.patch b/libre/kdepim-libre/fix-completion.patch new file mode 100644 index 000000000..c2edefe00 --- /dev/null +++ b/libre/kdepim-libre/fix-completion.patch @@ -0,0 +1,182 @@ +commit 6a06c57f52a00018d607085efa7570deb91dc707 +Author: David Faure <faure@kde.org> +Date: Mon Apr 8 17:41:39 2013 +0200 + + Fix kmail autocompletion from akonadi. + + My commit 02f5f0214e made autocompletion from nepomuk work better, but broke + completion from akonadi. I kept the "keywords" based code, but now it's only + used for the special case of nickname-based search (because the nickname shouldn't + appear in the completion item). For everything else it really doesn't make sense + to have a search engine (akonadi/nepomuk) on top of a search engine + (the one inside KCompletion). + + This time I verified that: + * nepomuk search still works + * contacts from akonadi work again + * contact groups from akonadi work (after previous commit) + * nickname-search in akonadi still doesn't work, but it didn't before. More work + needed for that one. This is the only reason to keep KMailCompletion around btw, + everything else would work without it. + + BUG: 259949 + FIXED-IN: 4.10.3 + +diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp +index b7b11be..ec4caf9 100644 +--- a/libkdepim/addresseelineedit.cpp ++++ b/libkdepim/addresseelineedit.cpp +@@ -30,6 +30,8 @@ + #include "completionordereditor.h" + #endif + ++#include "kmailcompletion.h" ++ + #include <Akonadi/Contact/ContactSearchJob> + #include <Akonadi/Contact/ContactGroupSearchJob> + #include <Akonadi/CollectionFetchJob> +@@ -77,6 +79,10 @@ + + using namespace KPIM; + ++namespace KPIM { ++ typedef QMap< QString, QPair<int,int> > CompletionItemsMap; ++} ++ + class AddresseeLineEditStatic + { + public: +@@ -496,11 +502,9 @@ void AddresseeLineEdit::Private::addCompletionItem( const QString &string, int w + s_static->completionItemMap.insert( string, qMakePair( weight, completionItemSource ) ); + } + +- if ( keyWords == 0 ) { +- s_static->completion->addItem( string, weight ); +- } else { +- s_static->completion->addItemWithKeys( string, weight, keyWords ); +- } ++ s_static->completion->addItem(string, weight); ++ if (keyWords && !keyWords->isEmpty()) ++ s_static->completion->addItemWithKeys(string, weight, keyWords); // see kmailcompletion.cpp + } + + const QStringList KPIM::AddresseeLineEdit::Private::adjustedCompletionItems( bool fullSearch ) +@@ -1348,17 +1352,13 @@ void AddresseeLineEdit::addItem( const Akonadi::Item &item, int weight, int sour + void AddresseeLineEdit::addContactGroup( const KABC::ContactGroup &group, int weight, int source ) + { + d->addCompletionItem( group.name(), weight, source ); +- QStringList keyWords; +- keyWords.append( group.name() ); +- d->addCompletionItem( group.name(), weight, source, &keyWords ); + } + + void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int source ) + { + const QStringList emails = addr.emails(); + QStringList::ConstIterator it; +- const int prefEmailWeight = 1; //increment weight by prefEmailWeight +- int isPrefEmail = prefEmailWeight; //first in list is preferredEmail ++ int isPrefEmail = 1; //first in list is preferredEmail + QStringList::ConstIterator end( emails.constEnd() ); + for ( it = emails.constBegin(); it != end; ++it ) { + //TODO: highlight preferredEmail +@@ -1368,40 +1368,6 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int + const QString nickName = addr.nickName(); + QString fullEmail = addr.fullEmail( email ); + +- // Prepare keywords (for CompletionShell, CompletionPopup) +- QStringList keyWords; +- const QString realName = addr.realName(); +- +- if ( !givenName.isEmpty() && !familyName.isEmpty() ) { +- keyWords.append( givenName + QLatin1Char( ' ' ) + familyName ); +- keyWords.append( familyName + QLatin1Char( ' ' ) + givenName ); +- keyWords.append( familyName + QLatin1String( ", " ) + givenName ); +- } else if ( !givenName.isEmpty() ) { +- keyWords.append( givenName ); +- } else if ( !familyName.isEmpty() ) { +- keyWords.append( familyName ); +- } +- +- if ( !nickName.isEmpty() ) { +- keyWords.append( nickName ); +- } +- +- if ( !realName.isEmpty() ) { +- keyWords.append( realName ); +- } +- +- keyWords.append( email ); +- +- /* KMailCompletion does not have knowledge about identities, it stores emails and +- * keywords for each email. KMailCompletion::allMatches does a lookup on the +- * keywords and returns an ordered list of emails. In order to get the preferred +- * email before others for each identity we use this little trick. +- * We remove the <blank> in adjustedCompletionItems. +- */ +- if ( isPrefEmail == prefEmailWeight ) { +- fullEmail.replace( QLatin1String( " <" ), QLatin1String( " <" ) ); +- } +- + // Prepare "givenName" + ' ' + "familyName" + QString fullName = givenName; + if (!familyName.isEmpty()) { +@@ -1413,12 +1379,16 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int + // Finally, we can add the completion items + if (!fullName.isEmpty()) { + const QString address = KPIMUtils::normalizedAddress(fullName, email, QString()); +- d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords); ++ if (fullEmail != address) { ++ // This happens when fullEmail contains a middle name, while our own fullName+email only has "first last". ++ // Let's offer both, the fullEmail with 3 parts, looks a tad formal. ++ d->addCompletionItem(address, weight + isPrefEmail, source); ++ } + } + +- if ( !nickName.isEmpty() ) { +- const QString address = KPIMUtils::normalizedAddress(nickName, email, QString()); +- d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords); ++ QStringList keyWords; ++ if (!nickName.isEmpty()) { ++ keyWords.append(nickName); + } + + d->addCompletionItem( fullEmail, weight + isPrefEmail, source, &keyWords ); +diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h +index 4e6784b..b2af4a9 100644 +--- a/libkdepim/addresseelineedit.h ++++ b/libkdepim/addresseelineedit.h +@@ -27,7 +27,6 @@ + #ifndef KDEPIM_ADDRESSEELINEEDIT_H + #define KDEPIM_ADDRESSEELINEEDIT_H + +-#include "kmailcompletion.h" + #include "kdepim_export.h" + + #include "ldap/ldapclient.h" +@@ -50,10 +49,6 @@ namespace KABC { + class ContactGroup; + } + +-namespace KPIM { +- typedef QMap< QString, QPair<int,int> > CompletionItemsMap; +-} +- + namespace Nepomuk2 { + namespace Query { + class Result; +diff --git a/libkdepim/kmailcompletion.h b/libkdepim/kmailcompletion.h +index e8574cc..93771d3 100644 +--- a/libkdepim/kmailcompletion.h ++++ b/libkdepim/kmailcompletion.h +@@ -32,7 +32,9 @@ namespace KPIM { + + /** + * KMailCompletion allows lookup of email addresses by keyword. +- * Typically a keywods would be firstname, lastname, nickname or domain. ++ * This is used for lookup by nickname, since we don't want the nickname to appear in the final email. ++ * E.g. you have a nickname "idiot" for your boss, you want to type "idiot" but you want the completion ++ * to offer "Full Name <email@domain>", without the nickname being visible. + */ + class KMailCompletion : public KCompletion + { diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 264685501..524b24bae 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.8.5 +_kernver=3.8.6 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=11 +pkgrel=12 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' license=('GPL2') -depends=("linux-libre=$_kernver") -makedepends=("linux-libre-headers=$_kernver") +depends=("linux-libre=$_kernver-$_kernrel") +makedepends=("linux-libre-headers=$_kernver-$_kernrel") install=linux-libre-kmod-alx.install replaces=('alx' 'alx-driver' 'dkms-alx') provides=('alx' 'alx-driver' 'dkms-alx') diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 2e3f82a44..d2b2839ea 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.71 +_kernver=3.0.72 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=9 +pkgrel=10 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' license=('GPL2') -depends=("linux-libre-lts=$_kernver") -makedepends=("linux-libre-lts-headers=$_kernver") +depends=("linux-libre-lts=$_kernver-$_kernrel") +makedepends=("linux-libre-lts-headers=$_kernver-$_kernrel") install=linux-libre-lts-kmod-alx.install replaces=('alx' 'alx-driver' 'dkms-alx') provides=('alx' 'alx-driver' 'dkms-alx') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 3d56fdaa6..e0fb91bd4 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180979 2013-03-29 10:54:31Z andyrtr $ +# $Id: PKGBUILD 182062 2013-04-06 09:14:10Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=71 +_sublevel=72 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.70 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.71 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,11 +30,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' 'module-symbol-waiting-3.0.patch' 'module-init-wait-3.0.patch' + 'ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'a2ae6b2117cd99fef375764947302435' - '99f9c408b64393aceb2482c9a3e329ee' - 'fba95bf1857ce6bf863e13a1ab73f584' + '337d8baa608067d3ef79a553af790416' + 'fe0e9b4415b82f306fc1b63eb9a742a4' + '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -44,7 +45,8 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '864cfb1ffa4023f9794d5c0270ca4aa5') + 'ee587972bbd35841cc0efe82db9caa7c' + 'fd5bb788a849895ebf1b8efe64646715') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -64,6 +66,10 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" + # revert i686 build breaker 3.0.72 kernel + if [ "${CARCH}" = "i686" ]; then + patch -Rp1 -i "${srcdir}/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch" + fi # Some chips detect a ghost TV output # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html # Arch Linux bug report: FS#19234 diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index f903b2114..849fd016b 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -4978,7 +4978,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index c369e1b5b..fe5875138 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -4736,7 +4736,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set diff --git a/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch b/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch new file mode 100644 index 000000000..be6f7d1e9 --- /dev/null +++ b/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch @@ -0,0 +1,187 @@ +From 90ba983f6889e65a3b506b30dc606aa9d1d46cd2 Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o <tytso@mit.edu> +Date: Mon, 11 Mar 2013 23:39:59 -0400 +Subject: ext4: use atomic64_t for the per-flexbg free_clusters count + +From: Theodore Ts'o <tytso@mit.edu> + +commit 90ba983f6889e65a3b506b30dc606aa9d1d46cd2 upstream. + +A user who was using a 8TB+ file system and with a very large flexbg +size (> 65536) could cause the atomic_t used in the struct flex_groups +to overflow. This was detected by PaX security patchset: + +http://forums.grsecurity.net/viewtopic.php?f=3&t=3289&p=12551#p12551 + +This bug was introduced in commit 9f24e4208f7e, so it's been around +since 2.6.30. :-( + +Fix this by using an atomic64_t for struct orlav_stats's +free_clusters. + +[Backported for 3.0-stable. Renamed free_clusters back to free_blocks; +fixed a few more atomic_read's of free_blocks left in 3.0.] + +Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> +Reviewed-by: Lukas Czerner <lczerner@redhat.com> +Signed-off-by: Lingzhu Xiang <lxiang@redhat.com> +Reviewed-by: CAI Qian <caiqian@redhat.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- a/fs/ext4/ext4.h ++++ b/fs/ext4/ext4.h +@@ -288,9 +288,9 @@ struct ext4_group_desc + */ + + struct flex_groups { +- atomic_t free_inodes; +- atomic_t free_blocks; +- atomic_t used_dirs; ++ atomic64_t free_blocks; ++ atomic_t free_inodes; ++ atomic_t used_dirs; + }; + + #define EXT4_BG_INODE_UNINIT 0x0001 /* Inode table/bitmap not in use */ +diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c +index 29272de..dd732c7 100644 +--- a/fs/ext4/ialloc.c ++++ b/fs/ext4/ialloc.c +@@ -345,8 +345,8 @@ static int find_group_flex(struct super_block *sb, struct inode *parent, + ext4_group_t ngroups = ext4_get_groups_count(sb); + int flex_size = ext4_flex_bg_size(sbi); + ext4_group_t best_flex = parent_fbg_group; +- int blocks_per_flex = sbi->s_blocks_per_group * flex_size; +- int flexbg_free_blocks; ++ ext4_fsblk_t blocks_per_flex = sbi->s_blocks_per_group * flex_size; ++ ext4_fsblk_t flexbg_free_blocks; + int flex_freeb_ratio; + ext4_group_t n_fbg_groups; + ext4_group_t i; +@@ -355,7 +355,7 @@ static int find_group_flex(struct super_block *sb, struct inode *parent, + sbi->s_log_groups_per_flex; + + find_close_to_parent: +- flexbg_free_blocks = atomic_read(&flex_group[best_flex].free_blocks); ++ flexbg_free_blocks = atomic64_read(&flex_group[best_flex].free_blocks); + flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex; + if (atomic_read(&flex_group[best_flex].free_inodes) && + flex_freeb_ratio > free_block_ratio) +@@ -370,7 +370,7 @@ find_close_to_parent: + if (i == parent_fbg_group || i == parent_fbg_group - 1) + continue; + +- flexbg_free_blocks = atomic_read(&flex_group[i].free_blocks); ++ flexbg_free_blocks = atomic64_read(&flex_group[i].free_blocks); + flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex; + + if (flex_freeb_ratio > free_block_ratio && +@@ -380,14 +380,14 @@ find_close_to_parent: + } + + if ((atomic_read(&flex_group[best_flex].free_inodes) == 0) || +- ((atomic_read(&flex_group[i].free_blocks) > +- atomic_read(&flex_group[best_flex].free_blocks)) && ++ ((atomic64_read(&flex_group[i].free_blocks) > ++ atomic64_read(&flex_group[best_flex].free_blocks)) && + atomic_read(&flex_group[i].free_inodes))) + best_flex = i; + } + + if (!atomic_read(&flex_group[best_flex].free_inodes) || +- !atomic_read(&flex_group[best_flex].free_blocks)) ++ !atomic64_read(&flex_group[best_flex].free_blocks)) + return -1; + + found_flexbg: +@@ -406,8 +406,8 @@ out: + } + + struct orlov_stats { ++ __u64 free_blocks; + __u32 free_inodes; +- __u32 free_blocks; + __u32 used_dirs; + }; + +@@ -424,7 +424,7 @@ static void get_orlov_stats(struct super_block *sb, ext4_group_t g, + + if (flex_size > 1) { + stats->free_inodes = atomic_read(&flex_group[g].free_inodes); +- stats->free_blocks = atomic_read(&flex_group[g].free_blocks); ++ stats->free_blocks = atomic64_read(&flex_group[g].free_blocks); + stats->used_dirs = atomic_read(&flex_group[g].used_dirs); + return; + } +diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c +index 31bbdb5..35959f6 100644 +--- a/fs/ext4/mballoc.c ++++ b/fs/ext4/mballoc.c +@@ -2814,8 +2814,8 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, + if (sbi->s_log_groups_per_flex) { + ext4_group_t flex_group = ext4_flex_group(sbi, + ac->ac_b_ex.fe_group); +- atomic_sub(ac->ac_b_ex.fe_len, +- &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_sub(ac->ac_b_ex.fe_len, ++ &sbi->s_flex_groups[flex_group].free_blocks); + } + + err = ext4_handle_dirty_metadata(handle, NULL, bitmap_bh); +@@ -4614,7 +4614,7 @@ do_more: + + if (sbi->s_log_groups_per_flex) { + ext4_group_t flex_group = ext4_flex_group(sbi, block_group); +- atomic_add(count, &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_add(count, &sbi->s_flex_groups[flex_group].free_blocks); + } + + ext4_mb_unload_buddy(&e4b); +@@ -4745,8 +4745,8 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb, + + if (sbi->s_log_groups_per_flex) { + ext4_group_t flex_group = ext4_flex_group(sbi, block_group); +- atomic_add(blocks_freed, +- &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_add(blocks_freed, ++ &sbi->s_flex_groups[flex_group].free_blocks); + } + + ext4_mb_unload_buddy(&e4b); +diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c +index 244100f..d2661aac 100644 +--- a/fs/ext4/resize.c ++++ b/fs/ext4/resize.c +@@ -929,8 +929,8 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) + sbi->s_log_groups_per_flex) { + ext4_group_t flex_group; + flex_group = ext4_flex_group(sbi, input->group); +- atomic_add(input->free_blocks_count, +- &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_add(input->free_blocks_count, ++ &sbi->s_flex_groups[flex_group].free_blocks); + atomic_add(EXT4_INODES_PER_GROUP(sb), + &sbi->s_flex_groups[flex_group].free_inodes); + } +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index c6a3363..e05cd34 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -1992,8 +1992,8 @@ static int ext4_fill_flex_info(struct super_block *sb) + flex_group = ext4_flex_group(sbi, i); + atomic_add(ext4_free_inodes_count(sb, gdp), + &sbi->s_flex_groups[flex_group].free_inodes); +- atomic_add(ext4_free_blks_count(sb, gdp), +- &sbi->s_flex_groups[flex_group].free_blocks); ++ atomic64_add(ext4_free_blks_count(sb, gdp), ++ &sbi->s_flex_groups[flex_group].free_blocks); + atomic_add(ext4_used_dirs_count(sb, gdp), + &sbi->s_flex_groups[flex_group].used_dirs); + } +-- +1.7.11.7 + +-- +To unsubscribe from this list: send the line "unsubscribe stable" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 4dbbe33d3..76b9b14f0 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.71-1-LIBRE-LTS +KERNEL_VERSION=3.0.72-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 947339de7..a7672f35c 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.5-1-LIBRE +KERNEL_VERSION=3.8.6-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index f647e3913..bdc8b63c0 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181035 2013-03-30 11:31:35Z foutrelis $ +# $Id: PKGBUILD 182068 2013-04-06 09:25:55Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=40 +pkgrel=41 epoch=1 _extramodules=extramodules-3.8-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD index 26640795f..2af861641 100644 --- a/libre/luxblend25/PKGBUILD +++ b/libre/luxblend25/PKGBUILD @@ -3,44 +3,33 @@ pkgbase=luxrender pkgname=luxblend25 -srcver=3a928b723b29 -pkgver=1.1.v2.65 -_pkgver=${pkgver::3} +srcver=c9deae0646d0 +pkgver=1.2.1.v2.66 +_pkgver=${pkgver::5} reqname=blender -reqver=${pkgver:5} +reqver=${pkgver:7} +reqep=7 pkgrel=1 -pkgdesc='LuxRender exporter for Blender-libre' -arch=( - any -) -url="http://www.$pkgbase.net/" -license=( - GPL -) +pkgdesc="LuxRender exporter for ${reqname^}." +arch=any +url=http://www.$pkgbase.net/ +license=GPL depends=( $pkgbase=$_pkgver - "$reqname>=$reqver" -) -provides=( - $pkgname=$_pkgver -) -conflicts=( - $pkgname - #"$reqname>=${reqver::2}$((${reqver:2}+1))" -) -replaces=( - $pkgname -) -source=( - "https://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2" -) -sha512sums=( - f5aadc77e699f6b7259ece271b0c50ca7be5858bb628b99aedbb23b64e5587ac59cc3d1c52e063ba89c9d340f915727046e4d3017b26238425d43d3bba14f017 -) + "$reqname>=$(($reqep-1)):$reqver" + "$reqname<$reqep:${reqver::2}$((${reqver:2:4}+1))" +) +provides=($pkgname=$_pkgver) +conflicts=$pkgname +replaces=$pkgname +source=http://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2 +sha512sums=e8d93d5d9d73c1cd4f2008697bd9a8a125d08910aed3f4d3e4bcd290810d673aa663c327fc2cb7ac983cb3439a6996431c39bc3a2f0b6ed05ce5d0b8398ece92 package() { a=$pkgname-$srcver/src/$pkgbase b=usr/share/$reqname/$reqver/scripts/addons install -d -m755 $pkgdir/$b cp -a $srcdir/$a $pkgdir/$b + # change the search path in exporter so it finds pylux in its new location + sed -i 's|from.*import pylux|import pylux|' $pkgdir/$b/$pkgbase/outputs/pure_api.py } diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index 3ec9854e6..15bc771ed 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -5,28 +5,33 @@ # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=luxrender-libre _pkgflag=libre -pkgver=1.2 -_pkgver=ee0b9ff73d62 +pkgver=1.2.1 +_pkgver=3066b2161439 pkgrel=1 -pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendations" +pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.${pkgname%-$_pkgflag}.net/" license=('GPL') depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl') optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \ 'python: Python interface (pylux)') -makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') +makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=${pkgver::3}" 'python' 'opencl-headers') provides=(${pkgname%-$_pkgflag}=$pkgver) conflicts=${pkgname%-$_pkgflag} replaces=${pkgname%-$_pkgflag} -source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2) -md5sums=('eb1ed9ecfe540896863ad4ee4da5a2f9') +source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2 + boost-1.53-shared_array_constructor.diff) +md5sums=( + '87958798c164ad14f92fb4af2595d332' + 'dd19c7ac2ba8c9b703018a176ef77f98') build() { cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver # fix the installation sed -i '/.*wxgui.*/ d' CMakeLists.txt + # fix for boost 1.53 + patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true export CXXFLAGS="$CXXFLAGS -lpthread" cmake -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index cf38b1882..faf704096 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 -pkgrel=9.4 +pkgrel=10 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 2fda312b6..51329569f 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=16 +pkgrel=17 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 764beed0d..5bbbf618d 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.8-LIBRE -pkgrel=19 +pkgrel=20 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index f48fd9f32..038191729 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.10 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 45bbfb86d..c7c0c7707 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.10 _extramodules=extramodules-3.8-LIBRE -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index 41b5ac73a..3a8199ff8 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -2,16 +2,16 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install index 1ac430c3b..0a6d187e5 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install @@ -3,17 +3,17 @@ cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/pcr/hunspell-pt-br/PKGBUILD b/pcr/hunspell-pt-br/PKGBUILD new file mode 100644 index 000000000..0641711df --- /dev/null +++ b/pcr/hunspell-pt-br/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Daniel Felipe Reis Apolinario <dapolinario@gmail.com> +# Contributor: Bernardo Barros <bernardobarros@NOSPAM.gmail.com> +# Contributor: Robson R S Peixoto <robsonpeixoto@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +pkgname=hunspell-pt-br +pkgver=3.0 +pkgrel=3 +pkgdesc="Portuguese (Brazil) dictionary" +arch=(any) +url="http://pt-br.libreoffice.org/projetos/projeto-vero-verificador-ortografico" +license=('LGPLv3') +optdepends=('hunspell: the spell checking libraries and apps') +source=(http://pt-br.libreoffice.org/assets/VeroptBRV300AOG.oxt) +md5sums=('96e05c7b7df97e2d1ce57ff736063bdf') + +package() { + install -D -m644 ${srcdir}/pt_BR.dic ${pkgdir}/usr/share/hunspell/pt_BR.dic + install -D -m644 ${srcdir}/pt_BR.aff ${pkgdir}/usr/share/hunspell/pt_BR.aff + + mkdir -p ${pkgdir}/usr/share/myspell/dicts + ln -s /usr/share/hunspell/pt_BR.dic ${pkgdir}/usr/share/myspell/dicts/pt_BR.dic + ln -s /usr/share/hunspell/pt_BR.aff ${pkgdir}/usr/share/myspell/dicts/pt_BR.aff +} diff --git a/pcr/npapi-vlc-git/PKGBUILD b/pcr/npapi-vlc-git/PKGBUILD new file mode 100644 index 000000000..59b11bff6 --- /dev/null +++ b/pcr/npapi-vlc-git/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Det +# Contributor: Pimper (M0Rf30) + +_pkgname=npapi-vlc +pkgname=$_pkgname-git +pkgver=0.2.213.gc992dba +pkgrel=1 +pkgdesc="The modern VLC Mozilla plugin" +arch=('i686' 'x86_64') +url="http://git.videolan.org/?p=$_pkgname.git;a=summary" +license=('LGPL-2.1') +options=('!libtool') +depends=('vlc') +makedepends=('git' 'npapi-sdk') +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +source=("git://git.videolan.org/$_pkgname.git") +md5sums=('SKIP') + +pkgver() { + cd $_pkgname + git describe --always | sed 's/-/./g' +} + +build() { + cd $_pkgname + msg2 "Starting autogen.sh..." + sh ./autogen.sh + msg2 "Starting configure..." + ./configure --prefix=/usr + msg2 "Starting make..." + make +} + +package() { + cd $_pkgname + msg2 "Starting make install..." + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING" +}
\ No newline at end of file diff --git a/pcr/plowshare/PKGBUILD b/pcr/plowshare/PKGBUILD new file mode 100644 index 000000000..cc2fd08ef --- /dev/null +++ b/pcr/plowshare/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer : speps <speps at aur dot archlinux dot org> +# Contributor: breakdown <breakdown(at)archlinux(dot)us> + +pkgname=plowshare +pkgver=snapshot_git20130401.7b374cb +pkgrel=1 +pkgdesc="Command-line downloader and uploader for Rapidshare, Mediafire and other file sharing websites." +arch=('any') +url="http://code.google.com/p/plowshare/" +license=('GPL') +depends=('curl' 'recode' 'js') +optdepends=('bash-completion: enable bash auto completion' + 'libcaca: ascii display for no X server' + 'tiv: ascii display for no X server' + 'aview: ascii display for no X server') +conflicts=("$pkgname-git") +source=("http://$pkgname.googlecode.com/files/${pkgname}4-${pkgver/_/-}.tar.gz") +md5sums=('edcc004c9432c22644a44f97c2cd5992') + +package() { + cd "$srcdir/${pkgname}4-${pkgver/_/-}" + + DESTDIR="$pkgdir/" PREFIX=/usr ./setup.sh install + + # bash completion script + install -Dm644 etc/$pkgname.completion \ + "$pkgdir/usr/share/bash-completion/completions/$pkgname" + + # set CDIR for bash completion + sed -i "s|local/||" \ + "$pkgdir/usr/share/bash-completion/completions/$pkgname" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/xcftools/PKGBUILD b/pcr/xcftools/PKGBUILD new file mode 100644 index 000000000..979453d24 --- /dev/null +++ b/pcr/xcftools/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Jonathan Frawley <jonathanfrawley@gmail.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +pkgname=xcftools +pkgver=1.0.7 +pkgrel=1 +pkgdesc="Miscellaneous command line tools for use with the open ${pkgname::3} format used by The GIMP." +url=http://henning.makholm.net/software +arch=( + i686 + x86_64 + mips64el +) +license=( + GPL2 + perl +) +depends=( + libpng + perl +) +optdepends=gimp +makedepends=libpng +source=( + http://henning.makholm.net/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname.patch +) +md5sums=( + fd960b6470fb23520fc4b1ade6cf6e25 + 7439f6a8369a12913243ded6c93d31e1 +) + +build() { + cd $srcdir/$pkgname-$pkgver + patch -i ../$pkgname.patch + /bin/bash configure --prefix=/usr + setarch $CARCH make +} + +package() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install +} + +# vim:set ts=2 sw=2 et: diff --git a/social/hunspell-pt-br/PKGBUILD b/social/hunspell-pt-br/PKGBUILD deleted file mode 100644 index 35e1dc887..000000000 --- a/social/hunspell-pt-br/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Daniel Felipe Reis Apolinario <dapolinario@gmail.com> -# Contributor: Bernardo Barros <bernardobarros@NOSPAM.gmail.com> -# Contributor: Robson R S Peixoto <robsonpeixoto@gmail.com> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> - -pkgname=hunspell-pt-br -pkgver=2.0.9 -pkgrel=1 -pkgdesc="Portuguese (Brazil) hunspell dictionary" -arch=(any) -url="http://www.broffice.org/verortografico/" -license=('LGPL-2.1') -optdepends=('hunspell: the spell checking libraries and apps') -source=(http://www.broffice.org/files/Vero_pt_BR_V209AOC.oxt) - -build() { - cd ${srcdir} - install -D -m644 pt_BR.dic $pkgdir/usr/share/hunspell/pt_BR.dic - install -D -m644 pt_BR.aff $pkgdir/usr/share/hunspell/pt_BR.aff - mkdir -p $pkgdir/usr/share/myspell/dicts - cd $pkgdir/usr/share/myspell/dicts - - ln -s /usr/share/hunspell/pt_BR.dic pt_BR.dic - ln -s /usr/share/hunspell/pt_BR.aff pt_BR.aff -} - -md5sums=('47313490f1a21c87b6d5fb5655042e22') diff --git a/~emulatorman/hunspell-pt-br/PKGBUILD b/~emulatorman/hunspell-pt-br/PKGBUILD deleted file mode 100644 index 35e1dc887..000000000 --- a/~emulatorman/hunspell-pt-br/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Daniel Felipe Reis Apolinario <dapolinario@gmail.com> -# Contributor: Bernardo Barros <bernardobarros@NOSPAM.gmail.com> -# Contributor: Robson R S Peixoto <robsonpeixoto@gmail.com> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> - -pkgname=hunspell-pt-br -pkgver=2.0.9 -pkgrel=1 -pkgdesc="Portuguese (Brazil) hunspell dictionary" -arch=(any) -url="http://www.broffice.org/verortografico/" -license=('LGPL-2.1') -optdepends=('hunspell: the spell checking libraries and apps') -source=(http://www.broffice.org/files/Vero_pt_BR_V209AOC.oxt) - -build() { - cd ${srcdir} - install -D -m644 pt_BR.dic $pkgdir/usr/share/hunspell/pt_BR.dic - install -D -m644 pt_BR.aff $pkgdir/usr/share/hunspell/pt_BR.aff - mkdir -p $pkgdir/usr/share/myspell/dicts - cd $pkgdir/usr/share/myspell/dicts - - ln -s /usr/share/hunspell/pt_BR.dic pt_BR.dic - ln -s /usr/share/hunspell/pt_BR.aff pt_BR.aff -} - -md5sums=('47313490f1a21c87b6d5fb5655042e22') |