diff options
Diffstat (limited to 'extra')
389 files changed, 5276 insertions, 2979 deletions
diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD index da5b43bb8..4d28f1031 100644 --- a/extra/aisleriot/PKGBUILD +++ b/extra/aisleriot/PKGBUILD @@ -1,36 +1,44 @@ -# $Id: PKGBUILD 170150 2012-11-03 17:53:42Z heftig $ +# $Id: PKGBUILD 188075 2013-06-08 11:18:20Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=aisleriot -pkgver=3.2.3.2 +pkgver=3.8.0 pkgrel=1 -pkgdesc="GNOME Solitaire card games" +pkgdesc="A collection of patience games written in guile scheme" arch=(i686 x86_64 mips64el) license=(GPL) url="http://www.gnome.org" groups=('gnome-extra') -depends=(libsm gconf guile libcanberra librsvg hicolor-icon-theme dconf) -makedepends=(intltool itstool docbook-xsl) +depends=(guile gtk3 librsvg libcanberra gconf hicolor-icon-theme dconf) +makedepends=(intltool itstool docbook-xsl yelp-tools desktop-file-utils) +optdepends=('libkdegames: KDE card sets' + 'pysolfc: PySol card sets' + 'pysolfc-cardsets: PySol card sets') options=('!emptydirs' '!libtool') install=aisleriot.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('06eeeef49e7a0f8a98142085a64bc7830d0dd02e480fbfa1309545fccc977a36') +sha256sums=('14954fe77fa953b20f5385292743857f79efd45e8b75fb06807e7cf17f9db004') build() { cd $pkgname-$pkgver - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib --disable-static \ + --with-card-theme-formats=all \ + --with-kde-card-theme-path=/usr/share/apps/carddecks \ + --with-pysol-card-theme-path=/usr/share/PySolFC + + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } package() { cd $pkgname-$pkgver - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain aisleriot ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + make DESTDIR="$pkgdir" install GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \ + --domain aisleriot "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 53f6fdfb5..7b822ce93 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,29 +1,39 @@ -# $Id: PKGBUILD 184322 2013-05-06 06:46:28Z andrea $ +# $Id: PKGBUILD 188070 2013-06-08 08:31:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi pkgver=1.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') url='http://community.kde.org/KDE_PIM/Akonadi' license=('LGPL') depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') +makedepends=('cmake' 'automoc4' 'boost' 'postgresql') +optdepends=('postgresql: PostgreSQL backend') install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('bdce288f4b91055d69f35c26dab276d0') +source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2" + 'boost153.patch') +md5sums=('bdce288f4b91055d69f35c26dab276d0' + 'd797b338914c677fb6b93c0c23f46197') + +prepare() { + mkdir -p build + + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/boost153.patch +} build() { - mkdir build cd build CXX="g++" \ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \ - -DQT_QMAKE_EXECUTABLE=qmake-qt4 + -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ + -DAKONADI_BUILD_TESTS=OFF make } diff --git a/extra/akonadi/boost153.patch b/extra/akonadi/boost153.patch new file mode 100644 index 000000000..53ab4d91e --- /dev/null +++ b/extra/akonadi/boost153.patch @@ -0,0 +1,27 @@ +From: Sergio Martins <iamsergio@gmail.com> +Date: Tue, 28 May 2013 20:22:11 +0000 +Subject: Compile with boost-1.53 +X-Git-Url: http://quickgit.kde.org/?p=akonadi.git&a=commitdiff&h=fe3f49cbd21a634c3257903a229b7d5357ee194a +--- +Compile with boost-1.53 + +The bug isn't going to be fixed in Qt4, so we need the ifdef. + +CCMAIL: vkrause@kde.org +--- + + +--- a/shared/akapplication.h ++++ b/shared/akapplication.h +@@ -23,7 +23,9 @@ + #include <QtCore/QObject> + + #ifndef _WIN32_WCE +-#include <boost/program_options.hpp> ++# ifndef Q_MOC_RUN ++# include <boost/program_options.hpp> ++# endif + #endif + + class QCoreApplication; + diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 0c302fd47..b0685b62c 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185605 2013-05-15 22:40:19Z andrea $ +# $Id: PKGBUILD 188524 2013-06-15 07:43:53Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,7 +6,7 @@ pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org/" @@ -22,11 +22,19 @@ optdepends=("libgpod: support for Apple iPod audio devices" "libmygpo-qt: gpodder.net Internet Service" "clamz: allow to download songs from Amazon.com") install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d') - -build() { +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'kde411.patch') +sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d' + 'c2fd0153ec622fccac47ebd31a1b0548c6222541') + +prepare() { mkdir build + + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/kde411.patch +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/amarok/kde411.patch b/extra/amarok/kde411.patch new file mode 100644 index 000000000..8099a4432 --- /dev/null +++ b/extra/amarok/kde411.patch @@ -0,0 +1,35 @@ +commit e899704b3db4af2ff228eb0d4dbbec05fb9a2448 +Author: Hrvoje Senjan <hrvoje.senjan@gmail.com> +Date: Mon Jun 10 09:26:37 2013 +0200 + + Remove usage of (fake) Amarok-Mockup theme + + This is due to https://bugs.kde.org/show_bug.cgi?id=320855 + Amarok-Mockup is unused, as far i can see, and also makes Amarok crash with kdelibs master/4.11 + If it is still needed, or there is a better solution, i'll discard the review... + + From 6b85a2899a30db5acebee92182a67778499a8d9e Mon Sep 17 00:00:00 2001 + From: Hrvoje Senjan <hrvoje.senjan@gmail.com> + Date: Sun, 9 Jun 2013 19:55:58 +0200 + Subject: [PATCH 1/1] Kill Amarok-Mockup + + BUG: 320855 + FIXED-IN: 2.8 + REVIEW: 110917 + +diff --git a/src/context/ContextView.cpp b/src/context/ContextView.cpp +index f61518f..152f8da 100644 +--- a/src/context/ContextView.cpp ++++ b/src/context/ContextView.cpp +@@ -78,11 +78,6 @@ ContextView::ContextView( Plasma::Containment *cont, Plasma::Corona *corona, QWi + p.setColor( QPalette::Base, c ); + setPalette( p ); + +- PERF_LOG( "Accessing Plasma::Theme" ); +- // here we initialize all the Plasma paths to Amarok paths +- Plasma::Theme::defaultTheme()->setUseGlobalSettings( false ); +- Theme::defaultTheme()->setThemeName( "Amarok-Mockup" ); +- PERF_LOG( "Access to Plasma::Theme complete" ) + contextScene()->setAppletMimeType( "text/x-amarokappletservicename" ); + + cont->setPos( 0, 0 ); diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 53e3e6a6d..454f3bd4d 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184360 2013-05-06 19:36:35Z foutrelis $ +# $Id: PKGBUILD 188084 2013-06-08 17:28:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10802 +pkgver=10803 pkgrel=2 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('46bbfbfba0af431b6baa0c30bd35600c') +md5sums=('febf14f5b1185f25acde64f61b78ed38') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index ade163a66..85cee7edc 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186137 2013-05-21 08:51:28Z heftig $ +# $Id: PKGBUILD 188637 2013-06-17 09:36:56Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgbase=anjuta pkgname=('libanjuta' 'anjuta') -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme v url="http://www.anjuta.org/" options=('!libtool' '!emptydirs') source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('06afea1de911067419b774eda2548a729668f93c5463726b353f5db686493f95') +sha256sums=('eea77ef71dd156a2296cbaf02a343f3b9099aec245ee7d1495f002ff2f81fa17') build() { cd "$pkgbase-$pkgver" diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index a119da557..6602b518b 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 180169 2013-03-18 14:04:21Z jgc $ +# $Id: PKGBUILD 187049 2013-06-03 11:16:09Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache pkgver=2.2.24 -pkgrel=1 +pkgrel=3 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64' 'mips64el') options=('!libtool') url='http://www.apache.org/dist/httpd' license=('APACHE') -backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf +backup=(etc/httpd/conf/httpd.conf etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf @@ -36,11 +36,10 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 apache.conf.d apache.tmpfiles.conf httpd.logrotate - httpd httpd.service arch.layout) md5sums=('91bd1484aca13a7095d6432be37fc7ae' - 'f8f0d879b5fda028aad7ac9f329e057b' + 'SKIP' 'f1d9d41360908ceb2374da55ae99197a' 'cdfa04985a0efa850976aef01c2a0c40' '0930d2d0612eb0a53a0d00aea7e8687f' @@ -54,10 +53,9 @@ md5sums=('91bd1484aca13a7095d6432be37fc7ae' '4ac64df6e019edbe137017cba1ff2f51' '08b3c875f6260644f2f52b4056d656b0' '82068753dab92fe86312b1010a2904d7' - '6382331e9700ed9e8cc78ea51887b537' - 'c7e300a287ef7e2e066ac7639536f87e' - 'ed219c8228d4d5ae9b7a55107cf79706' - '3d659d41276ba3bfcb20c231eb254e0c') + '13dbaaf949c5bc36cfcf5718b95cb020' + 'a823bb355c136fd0e2b3fb820e2d903c' + '6b7122245a67597230a3b3f317eaf34e') build() { cd "${srcdir}/httpd-${pkgver}" @@ -71,31 +69,41 @@ build() { cat "${srcdir}/arch.layout" >> config.layout + cd .. + cp -r httpd-${pkgver} httpd-itk-${pkgver} + + cd httpd-itk-${pkgver} + + # Fix patch to apply with latest Apache version + sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch" + + mkdir -p server/mpm/experimental/itk + cp -r server/mpm/prefork/* server/mpm/experimental/itk/ + mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c + + patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch" + patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch" + patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch" + patch -Np1 -i "${srcdir}/05-add-copyright.patch" + patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch" + patch -Np1 -i "${srcdir}/07-base-functionality.patch" + patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch" + patch -Np1 -i "${srcdir}/09-capabilities.patch" + patch -Np1 -i "${srcdir}/10-nice.patch" + patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch" + + autoconf + cd .. for mpm in prefork worker itk; do if [ "${mpm}" = "itk" ]; then - # Fix patch to apply with latest Apache version - sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch" - - mkdir -p server/mpm/experimental/itk - cp -r server/mpm/prefork/* server/mpm/experimental/itk/ - mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c - - patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch" - patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch" - patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch" - patch -Np1 -i "${srcdir}/05-add-copyright.patch" - patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch" - patch -Np1 -i "${srcdir}/07-base-functionality.patch" - patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch" - patch -Np1 -i "${srcdir}/09-capabilities.patch" - patch -Np1 -i "${srcdir}/10-nice.patch" - patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch" - - autoconf + CONFIGURE=../httpd-itk-${pkgver}/configure + else + CONFIGURE=../httpd-${pkgver}/configure fi + mkdir build-${mpm} pushd build-${mpm} - ../configure --enable-layout=Arch \ + $CONFIGURE --enable-layout=Arch \ --enable-modules=all \ --enable-mods-shared=all \ --enable-so \ @@ -103,7 +111,7 @@ build() { --with-suexec-caller=http \ --with-suexec-docroot=/srv/http \ --with-suexec-logfile=/var/log/httpd/suexec.log \ - --with-suexec-bin=/usr/sbin/suexec \ + --with-suexec-bin=/usr/bin/suexec \ --with-suexec-uidmin=99 --with-suexec-gidmin=99 \ --enable-ldap --enable-authnz-ldap \ --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \ @@ -117,15 +125,19 @@ build() { --with-pcre=/usr \ --with-mpm=${mpm} make - if [ "${mpm}" = "prefork" ]; then - make DESTDIR="${pkgdir}" install - else - install -m755 httpd "${pkgdir}/usr/sbin/httpd.${mpm}" - fi popd done +} + +package() { + cd "${srcdir}" + cd build-prefork + make DESTDIR="${pkgdir}" install + cd .. + + install -m755 build-worker/httpd "${pkgdir}/usr/bin/httpd.worker" + install -m755 build-itk/httpd "${pkgdir}/usr/bin/httpd.itk" - install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd" install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd" install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache" install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf" @@ -149,9 +161,7 @@ build() { rm -rf "${pkgdir}/usr/share/httpd/manual" rm -rf "${pkgdir}/etc/httpd/conf/original" rm -rf "${pkgdir}/srv/" - rm -rf "${pkgdir}/usr/bin" - rm -rf "${pkgdir}/var/run" - + rm -rf "${pkgdir}/run" install -m755 -d "${pkgdir}/usr/lib/systemd/system" install -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/" diff --git a/extra/apache/arch.layout b/extra/apache/arch.layout index ab59db84b..d5d2e8a08 100644 --- a/extra/apache/arch.layout +++ b/extra/apache/arch.layout @@ -2,7 +2,7 @@ prefix: /etc/httpd exec_prefix: /usr bindir: /usr/bin - sbindir: /usr/sbin + sbindir: /usr/bin libdir: /usr/lib/httpd libexecdir: /usr/lib/httpd/modules mandir: /usr/share/man @@ -16,7 +16,7 @@ cgidir: /srv/http/cgi-bin includedir: /usr/include/httpd localstatedir: /var - runtimedir: /var/run/httpd + runtimedir: /run/httpd logfiledir: /var/log/httpd proxycachedir: /var/cache/httpd </Layout>
\ No newline at end of file diff --git a/extra/apache/httpd b/extra/apache/httpd deleted file mode 100755 index 6fa9c3cc7..000000000 --- a/extra/apache/httpd +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -daemon_name=httpd - -. /etc/rc.conf -. /etc/rc.d/functions - -APACHECTL=/usr/sbin/apachectl - -case "$1" in - start) - stat_busy "Starting Apache Web Server" - [ ! -d /var/run/httpd ] && install -d /var/run/httpd - if $APACHECTL start >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Apache Web Server" - if $APACHECTL stop >/dev/null ; then - rm_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - reload) - stat_busy "Reloading Apache Web Server" - if $APACHECTL graceful >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - restart) - stat_busy "Restarting Apache Web Server" - if $APACHECTL restart >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - status) - stat_busy "Checking Apache Web Server status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|reload|restart|status}" -esac - -exit 0 diff --git a/extra/apache/httpd.logrotate b/extra/apache/httpd.logrotate index a723d20d2..c9755de14 100644 --- a/extra/apache/httpd.logrotate +++ b/extra/apache/httpd.logrotate @@ -1,6 +1,6 @@ /var/log/httpd/*log { missingok postrotate - /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true endscript } diff --git a/extra/apache/httpd.service b/extra/apache/httpd.service index bb02b5992..247e28fba 100644 --- a/extra/apache/httpd.service +++ b/extra/apache/httpd.service @@ -5,9 +5,9 @@ After=network.target remote-fs.target nss-lookup.target [Service] Type=forking PIDFile=/run/httpd/httpd.pid -ExecStart=/usr/sbin/apachectl start -ExecStop=/usr/sbin/apachectl graceful-stop -ExecReload=/usr/sbin/apachectl graceful +ExecStart=/usr/bin/apachectl start +ExecStop=/usr/bin/apachectl graceful-stop +ExecReload=/usr/bin/apachectl graceful PrivateTmp=true LimitNOFILE=infinity diff --git a/extra/arora/PKGBUILD b/extra/arora/PKGBUILD index ce7012596..c84d829b7 100644 --- a/extra/arora/PKGBUILD +++ b/extra/arora/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 145325 2011-12-21 20:47:00Z andrea $ +# $Id: PKGBUILD 188497 2013-06-15 04:38:48Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=arora pkgver=0.11.0 -pkgrel=3.1 +pkgrel=4 pkgdesc='Lightweight cross-platform Web browser' -url='http://www.arora-browser.org/' +url='http://code.google.com/p/arora/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('qtwebkit' 'desktop-file-utils') @@ -18,7 +18,7 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - qmake PREFIX='/usr' 'CONFIG-=debug' -r + qmake-qt4 PREFIX='/usr' 'CONFIG-=debug' -r make } diff --git a/extra/arora/install b/extra/arora/install index 6c87527e2..b0409600c 100644 --- a/extra/arora/install +++ b/extra/arora/install @@ -1,6 +1,6 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor &> /dev/null || true + update-desktop-database -q || true } post_upgrade() { diff --git a/extra/aspell-pt/PKGBUILD b/extra/aspell-pt/PKGBUILD index 45b4196a8..8d4d68058 100644 --- a/extra/aspell-pt/PKGBUILD +++ b/extra/aspell-pt/PKGBUILD @@ -1,13 +1,11 @@ -# $Id: PKGBUILD 171362 2012-11-17 09:56:22Z eric $ +# $Id: PKGBUILD 188442 2013-06-14 04:11:14Z eric $ # Maintainer: -# Contributor: Simo Leone <simo@archlinux.org> -# Contributor: jlvsimoes <jlvsimoes@oninet.pt> pkgname=aspell-pt -_pkgverPT=20070510 +_pkgverPT=20130331 _pkgverBR=20090702 -pkgver=$_pkgverBR -pkgrel=4 +pkgver=$_pkgverPT +pkgrel=1 pkgdesc="Portuguese and Brazilian Portuguese dictionary for aspell" arch=('i686' 'x86_64' 'mips64el') url="http://aspell.net/" @@ -16,25 +14,34 @@ depends=('aspell') conflicts=('aspell-pt_br') replaces=('aspell-pt_br') source=(ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgverBR-0.tar.bz2 - ftp://ftp.gnu.org/gnu/aspell/dict/pt_PT/aspell6-pt_PT-$_pkgverPT-0.tar.bz2) + http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-$_pkgverPT.tar.bz2 + http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-preao-$_pkgverPT.tar.bz2) sha1sums=('add1db9a6a908dccaad13a7fd85c3b202299ff26' - 'e136c2f411b582897437b06b9068c98ee333be41') + '694b35b1a6fcb90ff808b730a4513ff283e1ceee' + 'fa164ac44adc4544c7fdbb3dc5c146c28f30525a') build() { - cd "$srcdir/aspell6-pt_BR-$_pkgverBR-0" + cd aspell6-pt_BR-$_pkgverBR-0 ./configure make - cd "$srcdir/aspell6-pt_PT-$_pkgverPT-0" + cd ../aspell6-pt_PT-$_pkgverPT-0 + ./configure + make + + cd ../aspell6-pt_PT-preao-$_pkgverPT-0 ./configure make } package() { - cd "$srcdir/aspell6-pt_BR-$_pkgverBR-0" + cd aspell6-pt_BR-$_pkgverBR-0 + make DESTDIR="$pkgdir" install + + cd ../aspell6-pt_PT-$_pkgverPT-0 make DESTDIR="$pkgdir" install - cd "$srcdir/aspell6-pt_PT-$_pkgverPT-0" + cd ../aspell6-pt_PT-preao-$_pkgverPT-0 make DESTDIR="$pkgdir" install echo "add pt_BR.multi" > "$pkgdir"/usr/lib/aspell-0.60/brasileiro.alias diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD index 66c49f488..ee4b8ed79 100644 --- a/extra/asymptote/PKGBUILD +++ b/extra/asymptote/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169579 2012-10-23 20:01:18Z remy $ +# $Id: PKGBUILD 187088 2013-06-03 15:58:10Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: Firmicus <francois.archlinux.org> # Contributor: bender02 at gmx dot com pkgname=asymptote -pkgver=2.21 +pkgver=2.23 pkgrel=1 pkgdesc="A vector graphics language (like metapost)" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ optdepends=('python2: for the xasy GUI' 'tix: for the xasy GUI') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz) install=texlive.install -sha1sums=('946269c63b7aa3a7d2875f5faa8a0b8d3d36628c') +sha1sums=('c24de9766ae7195c1cda947f9d2ae07497a0af8f') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -27,7 +27,8 @@ build() { ./configure --enable-gc=/usr \ --prefix=/usr \ --with-latex=/usr/share/texmf/tex/latex \ - --with-context=/usr/share/texmf/tex/context + --with-context=/usr/share/texmf/tex/context \ + --enable-offscreen make all } diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD index fdf102f79..792a1ecfe 100644 --- a/extra/attica/PKGBUILD +++ b/extra/attica/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178948 2013-03-01 10:19:16Z andrea $ +# $Id: PKGBUILD 188216 2013-06-13 06:07:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=attica -pkgver=0.4.1 -pkgrel=2 +pkgver=0.4.2 +pkgrel=1 pkgdesc='A Qt library that implements the Open Collaboration Services API' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kdesupport/attica' @@ -11,11 +11,9 @@ license=('LGPL') depends=('qt4') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b90983ec5d79e5ddcbc9146fa23cab72') +md5sums=('d62c5c9489a68432e8d990dde7680c24') build() { - . /etc/profile.d/qt4.sh - mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD index e1ce414c6..2d145eddb 100644 --- a/extra/autogen/PKGBUILD +++ b/extra/autogen/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179949 2013-03-13 11:07:49Z jgc $ +# $Id: PKGBUILD 188076 2013-06-08 11:18:21Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soufly.nl> # Contributor: Tor Krill pkgname=autogen -pkgver=5.17.2 +pkgver=5.17.4 pkgrel=1 pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ depends=('guile' 'libxml2') options=('!libtool') install=autogen.install source=(http://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('567dd065d24294c5c31517e399c2fcf5' - 'af72d4d6f27486366e7712c41f61b8fa') +md5sums=('09b031866b7d89f0532b6c3168d67c59' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD index d1dfe3337..b5489bdad 100644 --- a/extra/bftpd/PKGBUILD +++ b/extra/bftpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165789 2012-08-29 23:52:16Z thomas $ +# $Id: PKGBUILD 187832 2013-06-06 18:31:08Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=bftpd -pkgver=3.8 -pkgrel=2 +pkgver=4.0 +pkgrel=1 pkgdesc="Small, easy-to-configure FTP server" arch=(i686 x86_64 'mips64el') url="http://bftpd.sourceforge.net/" @@ -15,15 +15,13 @@ backup=(etc/bftpd.conf etc/pam.d/bftpd etc/xinetd.d/bftpd) source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz - bftpd.rc bftpd.logrotate bftpd.pam bftpd.xinetd bftpd.service bftpd.socket bftpd_AT.service) -md5sums=('880c1274e623ddd1e3e37f9f0cf09d70' - '2419d7293000813f9d01bd357181445c' +md5sums=('34bac87bb196ae823fa2b4731dfa9383' '853680dad0df39d0b4d2fb43d4be430a' '96f82c38f3f540b53f3e5144900acf17' '23feb84e8ecbae5df320b49e01821d9a' @@ -35,6 +33,7 @@ build() { cd "${srcdir}"/$pkgname # The bftpd author keeps screwing up the release tarballs rm -f config.{cache,status} + autoreconf sed 's|$(prefix)/sbin|$(prefix)/bin|g' -i Makefile.in ./configure --prefix=/usr \ --enable-pam \ @@ -47,7 +46,6 @@ package() { cd "${srcdir}"/$pkgname install -d -m755 "${pkgdir}"/usr/{bin,share/man/man8} install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd - install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd make DESTDIR="${pkgdir}" install # Remove log file and /var/run from the package # This guy keeps messing up his Makefile, /usr/var, wtf? diff --git a/extra/bftpd/bftpd.rc b/extra/bftpd/bftpd.rc deleted file mode 100755 index 4784ae28a..000000000 --- a/extra/bftpd/bftpd.rc +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PIDFILE="/var/run/bftpd.pid" - -case "$1" in - start) - stat_busy "Starting bftpd Server" - PID="$(pidof -o %PPID /usr/bin/bftpd)" - if [ -z "$PID" ]; then - /usr/bin/bftpd -d - if [ $? -gt 0 ]; then - stat_fail - else - # wait until it forks - sleep 2 - echo $(pidof -o %PPID /usr/bin/bftpd) > $PIDFILE - add_daemon bftpd - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping bftpd Server" - if [ -f $PIDFILE ] && kill -0 $(cat $PIDFILE); then - kill -15 $(cat $PIDFILE) - rm $PIDFILE - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD deleted file mode 100644 index 12dec55a7..000000000 --- a/extra/bluez-hcidump/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 157961 2012-04-30 07:30:22Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Geoffroy carrier <geoffroy@archlinux.org> - -pkgname=bluez-hcidump -pkgver=2.4 -pkgrel=1.1 -pkgdesc="Bluetooth HCI package analyzer" -url="http://www.bluez.org/" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -depends=('bluez') -source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz") -md5sums=('d39833de0ed26bddf784e9580b6f33c4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index fc4d04b4e..bd2a60214 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,83 +1,75 @@ -# $Id: PKGBUILD 162308 2012-06-24 20:46:50Z tomegun $ +# $Id: PKGBUILD 188424 2013-06-13 21:55:40Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> -pkgname=bluez -pkgver=4.101 -pkgrel=1.1 -pkgdesc="Libraries and tools for the Bluetooth protocol stack" +pkgbase=bluez +pkgname=('bluez' 'bluez-utils' 'bluez-libs') +pkgver=5.5 +pkgrel=3 url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('dbus-core' 'python2' 'systemd-tools') -makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx') -optdepends=("gstreamer0.10-base: bluetooth GStreamer support" - "alsa-lib: Audio bluetooth devices support" - "dbus-python: to run bluez-simple-agent" - "pygobject: to run bluez-simple-agent" - "libusb-compat: USB adapters support" - "cups: CUPS backend") -conflicts=('bluez-libs' 'bluez-utils') -provides=('bluez-libs' 'bluez-utils') -replaces=('bluez-libs' 'bluez-utils') -options=('!libtool') -backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf - 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') -source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" - 'bluetooth.conf.d' - 'rc.bluetooth') +makedepends=('libusb-compat' 'dbus' 'libical' 'systemd') +options=(!libtool) +source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2") build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/lib \ - --enable-gstreamer \ - --enable-alsa \ - --enable-usb \ - --enable-tools \ - --enable-bccmd \ - --enable-dfutool \ - --enable-hid2hci \ - --enable-hidd \ - --enable-pand \ - --enable-dund \ - --enable-cups \ - --enable-wiimote \ - --disable-test \ - --with-systemdunitdir=/usr/lib/systemd/system + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --enable-library # this is deprecated make } -package() { +package_bluez() { + pkgdesc="Daemons for the bluetooth protocol stack" + depends=('libical' 'dbus' 'glib2') + optdepends=("cups: CUPS backend") + backup=('etc/dbus-1/system.d/bluetooth.conf') + conflicts=('obexd-client' 'obexd-server') + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth - - install -d ${pkgdir}/etc/bluetooth - install -m644 network/network.conf \ - input/input.conf \ - audio/audio.conf \ - serial/serial.conf \ - ${pkgdir}/etc/bluetooth/ - - install -Dm644 ${srcdir}/bluetooth.conf.d \ - ${pkgdir}/etc/conf.d/bluetooth + ### split out bluez-utils + rm -rf "$srcdir/_utils" + install -dm755 "$srcdir"/_utils/usr/share/man + mv "$pkgdir"/usr/share/man/man1 "$srcdir"/_utils/usr/share/man/ + install -dm755 "$srcdir"/_utils/usr/bin + mv "$pkgdir"/usr/bin/{bccmd,ciptool,hciattach,hciconfig,hcidump,hcitool,l2ping,l2test,rctest,rfcomm,sdptool}\ + "$srcdir"/_utils/usr/bin/ + install -dm755 "$srcdir"/_utils/usr/lib + mv "$pkgdir"/usr/lib/udev "$srcdir"/_utils/usr/lib/ + + ### split out bluez-libs + rm -rf "$srcdir/_libs" + install -dm755 "$srcdir"/_libs/usr/lib/ + mv "$pkgdir"/usr/lib/{pkgconfig,libbluetooth*} \ + "$srcdir"/_libs/usr/lib/ + mv "$pkgdir"/usr/include \ + "$srcdir"/_libs/usr/ +} + +package_bluez-libs() { + pkgdesc="Deprecated libraries for the bluetooth protocol stack" + depends=('glibc') + + mv "$srcdir/_libs"/* "$pkgdir" +} +package_bluez-utils() { + pkgdesc="Development and debugging utilities for the bluetooth protocol stack" + depends=('systemd' 'libusb-compat') + conflicts=('bluez-hcidump') + provides=('bluez-hcidump') + replaces=('bluez-hcidump' 'bluez<=4.101') - # FS#27630 - install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent - install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device - install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input - sed -i 's#/usr/bin/python#/usr/bin/python2#' \ - "${pkgdir}"/usr/bin/bluez-simple-agent \ - "${pkgdir}"/usr/bin/bluez-test-device \ - "${pkgdir}"/usr/bin/bluez-test-input + mv "$srcdir/_utils"/* "$pkgdir" } -md5sums=('902b390af95c6c5d6d1a17d94c8344ab' - '7412982b440f29fa7f76a41a87fef985' - '864cbd24e6efc3592e9284b0b5fb2cfd') +md5sums=('cfe6bd2f7f3f45f689b3a21a6ba59edd') diff --git a/extra/bluez/bluetooth.conf.d b/extra/bluez/bluetooth.conf.d deleted file mode 100644 index 1c1e02589..000000000 --- a/extra/bluez/bluetooth.conf.d +++ /dev/null @@ -1,30 +0,0 @@ -# Bluetooth configuraton file - -# Bluetooth services (allowed values are "true" and "false") - -# Run the bluetoothd daemon (default: true) -#DAEMON_ENABLE="false" - -# Run the sdp daemon (default: false) -# If this is disabled, hcid's internal sdp daemon will be used -#SDPD_ENABLE="true" - -# Run the bluetooth HID daemon (default: false) -#HIDD_ENABLE="true" - -# Activate rfcomm ports (default: false) -#RFCOMM_ENABLE="true" - -# Run bluetooth dial-up networking daemon (default: false) -#DUND_ENABLE="true" - -# Run bluetooth PAN daemon (default: false) -#PAND_ENABLE="true" - -# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf) -#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -# Options for hidd, dund and pand (default: none) -HIDD_OPTIONS="--server" -#DUND_OPTIONS="" -#PAND_OPTIONS="" diff --git a/extra/bluez/rc.bluetooth b/extra/bluez/rc.bluetooth deleted file mode 100644 index 0feeaeab6..000000000 --- a/extra/bluez/rc.bluetooth +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash -# -# Start/stop the Bluetooth daemons -# - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="bluetoothd" -HIDD_NAME="hidd" -RFCOMM_NAME="rfcomm" -PAND_NAME="pand" -DUND_NAME="dund" - -DAEMON_EXEC="/usr/sbin/bluetoothd" -HIDD_EXEC="/usr/bin/hidd" -RFCOMM_EXEC="/usr/bin/rfcomm" -PAND_EXEC="/usr/bin/pand" -DUND_EXEC="/usr/bin/dund" - -DAEMON_ENABLE="true" -HIDD_ENABLE="false" -RFCOMM_ENABLE="false" -PAND_ENABLE="false" -DUND_ENABLE="false" - -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -HIDD_OPTIONS="" -PAND_OPTIONS="" -DUND_OPTIONS="" - -[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth - -case "$1" in - start) - stat_busy "Starting bluetooth subsystem:" - if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then - stat_append " $DAEMON_NAME" - $DAEMON_EXEC - sleep 1 - fi - if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then - stat_append " $HIDD_NAME" - $HIDD_EXEC $HIDD_OPTIONS - fi - if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all - fi - if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then - stat_append " $PAND_NAME" - $PAND_EXEC $PAND_OPTIONS - fi - if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then - stat_append " $DUND_NAME" - $DUND_EXEC $DUND_OPTIONS - fi - add_daemon bluetooth - stat_done - ;; - stop) - stat_busy "Stopping bluetooth subsystem:" - - stat_append " $DUND_NAME" - killall $DUND_NAME >/dev/null 2>&1 - - stat_append " $PAND_NAME" - killall $PAND_NAME >/dev/null 2>&1 - - if [ -x "$RFCOMM_EXEC" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC release all >/dev/null 2>&1 - fi - - stat_append " $HIDD_NAME" - killall $HIDD_NAME >/dev/null 2>&1 - - stat_append " $DAEMON_NAME" - killall $DAEMON_NAME >/dev/null 2>&1 - - rm_daemon bluetooth - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/bluez4/PKGBUILD b/extra/bluez4/PKGBUILD new file mode 100644 index 000000000..4d95290c3 --- /dev/null +++ b/extra/bluez4/PKGBUILD @@ -0,0 +1,88 @@ +# $Id: PKGBUILD 188425 2013-06-13 21:55:41Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> + +pkgname=bluez4 +pkgver=4.101 +pkgrel=3 +pkgdesc="Deprecated daemon and tools for the Bluetooth protocol stack" +url="http://www.bluez.org/" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('dbus' 'bluez-utils') +conflicts=('bluez') +replaces=("bluez<=$pkgver") +makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx') +optdepends=("gstreamer0.10-base: bluetooth GStreamer support" + "alsa-lib: Audio bluetooth devices support" + "python2: to run bluez-simple-agent" + "dbus-python: to run bluez-simple-agent" + "pygobject: to run bluez-simple-agent" + "libusb-compat: USB adapters support" + "cups: CUPS backend") +options=('!libtool') +backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf + etc/dbus-1/system.d/bluetooth.conf) +source=("http://www.kernel.org/pub/linux/bluetooth/bluez-${pkgver}.tar.bz2") + +build() { + cd bluez-"${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --sbindir=/usr/lib/bluetooth \ + --enable-gstreamer \ + --enable-alsa \ + --enable-usb \ + --enable-dfutool \ + --enable-dund \ + --enable-hidd \ + --enable-pand \ + --enable-gatt \ + --enable-cups \ + --enable-wiimote \ + --disable-test \ + --with-systemdunitdir=/usr/lib/systemd/system + + make +} + +package() { + cd bluez-"${pkgver}" + make DESTDIR=${pkgdir} install + + # adjust systemd service file + sed -i 's#/usr/sbin/#/usr/lib/bluetooth/#' \ + "${pkgdir}"/usr/lib/systemd/system/bluetooth.service + + install -d ${pkgdir}/etc/bluetooth + install -m644 network/network.conf \ + input/input.conf \ + audio/audio.conf \ + serial/serial.conf \ + ${pkgdir}/etc/bluetooth/ + + # FS#27630 + install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent + install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device + install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input + sed -i 's#/usr/bin/python#/usr/bin/python2#' \ + "${pkgdir}"/usr/bin/bluez-simple-agent \ + "${pkgdir}"/usr/bin/bluez-test-device \ + "${pkgdir}"/usr/bin/bluez-test-input + + # drop files that are in bluez-libs + rm -rf "${pkgdir}"/usr/{include,lib/pkgconfig} + rm "${pkgdir}"/usr/lib/libbluetooth* + + # drop files that are in bluez-utils + rm -rf "${pkgdir}"/lib + rm "${pkgdir}"/usr/bin/{ciptool,hcitool,l2ping,rfcomm,sdptool} + rm "${pkgdir}"/usr/share/man/man1/{ciptool,hcitool,rfcomm,sdptool}.1 + rm "${pkgdir}"/usr/lib/bluetooth/{hciattach,hciconfig} + rm "${pkgdir}"/usr/share/man/man8/{hciattach,hciconfig}.8 +} +md5sums=('902b390af95c6c5d6d1a17d94c8344ab') diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index e1aca1de3..29c1c5e1c 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 183561 2013-04-23 13:10:19Z tomegun $ +# $Id: PKGBUILD 187859 2013-06-07 09:24:55Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=brltty pkgver=4.5 -pkgrel=3 +pkgrel=4 pkgdesc="Braille display driver for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://mielke.cc/brltty" license=(GPL LGPL) depends=(libxaw gpm icu tcl cython) -makedepends=(bluez at-spi2-core) -optdepends=('bluez: bluetooth support' +makedepends=(bluez-libs at-spi2-core) +optdepends=('bluez-libs: bluetooth support' 'at-spi2-core: X11/GNOME Apps accessibility' 'atk: ATK bridge for X11/GNOME accessibility') backup=(etc/brltty.conf) diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD index 8deae238c..ec409f8b9 100644 --- a/extra/caribou/PKGBUILD +++ b/extra/caribou/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183337 2013-04-21 22:08:38Z heftig $ +# $Id: PKGBUILD 187111 2013-06-04 04:29:06Z heftig $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Adam Hani Schakaki <krzd@krzd.net> pkgname=caribou -pkgver=0.4.10 +pkgver=0.4.11 pkgrel=1 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard." arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=(intltool docbook-xsl gtk2) install=caribou.install options=(!libtool !emptydirs) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) -sha256sums=('6480ce3a87cf4f01dd1fb52edbb31a2aa9f5573a0860b67115c86bbcd7b17865') +sha256sums=('e4e81387a1a6875652b8ec9dede8573844fac274c8de9ad0416cf586a318f4f9') build() { cd $pkgname-$pkgver @@ -25,6 +25,10 @@ build() { --disable-gtk2-module \ --disable-static \ --disable-schemas-compile + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 35d1b4d71..e0a9df0fd 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186227 2013-05-22 10:21:47Z andrea $ +# $Id: PKGBUILD 187917 2013-06-08 07:00:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake -pkgver=2.8.11 +pkgver=2.8.11.1 pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,15 @@ depends=('curl' 'libarchive' 'shared-mime-info') makedepends=('qt4' 'emacs') optdepends=('qt4: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('be6008f2299613d23fe82ab53ef7472e') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" + 'imagemagick.patch') +md5sums=('df5324a3b203373a9e0a04b924281a43' + '19c4cf0e6e9c9a890f3698c9df8062f1') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/imagemagick.patch +} build() { cd ${pkgname}-${pkgver} diff --git a/extra/cmake/imagemagick.patch b/extra/cmake/imagemagick.patch new file mode 100644 index 000000000..8e5279030 --- /dev/null +++ b/extra/cmake/imagemagick.patch @@ -0,0 +1,27 @@ +From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001 +From: Funda Wang <fundawang@gmail.com> +Date: Tue, 28 May 2013 06:17:49 +0000 +Subject: [PATCH] FindImageMagick: Find v6 include dir (#14174) + +The header files of ImageMagick are now located at +<prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick. +--- + Modules/FindImageMagick.cmake | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake +index cd97b38..02a5777 100644 +--- a/Modules/FindImageMagick.cmake ++++ b/Modules/FindImageMagick.cmake +@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header) + ${ImageMagick_INCLUDE_DIRS} + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" + PATH_SUFFIXES +- ImageMagick ++ ImageMagick ImageMagick-6 + DOC "Path to the ImageMagick include dir." + ) + find_library(ImageMagick_${component}_LIBRARY +-- +1.7.0 + diff --git a/extra/cmake/qt4.patch b/extra/cmake/qt4.patch deleted file mode 100644 index 0518681f0..000000000 --- a/extra/cmake/qt4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake-2.8.10.2/Modules/FindQt4.cmake~ 2013-03-07 16:50:35.388399689 +0000 -+++ cmake-2.8.10.2/Modules/FindQt4.cmake 2013-03-07 16:51:35.017991029 +0000 -@@ -497,7 +497,7 @@ - # check for qmake - # Debian uses qmake-qt4 - # macports' Qt uses qmake-mac --find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac -+find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac - PATHS - ENV QTDIR - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" diff --git a/extra/cups-pk-helper/PKGBUILD b/extra/cups-pk-helper/PKGBUILD index b07530b05..a59561d22 100644 --- a/extra/cups-pk-helper/PKGBUILD +++ b/extra/cups-pk-helper/PKGBUILD @@ -1,7 +1,7 @@ -#$Id: PKGBUILD 169617 2012-10-24 17:03:25Z ibiru $ +#$Id: PKGBUILD 188583 2013-06-16 10:29:51Z tomegun $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cups-pk-helper -pkgver=0.2.4 +pkgver=0.2.5 pkgrel=1 pkgdesc="A helper that makes system-config-printer use PolicyKit" arch=(i686 x86_64 'mips64el') @@ -10,7 +10,7 @@ license=('GPL') depends=(polkit libcups) makedepends=(intltool) source=(http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.xz) -sha256sums=('d187dc994ff64621aa090d114170b292daa11122481d8b8adb7613b32ca4e3c3') +sha256sums=('19221eed65a1e1498d396f3f99a783a95b21b4385e63b57a1f16e8728b8ca118') build() { cd $pkgname-$pkgver diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index b598ce0f3..9c7fb3531 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,29 +1,56 @@ -# $Id: PKGBUILD 185777 2013-05-18 15:46:13Z andyrtr $ +# $Id: PKGBUILD 188723 2013-06-18 15:31:30Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.6.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd') -source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 +source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 + http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.gz + cups.logrotate cups.pam + # improve build and linking cups-no-export-ssllibs.patch cups-no-gcrypt.patch cups-no-gzip-man.patch + # FC cups-systemd-socket.patch - cups.logrotate cups.pam) + cups-dbus-utf8.patch + cups-res_init.patch + cups-avahi-address.patch + cups-enum-all.patch + # Gentoo + cups-1.6.0-fix-install-perms.patch + cups-1.6.2-statedir.patch + # Debian + usb-backend-more-quirk-rules.patch + cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch + get-ppd-file-for-statically-configured-ipp-shared-queues.patch + ppd-poll-with-client-conf.patch + usb-backend-do-not-crash-if-usb-disabled-in-bios.patch) #options=('!emptydirs') -md5sums=('13c8b2b2336d42001abe4899766b62dc' +md5sums=('8b8e40560b67e28607b1f04dafd9a94d' + 'f861b18f4446c43918c8643dcbbd7f6d' + '96f82c38f3f540b53f3e5144900acf17' '3ba9e3410df1dc3015463d615ef91b3b' 'cc4101beccb5ed6deb1c92707a575925' '90c30380d4c8cd48a908cfdadae1ea24' 'b4868b83f7f2d6ec24a1be76509379f0' - 'f861b18f4446c43918c8643dcbbd7f6d' - '96f82c38f3f540b53f3e5144900acf17') + 'a2a88b3a3257c3b5fd3edcc169e6aca4' + '8fe27d4248cacbc02824e7937cab4088' + 'df0c367c0022e3c7d8e01827e8a6c5e7' + 'f30c2a161caaf27854581507cde8cac6' + '5117f65342fcc69c6a506529e4daca9e' + '9247e218eea94ebda0aebc8ee0e77db8' + '52675e2d7a7f77005f1fc0212b86dbe3' + 'cb58bf4e0b80eaee383712e5c84a1ab4' + 'b578bcd17949a7203237ba1e31f78ef9' + '0becd6ab8782b97f19a02c1dc174c75e' + 'f1f0ee65296d438a8c83467ff03f652d') build() { cd ${srcdir}/${pkgbase}-${pkgver} @@ -40,6 +67,36 @@ build() { # don't zip man pages in make install, let makepkg do that / Fedora patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch + + + # various bugfixes (upstream reports/SVN or Fedora/Debian + + # Ensure attributes are valid UTF-8 in dbus notifier + patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch + + # More USB quirks for the libusb-based backend (STR #4311) + # Fixed in 1.6.3 + patch -Np1 -i ${srcdir}/usb-backend-more-quirk-rules.patch + # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll. + patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch + # Applications could not get the PPD file for statically-configured IPP-shared print queues + patch -Np1 -i ${srcdir}/get-ppd-file-for-statically-configured-ipp-shared-queues.patch + # If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs + # for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server Bug: http://www.cups.org/str.php?L2763 + patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch + # Add more error handling to the libusb-based USB backend, especially to avoid a crash when USB is disabled in the BIOS. Also + # discard that error when counting warning messages. + patch -Np1 -i ${srcdir}/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch + # fix permissions on some files - alternative: cups-0755.patch by FC + patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch + # move /var/run -> /run for pid file + patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch + # Re-initialise the resolver on failure in httpAddrGetList() + patch -Np1 -i ${srcdir}/cups-res_init.patch + # Use IP address when resolving DNSSD URIs + patch -Np1 -i ${srcdir}/cups-avahi-address.patch + # Return from cupsEnumDests() once all records have been returned. + patch -Np1 -i ${srcdir}/cups-enum-all.patch # Rebuild configure script for not zipping man-pages. aclocal -I config-scripts diff --git a/extra/cups/cups-1.6.0-fix-install-perms.patch b/extra/cups/cups-1.6.0-fix-install-perms.patch new file mode 100644 index 000000000..2d7a77c44 --- /dev/null +++ b/extra/cups/cups-1.6.0-fix-install-perms.patch @@ -0,0 +1,25 @@ +Index: Makedefs.in +=================================================================== +--- Makedefs.in (Revision 10520) ++++ Makedefs.in (Arbeitskopie) +@@ -40,14 +40,14 @@ + # Installation programs... + # + +-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ +-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ ++INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ ++INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@ + INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ +-INSTALL_DATA = $(INSTALL) -c -m 444 ++INSTALL_DATA = $(INSTALL) -c -m 644 + INSTALL_DIR = $(INSTALL) -d +-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ +-INSTALL_MAN = $(INSTALL) -c -m 444 +-INSTALL_SCRIPT = $(INSTALL) -c -m 555 ++INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ ++INSTALL_MAN = $(INSTALL) -c -m 644 ++INSTALL_SCRIPT = $(INSTALL) -c -m 755 + + # + # Default user, group, and system groups for the scheduler... diff --git a/extra/cups/cups-1.6.2-statedir.patch b/extra/cups/cups-1.6.2-statedir.patch new file mode 100644 index 000000000..3e836657d --- /dev/null +++ b/extra/cups/cups-1.6.2-statedir.patch @@ -0,0 +1,12 @@ +diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4 +--- cups-1.6.2.orig/config-scripts/cups-directories.m4 2012-10-01 03:55:23.000000000 +0200 ++++ cups-1.6.2/config-scripts/cups-directories.m4 2013-04-02 00:11:41.000000000 +0200 +@@ -429,7 +429,7 @@ + ;; + *) + # All others +- CUPS_STATEDIR="$localstatedir/run/cups" ++ CUPS_STATEDIR="/run/cups" + ;; + esac + AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") diff --git a/extra/cups/cups-avahi-address.patch b/extra/cups/cups-avahi-address.patch new file mode 100644 index 000000000..a03d1adbb --- /dev/null +++ b/extra/cups/cups-avahi-address.patch @@ -0,0 +1,75 @@ +diff -up cups-1.6.2/cups/http-support.c.avahi-address cups-1.6.2/cups/http-support.c +--- cups-1.6.2/cups/http-support.c.avahi-address 2013-03-11 18:44:36.000000000 +0000 ++++ cups-1.6.2/cups/http-support.c 2013-04-04 15:39:06.651847041 +0100 +@@ -2121,7 +2121,7 @@ http_resolve_cb( + const char *type, /* I - Registration type */ + const char *domain, /* I - Domain (unused) */ + const char *hostTarget, /* I - Hostname */ +- const AvahiAddress *address, /* I - Address (unused) */ ++ const AvahiAddress *address, /* I - Address */ + uint16_t port, /* I - Port number */ + AvahiStringList *txt, /* I - TXT record */ + AvahiLookupResultFlags flags, /* I - Lookup flags (unused) */ +@@ -2253,36 +2253,37 @@ http_resolve_cb( + + DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget)); + +- snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port)); +- if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL) ++ int error = getnameinfo(&(address->data), ++ address->proto == AVAHI_PROTO_INET ? ++ sizeof (AvahiIPv4Address) : ++ (address->proto == AVAHI_PROTO_INET6 ? ++ sizeof (AvahiIPv6Address) : ++ sizeof (address->data)), ++ fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); ++ ++ if (!error) + { +- for (addr = addrlist; addr; addr = addr->next) ++ DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn)); ++ ++ if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || ++ _cups_strcasecmp(hostptr, ".local")) + { +- int error = getnameinfo(&(addr->addr.addr), +- httpAddrLength(&(addr->addr)), +- fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); +- +- if (!error) +- { +- DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn)); +- +- if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || +- _cups_strcasecmp(hostptr, ".local")) +- { +- hostTarget = fqdn; +- break; +- } +- } ++ hostTarget = fqdn; ++ } ++ } + #ifdef DEBUG +- else +- DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d", +- httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)), +- error)); ++ else ++ DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d", ++ httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)), ++ error)); + #endif /* DEBUG */ +- } ++ } else { ++ /* ++ * Use the IP address that responded... ++ */ + +- httpAddrFreeList(addrlist); +- } ++ avahi_address_snprint (fqdn, sizeof (fqdn), address); ++ hostTarget = fqdn; + } + + /* diff --git a/extra/cups/cups-dbus-utf8.patch b/extra/cups/cups-dbus-utf8.patch new file mode 100644 index 000000000..0bcd4a163 --- /dev/null +++ b/extra/cups/cups-dbus-utf8.patch @@ -0,0 +1,106 @@ +diff -up cups-1.6.1/notifier/dbus.c.dbus-utf8 cups-1.6.1/notifier/dbus.c +--- cups-1.6.1/notifier/dbus.c.dbus-utf8 2012-01-20 19:00:32.000000000 +0000 ++++ cups-1.6.1/notifier/dbus.c 2012-10-31 11:04:47.686973616 +0000 +@@ -31,6 +31,9 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> ++#include <assert.h> ++#include <locale.h> ++#include <wchar.h> + + #ifdef HAVE_DBUS + # include <dbus/dbus.h> +@@ -157,10 +160,82 @@ enum + * Local functions... + */ + +-static int acquire_lock(int *fd, char *lockfile, size_t locksize); ++static int acquire_lock(int *fd, char *lockfile, size_t locksize); ++static const char *validate_utf8(const char *str); + + + /* ++ * 'validate_utf8()' - Convert to valid UTF-8 ++ */ ++ ++static const char * ++validate_utf8 (const char *str) ++{ ++ static char *buffer = NULL; ++ static size_t buflen = 0; ++ char *p; ++ size_t str_len; ++ unsigned int i; ++ mbstate_t instate, outstate; ++ ++ if (str == NULL) ++ { ++ free (buffer); ++ return (NULL); ++ } ++ ++ /* Is it already valid? */ ++ if (mbstowcs (NULL, str, 0) != (size_t) -1) ++ return str; ++ ++ /* Make sure our buffer is at least as large as the input string */ ++ str_len = strlen (str); ++ if (str_len > buflen) ++ { ++ if (buffer == NULL) ++ /* Set encoding type to UTF-8 the first time we need to */ ++ setlocale (LC_CTYPE, "en_US.UTF-8"); ++ ++ buflen = str_len + 1; ++ buffer = realloc (buffer, buflen); ++ } ++ ++ memset (&instate, '\0', sizeof (mbstate_t)); ++ memset (&outstate, '\0', sizeof (mbstate_t)); ++ p = buffer; ++ i = 0; ++ while (i < str_len) ++ { ++ wchar_t wc; ++ size_t used, written; ++ mbstate_t orig_instate = instate; ++ used = mbrtowc (&wc, str + i, str_len - i, &instate); ++ switch (used) ++ { ++ case (size_t) -2: ++ case (size_t) -1: ++ wc = L'?'; /* so replacement is never longer than original char */ ++ instate = orig_instate; ++ /* fallthru */ ++ case 0: ++ used = 1; ++ } ++ ++ written = wcrtomb (p, wc, &outstate); ++ if (written != -1) ++ { ++ p += written; ++ assert (p - buffer < buflen); ++ } ++ ++ i += used; ++ } ++ ++ *p = '\0'; ++ return buffer; ++} ++ ++/* + * 'main()' - Read events and send DBUS notifications. + */ + +@@ -366,7 +441,7 @@ main(int argc, /* I - Number of comm + attr = ippFindAttribute(msg, "notify-text", IPP_TAG_TEXT); + if (attr) + { +- const char *val = ippGetString(attr, 0, NULL); ++ const char *val = validate_utf8 (ippGetString(attr, 0, NULL)); + if (!dbus_message_iter_append_string(&iter, &val)) + goto bail; + } diff --git a/extra/cups/cups-enum-all.patch b/extra/cups/cups-enum-all.patch new file mode 100644 index 000000000..0ac39835e --- /dev/null +++ b/extra/cups/cups-enum-all.patch @@ -0,0 +1,17 @@ +diff -up cups-1.6.2/cups/dest.c.enum-all cups-1.6.2/cups/dest.c +--- cups-1.6.2/cups/dest.c.enum-all 2013-06-04 10:58:36.169786250 +0100 ++++ cups-1.6.2/cups/dest.c 2013-06-04 10:59:02.147900811 +0100 +@@ -2724,9 +2724,12 @@ cups_dnssd_browse_cb( + break; + + case AVAHI_BROWSER_REMOVE: +- case AVAHI_BROWSER_ALL_FOR_NOW: + case AVAHI_BROWSER_CACHE_EXHAUSTED: + break; ++ ++ case AVAHI_BROWSER_ALL_FOR_NOW: ++ avahi_simple_poll_quit(data->simple_poll); ++ break; + } + } + diff --git a/extra/cups/cups-res_init.patch b/extra/cups/cups-res_init.patch new file mode 100644 index 000000000..94a81a457 --- /dev/null +++ b/extra/cups/cups-res_init.patch @@ -0,0 +1,26 @@ +diff -up cups-1.6b1/cups/http-addr.c.res_init cups-1.6b1/cups/http-addr.c +--- cups-1.6b1/cups/http-addr.c.res_init 2012-05-17 00:57:03.000000000 +0200 ++++ cups-1.6b1/cups/http-addr.c 2012-05-25 15:51:51.323916352 +0200 +@@ -254,7 +254,8 @@ httpAddrLookup( + + if (error) + { +- if (error == EAI_FAIL) ++ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || ++ error == EAI_NONAME) + cg->need_res_init = 1; + + return (httpAddrString(addr, name, namelen)); +diff -up cups-1.6b1/cups/http-addrlist.c.res_init cups-1.6b1/cups/http-addrlist.c +--- cups-1.6b1/cups/http-addrlist.c.res_init 2012-04-23 19:26:57.000000000 +0200 ++++ cups-1.6b1/cups/http-addrlist.c 2012-05-25 16:05:05.930377452 +0200 +@@ -540,7 +540,8 @@ httpAddrGetList(const char *hostname, /* + } + else + { +- if (error == EAI_FAIL) ++ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || ++ error == EAI_NONAME) + cg->need_res_init = 1; + + _cupsSetError(IPP_INTERNAL_ERROR, gai_strerror(error), 0); diff --git a/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch b/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch new file mode 100644 index 000000000..ee36936f8 --- /dev/null +++ b/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch @@ -0,0 +1,19 @@ +Description: Fixed crash which sometimes happens on shutdown of the CUPS + daemon, caused by a wrong shutdown sequence for shutting down the Avahi + threaded poll. +Author: Till Kamppeter <till.kamppeter@gmail.com> +Bug-Upstream: http://cups.org/str.php?L4180 +Bug-Upstream: http://cups.org/str.php?L4213 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1034045 +Last-Updated: 2012-10-16 + +--- a/scheduler/dirsvc.c ++++ b/scheduler/dirsvc.c +@@ -1333,6 +1333,7 @@ + DNSSDMaster = NULL; + + # else /* HAVE_AVAHI */ ++ avahi_threaded_poll_stop(DNSSDMaster); + avahi_client_free(DNSSDClient); + DNSSDClient = NULL; + diff --git a/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch b/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch new file mode 100644 index 000000000..ed132d750 --- /dev/null +++ b/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch @@ -0,0 +1,31 @@ +Description: Applications could not get the PPD file for + statically-configured IPP-shared print queues +Author: Till Kamppeter <till.kamppeter@gmail.com> +Bug-Upstream: http://cups.org/str.php?L4178 +Last-Updated: 2012-09-19 + +--- a/cups/util.c ++++ b/cups/util.c +@@ -1731,6 +1731,22 @@ + + return (1); + } ++ else if (device_uri && ++ (!strncmp(device_uri, "ipp:", 4) != NULL || ++ !strncmp(device_uri, "ipps:", 5) != NULL)) ++ { ++ /* ++ * Statically-configured IPP shared printer. ++ */ ++ ++ httpSeparateURI(HTTP_URI_CODING_ALL, ++ device_uri, ++ scheme, sizeof(scheme), username, sizeof(username), ++ host, hostsize, port, resource, resourcesize); ++ ippDelete(response); ++ ++ return (1); ++ } + else if ((attr = ippFindAttribute(response, "member-uris", + IPP_TAG_URI)) != NULL) + { diff --git a/extra/cups/ppd-poll-with-client-conf.patch b/extra/cups/ppd-poll-with-client-conf.patch new file mode 100644 index 000000000..8985fa3be --- /dev/null +++ b/extra/cups/ppd-poll-with-client-conf.patch @@ -0,0 +1,23 @@ +Description: If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server +Bug: http://www.cups.org/str.php?L2763 + +--- a/cups/util.c ++++ b/cups/util.c +@@ -1085,11 +1085,13 @@ + http2 = http; + else if ((http2 = httpConnectEncrypt(hostname, port, + cupsEncryption())) == NULL) +- { +- DEBUG_puts("1cupsGetPPD3: Unable to connect to server"); ++ if ((http2 = httpConnectEncrypt(http_hostname, http_port, ++ cupsEncryption())) == NULL) ++ { ++ DEBUG_puts("1cupsGetPPD3: Unable to connect to server"); + +- return (HTTP_SERVICE_UNAVAILABLE); +- } ++ return (HTTP_SERVICE_UNAVAILABLE); ++ } + + /* + * Get a temp file... diff --git a/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch b/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch new file mode 100644 index 000000000..711dab8ce --- /dev/null +++ b/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch @@ -0,0 +1,54 @@ +Description: Add more error handling to the libusb-based USB backend, + especially to avoid a crash when USB is disabled in the BIOS. Also + discard that error when counting warning messages. +Author: Till Kamppeter <till.kamppeter@gmail.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1108719 +Last-Update: 2013-05-03 +--- a/backend/usb-libusb.c ++++ b/backend/usb-libusb.c +@@ -898,7 +898,8 @@ + /* Pointer to current alternate setting */ + const struct libusb_endpoint_descriptor *endpptr = NULL; + /* Pointer to current endpoint */ +- ssize_t numdevs, /* number of connected devices */ ++ ssize_t err = 0, ++ numdevs, /* number of connected devices */ + i = 0; + uint8_t conf, /* Current configuration */ + iface, /* Current interface */ +@@ -917,7 +918,13 @@ + * Initialize libusb... + */ + +- libusb_init(NULL); ++ err = libusb_init(NULL); ++ if (err) ++ { ++ fprintf(stderr, "WARNING: Unable to initialize USB access via libusb, libusb error %i\n", err); ++ return (NULL); ++ } ++ + numdevs = libusb_get_device_list(NULL, &list); + fprintf(stderr, "DEBUG: libusb_get_device_list=%d\n", (int)numdevs); + +@@ -1087,7 +1094,8 @@ + * Clean up .... + */ + +- libusb_free_device_list(list, 1); ++ if (numdevs >= 0) ++ libusb_free_device_list(list, 1); + libusb_exit(NULL); + + return (NULL); +--- a/test/run-stp-tests.sh ++++ b/test/run-stp-tests.sh +@@ -838,7 +838,7 @@ + fi + + # Warning log messages +-count=`$GREP '^W ' /tmp/cups-$user/log/error_log | wc -l | awk '{print $1}'` ++count=`$GREP '^W ' /tmp/cups-$user/log/error_log | grep -v 'Unable to initialize USB access via libusb, libusb error' | wc -l | awk '{print $1}'` + if test $count != 9; then + echo "FAIL: $count warning messages, expected 9." + $GREP '^W ' /tmp/cups-$user/log/error_log diff --git a/extra/cups/usb-backend-more-quirk-rules.patch b/extra/cups/usb-backend-more-quirk-rules.patch new file mode 100644 index 000000000..3b72011d6 --- /dev/null +++ b/extra/cups/usb-backend-more-quirk-rules.patch @@ -0,0 +1,66 @@ +Description: USB backend quirk rule for Epson Stylus Photo 750 (and maybe others) +Author: Didier Raboud <odyx@debian.org> +Bugs-Debian: http://bugs.debian.org/697970 +Last-Update: 2013-03-11 + +--- a/backend/usb-libusb.c ++++ b/backend/usb-libusb.c +@@ -142,8 +142,12 @@ + { 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */ + { 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */ + { 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */ ++ { 0x043d, 0x00f3, USBLP_QUIRK_NO_REATTACH }, /* Lexmark International, ++ Inc. (e250d), https://bugs.launchpad.net/bugs/1084164 */ + { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, + by zut <kernel@zut.de> */ ++ { 0x04a9, 0x1095, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP6000D ++ Printer, https://bugs.launchpad.net/bugs/1160638 */ + { 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200 + Printer, http://www.cups.org/str.php?L4155 */ + { 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300 +@@ -158,6 +162,8 @@ + Printer, http://www.cups.org/str.php?L4155 */ + { 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560 + Printer, http://www.cups.org/str.php?L4155 */ ++ { 0x04a9, 0x26a3, USBLP_QUIRK_NO_REATTACH }, /* Canon, Inc. MF4150 ++ Printer, https://bugs.launchpad.net/bugs/1160638 */ + { 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd + HL-1430 Laser Printer, + https://bugs.launchpad.net/bugs/1038695 */ +@@ -165,24 +171,33 @@ + USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd + HL-1440 Laser Printer, + https://bugs.launchpad.net/bugs/1000253 */ ++ { 0x04f9, 0x000e, USBLP_QUIRK_BIDIR | ++ USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd ++ HL-1450 Laser Printer, ++ https://bugs.launchpad.net/bugs/1000253 */ + { 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. + Okipage 14ex Printer, + https://bugs.launchpad.net/bugs/872483 */ + { 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d, + https://bugs.launchpad.net/bugs/872483 */ +- { 0x04b8, 0x0001, USBLP_QUIRK_BIDIR }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750, ++ { 0x04b8, 0x0001, USBLP_QUIRK_BIDIR | ++ USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750, + http://bugs.debian.org/697970 */ ++ { 0x04b8, 0x0005, USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 670, ++ https://bugs.launchpad.net/bugs/872483 */ + { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt + Printer M129C */ + { 0x067b, 0x2305, USBLP_QUIRK_BIDIR | + USBLP_QUIRK_NO_REATTACH | + USBLP_QUIRK_RESET }, ++ /* Prolific Technology, Inc. PL2305 Parallel Port ++ (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */ + { 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124 + https://bugzilla.redhat.com/show_bug.cgi?id=867392 */ + { 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210 + https://bugs.launchpad.net/bugs/1102470 */ +- /* Prolific Technology, Inc. PL2305 Parallel Port +- (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */ ++ { 0x1a86, 0x7584, USBLP_QUIRK_NO_REATTACH }, /* QinHeng Electronics ++ CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253 */ + { 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices, + https://bugs.launchpad.net/bugs/1032456 */ + { 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices, diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index 7915d580f..07cf8e0cb 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186312 2013-05-24 16:21:18Z jgc $ +# $Id: PKGBUILD 187053 2013-06-03 11:16:18Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -8,7 +8,7 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl pkgver=2.1.26 -pkgrel=3 +pkgrel=4 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/" @@ -25,7 +25,6 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.service saslauthd.conf.d - saslauthd tmpfiles.conf) md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' @@ -37,7 +36,6 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '8e7106f32e495e9ade69014fd1b3352a' '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' - '75542f613185d5a90520ad0d7d926a20' '45bb0192d2f188066240b9a66ee6365f') build() { @@ -76,6 +74,7 @@ build() { ./configure --prefix=/usr \ --host=$CHOST \ --build=$CHOST \ + --sbin=/usr/bin \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-static \ @@ -133,7 +132,6 @@ package_cyrus-sasl() { cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" make DESTDIR="${pkgdir}" install - install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf" diff --git a/extra/cyrus-sasl/saslauthd b/extra/cyrus-sasl/saslauthd deleted file mode 100644 index 6afafae0b..000000000 --- a/extra/cyrus-sasl/saslauthd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="saslauthd" -SASLAUTHD_BIN=/usr/sbin/saslauthd -SASLAUTHD_RUN=/var/run/saslauthd -SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid - -case "$1" in - start) - stat_busy "Starting $DAEMON_NAME" - [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd - if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then - add_daemon $DAEMON_NAME - stat_done - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $DAEMON_NAME" - [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm_daemon $DAEMON_NAME - stat_done - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/davfs2/PKGBUILD b/extra/davfs2/PKGBUILD index 0293473a7..dca4adc8d 100644 --- a/extra/davfs2/PKGBUILD +++ b/extra/davfs2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165783 2012-08-29 23:04:18Z thomas $ +# $Id: PKGBUILD 187054 2013-06-03 11:16:20Z allan $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=davfs2 pkgver=1.4.7 -pkgrel=1 +pkgrel=2 pkgdesc="File system driver that allows you to mount a WebDAV folder" arch=(i686 x86_64 'mips64el') url="http://savannah.nongnu.org/projects/davfs2" @@ -14,19 +14,14 @@ sha256sums=('50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044') build() { cd "${srcdir}/${pkgname}-${pkgver}" - dav_user=nobody dav_group=network ./configure --prefix=/usr --sysconfdir=/etc --disable-debug + dav_user=nobody dav_group=network ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --disable-debug make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - # Create some dirs - install -d -m755 "${pkgdir}/sbin" make DESTDIR="${pkgdir}" install - rm -f ${pkgdir}/sbin/{u,}mount.davfs - ln -sf /usr/sbin/mount.davfs "${pkgdir}/sbin/mount.davfs" - ln -sf /usr/sbin/umount.davfs "${pkgdir}/sbin/umount.davfs" - + rm -rf ${pkgdir}/sbin rm -f ${pkgdir}/usr/share/davfs2/{BUGS,COPYING,FAQ,NEWS,TODO,ChangeLog,GPL,README,THANKS} } diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD index ed1cb8240..58fdb28b5 100644 --- a/extra/dbus-python/PKGBUILD +++ b/extra/dbus-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168991 2012-10-17 10:19:14Z allan $ +# $Id: PKGBUILD 188645 2013-06-17 09:56:29Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=dbus-python pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common') -pkgver=1.1.1 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Python bindings for DBUS" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') @@ -12,7 +12,7 @@ url="http://www.freedesktop.org/wiki/Software/DBusBindings" makedepends=('docutils' 'dbus-glib' 'python' 'python2') options=('!libtool') source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz) -md5sums=('742c7432ad0f7c3f98291d58fa2e35dc') +md5sums=('b09cd2d1a057cc432ce944de3fc06bf7') build() { cd "${srcdir}" diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD index ae77018af..e50a4fc32 100644 --- a/extra/dcraw/PKGBUILD +++ b/extra/dcraw/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 177853 2013-02-10 10:42:13Z bisson $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id: PKGBUILD 188700 2013-06-18 09:44:02Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=dcraw -pkgver=9.17 +pkgver=9.19 pkgrel=1 pkgdesc='Decodes any raw image from any digital camera' url='http://www.cybercom.net/~dcoffin/dcraw/' @@ -11,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('custom') depends=('lcms' 'jasper') source=("http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz") -sha1sums=('11a0b20b8f46950dd94e6c1ada313807049a6b27') +sha1sums=('83a85200b0f105a40d23e885f5108bc3b53bdbe4') build() { cd "${srcdir}/${pkgname}" diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD index 13140a531..5ae6a42c6 100644 --- a/extra/dhcp/PKGBUILD +++ b/extra/dhcp/PKGBUILD @@ -1,32 +1,31 @@ -# $Id: PKGBUILD 180410 2013-03-21 12:04:16Z jgc $ +# $Id: PKGBUILD 187056 2013-06-03 11:16:27Z allan $ # Maintainer: Daniel Isenmann <daniel @archlinux.org> pkgbase=dhcp pkgname=('dhcp' 'dhclient') # separate patch levels with a period to maintain proper versioning. -pkgver=4.2.5 -_pkgver=4.2.5 -pkgrel=1 +pkgver=4.2.5.p1 +_pkgver=4.2.5-P1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom:isc-dhcp') url="https://www.isc.org/software/dhcp" makedepends=('bash' 'iproute2') source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc} - dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service + dhcpd4.service + dhcpd6.service dhcp-4.2.5-client_script-1.patch dhcp-4.2.5-missing_ipv6-1.patch) -md5sums=('6489e919ac093d17249270ee9be1020e' - '022bc7038b3061cfb31da4736e7ab8a8' - 'c49b1497837ba56c54e401a66e1bab9b' - '12c2f3ae47ed23eb698eb7f1bfd80f20' - '8f357e46e1efcbb746f38737a3f977a2' +md5sums=('f68e3c1f00a9af5742bc5e71d567cf93' + 'SKIP' '439ee2f145a1e86dd644cb94a854f8e7' '588aa85b6fe228c45623185a58d11992' '9e4dcf90beec15bfcb6631809cdcc780' 'da655f02f1cf4d95b4708e84e69edbc8') -build() { + +prepare() { cd "${srcdir}/${pkgbase}-${_pkgver}" # Define _GNU_SOURCE to fix IPV6. @@ -36,8 +35,11 @@ build() { patch -Np1 -i ../dhcp-4.2.5-missing_ipv6-1.patch # Make dhcp client script suck less. patch -Np1 -i ../dhcp-4.2.5-client_script-1.patch +} - ./configure --prefix=/usr --sysconfdir=/etc \ +build() { + cd "${srcdir}/${pkgbase}-${_pkgver}" + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \ --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \ @@ -48,15 +50,12 @@ build() { package_dhcp(){ pkgdesc="A DHCP server, client, and relay agent" - backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp') + backup=('etc/dhcpd.conf') install=dhcp.install - + cd "${srcdir}/${pkgbase}-${_pkgver}" make DESTDIR="${pkgdir}" install - install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4" - install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6" - install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}" install -d "${pkgdir}/var/lib/dhcp" install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service" @@ -67,7 +66,7 @@ package_dhcp(){ # Remove dhclient make -C client DESTDIR="${pkgdir}" uninstall - + # install license install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhcp/LICENSE" } @@ -82,11 +81,11 @@ package_dhclient(){ install -m755 -d "${pkgdir}/usr/share/dhclient" mv "${pkgdir}/etc/dhclient.conf.example" "${pkgdir}/usr/share/dhclient/" - + install -d "${pkgdir}/var/lib/dhclient" # install dhclient linux script - install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script" + install -m755 client/scripts/linux "${pkgdir}/usr/bin/dhclient-script" # install license install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhclient/LICENSE" diff --git a/extra/dhcp/dhcp b/extra/dhcp/dhcp deleted file mode 100644 index d4f228d9c..000000000 --- a/extra/dhcp/dhcp +++ /dev/null @@ -1,10 +0,0 @@ -# -# Arguments to be passed to the DHCP server daemon -# - -# ipv4 runtime parameters -DHCP4_ARGS="-q" - -# ipv6 runtime parameters -DHCP6_ARGS="-q" - diff --git a/extra/dhcp/dhcp.conf.d b/extra/dhcp/dhcp.conf.d deleted file mode 100644 index 99ba6d13d..000000000 --- a/extra/dhcp/dhcp.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Arguments to be passed to the DHCP server daemon -# - -DHCP_ARGS="-q" - diff --git a/extra/dhcp/dhcp4 b/extra/dhcp/dhcp4 deleted file mode 100644 index 8e1277a37..000000000 --- a/extra/dhcp/dhcp4 +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/dhcp - -PIDFILE="/var/run/dhcpd.pid" - -if [[ -f $PIDFILE ]]; then - read -r PID < "$PIDFILE" - - # prevent stale pidfiles from hanging around - if [[ ! -d /proc/$PID ]]; then - echo 'pid not found. deleteing stale pidfile' - unset PID - rm -f "$PIDFILE" - fi -fi - -case "$1" in - start) - stat_busy "Starting DHCPv4 Server" - if [[ $PID ]]; then - stat_fail - exit 1 - fi - if /usr/sbin/dhcpd -4 -pf "$PIDFILE" $DHCP4_ARGS; then - add_daemon dhcp4 - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping DHCPv4 Server" - if [[ ! $PID ]]; then - stat_fail - exit 1 - fi - if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then - rm_daemon dhcp4 - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - diff --git a/extra/dhcp/dhcp6 b/extra/dhcp/dhcp6 deleted file mode 100644 index 6b4b4d359..000000000 --- a/extra/dhcp/dhcp6 +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/dhcp - -PIDFILE="/var/run/dhcp6.pid" - -if [[ -f $PIDFILE ]]; then - read -r PID < "$PIDFILE" - - # prevent stale pidfiles from hanging around - if [[ ! -d /proc/$PID ]]; then - echo 'pid not found. deleteing stale pidfile' - unset PID - rm -f "$PIDFILE" - fi -fi - -case "$1" in - start) - stat_busy "Starting DHCPv6 Server" - if [[ $PID ]]; then - stat_fail - exit 1 - fi - if /usr/sbin/dhcpd -6 -pf "$PIDFILE" $DHCP6_ARGS; then - add_daemon dhcp6 - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping DHCPv6 Server" - if [[ ! $PID ]]; then - stat_fail - exit 1 - fi - if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then - rm_daemon dhcp6 - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - diff --git a/extra/dhcp/dhcpd b/extra/dhcp/dhcpd deleted file mode 100755 index 1fbb31e7c..000000000 --- a/extra/dhcp/dhcpd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/dhcp - -PIDFILE="/var/run/dhcpd.pid" -PID=`cat $PIDFILE 2>/dev/null` -case "$1" in - start) - stat_busy "Starting DHCP Server" - if [ "$PID" = "" ]; then - /usr/sbin/dhcpd $DHCP_ARGS - fi - if [ "$PID" != "" -o $? -gt 0 ]; then - stat_fail - else - add_daemon dhcpd - stat_done - fi - ;; - stop) - stat_busy "Stopping DHCP Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - rm -f $PIDFILE - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dhcpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 4217fbf8f..634e8d8ec 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 184369 2013-05-06 19:36:56Z foutrelis $ +# $Id: PKGBUILD 187093 2013-06-03 17:45:39Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=3.1.0 -pkgrel=4 +pkgver=3.2.0 +pkgrel=2 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.digikam.org/" makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' - 'cmake' 'automoc4' 'doxygen' 'lensfun') + 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - "digikam-3.1.0-htmlexport.patch" "digikam-3.1.0-fixed-pngs.tar.gz") noextract=("digikam-3.1.0-fixed-pngs.tar.gz") -sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd' - 'ef3ee0b6e56e692eb7c10cda5cd581d20c3c46bb' +sha1sums=('666f1d937dc033ddb880aed8a32e7943113d973f' 'b0a1991e0df9b72c79562c719bc9d944a3b8bc78') prepare() { @@ -27,9 +25,6 @@ prepare() { cd ${pkgname}-${pkgver} - # https://bugs.kde.org/show_bug.cgi?id=316620 - patch -Np1 -i "${srcdir}/digikam-3.1.0-htmlexport.patch" - # Fix invalid PNG images to work with libpng 1.6 # https://bugs.kde.org/show_bug.cgi?id=319350 tar xf "${srcdir}/digikam-3.1.0-fixed-pngs.tar.gz" --strip-components=1 @@ -50,7 +45,7 @@ package_digikam() { pkgdesc="Digital photo management application for KDE" depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr' 'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap' 'lensfun') - optdepends=('kipi-plugins: for more extras and plugins') + optdepends=('kipi-plugins: more tools and plugins') install=digikam.install cd build/core @@ -60,7 +55,7 @@ package_digikam() { cd ../../build/po make DESTDIR="${pkgdir}" install - # Fix conflicts with kde-l10n-* + # Fix conflicts with kde-l10n-* (FS#33762) rm "${pkgdir}"/usr/share/locale/*/LC_MESSAGES/libkipi.mo } @@ -98,12 +93,14 @@ package_libmediawiki() { package_kipi-plugins() { pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" - depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' - 'opencv' 'libkvkontakte' 'libkexiv2') - optdepends=('libkgeomap' - 'libmediawiki' - 'libgpod' - 'hugin') + depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' 'libkexiv2') + optdepends=('libkgeomap: Geolocalize tool' + 'libmediawiki: MediaWiki Export plugin' + 'libkvkontakte: VKontakte.ru Exporter plugin' + 'libgpod: iPodExport plugin' + 'opencv: Remove Red Eyes plugin' + 'imagemagick: Video SlideShow plugin' + 'qt-gstreamer: Video SlideShow plugin') install=kipi-plugins.install cd build/extra/kipi-plugins diff --git a/extra/digikam/digikam-3.1.0-htmlexport.patch b/extra/digikam/digikam-3.1.0-htmlexport.patch deleted file mode 100644 index c9e2ff365..000000000 --- a/extra/digikam/digikam-3.1.0-htmlexport.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-11 10:24:11.000000000 +0200 -+++ digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-13 00:15:05.539275132 +0200 -@@ -468,9 +468,9 @@ - # Currently the cmake module distributed w/ cmake uses a different variable - # name LIBXLST_EXSLT_LIBRARIES for libxeslt than the cmake modeule - # distributed w/ kdelibs LIBEXSLT_LIBRARIES. -- if (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES) -- set(LIBXSLT_EXSLT_LIBRARIES ${LIBXSLT_LIBRARIES}) -- endif (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES) -+ if (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES) -+ set(LIBXSLT_EXSLT_LIBRARIES ${LIBEXSLT_LIBRARIES}) -+ endif (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES) - IF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES) - ADD_SUBDIRECTORY(htmlexport) - ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES) diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index c21a98267..0c74200e2 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186001 2013-05-20 08:28:29Z andyrtr $ +# $Id: PKGBUILD 188728 2013-06-18 15:46:35Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.2 +pkgver=2.2.3 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.tmpfilesd) -md5sums=('e6c011b4bbddf19e79205d012723449a' +md5sums=('306664f09560d2c6515ba80e1dd7f353' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD deleted file mode 100755 index c538a4a96..000000000 --- a/extra/efibootmgr/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 185838 2013-05-19 14:37:47Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor : Murtuza Akhtari <inxsible at gmail dot com> -# Contributor: Keshav P R <skodabenz at rocketmail dot com> - -pkgname=efibootmgr -pkgver=0.6.0 -pkgrel=2 -pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables." -arch=('i686' 'x86_64') -url="http://linux.dell.com/efibootmgr/" -license=('GPL2') -depends=('zlib' 'pciutils') -makedepends=() -provides=() -options=(strip purge docs zipman !emptydirs) - -source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz") - -build () { - rm -rf ${srcdir}/efibootmgr-${pkgver}_build/ || true - - cp -r ${srcdir}/efibootmgr-${pkgver} ${srcdir}/efibootmgr-${pkgver}_build - - cd ${srcdir}/efibootmgr-${pkgver}_build/ - - echo - - CFLAGS= make - echo - -} - - -package() { - - mkdir -p ${pkgdir}/usr/bin/ - mkdir -p ${pkgdir}/usr/share/man/man8/ - - cd ${srcdir}/efibootmgr-${pkgver}_build/ - - install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/bin/efibootmgr - install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8 - -} -md5sums=('9e9a31d79e579644de83a14139b66d10') diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 88621b001..43f81f44b 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185541 2013-05-14 21:40:19Z andrea $ +# $Id: PKGBUILD 188088 2013-06-08 19:38:24Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.8.2 -pkgrel=2 +pkgver=3.8.3 +pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata) @@ -13,7 +13,7 @@ install=$pkgname.install url="http://www.gnome.org" license=(GPL) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('570d97150ed04e8b6681814731c4d216bda44e164533b28953e38319fec21015') +sha256sums=('4f60403ec17b462fc39f59193093d9819c534bbce689e14cbab20bc262ca5870') build() { cd "$pkgname-$pkgver" diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index e7a3ac883..a5f9df144 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185542 2013-05-14 21:40:20Z andrea $ +# $Id: PKGBUILD 188090 2013-06-08 19:44:06Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=evolution-ews -pkgver=3.8.2 -pkgrel=2 +pkgver=3.8.3 +pkgrel=1 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64' 'mips64el') license=('LGPL2.1') @@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ff3586b76013f71b0c32339279985cb0e2e1706bd181726ce9d00ebf4387cdd9') +sha256sums=('948dbee5e31b364155719003a0a8b28dfa270aae5f364b5614faa0b262a7ff3a') build() { cd $pkgname-$pkgver diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index fd61dd3b3..1cd35cf91 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185540 2013-05-14 21:40:18Z andrea $ +# $Id: PKGBUILD 188089 2013-06-08 19:43:23Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.8.2 -pkgrel=2 +pkgver=3.8.3 +pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') license=(GPL) @@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('6333864015e83c2120ffe7adb262ac3055ac82995a915071440be96e08a73112') +sha256sums=('b0ee1eae5f4752eeb0b62c3be2daa08195ab4fd19092bfe6e75d02ac457ebe3a') build() { cd $pkgname-$pkgver diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 0f95ef0e6..35a95f28d 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184374 2013-05-06 19:37:01Z foutrelis $ +# $Id: PKGBUILD 188169 2013-06-11 11:59:02Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=2.9.2 +pkgver=2.9.3 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' @@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh' 'imagemagick: support more file formats') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2"{,.asc}) -sha1sums=('4d7d183491f916c8f1db668065f986f4a845503e' 'SKIP') +sha1sums=('6e93c9bbc339d36002ead189d0a94880f58876bd' 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD index a929f0a3b..befd6efeb 100644 --- a/extra/folks/PKGBUILD +++ b/extra/folks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183356 2013-04-21 22:09:07Z heftig $ +# $Id: PKGBUILD 188065 2013-06-08 08:06:46Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=folks -pkgver=0.9.1 -pkgrel=3 +pkgver=0.9.2 +pkgrel=1 pkgdesc="Library to aggregates people into metacontacts" arch=(i686 x86_64 'mips64el') url="http://telepathy.freedesktop.org/wiki/Folks" @@ -13,7 +13,7 @@ makedepends=(gobject-introspection intltool) install=folks.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('102b1867355d16e73a837871a058dda13c74fa385908ddda1623893ab0baee4a') +sha256sums=('4b034ffe83928acd8a7d607edab60f36eb13801a9d3fcc34ccc7c34a16747818') build() { cd "$pkgname-$pkgver" diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD index 514dc00bf..2b7bcc010 100644 --- a/extra/fuse/PKGBUILD +++ b/extra/fuse/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 171437 2012-11-17 15:03:45Z ronald $ +# $Id: PKGBUILD 187057 2013-06-03 11:16:31Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse pkgver=2.9.2 -pkgrel=1 +pkgrel=3 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64' 'mips64el') url="http://fuse.sourceforge.net/" @@ -19,14 +19,18 @@ options=(!libtool) sha1sums=('fcfc005b1edcd5e8b325729a1b325ff0e8b2a5ab' '3b42e37a741d4651099225987dc40e7f02a716ad') -build() { +prepare() { cd "$pkgname-$pkgver" - # fix building with glibc-2.14 - sed -i '1i#define _GNU_SOURCE' util/fusermount.c + sed -i '1i#define _GNU_SOURCE' util/fusermount.c + + sed -i "/MOUNT_FUSE_PATH=/s#/sbin#/usr/bin#" configure +} - ./configure --prefix=/usr --libdir=/usr/lib --enable-lib \ - --enable-util --bindir=/bin +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --libdir=/usr/lib \ + --enable-lib --enable-util make } @@ -38,7 +42,6 @@ package() { # Remove init script in wrong path # Don't add our own for now, as fusectl fs oopses on 2.6.18 rm -rf ${pkgdir}/etc/init.d - #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse # install sample config file install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD index bb5602e78..527e3cd30 100644 --- a/extra/gconf/PKGBUILD +++ b/extra/gconf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179963 2013-03-13 14:27:34Z jgc $ +# $Id: PKGBUILD 187058 2013-06-03 11:16:33Z allan $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gconf pkgver=3.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="A configuration database system" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -23,7 +23,7 @@ sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c' '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' 'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8') -build() { +prepare() { cd "GConf-$pkgver" # Patch from fedora - reloads gconf after installing schemas @@ -33,6 +33,10 @@ build() { # Python2 fix sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert +} + +build() { + cd "GConf-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/GConf \ @@ -48,5 +52,5 @@ package() { install -m755 -d "$pkgdir/etc/gconf/gconf.xml.system" install -m755 "$srcdir/gconf-merge-schema" "$pkgdir/usr/bin/" - install -Dm755 "$srcdir/gconfpkg" "$pkgdir/usr/sbin/gconfpkg" + install -m755 "$srcdir/gconfpkg" "$pkgdir/usr/bin/gconfpkg" } diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index 8a61d7f96..43651ad2a 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184380 2013-05-06 19:37:23Z foutrelis $ +# $Id: PKGBUILD 187905 2013-06-07 22:45:04Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gdk-pixbuf2 -pkgver=2.28.1 -pkgrel=2 +pkgver=2.28.2 +pkgrel=1 pkgdesc="An image loading library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') install=gdk-pixbuf2.install source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb') +sha256sums=('183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617') build() { cd gdk-pixbuf-$pkgver diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 471ef2a53..6c225a409 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183315 2013-04-21 22:06:33Z heftig $ +# $Id: PKGBUILD 188471 2013-06-14 19:27:51Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gdm pkgname=(gdm libgdm) -pkgver=3.8.1.1 +pkgver=3.8.3 pkgrel=1 pkgdesc="Gnome Display Manager" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=(itstool intltool gnome-doc-utils gobject-introspection) checkdepends=('check') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz fix_external_program_directories.patch) -sha256sums=('16f8141040798ba00be0d718ba24cce927d6412b767d091f9ee5bf93f5800ba8' +sha256sums=('1d0ed61ac2b184c62acb0d09a5b7c03793b5793599dbb6888d7fe8d1fb6e8da2' 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2') build() { @@ -25,6 +25,7 @@ build() { ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --libexecdir=/usr/lib/gdm \ --localstatedir=/var \ diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD index 1f1778b19..7d14e7a82 100644 --- a/extra/giflib/PKGBUILD +++ b/extra/giflib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185106 2013-05-11 07:24:47Z bpiotrowski $ +# $Id: PKGBUILD 187002 2013-06-03 07:04:28Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> @@ -6,7 +6,7 @@ pkgname=giflib pkgver=4.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64' 'mips64el') @@ -17,12 +17,15 @@ provides=("libungif=${pkgver}") conflicts=('libungif') replaces=('libungif') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2) -md5sums=('bbd3324af24156d5d7e66ab1cee8508d') +source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2 + giflib-4.2.1-quantize.patch) +md5sums=('bbd3324af24156d5d7e66ab1cee8508d' + '67e46b344340ac10f4f597d772679f23') prepare() { cd ${pkgname}-${pkgver} sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac + patch -Np1 -i "$srcdir"/giflib-4.2.1-quantize.patch autoreconf -fi } diff --git a/extra/giflib/giflib-4.2.1-quantize.patch b/extra/giflib/giflib-4.2.1-quantize.patch new file mode 100644 index 000000000..197f88b77 --- /dev/null +++ b/extra/giflib/giflib-4.2.1-quantize.patch @@ -0,0 +1,404 @@ +diff -up giflib-4.2.1/lib/Makefile.in.quantize giflib-4.2.1/lib/Makefile.in +--- giflib-4.2.1/lib/Makefile.in.quantize 2012-10-09 00:37:59.000000000 -0300 ++++ giflib-4.2.1/lib/Makefile.in 2012-11-17 12:16:04.485736553 -0200 +@@ -77,7 +77,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" + LTLIBRARIES = $(lib_LTLIBRARIES) + libgif_la_DEPENDENCIES = + am_libgif_la_OBJECTS = dgif_lib.lo egif_lib.lo gif_font.lo gif_hash.lo \ +- gifalloc.lo gif_err.lo ++ gifalloc.lo gif_err.lo quantize.lo + libgif_la_OBJECTS = $(am_libgif_la_OBJECTS) + libgif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +@@ -234,6 +234,7 @@ libgif_la_SOURCES = dgif_lib.c \ + gif_hash.h \ + gifalloc.c \ + gif_err.c \ ++ quantize.c \ + gif_lib_private.h + + libgif_la_LDFLAGS = -version-info @SHLIBVERSION@ +@@ -319,6 +320,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_font.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_hash.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gifalloc.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +diff -up giflib-4.2.1/lib/gif_lib.h.quantize giflib-4.2.1/lib/gif_lib.h +--- giflib-4.2.1/lib/gif_lib.h.quantize 2012-10-09 00:36:32.000000000 -0300 ++++ giflib-4.2.1/lib/gif_lib.h 2012-11-17 12:16:04.488735917 -0200 +@@ -180,6 +180,15 @@ int DGifCloseFile(GifFileType * GifFile) + #define D_GIF_ERR_IMAGE_DEFECT 112 + #define D_GIF_ERR_EOF_TOO_SOON 113 + ++/****************************************************************************** ++ * O.K., here are the routines from GIF_LIB file QUANTIZE.C. ++******************************************************************************/ ++int QuantizeBuffer(unsigned int Width, unsigned int Height, ++ int *ColorMapSize, GifByteType * RedInput, ++ GifByteType * GreenInput, GifByteType * BlueInput, ++ GifByteType * OutputBuffer, ++ GifColorType * OutputColorMap); ++ + /* These are legacy. You probably do not want to call them directly */ + int DGifGetScreenDesc(GifFileType * GifFile); + int DGifGetRecordType(GifFileType * GifFile, GifRecordType * GifType); +diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c +--- giflib-4.2.1/lib/quantize.c.quantize 2012-11-17 12:17:44.741435334 -0200 ++++ giflib-4.2.1/lib/quantize.c 2012-11-17 12:16:04.491735283 -0200 +@@ -0,0 +1,332 @@ ++/***************************************************************************** ++ * "Gif-Lib" - Yet another gif library. ++ * ++ * Written by: Gershon Elber IBM PC Ver 0.1, Jun. 1989 ++ ****************************************************************************** ++ * Module to quatize high resolution image into lower one. You may want to ++ * peek into the following article this code is based on: ++ * "Color Image Quantization for frame buffer Display", by Paul Heckbert ++ * SIGGRAPH 1982 page 297-307. ++ ****************************************************************************** ++ * History: ++ * 5 Jan 90 - Version 1.0 by Gershon Elber. ++ *****************************************************************************/ ++ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ ++#ifdef __MSDOS__ ++#include <dos.h> ++#include <alloc.h> ++#include <graphics.h> ++#endif /* __MSDOS__ */ ++ ++#include <stdlib.h> ++#include <stdio.h> ++#include "gif_lib.h" ++#include "gif_lib_private.h" ++ ++#define ABS(x) ((x) > 0 ? (x) : (-(x))) ++ ++#define PROGRAM_NAME "giflib" ++ ++/* The colors are stripped to 5 bits per primary color if non MSDOS system ++ * or to 4 (not enough memory...) if MSDOS as first step. ++ */ ++#ifdef __MSDOS__ ++#define COLOR_ARRAY_SIZE 4096 ++#define BITS_PER_PRIM_COLOR 4 ++#define MAX_PRIM_COLOR 0x0f ++#else ++#define COLOR_ARRAY_SIZE 32768 ++#define BITS_PER_PRIM_COLOR 5 ++#define MAX_PRIM_COLOR 0x1f ++#endif /* __MSDOS__ */ ++ ++static int SortRGBAxis; ++ ++typedef struct QuantizedColorType { ++ GifByteType RGB[3]; ++ GifByteType NewColorIndex; ++ long Count; ++ struct QuantizedColorType *Pnext; ++} QuantizedColorType; ++ ++typedef struct NewColorMapType { ++ GifByteType RGBMin[3], RGBWidth[3]; ++ unsigned int NumEntries; /* # of QuantizedColorType in linked list below */ ++ unsigned long Count; /* Total number of pixels in all the entries */ ++ QuantizedColorType *QuantizedColors; ++} NewColorMapType; ++ ++static int SubdivColorMap(NewColorMapType * NewColorSubdiv, ++ unsigned int ColorMapSize, ++ unsigned int *NewColorMapSize); ++static int SortCmpRtn(const VoidPtr Entry1, const VoidPtr Entry2); ++ ++/****************************************************************************** ++ * Quantize high resolution image into lower one. Input image consists of a ++ * 2D array for each of the RGB colors with size Width by Height. There is no ++ * Color map for the input. Output is a quantized image with 2D array of ++ * indexes into the output color map. ++ * Note input image can be 24 bits at the most (8 for red/green/blue) and ++ * the output has 256 colors at the most (256 entries in the color map.). ++ * ColorMapSize specifies size of color map up to 256 and will be updated to ++ * real size before returning. ++ * Also non of the parameter are allocated by this routine. ++ * This function returns GIF_OK if succesfull, GIF_ERROR otherwise. ++ ******************************************************************************/ ++int ++QuantizeBuffer(unsigned int Width, ++ unsigned int Height, ++ int *ColorMapSize, ++ GifByteType * RedInput, ++ GifByteType * GreenInput, ++ GifByteType * BlueInput, ++ GifByteType * OutputBuffer, ++ GifColorType * OutputColorMap) { ++ ++ unsigned int Index, NumOfEntries; ++ int i, j, MaxRGBError[3]; ++ unsigned int NewColorMapSize; ++ long Red, Green, Blue; ++ NewColorMapType NewColorSubdiv[256]; ++ QuantizedColorType *ColorArrayEntries, *QuantizedColor; ++ ++ ColorArrayEntries = (QuantizedColorType *)malloc( ++ sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE); ++ if (ColorArrayEntries == NULL) { ++ _GifError = E_GIF_ERR_NOT_ENOUGH_MEM; ++ return GIF_ERROR; ++ } ++ ++ for (i = 0; i < COLOR_ARRAY_SIZE; i++) { ++ ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR); ++ ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) & ++ MAX_PRIM_COLOR; ++ ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR; ++ ColorArrayEntries[i].Count = 0; ++ } ++ ++ /* Sample the colors and their distribution: */ ++ for (i = 0; i < (int)(Width * Height); i++) { ++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ (2 * BITS_PER_PRIM_COLOR)) + ++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ BITS_PER_PRIM_COLOR) + ++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); ++ ColorArrayEntries[Index].Count++; ++ } ++ ++ /* Put all the colors in the first entry of the color map, and call the ++ * recursive subdivision process. */ ++ for (i = 0; i < 256; i++) { ++ NewColorSubdiv[i].QuantizedColors = NULL; ++ NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0; ++ for (j = 0; j < 3; j++) { ++ NewColorSubdiv[i].RGBMin[j] = 0; ++ NewColorSubdiv[i].RGBWidth[j] = 255; ++ } ++ } ++ ++ /* Find the non empty entries in the color table and chain them: */ ++ for (i = 0; i < COLOR_ARRAY_SIZE; i++) ++ if (ColorArrayEntries[i].Count > 0) ++ break; ++ QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i]; ++ NumOfEntries = 1; ++ while (++i < COLOR_ARRAY_SIZE) ++ if (ColorArrayEntries[i].Count > 0) { ++ QuantizedColor->Pnext = &ColorArrayEntries[i]; ++ QuantizedColor = &ColorArrayEntries[i]; ++ NumOfEntries++; ++ } ++ QuantizedColor->Pnext = NULL; ++ ++ NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */ ++ NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */ ++ NewColorMapSize = 1; ++ if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) != ++ GIF_OK) { ++ free((char *)ColorArrayEntries); ++ return GIF_ERROR; ++ } ++ if (NewColorMapSize < *ColorMapSize) { ++ /* And clear rest of color map: */ ++ for (i = NewColorMapSize; i < *ColorMapSize; i++) ++ OutputColorMap[i].Red = OutputColorMap[i].Green = ++ OutputColorMap[i].Blue = 0; ++ } ++ ++ /* Average the colors in each entry to be the color to be used in the ++ * output color map, and plug it into the output color map itself. */ ++ for (i = 0; i < NewColorMapSize; i++) { ++ if ((j = NewColorSubdiv[i].NumEntries) > 0) { ++ QuantizedColor = NewColorSubdiv[i].QuantizedColors; ++ Red = Green = Blue = 0; ++ while (QuantizedColor) { ++ QuantizedColor->NewColorIndex = i; ++ Red += QuantizedColor->RGB[0]; ++ Green += QuantizedColor->RGB[1]; ++ Blue += QuantizedColor->RGB[2]; ++ QuantizedColor = QuantizedColor->Pnext; ++ } ++ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j; ++ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j; ++ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j; ++ } else ++ fprintf(stderr, ++ "\n%s: Null entry in quantized color map - that's weird.\n", ++ PROGRAM_NAME); ++ } ++ ++ /* Finally scan the input buffer again and put the mapped index in the ++ * output buffer. */ ++ MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0; ++ for (i = 0; i < (int)(Width * Height); i++) { ++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ (2 * BITS_PER_PRIM_COLOR)) + ++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ BITS_PER_PRIM_COLOR) + ++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); ++ Index = ColorArrayEntries[Index].NewColorIndex; ++ OutputBuffer[i] = Index; ++ if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i])) ++ MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]); ++ if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i])) ++ MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]); ++ if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i])) ++ MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]); ++ } ++ ++#ifdef DEBUG ++ fprintf(stderr, ++ "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n", ++ MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]); ++#endif /* DEBUG */ ++ ++ free((char *)ColorArrayEntries); ++ ++ *ColorMapSize = NewColorMapSize; ++ ++ return GIF_OK; ++} ++ ++/****************************************************************************** ++ * Routine to subdivide the RGB space recursively using median cut in each ++ * axes alternatingly until ColorMapSize different cubes exists. ++ * The biggest cube in one dimension is subdivide unless it has only one entry. ++ * Returns GIF_ERROR if failed, otherwise GIF_OK. ++ ******************************************************************************/ ++static int ++SubdivColorMap(NewColorMapType * NewColorSubdiv, ++ unsigned int ColorMapSize, ++ unsigned int *NewColorMapSize) { ++ ++ int MaxSize; ++ unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor; ++ long Sum, Count; ++ QuantizedColorType *QuantizedColor, **SortArray; ++ ++ while (ColorMapSize > *NewColorMapSize) { ++ /* Find candidate for subdivision: */ ++ MaxSize = -1; ++ for (i = 0; i < *NewColorMapSize; i++) { ++ for (j = 0; j < 3; j++) { ++ if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) && ++ (NewColorSubdiv[i].NumEntries > 1)) { ++ MaxSize = NewColorSubdiv[i].RGBWidth[j]; ++ Index = i; ++ SortRGBAxis = j; ++ } ++ } ++ } ++ ++ if (MaxSize == -1) ++ return GIF_OK; ++ ++ /* Split the entry Index into two along the axis SortRGBAxis: */ ++ ++ /* Sort all elements in that entry along the given axis and split at ++ * the median. */ ++ SortArray = (QuantizedColorType **)malloc( ++ sizeof(QuantizedColorType *) * ++ NewColorSubdiv[Index].NumEntries); ++ if (SortArray == NULL) ++ return GIF_ERROR; ++ for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors; ++ j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL; ++ j++, QuantizedColor = QuantizedColor->Pnext) ++ SortArray[j] = QuantizedColor; ++ ++ qsort(SortArray, NewColorSubdiv[Index].NumEntries, ++ sizeof(QuantizedColorType *), SortCmpRtn); ++ ++ /* Relink the sorted list into one: */ ++ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++) ++ SortArray[j]->Pnext = SortArray[j + 1]; ++ SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL; ++ NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0]; ++ free((char *)SortArray); ++ ++ /* Now simply add the Counts until we have half of the Count: */ ++ Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count; ++ NumEntries = 1; ++ Count = QuantizedColor->Count; ++ while ((Sum -= QuantizedColor->Pnext->Count) >= 0 && ++ QuantizedColor->Pnext != NULL && ++ QuantizedColor->Pnext->Pnext != NULL) { ++ QuantizedColor = QuantizedColor->Pnext; ++ NumEntries++; ++ Count += QuantizedColor->Count; ++ } ++ /* Save the values of the last color of the first half, and first ++ * of the second half so we can update the Bounding Boxes later. ++ * Also as the colors are quantized and the BBoxes are full 0..255, ++ * they need to be rescaled. ++ */ ++ MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */ ++ MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */ ++ MaxColor <<= (8 - BITS_PER_PRIM_COLOR); ++ MinColor <<= (8 - BITS_PER_PRIM_COLOR); ++ ++ /* Partition right here: */ ++ NewColorSubdiv[*NewColorMapSize].QuantizedColors = ++ QuantizedColor->Pnext; ++ QuantizedColor->Pnext = NULL; ++ NewColorSubdiv[*NewColorMapSize].Count = Count; ++ NewColorSubdiv[Index].Count -= Count; ++ NewColorSubdiv[*NewColorMapSize].NumEntries = ++ NewColorSubdiv[Index].NumEntries - NumEntries; ++ NewColorSubdiv[Index].NumEntries = NumEntries; ++ for (j = 0; j < 3; j++) { ++ NewColorSubdiv[*NewColorMapSize].RGBMin[j] = ++ NewColorSubdiv[Index].RGBMin[j]; ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[j] = ++ NewColorSubdiv[Index].RGBWidth[j]; ++ } ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] = ++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] + ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor; ++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor; ++ ++ NewColorSubdiv[Index].RGBWidth[SortRGBAxis] = ++ MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis]; ++ ++ (*NewColorMapSize)++; ++ } ++ ++ return GIF_OK; ++} ++ ++/**************************************************************************** ++ * Routine called by qsort to compare to entries. ++ ****************************************************************************/ ++static int ++SortCmpRtn(const VoidPtr Entry1, ++ const VoidPtr Entry2) { ++ ++ return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] - ++ (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis]; ++} +diff -up giflib-4.2.1/util/rgb2gif.c.quantize giflib-4.2.1/util/rgb2gif.c +--- giflib-4.2.1/util/rgb2gif.c.quantize 2012-10-09 00:28:12.000000000 -0300 ++++ giflib-4.2.1/util/rgb2gif.c 2012-11-17 12:16:04.490735495 -0200 +@@ -129,7 +129,7 @@ static int SortCmpRtn(const void *Entry1 + * This function returns GIF_OK if succesfull, GIF_ERROR otherwise. + ******************************************************************************/ + static int +-QuantizeBuffer(unsigned int Width, ++GifQuantizeBuffer(unsigned int Width, + unsigned int Height, + int *ColorMapSize, + GifByteType * RedInput, +@@ -428,7 +428,7 @@ int main(int argc, char **argv) + sizeof(GifByteType))) == NULL) + GIF_EXIT("Failed to allocate memory required, aborted."); + +- if (QuantizeBuffer(Width, Height, &ColorMapSize, ++ if (GifQuantizeBuffer(Width, Height, &ColorMapSize, + RedBuffer, GreenBuffer, BlueBuffer, + OutputBuffer, OutputColorMap->Colors) == GIF_ERROR) + QuitGifError(NULL); diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 161a431da..42ed4765d 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186460 2013-05-26 20:12:59Z dan $ +# $Id: PKGBUILD 188161 2013-06-10 22:30:55Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.3 +pkgver=1.8.3.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=('d91b6099fb6763cf92c696977a247060' - '0b469c0fd81b4a56b9059d7c443282f0' +md5sums=('35401b410e7f248b13e35a1069aca2e2' + '3f801cc82a58c2c2ceeab95975114113' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index 77761149a..74c73d9ff 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 183369 2013-04-21 22:09:32Z heftig $ +# $Id: PKGBUILD 188094 2013-06-09 11:29:56Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth -pkgver=3.8.0 -pkgrel=1 +pkgver=3.8.1 +pkgrel=2 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/GnomeBluetooth" -license=('GPL' 'LGPL') -depends=('gtk3' 'hicolor-icon-theme' 'libnotify') -makedepends=('intltool' 'gobject-introspection' 'itstool' 'docbook-xsl') -options=('!libtool' '!emptydirs') +license=(GPL LGPL) +depends=(gtk3 hicolor-icon-theme libnotify bluez4) +makedepends=(intltool gobject-introspection itstool docbook-xsl) +options=(!libtool !emptydirs) install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 61-gnome-bluetooth-rfkill.rules) -sha256sums=('70f275922f10ac9f40eb7d57f89193502ee490894b5b721d0f6273432fc97f82' +sha256sums=('8095fcfa014931773e9d231dff76c6924f43abfbe4c5525cf07fd2d7f8e1f770' '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53') build() { @@ -26,6 +26,10 @@ build() { --disable-desktop-update \ --disable-icon-update \ --disable-schemas-compile + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD index c9dd18a58..6d17f5df6 100644 --- a/extra/gnome-chess/PKGBUILD +++ b/extra/gnome-chess/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185633 2013-05-16 14:54:23Z heftig $ +# $Id: PKGBUILD 188128 2013-06-10 07:55:22Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-chess -pkgver=3.8.2.1 +pkgver=3.8.3 pkgrel=1 pkgdesc="Play the classic two-player boardgame of chess" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ install=gnome-chess.install url="https://live.gnome.org/Chess" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('d38cf534eeeffa4db81edf9db92c0c188d5ffd52cd7091352a0972b2b5c655cb') +sha256sums=('c45493ca7de778029ea78bcf328410a6399dfd91f50241c6f6b4420115c2e786') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 5ba599d6d..1c9c043e9 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185509 2013-05-14 12:14:45Z heftig $ +# $Id: PKGBUILD 187908 2013-06-07 23:36:32Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) @@ -23,7 +23,7 @@ url="http://www.gnome.org" install=gnome-control-center.install options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('abf6c1acb0b82631e730cb32762deff905fd4f776b89b475b8e732dc73a9d1fb') +sha256sums=('e78a5b01692ccfe825e079d795d9e9610fcb94853c0e6d747b2d8d36dead9d84') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index c1cd8b85d..9bad9ef45 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,31 +1,30 @@ -# $Id: PKGBUILD 185455 2013-05-14 10:21:59Z heftig $ +# $Id: PKGBUILD 188610 2013-06-16 23:56:02Z heftig $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.8.2 -pkgrel=1 +pkgver=3.8.3 +pkgrel=2 epoch=1 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL') -depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config' 'iso-codes') -makedepends=('intltool' 'gobject-introspection' 'itstool') +license=(GPL LGPL) +depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes) +makedepends=(intltool gobject-introspection itstool) url="http://www.gnome.org" -groups=('gnome') -options=('!libtool') +groups=(gnome) +options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('af4ec330fa61ee761daf2d5e481e2f9ffbd068d135d5e31a3eaf274524cba33d') +sha256sums=('c9c8d1888e28cb30e466be46909efe640fb3cb348909cae2664489508790e5a2') build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-desktop \ - --with-gnome-distributor="Arch Linux" + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static \ + --with-gnome-distributor="Arch Linux" make } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index a032e2db7..830d2116d 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185457 2013-05-14 10:25:02Z heftig $ +# $Id: PKGBUILD 188472 2013-06-14 19:29:50Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-documents -pkgver=3.8.2.1 +pkgver=3.8.3.1 pkgrel=1 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64 mips64el) @@ -11,12 +11,12 @@ license=(GPL) groups=(gnome-extra) depends=(evince gjs gtk3 gnome-desktop gnome-online-accounts libgdata tracker libzapojit webkitgtk3) -makedepends=(intltool gobject-introspection itstool) +makedepends=(intltool gobject-introspection itstool docbook-xsl) optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('52cbe1590b47fbf446becde227e0fa3772dda589b631ab1350a034c2eae77b85') +sha256sums=('608d965857a0dc0230f0c2408dc28acd78fba5e77b2ba4a1c7fe99376c05b551') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 898a2131b..a7df534fb 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185507 2013-05-14 12:11:03Z heftig $ +# $Id: PKGBUILD 187903 2013-06-07 22:41:57Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be') +sha256sums=('00e7f46c9a6fb8b148255adfcdd26bc5f2c1d393b8dfbac69da100c8dcfa1b6c') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 949e5a37b..35b067508 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186665 2013-05-30 12:26:35Z heftig $ +# $Id: PKGBUILD 187902 2013-06-07 22:40:58Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.8.2 -pkgrel=4 +pkgver=3.8.3 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64 mips64el) url="http://live.gnome.org/GnomeShell" @@ -19,19 +19,15 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - nm-libexecdir.patch popupmenu.patch) -sha256sums=('ffdf42d382d50cd756f1f51a31eaa6877edb51a08f0ca80b6e973f05072416df' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607' - '7df2a128d12350fe8e349c6aa5e125eb5d90b05e0201a842d6f3e1c2683b351d') + nm-libexecdir.patch) +sha256sums=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') prepare() { cd $pkgname-$pkgver # FS#30747 FS#32730 Problems due to libexecdir different from NM patch -Np1 -i ../nm-libexecdir.patch - - # FS#35326 (from gnome-3-8 branch) - patch -Np1 -i ../popupmenu.patch } build() { diff --git a/extra/gnome-shell/popupmenu.patch b/extra/gnome-shell/popupmenu.patch deleted file mode 100644 index 035432cd5..000000000 --- a/extra/gnome-shell/popupmenu.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dd8ca024254341258a9e54c253c080f25be6f9cd Mon Sep 17 00:00:00 2001 -From: Florian Müllner <fmuellner@gnome.org> -Date: Tue, 14 May 2013 16:55:08 +0000 -Subject: PopupMenuManager: Fix child menus - -Since commit c84dc6254d2d65c, popup menus are closed automatically -when another menu opens (to catch the case where a menu is opened -by keyboard shortcut, which wasn't handled before). However in the -case of child menus, both child and parent are expected to be visible, -so handle this case explicitly. - -https://bugzilla.gnome.org/show_bug.cgi?id=699678 ---- -diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js -index fc37dd8..ab6c795 100644 ---- a/js/ui/popupMenu.js -+++ b/js/ui/popupMenu.js -@@ -2124,7 +2124,7 @@ const PopupMenuManager = new Lang.Class({ - - _onMenuOpenState: function(menu, open) { - if (open) { -- if (this.activeMenu) -+ if (this.activeMenu && !this.activeMenu.isChildMenu(menu)) - this.activeMenu.close(BoxPointer.PopupAnimation.FADE); - this._grabHelper.grab({ actor: menu.actor, modal: true, focus: menu.sourceActor, - onUngrab: Lang.bind(this, this._closeMenu, menu) }); --- -cgit v0.9.1 diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index a020fefaf..83525bdf0 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185395 2013-05-13 18:52:30Z heftig $ +# $Id: PKGBUILD 188152 2013-06-10 16:22:47Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('4937dfe9e88fcf56de6ed670989cd119b468a32bb078c6cf720c3c8831915347') +sha256sums=('b368a9220f9a50fecdb57ba8ce7008c65e3c236bc700325a45ecb806f3ab4651') build() { cd $pkgname-$pkgver diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index bc897d81c..827fb93ec 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173829 2012-12-24 16:03:19Z jgc $ +# $Id: PKGBUILD 188077 2013-06-08 11:18:22Z bpiotrowski $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Mark Schneider <queueRAM@gmail.com> pkgname=gnucash -pkgver=2.4.11 -pkgrel=2 +pkgver=2.4.13 +pkgrel=1 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnucash.org" @@ -17,10 +17,16 @@ optdepends=('evince: for print preview' options=('!libtool' '!makeflags' '!emptydirs') install=gnucash.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('c157ad7ea0960c71966f5071acd9018580ece538') +sha1sums=('cd28d4e7d84d71ade56173734d634ccadc59ed81') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|guile-config|guile-config1.8|g' configure +} build() { cd "${srcdir}/${pkgname}-${pkgver}" + export GUILE=/usr/bin/guile1.8 ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \ --libexecdir=/usr/lib --disable-schemas-install --enable-ofx --enable-aqbanking make diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 5c31a4028..0f50c438b 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185059 2013-05-10 18:32:00Z andyrtr $ +# $Id: PKGBUILD 187148 2013-06-04 15:50:10Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.1.11 +pkgver=3.2.1 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -11,15 +11,21 @@ license=('GPL3' 'LGPL2.1') url="http://www.gnutls.org/" install=gnutls.install options=('!libtool' '!zipman') -depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') makedepends=('strace' 'datefudge') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') -source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('b1c8f431f7c258a1e76cdba05cc1dd88' - 'SKIP') +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig} + check_fix.diff) +md5sums=('c220b50736f61292ed8722d5132b6a3e' + 'SKIP' + '53ae2a58a401d9e6d052910670da8b07') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # fix i686 test suite failure + patch -Np1 -i ${srcdir}/check_fix.diff + ./configure --prefix=/usr \ --with-zlib \ --disable-static \ @@ -31,6 +37,7 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}" make -k check + #make -j1 check } package() { diff --git a/extra/gnutls/check_fix.diff b/extra/gnutls/check_fix.diff new file mode 100644 index 000000000..f7c7e32c3 --- /dev/null +++ b/extra/gnutls/check_fix.diff @@ -0,0 +1,34 @@ +From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001 +From: Nikos Mavrogiannopoulos <nmav@gnutls.org> +Date: Sun, 2 Jun 2013 12:10:06 +0200 +Subject: [PATCH] Avoid comparing the expiration date to prevent false positive error in 32-bit systems. + +--- + tests/cert-tests/pem-decoding | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding +index fe769ec..f8c6372 100755 +--- a/tests/cert-tests/pem-decoding ++++ b/tests/cert-tests/pem-decoding +@@ -61,7 +61,9 @@ if test "$rc" != "0"; then + exit $rc + fi + +-diff $srcdir/complex-cert.pem tmp-pem.pem ++cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1 ++cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2 ++diff tmp1 tmp2 + rc=$? + + if test "$rc" != "0"; then +@@ -69,6 +71,6 @@ if test "$rc" != "0"; then + exit $rc + fi + +-rm -f tmp-pem.pem ++rm -f tmp-pem.pem tmp1 tmp2 + + exit 0 +-- +1.7.1 diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD index b8e7fdc69..b53c67c02 100644 --- a/extra/gphoto2/PKGBUILD +++ b/extra/gphoto2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179980 2013-03-13 20:13:10Z jgc $ +# $Id: PKGBUILD 188639 2013-06-17 09:41:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=gphoto2 -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 pkgdesc="A digital camera download and access program." arch=(i686 x86_64 'mips64el') @@ -11,7 +11,7 @@ url="http://www.gphoto.org" license=('GPL' 'LGPL') depends=('libgphoto2' 'popt' 'readline') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2) -md5sums=('03cda6d5b7c647ac4c90d0081f2cb7c7') +md5sums=('7e59e7e06a58febd35820978c6e48287') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index cf42e5a1f..de6cbd64e 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185608 2013-05-15 22:56:58Z tomegun $ +# $Id: PKGBUILD 187860 2013-06-07 09:24:56Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,12 +6,12 @@ pkgname=gpsd pkgver=3.9 -pkgrel=2 +pkgrel=3 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64' 'mips64el') url="http://catb.org/gpsd/" license=('BSD') -depends=('python2' 'libusb' 'bluez' 'desktop-file-utils') +depends=('python2' 'libusb' 'bluez-libs' 'desktop-file-utils') optdepends=('php: generate a PHP status page for your GPS' 'php-gd: image support for the PHP status page' 'pygtk: GUI frontends') diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index dbf1df9d3..680294ec3 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186328 2013-05-24 20:18:53Z andyrtr $ +# $Id: PKGBUILD 188519 2013-06-15 07:02:29Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=graphite -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 epoch=1 arch=('i686' 'x86_64' 'mips64el') @@ -10,23 +10,40 @@ url="http://projects.palaso.org/projects/graphitedev" pkgdesc='reimplementation of the SIL Graphite text processing engine' license=('LGPL' 'GPL' 'custom') depends=('gcc-libs') -makedepends=('cmake' 'freetype2' 'python2') -# 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') - only for docs - target doesn't install properly +makedepends=('cmake' 'freetype2' 'python2') + # - only for docs - target doesn't install properly + # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') # builds doc properly? 'texlive-helvetic' seems to be missing options=('!libtool' '!emptydirs') -source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz") -md5sums=('4bfd5db6c91a4097cd76a699beaca70e') +source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz + graphite2-1.2.0-cmakepath.patch) +md5sums=('7042305e4208af4c2d5249d814ccce58' + '00353b67941dbc30b76a43253760769e') build() { cd "${srcdir}" + + # python2 fixes sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" graphite2-${pkgver}/tests/{jsoncmp,fuzztest,defuzz,corrupt.py} + + # fix install path - .cmake files contain architecture dependend content - patch taken from FC/Slackware + pushd graphite2-${pkgver} + patch -Np1 -i ${srcdir}/graphite2-1.2.0-cmakepath.patch + popd + mkdir build cd build cmake -G "Unix Makefiles" ../graphite2-${pkgver} \ + -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE:STRING=Release \ - -DGRAPHITE2_COMPARE_RENDERER=OFF - make -# make docs + -DGRAPHITE2_COMPARE_RENDERER=OFF \ + #-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON # remove when docs install target will be fixed + + # fix unwanted -O3 cflag (taken form Debian) + find . -type f ! -name "rules" ! -name "changelog" -exec sed -i -e 's/\-O3//g' {} \; + + make + #make docs } check() { @@ -37,7 +54,8 @@ check() { package() { cd "${srcdir}"/build - make DESTDIR="$pkgdir/" install + # FIXME: all target doesn't install the docs target files + make DESTDIR="$pkgdir/" install # licenses mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname} diff --git a/extra/graphite/graphite2-1.2.0-cmakepath.patch b/extra/graphite/graphite2-1.2.0-cmakepath.patch new file mode 100644 index 000000000..ee71cd6de --- /dev/null +++ b/extra/graphite/graphite2-1.2.0-cmakepath.patch @@ -0,0 +1,9 @@ +diff -urN graphite2-1.2.0.orig/src/CMakeLists.txt graphite2-1.2.0/src/CMakeLists.txt +--- graphite2-1.2.0.orig/src/CMakeLists.txt 2013-01-29 15:47:32.465841769 +0530 ++++ graphite2-1.2.0/src/CMakeLists.txt 2013-01-29 15:48:24.056843352 +0530 +@@ -136,4 +136,4 @@ + + + install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin) +-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_) ++install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/graphite2 NAMESPACE gr2_) diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index f8952e875..0ee45abf2 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186382 2013-05-26 09:24:35Z bluewind $ +# $Id: PKGBUILD 188078 2013-06-08 11:18:23Z bpiotrowski $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.30.1 -pkgrel=4 +pkgrel=5 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD index 6cd486b41..59afb9248 100644 --- a/extra/gstreamer-vaapi/PKGBUILD +++ b/extra/gstreamer-vaapi/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 183264 2013-04-19 23:02:28Z heftig $ +# $Id: PKGBUILD 188473 2013-06-14 19:32:02Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gstreamer-vaapi pkgname=(gst-vaapi gstreamer0.10-vaapi) -pkgver=0.5.3 +pkgver=0.5.4 pkgrel=1 pkgdesc="GStreamer Multimedia Framework VA Plugins" arch=(i686 x86_64) license=(LGPL) url="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/" -makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva) +makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva + libxrandr) options=(!libtool !emptydirs) source=($url/$pkgbase-${pkgver}.tar.bz2) -sha1sums=('f99f657c8c19dd008a8066d8b2237aff4a05810d') +sha1sums=('acd624693e392d6fd037d7072613e7384ebd6371') prepare() { cd $pkgbase-$pkgver @@ -40,14 +41,14 @@ check() { } package_gst-vaapi() { - depends=(gst-plugins-base gst-plugins-bad libva) + depends=(gst-plugins-base gst-plugins-bad libva libxrandr) cd $pkgbase-$pkgver/build-1.0 make DESTDIR="$pkgdir" install } package_gstreamer0.10-vaapi() { - depends=(gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva) + depends=(gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva libxrandr) cd $pkgbase-$pkgver/build-0.10 make DESTDIR="$pkgdir" install diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index c691ea0a7..48928df3a 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185341 2013-05-13 13:52:12Z heftig $ +# $Id: PKGBUILD 188597 2013-06-16 18:27:06Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.18 +pkgver=2.24.19 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('6c963101272ff53bb5b01d21bfb86cebba5f0a68f31c5e10523c63f07e762385' +sha256sums=('15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/gts/PKGBUILD b/extra/gts/PKGBUILD index 46985e4b0..565a2f9d1 100644 --- a/extra/gts/PKGBUILD +++ b/extra/gts/PKGBUILD @@ -1,5 +1,4 @@ -# $Id: PKGBUILD 143014 2011-11-20 23:59:13Z bisson $ - +# $Id: PKGBUILD 188503 2013-06-15 04:44:21Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thomas Dziedzic <gostrc at gmail> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +6,7 @@ pkgname=gts pkgver=0.7.6 -pkgrel=2.2 +pkgrel=3 pkgdesc='Provides useful functions to deal with 3D surfaces meshed with interconnected triangles' url='http://gts.sourceforge.net/' license=('LGPL') @@ -15,6 +14,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('glib2') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") sha1sums=('000720bebecf0b153eb28260bd30fbd979dcc040') + options=('!libtool') build() { diff --git a/extra/guile/PKGBUILD b/extra/guile/PKGBUILD index b42673104..e1fb8eb71 100644 --- a/extra/guile/PKGBUILD +++ b/extra/guile/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 150868 2012-02-23 13:23:16Z ibiru $ +# $Id: PKGBUILD 188079 2013-06-08 11:18:24Z bpiotrowski $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=guile -pkgver=1.8.8 -pkgrel=2.2 +pkgver=2.0.9 +pkgrel=1 pkgdesc="a portable, embeddable Scheme implementation written in C" url="http://www.gnu.org/software/guile/" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo') +depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo' 'libunistring' 'gc' 'libffi') install=guile.install source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) options=('!libtool') -md5sums=('18661a8fdfef13e2fcb7651720aa53f3') +md5sums=('531839c3fe887382ca9d4774db544d34') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/guile1.8/PKGBUILD b/extra/guile1.8/PKGBUILD new file mode 100644 index 000000000..00991e313 --- /dev/null +++ b/extra/guile1.8/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 188080 2013-06-08 11:18:25Z bpiotrowski $ +# Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> + +pkgname=guile1.8 +pkgver=1.8.8 +pkgrel=3 +pkgdesc='Portable, embeddable Scheme implementation written in C. Legacy branch.' +url="http://www.gnu.org/software/guile/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo') +source=(ftp://ftp.gnu.org/pub/gnu/guile/guile-$pkgver.tar.gz) +options=('!libtool') +md5sums=('18661a8fdfef13e2fcb7651720aa53f3') + +build() { + cd guile-$pkgver + ./configure --prefix=/usr \ + --disable-static \ + --disable-error-on-warning \ + --program-suffix=1.8 + make LDFLAGS+="-lpthread" +} + +package() { + cd guile-$pkgver + make DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/share/info + sed -i '1s/guile/guile1.8/' -i "$pkgdir"/usr/bin/guile-config1.8 + mv "$pkgdir"/usr/share/aclocal/guile.m4 "$pkgdir"/usr/share/aclocal/guile18.m4 +} diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 2bcd1cf06..384f2d116 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 185516 2013-05-14 16:46:51Z heftig $ +# $Id: PKGBUILD 188470 2013-06-14 19:24:13Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp') -pkgver=1.16.2 +pkgver=1.16.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') +makedepends=('avahi' 'bluez-libs' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('6b0e62d27fe73844efb536689057b762fbce085984800c83395371306ec547f1') +sha256sums=('02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345b73ac8d6f87bb91189c8e49') build() { cd "$pkgbase-$pkgver" @@ -96,7 +96,7 @@ package_gvfs-gphoto2() { package_gvfs-obexftp() { pkgdesc="ObexFTP (bluetooth) backend for gvfs" - depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server') + depends=("gvfs=$pkgver" 'dbus-glib' 'bluez4' 'obex-data-server') install=gvfs-module.install cd "$pkgbase-$pkgver/daemon" diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 1d005d29f..05f197b67 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,29 +1,46 @@ -# $Id: PKGBUILD 186346 2013-05-25 04:11:23Z foutrelis $ +# $Id: PKGBUILD 187876 2013-06-07 17:10:53Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=harfbuzz -pkgver=0.9.17 -pkgrel=2 -pkgdesc="OpenType text shaping engine." +pkgbase=(harfbuzz) +pkgname=(harfbuzz harfbuzz-icu) +pkgver=0.9.18 +pkgrel=1 +pkgdesc="OpenType text shaping engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/HarfBuzz" -license=('MIT') -depends=('icu' 'glib2' 'freetype2' 'graphite>=1.2.0') -makedepends=('icu' 'cairo' 'glib2' 'freetype2') -optdepends=('cairo: hb-view program') +license=(MIT) +makedepends=(glib2 freetype2 graphite cairo icu) options=(!libtool) -source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed') +source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2) +sha256sums=('fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908') build() { - cd ${pkgname}-${pkgver} - - ./configure --prefix=/usr + cd $pkgbase-$pkgver + ./configure --prefix=/usr \ + --with-glib --with-freetype --with-cairo --with-icu --with-graphite2 make } -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/harfbuzz/COPYING" +package_harfbuzz() { + depends=(glib2 freetype2 graphite) + optdepends=('cairo: hb-view program') + + cd $pkgbase-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/harfbuzz/COPYING" + +# Split harfbuzz-icu + mkdir -p ../hb-icu/usr/{include/harfbuzz,lib/pkgconfig}; cd ../hb-icu + mv "$pkgdir"/usr/lib/libharfbuzz-icu* ./usr/lib + mv "$pkgdir"/usr/lib/pkgconfig/harfbuzz-icu.pc ./usr/lib/pkgconfig + mv "$pkgdir"/usr/include/harfbuzz/hb-icu.h ./usr/include/harfbuzz +} + +package_harfbuzz-icu(){ + pkgdesc="$pkgdesc (ICU integration)" + depends=(harfbuzz icu) + + mv hb-icu/* "$pkgdir" + + install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/harfbuzz-icu/COPYING" } diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index 6145832a7..41ddf12bc 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180744 2013-03-26 01:47:54Z stephane $ +# $Id: PKGBUILD 188118 2013-06-10 06:43:40Z bpiotrowski $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sylvain HENRY <hsyl20@yahoo.fr> # Contributor: Hervé YVIQUEL <elldekaa@gmail.com> pkgname=hwloc -pkgver=1.6.2 +pkgver=1.7.1 pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('BSD') depends=('sh' 'pciutils' 'cairo' 'libxml2') makedepends=('pkg-config') options=('!libtool' '!docs') -source=(http://www.open-mpi.org/software/hwloc/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('f9d9938d427e65257d1745ffc1d10634251cdc09') +source=(http://www.open-mpi.org/software/hwloc/v1.7/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('7bb4e6c68d1c24f881d3f7ddf0682b50622351c8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ifplugd/PKGBUILD b/extra/ifplugd/PKGBUILD index baa62dbb6..9c90f3bc5 100644 --- a/extra/ifplugd/PKGBUILD +++ b/extra/ifplugd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165791 2012-08-30 09:38:27Z thomas $ +# $Id: PKGBUILD 187834 2013-06-06 18:34:52Z thomas $ # Contributor: Manolis Tzanidakis # Contributor: kevin <kevin@archlinux.org> # Maintainer: pkgname=ifplugd pkgver=0.28 -pkgrel=13 +pkgrel=14 pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal." arch=('i686' 'x86_64' 'mips64el') url="http://0pointer.de/lennart/projects/ifplugd" @@ -13,17 +13,15 @@ install=ifplugd.install license=('GPL2') depends=('libdaemon' 'bash') backup=('etc/ifplugd/ifplugd.conf') -options=('!makeflags') +options=('!makeflags' '!emptydirs') source=($url/${pkgname}-${pkgver}.tar.gz ifplugd-0.28-interface.patch ifplugd-fix-return-value.patch - ifplugd ifplugd-daemon ifplugd.systemd) md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3' '54eb22844b5aeed161c0b80aa9008570' 'f26dbd7597d9d637f0b2b104b11ab820' - '1ea9aa64415a5a9e27b84634cd08a7f2' 'f2e8a37af52b79ee0e3c5bcc2470ce10' '3dc2ce45d0e12d155ecc7a5bc9e3ee04') @@ -41,11 +39,9 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - # replace the default init script & action files with ours. - install -D -m755 ${srcdir}/ifplugd ${pkgdir}/etc/rc.d/ifplugd install -D -m755 ${srcdir}/ifplugd-daemon ${pkgdir}/usr/bin/ifplugd-daemon - # remove default action script - rm -f ${pkgdir}/etc/ifplugd/ifplugd.action + # remove the default init script and action script + rm -f ${pkgdir}/etc/{ifplugd/ifplugd.action,rc.d/ifplugd} # install systemd unit install -D -m644 ${srcdir}/ifplugd.systemd ${pkgdir}/usr/lib/systemd/system/ifplugd@.service } diff --git a/extra/ifplugd/ifplugd b/extra/ifplugd/ifplugd deleted file mode 100644 index 354238fe2..000000000 --- a/extra/ifplugd/ifplugd +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# -# ifplugd daemon script for Arch Linux - -. /etc/rc.conf -. /etc/rc.d/functions - -shopt -s extglob - -# env vars -daemonname=ifplugd -cfg=/etc/ifplugd/ifplugd.conf -PID=$(pidof -o %PPID ifplugd) - -# source configuration file -[[ -r $cfg ]] && . "$cfg" - -# discover interfaces to monitor -net_ifs=($INTERFACES) - -case $1 in - start) - stat_busy "Starting $daemonname: ${net_ifs[*]}" - - for nic in "${net_ifs[@]}"; do - # only start if a PID doesn't already exist - if [[ ! -f /var/run/ifplugd.$nic.pid ]]; then - /usr/bin/ifplugd-daemon $nic - - # use presence of PID file to check for start success - [[ -f /var/run/ifplugd.$nic.pid ]] || (( ++err )) - fi - done - unset nic - - if (( err )); then - stat_fail - exit 1 - else - add_daemon $daemonname - stat_done - fi - ;; - stop) - stat_busy "Stopping $daemonname: ${net_ifs[*]}" - - for nic in /var/run/ifplugd.*.pid; do - [[ -f $nic ]] || { (( ++err )); break; } - nic=${nic%.pid} - nic=${nic##*.} - ifplugd -k -i "$nic" || (( ++err )) - done - - if (( err )); then - stat_fail - exit 1 - else - rm_daemon $daemonname - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - status) - for nic in "${net_ifs[@]}"; do - ifplugd -c -i "$nic" - done - unset nic - ;; - suspend) - stat_busy "Suspending $daemonname: ${net_ifs[*]}" - for nic in "${net_ifs[@]}"; do - ifplugd -S -i $nic || (( ++err )) - done - unset nic - - if (( err )); then - stat_fail - exit 1 - else - stat_done - fi - ;; - resume) - stat_busy "Resuming $daemonname ${net_ifs[*]}" - - for nic in "${net_ifs[@]}"; do - ifplugd -R -i $nic || (( ++err )) - done - unset nic - - if (( err )); then - stat_fail - exit 1 - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|status|suspend|resume}" -esac -exit 0 diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index df0d77d66..252085b35 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186384 2013-05-26 09:24:37Z bluewind $ +# $Id: PKGBUILD 187911 2013-06-08 05:14:18Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.5.7 +pkgver=6.8.5.10 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -13,7 +13,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('f393612e9797a6129f2cac7f83df337bb54ecf76' +sha1sums=('ae47754c676df262956d1c740cf4ff297dfda71b' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD index 7274afa72..cc8675afb 100644 --- a/extra/iptraf-ng/PKGBUILD +++ b/extra/iptraf-ng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160611 2012-06-02 21:10:00Z ibiru $ +# $Id: PKGBUILD 187060 2013-06-03 11:16:37Z allan $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: sh0 <mee@sh0.org> pkgname=iptraf-ng pkgver=1.1.3.1 -pkgrel=1.1 +pkgrel=2 pkgdesc="A console-based network monitoring utility (a fork of original iptraf)" url="https://fedorahosted.org/iptraf-ng/" arch=('i686' 'x86_64' 'mips64el') @@ -13,15 +13,19 @@ license=('GPL2') replaces=('iptraf') options=('!libtool') source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz - 0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch) + iptraf-ng-linux-3.5-compat.patch) md5sums=('1a2c02944b0b012d6a3de96207610fa2' - 'd5eab1e094b93f0e3a256cf9ccfaa9c3') + 'd2ddee5f9ff485155235f7cb4671d8fb') + +prepare() { + cd "$pkgname-$pkgver" + patch -p1 -i ${srcdir}/iptraf-ng-linux-3.5-compat.patch +} build() { cd "$pkgname-$pkgver" - patch -p1 -i "$srcdir/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --sbindir=/usr/sbin + --localstatedir=/var --sbindir=/usr/bin make CFLAGS="$CFLAGS -std=gnu99" } diff --git a/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch b/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch new file mode 100644 index 000000000..85fd791df --- /dev/null +++ b/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch @@ -0,0 +1,127 @@ +From 72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab Mon Sep 17 00:00:00 2001 +From: Nikola Pajkovsky <npajkovs@redhat.com> +Date: Wed, 23 May 2012 16:32:27 +0200 +Subject: [PATCH 01/91] token-ring: kernel v3.5 kill off token-ring support + +Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com> +--- + src/hostmon.c | 10 ---------- + src/iptraf-ng-compat.h | 1 - + src/othptab.c | 6 ------ + src/packet.c | 27 --------------------------- + src/tcptable.c | 4 ---- + 5 files changed, 48 deletions(-) + +diff --git a/src/hostmon.c b/src/hostmon.c +index 40a2b95..72b91f8 100644 +--- a/src/hostmon.c ++++ b/src/hostmon.c +@@ -1004,16 +1004,6 @@ void hostmon(const struct OPTIONS *options, time_t facilitytime, char *ifptr, + FDDI_K_ALEN); + list = flist; + break; } +- case ARPHRD_IEEE802: +- case ARPHRD_IEEE802_TR: { +- struct trh_hdr *hdr_trh = +- (struct trh_hdr *)pkt.pkt_buf; +- memcpy(scratch_saddr, hdr_trh->saddr, +- TR_ALEN); +- memcpy(scratch_daddr, hdr_trh->daddr, +- TR_ALEN); +- list = flist; +- break; } + default: + /* unknown link protocol */ + continue; +diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h +index d5aee4a..2d9da96 100644 +--- a/src/iptraf-ng-compat.h ++++ b/src/iptraf-ng-compat.h +@@ -39,7 +39,6 @@ + #include <linux/if_ether.h> + #include <linux/if_packet.h> + #include <linux/if_fddi.h> +-#include <linux/if_tr.h> + #include <linux/types.h> + #include <linux/isdn.h> + +diff --git a/src/othptab.c b/src/othptab.c +index d12cdfd..1181eb1 100644 +--- a/src/othptab.c ++++ b/src/othptab.c +@@ -193,12 +193,6 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt, + saddr), new_entry->smacaddr); + convmacaddr((char *) (((struct fddihdr *) packet)-> + daddr), new_entry->dmacaddr); +- } else if ((pkt->pkt_hatype == ARPHRD_IEEE802) +- || (pkt->pkt_hatype == ARPHRD_IEEE802_TR)) { +- convmacaddr((char *) (((struct trh_hdr *) packet)-> +- saddr), new_entry->smacaddr); +- convmacaddr((char *) (((struct trh_hdr *) packet)-> +- daddr), new_entry->dmacaddr); + } + } + +diff --git a/src/packet.c b/src/packet.c +index a43a27a..f3e4304 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -51,24 +51,6 @@ static int in_cksum(u_short * addr, int len) + return (u_short) (~sum); + } + +-static unsigned int get_tr_ip_offset(char *pkt) +-{ +- struct trh_hdr *trh; +- unsigned int riflen = 0; +- +- trh = (struct trh_hdr *) pkt; +- +- /* +- * Check if this packet has TR routing information and get +- * its length. +- */ +- if (trh->saddr[0] & TR_RII) +- riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8; +- +- return sizeof(struct trh_hdr) - TR_MAXRIFLEN + riflen + +- sizeof(struct trllc); +-} +- + static int packet_adjust(struct pkt_hdr *pkt) + { + int retval = 0; +@@ -109,15 +91,6 @@ static int packet_adjust(struct pkt_hdr *pkt) + pkt->pkt_payload += sizeof(struct fddihdr); + pkt->pkt_len -= sizeof(struct fddihdr); + break; +- case ARPHRD_IEEE802_TR: +- case ARPHRD_IEEE802: +- pkt->pkt_payload = pkt->pkt_buf; +- /* Token Ring patch supplied by Tomas Dvorak */ +- /* Get the start of the IP packet from the Token Ring frame. */ +- unsigned int dataoffset = get_tr_ip_offset(pkt->pkt_payload); +- pkt->pkt_payload += dataoffset; +- pkt->pkt_len -= dataoffset; +- break; + default: + /* return a NULL packet to signal an unrecognized link */ + /* protocol to the caller. Hopefully, this switch statement */ +diff --git a/src/tcptable.c b/src/tcptable.c +index 56c4780..b0e5ccc 100644 +--- a/src/tcptable.c ++++ b/src/tcptable.c +@@ -620,10 +620,6 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry, + } else if (linkproto == ARPHRD_FDDI) { + convmacaddr((char *) (((struct fddihdr *) packet)-> + saddr), newmacaddr); +- } else if ((linkproto == ARPHRD_IEEE802) +- || (linkproto == ARPHRD_IEEE802_TR)) { +- convmacaddr((char *) (((struct trh_hdr *) packet)-> +- saddr), newmacaddr); + } + + if (tableentry->smacaddr[0] != '\0') { +-- +1.8.3 + diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD index 886c0ff0d..e0e653f03 100644 --- a/extra/irqbalance/PKGBUILD +++ b/extra/irqbalance/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Martin Striz <ms@poruba.net> pkgname=irqbalance -pkgver=1.0.5 -pkgrel=2 +pkgver=1.0.6 +pkgrel=1 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/irqbalance" @@ -12,7 +12,7 @@ depends=(glib2 numactl libcap-ng) makedepends=(pkgconfig) source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz irqbalance.service) -md5sums=('b6403fa067c96adce448a48c9993654d' +md5sums=('b73b1a5a9e1c3c428ae39024c711e41e' 'a97ad17dc7df98b81acb500b27f931e5') build() { diff --git a/extra/isapnptools/PKGBUILD b/extra/isapnptools/PKGBUILD index fb0005b72..b5227742f 100644 --- a/extra/isapnptools/PKGBUILD +++ b/extra/isapnptools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185816 2013-05-19 12:09:03Z giovanni $ +# $Id: PKGBUILD 188739 2013-06-19 02:11:11Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=isapnptools @@ -9,7 +9,8 @@ url="http://www.roestock.demon.co.uk/isapnptools/" depends=('glibc') arch=('i686' 'x86_64') license=('GPL') -source=("ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") +#source=("ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") +source=("http://ibiblio.org/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") md5sums=('b997ba56583dc850fce9b93d658dfa0c') build() { diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 0c5e6b813..a5f225cca 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186020 2013-05-20 13:53:06Z guillaume $ +# $Id: PKGBUILD 188157 2013-06-10 20:38:57Z guillaume $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -7,23 +7,23 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc') pkgbase=java7-openjdk _java_ver=7 -_updatever=u21 -_icedtea_ver=2.3.9 +_updatever=u40 +_icedtea_ver=2.4.0 -# check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=47a6bf94ce11 -_JAXP_CHANGESET=d2142901bcb7 -_JAXWS_CHANGESET=b1877762d45c -_JDK_CHANGESET=8e91101e36f0 -_LANGTOOLS_CHANGESET=fd956199cb82 -_OPENJDK_CHANGESET=12b96a57263c +# check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am +_CORBA_CHANGESET=71d5ec2f3dfb +_JAXP_CHANGESET=5eaf3bca7f68 +_JAXWS_CHANGESET=9d2007a13c02 +_JDK_CHANGESET=29ce11184945 +_LANGTOOLS_CHANGESET=ffb1b6bc4750 +_OPENJDK_CHANGESET=9c74cb4a3ae8 -_HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map +_HOTSPOT_CHANGESET=c67fd7874b1a # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=4 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -33,7 +33,7 @@ makedepends=('jdk7-openjdk' 'libxp' 'libxslt' 'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget') [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj') -_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3 +_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-${_icedtea_ver:0:3} source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz @@ -50,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da' - '651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc' - '7346565688c3f01872af2c16a491233325ad5e924475dc89ff01f50582814934' - '8cad2dfee2d5e58a217193dcc9650debe519f72df7c136a15311195c9a1b48d6' - 'b8e109ac705b95e5605280c8ae13319a128e16eac950a455bfa30364ae4192cc' - '349009abfc8df1575336648bebd8a5ff0cb0f2ad045f6b661d88691411881d5e' - '2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12' - 'c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac' +sha256sums=('be030583f0216151bd4b67b354085bf957b532d7bd2d67f14166bb6a1fc5497a' + '4adfde4b056ea8f35b639156c7cad8bac140ba7957ea8ce49b440089babc6579' + '0191c678935dac77c0ad085bedb59e6bcc93e0712c3a4ef2b7171562e129807c' + '25bb13db8a426c2d84e13eed0d598c88c447af41de3f678a70680897c38083fd' + '4cff8300b4c23e9327607f7c09295a99ef7d1032d8397429c7879ba489d14456' + '13024c623bb37c4d44cb3b724876d7827924868fb8f94428faa87ddb11492352' + '80cbe75f7c268e97619e8007f8d29ecbbb7584062c1286c8b470f875526028f3' + '34e60aba6db2f7a5cac7861058db283bd1edcdd9194a5490114cf76edd71696d' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '583af9025df545264a15665e4c9f981bc7286aaecc6d312dced485102cf5dda9' 'd57754ff320475023688bd7c7af38a9ea37e27ed8c1edd3b1572e4d8b41b78d3' diff --git a/extra/json-c/PKGBUILD b/extra/json-c/PKGBUILD index 843e56686..96e2ad232 100644 --- a/extra/json-c/PKGBUILD +++ b/extra/json-c/PKGBUILD @@ -1,28 +1,21 @@ -# $Id: PKGBUILD 176239 2013-01-28 00:11:44Z heftig $ +# $Id: PKGBUILD 188176 2013-06-11 17:10:35Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: congyiwu <congyiwu AT gmail DOT com> pkgname=json-c -pkgver=0.10 -pkgrel=2 +pkgver=0.11 +pkgrel=1 pkgdesc="A JSON implementation in C" url="https://github.com/json-c/json-c/wiki" -license=("MIT") +license=(MIT) arch=('i686' 'x86_64' 'mips64el') -depends=('glibc') -source=(https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('a4edc79410eb894f08d7d52ca9f88732') -options=(!libtool) +depends=(glibc) +options=(!libtool !makeflags) +source=(https://s3.amazonaws.com/${pkgname}_releases/releases/$pkgname-${pkgver}.tar.gz) +sha256sums=('28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c') + build() { cd $pkgname-$pkgver - - ## from http://pkgs.fedoraproject.org/cgit/json-c.git/tree/json-c.spec - # Hack to get json_object_iterator.c compiled - sed -e 's/json_object.c/json_object.c json_object_iterator.c/' \ - -e 's/json_object.h/json_object.h json_object_iterator.h/' \ - -e 's/json_object.lo/json_object.lo json_object_iterator.lo/' \ - -i Makefile.in - ./configure --prefix=/usr --disable-static make } @@ -30,5 +23,5 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/extra/jsoncpp/PKGBUILD b/extra/jsoncpp/PKGBUILD new file mode 100644 index 000000000..94a3aae2b --- /dev/null +++ b/extra/jsoncpp/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 188521 2013-06-15 07:18:30Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Jonahtan Schaeffer <joschaeffer@gmail.com> +# COntributor: Drake Arconis <lightdrake@gmail.com> + +pkgname=jsoncpp +pkgver=0.5.0 +pkgrel=4 +pkgdesc="A JSON C++ library" +url='http://jsoncpp.sourceforge.net/' +license=('custom:Public_Domain') +arch=('i686' 'x86_64') +depends=('gcc-libs') +makedepends=('scons') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-src-${pkgver}.tar.gz") +md5sums=('24482b67c1cb17aac1ed1814288a3a8f') + +build() { + cd ${pkgname}-src-${pkgver} + scons platform=linux-gcc +} + +package() { + cd ${pkgname}-src-${pkgver} + + install -d "${pkgdir}"/usr/include/jsoncpp + cp -r include/json "${pkgdir}"/usr/include/jsoncpp/json + + install -Dm644 buildscons/linux-gcc-*/src/lib_json/libjson_linux-gcc*libmt.so \ + "${pkgdir}"/usr/lib/libjsoncpp.so + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index e6732f8db..e0ef39ff2 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184849 2013-05-09 09:42:19Z andrea $ +# $Id: PKGBUILD 187927 2013-06-08 07:59:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='API for using and interacting with the Activity Manager' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('nepomuk-core') makedepends=('cmake' 'automoc4' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('0c00782aea70ad1963e303b1eec55482265f0b37') +sha1sums=('a339ad9eeff20ba384a03d2dff5b4d3622f9e17d') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index a5d2c3055..5c8839f2f 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184876 2013-05-09 09:42:49Z andrea $ +# $Id: PKGBUILD 187954 2013-06-08 07:59:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A text to speech application' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdeaccessibility-kttsd') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz") -sha1sums=('ae73088307c31f53c9ac6c2a949b3a32ffad3b0b') +sha1sums=('3a4d718251fb8f5e66c127028dbca99607eb4b66') build() { mkdir build diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index 05a1ba5ea..3dcdb3506 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184877 2013-05-09 09:42:50Z andrea $ +# $Id: PKGBUILD 187955 2013-06-08 07:59:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Provides accessibility services like focus tracking and a screenreader' @@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") -sha1sums=('9db691a3a2571db88ae1ed94355797a4466928dc') +sha1sums=('c7e6946120b34e6a5963f103430da1d3ca812ca8') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index ede29daac..ce6110987 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184878 2013-05-09 09:42:51Z andrea $ +# $Id: PKGBUILD 187956 2013-06-08 07:59:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Screen Magnifier' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz") -sha1sums=('3976b199ed9ee1785c97920f2454bc988523dd8f') +sha1sums=('68e9ec4b646db7b7711a08ecf62e1011be60024e') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index 17267cba5..2787ba36d 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184879 2013-05-09 09:42:52Z andrea $ +# $Id: PKGBUILD 187957 2013-06-08 07:59:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Clicks the mouse for you, reducing the effects of RSI' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz") -sha1sums=('8314f6913059a7f012896be80705893876d1eb37') +sha1sums=('e3e635780254a2ac9ce94c5c1f21bfabc4b59121') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index d21feaff5..89402afcf 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184880 2013-05-09 09:42:53Z andrea $ +# $Id: PKGBUILD 187958 2013-06-08 07:59:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Speech Synthesizer Frontend' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz") -sha1sums=('3a9b2265592f45c3d07ae88e551aac0dceeded0e') +sha1sums=('3236b2fcb79f95a1eb44928a2cd286243f0b128c') build() { cd "${srcdir}" diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index ae163dee6..eb9b6cf89 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184881 2013-05-09 09:42:54Z andrea $ +# $Id: PKGBUILD 187959 2013-06-08 07:59:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdeadmin pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') @@ -14,14 +14,15 @@ groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdelibs' 'kdebase-runtime' 'kdepimlibs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('fefba9f6dc817b6c569d76efc536a7ae0c1371df' +sha1sums=('422b9cd97d40191080ee4a121fda24fb19759216' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') -build() { - cd ${srcdir}/${pkgbase}-${pkgver} +prepare() { + cd ${pkgbase}-${pkgver} patch -p1 -i ${srcdir}/syslog-path.patch +} - cd ${srcdir} +build() { mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index c4c149fb2..7f36675eb 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184882 2013-05-09 09:42:55Z andrea $ +# $Id: PKGBUILD 187960 2013-06-08 07:59:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,7 +12,7 @@ pkgname=('kdeartwork-colorschemes' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('45baac5806471aa33e976e06652f828d989e6b67') +sha1sums=('b41e00708a595f4ee310a69c7326a6f956e8c6e2') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index faf8ddaf1..11c370600 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184883 2013-05-09 09:42:56Z andrea $ +# $Id: PKGBUILD 187961 2013-06-08 07:59:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz") -sha1sums=('fd5d00103c2d6f8c446286f997edd286a719e1e9') +sha1sums=('8fdc5965837f104ddc9923e97bb1499f6293c833') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 0816713f8..2bf2aafab 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184862 2013-05-09 09:42:34Z andrea $ +# $Id: PKGBUILD 187940 2013-06-08 07:59:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') @@ -27,7 +27,7 @@ backup=('usr/share/config/kdm/kdmrc') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('3fc316e34ba10db3adad8b1a4bee61aaf8b58840' +sha1sums=('9f3f4f63e6fe409eb2293ee361b481198fb852b5' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' @@ -37,7 +37,7 @@ sha1sums=('3fc316e34ba10db3adad8b1a4bee61aaf8b58840' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'd509dac592bd8b310df27991b208c95b6d907514') -build() { +prepare() { cd ${_pkgname}-${pkgver} # reads the shell scripts in /etc/kde/ @@ -47,9 +47,9 @@ build() { # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch +} - cd ../ - +build() { mkdir build cd build cmake ../${_pkgname}-${pkgver} \ diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index 3aad2172e..efbd9f19d 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184864 2013-05-09 09:42:37Z andrea $ +# $Id: PKGBUILD 187942 2013-06-08 07:59:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,7 +11,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konq-plugins' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -19,7 +19,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('c9949ef6dafbc567bb3f088bf9e156c3a5a9ec08') +sha1sums=('5465fffdaea70a5ca225283f45b9504775d0432d') build() { cd ${srcdir} @@ -37,7 +37,10 @@ package_kdebase-dolphin() { pkgdesc='File Manager' depends=('kdebase-runtime' 'kdebase-lib' 'nepomuk-widgets') optdepends=('kdegraphics-svgpart: thumbailers for SVG files' - 'kdegraphics-thumbnailers: thumbnailers for graphics file' + 'kdegraphics-thumbnailers: thumbnailers for various graphics files' + 'kdemultimedia-ffmpegthumbs: thumbnailers for video files' + 'kdemultimedia-mplayerthumbs: thumbnailers for video files' + 'icoutils: thumbnailers for MS files' 'ruby: servicemenu installation') url="http://kde.org/applications/system/dolphin/" install=kdebase-dolphin.install diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 0200a90be..1ae1a8126 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184884 2013-05-09 09:42:57Z andrea $ +# $Id: PKGBUILD 187962 2013-06-08 07:59:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') optdepends=('kdepimlibs: akonadi bindings') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") -sha1sums=('6fadbe971f4db404fc30cf62fed264e9b06d3cef') +sha1sums=('87fb44759e2f4ffa1fbcbebb0f15b359f02875b8') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 311c13d3e..1c8772651 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184885 2013-05-09 09:42:58Z andrea $ +# $Id: PKGBUILD 187963 2013-06-08 07:59:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -17,14 +17,15 @@ optdepends=('kdegraphics-okular: okular bindings' conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" 'ruby19.patch') -sha1sums=('43d15e26ba9219874d8efc0140c5fb3eaac97792' +sha1sums=('d4b2920db047a10addbd1a8818878b2f93c75648' 'c074f027bac3b9bffe70a2c2304a6a7be12be034') -build() { +prepare() { cd korundum-${pkgver} patch -p1 -i "${srcdir}/ruby19.patch" - cd ../ +} +build() { mkdir build cd build cmake ../korundum-${pkgver} \ diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index 8583105ba..b8d38e105 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184886 2013-05-09 09:42:59Z andrea $ +# $Id: PKGBUILD 187964 2013-06-08 07:59:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz") -sha1sums=('ce5075da229c52ba5aab1139c843686213d23bff') +sha1sums=('04ab37ee0c6fcf0a3d7824b49f73529d4f480a0d') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 736e7712e..978794432 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186386 2013-05-26 09:24:39Z bluewind $ +# $Id: PKGBUILD 187965 2013-06-08 07:59:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.10.3 -pkgrel=2 +pkgver=4.10.4 +pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") -sha1sums=('7db692b0a06ba421caa870fc254f03c2e3bf4e79') +sha1sums=('034a5f0b98cb361cad8bb684a4834f47d16efb9c') build() { mkdir build diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 723c9b265..8e1f3070e 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186387 2013-05-26 09:24:45Z bluewind $ +# $Id: PKGBUILD 187936 2013-06-08 07:59:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.10.3 -pkgrel=2 +pkgver=4.10.4 +pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") -sha1sums=('261e1c4d9a6a216d7b5b5e2962ba5266f0d62bdf') +sha1sums=('8b72c8c53d74b2bc8f38baca6c599067a6cfaac6') build() { mkdir build diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 7b69f6519..1d709f430 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 184855 2013-05-09 09:42:26Z andrea $ +# $Id: PKGBUILD 188702 2013-06-18 10:31:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2' 'kdebindings-python-common') -pkgver=4.10.3 -pkgrel=1 +pkgver=4.10.4 +pkgrel=2 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' - 'pyqt' 'qscintilla' 'python2-sip' 'python-sip' 'mesa') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4' + 'python-pyqt4' 'qscintilla' 'python2-sip' 'python-sip' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('71dfb717cafc40331118b2b98c9b4075cd9b1c0d') +sha1sums=('4243f60d549b75ad734141ad2bfef884d12d014e') build() { export PYTHONDONTWRITEBYTECODE="TRUE" @@ -44,7 +44,7 @@ build() { package_kdebindings-python() { pkgdesc="A set of Python 3.x bindings for KDE" - depends=('kdepim-runtime' 'pyqt' 'kdebindings-python-common') + depends=('kdepim-runtime' 'python-pyqt4' 'kdebindings-python-common') cd "${srcdir}"/build make DESTDIR="${pkgdir}" install @@ -58,7 +58,7 @@ package_kdebindings-python() { package_kdebindings-python2() { pkgdesc="A set of Python 2.x bindings for KDE" - depends=('kdepim-runtime' 'python2-pyqt' 'kdebindings-python-common') + depends=('kdepim-runtime' 'python2-pyqt4' 'kdebindings-python-common') conflicts=('kdebindings-python<4.8.1-2') cd "${srcdir}"/build-python2 diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index 8df530d9d..c84ad53ff 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184860 2013-05-09 09:42:31Z andrea $ +# $Id: PKGBUILD 187938 2013-06-08 07:59:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Ruby bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") -sha1sums=('78a6fce69f751e8c4542431484d5e7fcb6362263') +sha1sums=('70fa8ea5ee961ece5d29cb84cb37c57923f18d85') build() { mkdir build diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index ef87a7a93..59acd2122 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184859 2013-05-09 09:42:30Z andrea $ +# $Id: PKGBUILD 187937 2013-06-08 07:59:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz") -sha1sums=('2fa451fddf1b05fde705f16bd24a0914aa3eb0de') +sha1sums=('1a0503ef0117aa19cdffdddc9501fee83411d576') build() { mkdir build diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index e4c20aeee..beb566986 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184852 2013-05-09 09:42:23Z andrea $ +# $Id: PKGBUILD 187930 2013-06-08 07:59:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('701e34f9dcc4e246e7361c472bfdb5a472ac31b2') +sha1sums=('57c92b313bae5274b571c09f94cf599d1afd4846') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 1c783c8cb..3ac063966 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184857 2013-05-09 09:42:28Z andrea $ +# $Id: PKGBUILD 187935 2013-06-08 07:59:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde" @@ -18,7 +18,7 @@ optdepends=('kdesdk-kate: Kate bindings' 'kdepimlibs: akonadi bindings') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") -sha1sums=('459ce74e658f30799164aee291e57c6ad5800734') +sha1sums=('557f3a888759cb3dd397466bd16246a1ef5858f2') build() { mkdir build diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 559511ee9..544939e8a 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184853 2013-05-09 09:42:24Z andrea $ +# $Id: PKGBUILD 187931 2013-06-08 07:59:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" @@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4' 'mesa') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('1e30ffc4747b6e01f24a487b31d1b07623afdfba') +sha1sums=('292285272998b096eef62812e65b5027cf2800ec') build() { cd "${srcdir}" diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index 30a18b2d9..4b63b0e41 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184871 2013-05-09 09:42:44Z andrea $ +# $Id: PKGBUILD 187949 2013-06-08 07:59:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="https://projects.kde.org/projects/kde/kdeedu/analitza" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") -sha1sums=('d2b986516a5f9ecaa1ed4151afe9f0958b68c868') +sha1sums=('46de1f60e149f6b5a526fa62e6dcf52ade9d4eff') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index f4569c01b..5c50b9b80 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184888 2013-05-09 09:43:01Z andrea $ +# $Id: PKGBUILD 187966 2013-06-08 07:59:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz") -sha1sums=('ff5e39fd1880dde2c11f6e3cbd89f7a8cead7154') +sha1sums=('ea4d9363c6bf08683a5c9733d11ec7928a358f73') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index a1ea2f5a8..565689876 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186565 2013-05-29 07:12:45Z andrea $ +# $Id: PKGBUILD 187967 2013-06-08 07:59:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.10.3 -pkgrel=2 +pkgver=4.10.4 +pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ optdepends=('maxima: Maxima backend' install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz" 'sage58.patch') -sha1sums=('ae2c9c50cc79030a3f15106d059997da5c37a886' +sha1sums=('3ecd559d6563945ed7730a524c2da5d637a340ba' 'c02051c30ece57800d693da60280b0bdb5f45697') prepare() { diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index caaf68b4d..a4633d125 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184890 2013-05-09 09:43:04Z andrea $ +# $Id: PKGBUILD 187968 2013-06-08 07:59:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") -sha1sums=('c3c237cdf891259b2bef399d2b5c75a420e21d55') +sha1sums=('86032621d84ef5d8ea68cf9b0e7b696b96154ece') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index 92a962bfe..2493416f2 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184891 2013-05-09 09:43:05Z andrea $ +# $Id: PKGBUILD 187969 2013-06-08 07:59:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'avogadro' 'ocaml' 'facile' 'chemical-mime-data') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('2711ee3b9914329d9813c24798cf57811dd7eadd') +sha1sums=('b8225cae39c1b27d1defabd08cd2e64e5c893602') build() { mkdir build diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index 61d9a4f10..b8e1b45ae 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184892 2013-05-09 09:43:06Z andrea $ +# $Id: PKGBUILD 187970 2013-06-08 07:59:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz") -sha1sums=('8aa646830e3f09162d98c9dab1650321d92ef90f') +sha1sums=('fa1635720602ba02cb0064d3c01c752d208f5e09') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index 2bba377b8..b18b17ced 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184893 2013-05-09 09:43:08Z andrea $ +# $Id: PKGBUILD 187971 2013-06-08 07:59:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz") -sha1sums=('c4effef0b1f6e54c5ca1dc4d3642398ccc180551') +sha1sums=('be9dd5ce3a0b8b7162faf1f78c22a7aeb5a8449c') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index a8c2db75c..7cdaf68b6 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184894 2013-05-09 09:43:09Z andrea $ +# $Id: PKGBUILD 187972 2013-06-08 07:59:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz") -sha1sums=('92189b526e1cd6138e7e884d60f0a6f76bb9a7df') +sha1sums=('a283d3521e853d040e7938e004fcbef6cf41aa82') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index 946610e90..ca5d48365 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184895 2013-05-09 09:43:11Z andrea $ +# $Id: PKGBUILD 187973 2013-06-08 07:59:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz") -sha1sums=('ee2071d89c65b47ace7fc38d0fb07c5b74883bab') +sha1sums=('1d1a8d7dc99e59bcb006302d1bb7d9a8366041d9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index 79ae84063..c88c5a4dd 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184896 2013-05-09 09:43:12Z andrea $ +# $Id: PKGBUILD 187974 2013-06-08 07:59:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") -sha1sums=('aea9806a7e52f5381dc479cd72069b2bcd9e9cc2') +sha1sums=('91c0880d48ed16e05481c3ce424075d30f695bf4') build() { mkdir build diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index a5685e2c9..ab2bdf211 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184897 2013-05-09 09:43:14Z andrea $ +# $Id: PKGBUILD 187975 2013-06-08 08:00:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz") -sha1sums=('906db6f251621983dc7c737424af0484706a1bbf') +sha1sums=('970620fc621dd31c99c71bd3b446da4d1d3015c4') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index f1375ff2c..37677c5d5 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184898 2013-05-09 09:43:15Z andrea $ +# $Id: PKGBUILD 187976 2013-06-08 08:00:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz") -sha1sums=('f40332da60528898909858b9271ab04a73ceba78') +sha1sums=('5141988a04d1a9e428c41cc751cd217a53fef13a') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 4722faccb..0e69c0c3e 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184899 2013-05-09 09:43:17Z andrea $ +# $Id: PKGBUILD 187977 2013-06-08 08:00:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz") -sha1sums=('0579eb13e5a764afc390e11acbb3da5ee40f63aa') +sha1sums=('e212aee5cdee0d767efd9d004a17238f043485a2') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index 97f471360..6971bf592 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184900 2013-05-09 09:43:19Z andrea $ +# $Id: PKGBUILD 187978 2013-06-08 08:00:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'wcslib' 'libindi') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") -sha1sums=('32490b846b468dc9a8393c0a70cb0d0e805163a8') +sha1sums=('9a434b7e2c9b67cce4611ad443cfd1ef9a190436') build() { mkdir build diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index 2609bfcee..caa89639d 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184901 2013-05-09 09:43:20Z andrea $ +# $Id: PKGBUILD 187979 2013-06-08 08:00:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('076345fadaf98bdc878cb4b9f99e759bb2642b2d') +sha1sums=('dfda5d6f0af6bfc2853595a5af86c7a96cd66c33') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index fd7a75440..e1b7409f6 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184902 2013-05-09 09:43:22Z andrea $ +# $Id: PKGBUILD 187980 2013-06-08 08:00:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz") -sha1sums=('8df184d9647dfbf342dcd3adcc674f2c9b50af39') +sha1sums=('82cc5e6abb7ab10bf1da247f67293d45b3d38195') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index d9e5a145e..7f552dbbe 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184903 2013-05-09 09:43:23Z andrea $ +# $Id: PKGBUILD 187981 2013-06-08 08:00:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz") -sha1sums=('0286f384cc3dfb9c6b7ca39badd50a18fa579f16') +sha1sums=('3c321e7f4a9a136cc29227c98d10bd3f4551f32b') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 995c35078..08459332f 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184866 2013-05-09 09:42:39Z andrea $ +# $Id: PKGBUILD 187944 2013-06-08 07:59:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('814fffa64d91bec647c3f7e5cb130a2027dd6815') +sha1sums=('664ff3564e2136566808d2ea801b42ede04d6a8d') build() { mkdir build diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD index dc1f74cf0..79610b18a 100644 --- a/extra/kdeedu-pairs/PKGBUILD +++ b/extra/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184904 2013-05-09 09:43:25Z andrea $ +# $Id: PKGBUILD 187982 2013-06-08 08:00:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-pairs -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A memory and pairs game for KDE" url="https://projects.kde.org/projects/kde/kdeedu/pairs" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz") -sha1sums=('7995139b4fc5604f6a71e5747f4db0de41bb666c') +sha1sums=('20b4e8e98487bc05602a15969bac63ea64a6ac74') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index c55a6b542..7c7738207 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184905 2013-05-09 09:43:26Z andrea $ +# $Id: PKGBUILD 187983 2013-06-08 08:00:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdebindings-kross-python: scripting support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") -sha1sums=('efcce4ba4c8a211d494c3537b1c0c2e421fa7586') +sha1sums=('d13d686b77a36ca488ab6f545e0871ad37f9b490') build() { mkdir build diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index 847b5a5ca..dfebfafa4 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184906 2013-05-09 09:43:28Z andrea $ +# $Id: PKGBUILD 187984 2013-06-08 08:00:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('aeb9aaee1a2ec3faf410da4319d0f7a7f27c3630') +sha1sums=('c09ba436f60bf856733e50bd331e84a8b1f975fb') build() { cd "${srcdir}" diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index f3331665e..8baf3884f 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184907 2013-05-09 09:43:29Z andrea $ +# $Id: PKGBUILD 187985 2013-06-08 08:00:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl') makedepends=('cmake' 'automoc4' 'eigen' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") -sha1sums=('85a85c09deb6f04bcf90279785d099aa31ce0262') +sha1sums=('3dcbd853ede5fbc6517d52faa8722395ecf0eb0b') build() { cd "${srcdir}" diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD index 3c2bc7c9b..6ee2a6ff2 100644 --- a/extra/kdegames-bomber/PKGBUILD +++ b/extra/kdegames-bomber/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184908 2013-05-09 09:43:31Z andrea $ +# $Id: PKGBUILD 187986 2013-06-08 08:00:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bomber -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A single player arcade game" url="http://kde.org/applications/games/bomber/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/bomber-${pkgver}.tar.xz") -sha1sums=('b2cf0a81d282424811cdc527545a132ef5d73a3a') +sha1sums=('88f98c0179516cfd08952112fb6dc6ba6bb85231') build() { mkdir build diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD index 67c30edf4..25008fee8 100644 --- a/extra/kdegames-bovo/PKGBUILD +++ b/extra/kdegames-bovo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184909 2013-05-09 09:43:32Z andrea $ +# $Id: PKGBUILD 187987 2013-06-08 08:00:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bovo -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A Gomoku like game for two players" url="http://kde.org/applications/games/bovo/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/bovo-${pkgver}.tar.xz") -sha1sums=('53fa8f79b8a6d048a00da0cfc703f400c6ddd178') +sha1sums=('102ceee58b4851b24cb23bd4907449cdd63aa3d7') build() { mkdir build diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD index b1f04a297..b8cf9165a 100644 --- a/extra/kdegames-granatier/PKGBUILD +++ b/extra/kdegames-granatier/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184910 2013-05-09 09:43:34Z andrea $ +# $Id: PKGBUILD 187988 2013-06-08 08:00:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-granatier -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A clone of the classic Bomberman game" url="http://kde.org/applications/games/granatier/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/granatier-${pkgver}.tar.xz") -sha1sums=('4a135280da57cac2cadc2874c27b50fc7740bebf') +sha1sums=('b49be2c81a8b8670bfe8f53ae09e9aab9de5134a') build() { mkdir build diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD index 91615d120..c636906f9 100644 --- a/extra/kdegames-kapman/PKGBUILD +++ b/extra/kdegames-kapman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184912 2013-05-09 09:43:37Z andrea $ +# $Id: PKGBUILD 187990 2013-06-08 08:00:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kapman -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A clone of the well known game Pac-Man" url="http://kde.org/applications/games/kapman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kapman-${pkgver}.tar.xz") -sha1sums=('83fda18300857338a698fff899cb2569ec4539fb') +sha1sums=('6dbb6b7f4a87aa2cd21d13330913d7a999b888e8') build() { mkdir build diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD index f6bc1c5d5..c89ad6099 100644 --- a/extra/kdegames-katomic/PKGBUILD +++ b/extra/kdegames-katomic/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184913 2013-05-09 09:43:39Z andrea $ +# $Id: PKGBUILD 187991 2013-06-08 08:00:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-katomic -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A fun and educational game built around molecular geometry" url="http://kde.org/applications/games/katomic/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/katomic-${pkgver}.tar.xz") -sha1sums=('69cf2cedad8575b32fbb685c1116bfd2c7090ebf') +sha1sums=('6c4893910a11f2c1bc20492a93d6475fa397f9df') build() { mkdir build diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD index eae2394df..60dcbc11b 100644 --- a/extra/kdegames-kblackbox/PKGBUILD +++ b/extra/kdegames-kblackbox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184914 2013-05-09 09:43:41Z andrea $ +# $Id: PKGBUILD 187992 2013-06-08 08:00:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblackbox -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A game of hide and seek played on a grid of boxes" url="http://kde.org/applications/games/kblackbox/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kblackbox-${pkgver}.tar.xz") -sha1sums=('2953256d4659cca0a2a4b35d2c81fe1569bbb762') +sha1sums=('dd19f0c54740e5e0add1271ebd6595f237a670d5') build() { mkdir build diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD index fdafd4881..6b5116b55 100644 --- a/extra/kdegames-kblocks/PKGBUILD +++ b/extra/kdegames-kblocks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184915 2013-05-09 09:43:44Z andrea $ +# $Id: PKGBUILD 187993 2013-06-08 08:00:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblocks -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="The classic falling blocks game" url="http://kde.org/applications/games/kblocks/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kblocks-${pkgver}.tar.xz") -sha1sums=('2a43bd8f55474122b241c8993fe98cbd26d36b98') +sha1sums=('e6c9e5d3dc368d87afe82375d3537aeb03247edb') build() { mkdir build diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD index 39014c6f8..353e13dde 100644 --- a/extra/kdegames-kbounce/PKGBUILD +++ b/extra/kdegames-kbounce/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184916 2013-05-09 09:43:46Z andrea $ +# $Id: PKGBUILD 187994 2013-06-08 08:00:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbounce -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A single player arcade game with the elements of puzzle" url="http://kde.org/applications/games/kbounce/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbounce-${pkgver}.tar.xz") -sha1sums=('6c83f932c62d29432aef0403733998a4ae0ca7ad') +sha1sums=('481fb1b98597ae0cceadcfb7d7b5d4b1171e1267') build() { mkdir build diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD index 7ec258b52..ae33ee756 100644 --- a/extra/kdegames-kbreakout/PKGBUILD +++ b/extra/kdegames-kbreakout/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184917 2013-05-09 09:43:47Z andrea $ +# $Id: PKGBUILD 187995 2013-06-08 08:00:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbreakout -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A Breakout-like game" url="http://kde.org/applications/games/kbreakout/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbreakout-${pkgver}.tar.xz") -sha1sums=('8d8508abde6eb2d0aaf75a66ffb253e2f7a67046') +sha1sums=('c8c5acdf8ca4915b37c6fa8e5cf6725e21ab97fa') build() { mkdir build diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD index ecd2c5a03..c5ef52b67 100644 --- a/extra/kdegames-kdiamond/PKGBUILD +++ b/extra/kdegames-kdiamond/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184918 2013-05-09 09:43:48Z andrea $ +# $Id: PKGBUILD 187996 2013-06-08 08:00:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kdiamond -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A single player puzzle game" url="http://kde.org/applications/games/kdiamond/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdiamond-${pkgver}.tar.xz") -sha1sums=('ba11547157b1b5d7b789fd2c854aebb3ff5b1714') +sha1sums=('acb1b7cdfdc30025a4686321ab0ef226c8adb1e0') build() { mkdir build diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD index e602a066e..6eeff0f0a 100644 --- a/extra/kdegames-kfourinline/PKGBUILD +++ b/extra/kdegames-kfourinline/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184919 2013-05-09 09:43:50Z andrea $ +# $Id: PKGBUILD 187997 2013-06-08 08:00:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kfourinline -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A four-in-a-row game" url="http://kde.org/applications/games/kfourinline/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfourinline-${pkgver}.tar.xz") -sha1sums=('d49eff3bc2198c4ebb7d14a664ed7b2271e4ca32') +sha1sums=('263a7a641c3f48f078aebbc179ec2475558605e8') build() { mkdir build diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD index 3ef15549d..7a8d4adbd 100644 --- a/extra/kdegames-kgoldrunner/PKGBUILD +++ b/extra/kdegames-kgoldrunner/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184920 2013-05-09 09:43:52Z andrea $ +# $Id: PKGBUILD 187998 2013-06-08 08:00:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kgoldrunner -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A game of action and puzzle solving" url="http://kde.org/applications/games/kgoldrunner/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgoldrunner-${pkgver}.tar.xz") -sha1sums=('3701237b7c3b15d4d4ffe17d78c8470231004d0a') +sha1sums=('95fc29d606d5b491920c612e1887b1699aad4481') build() { mkdir build diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD index 5cce3d51c..825c1c938 100644 --- a/extra/kdegames-kigo/PKGBUILD +++ b/extra/kdegames-kigo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184921 2013-05-09 09:43:53Z andrea $ +# $Id: PKGBUILD 187999 2013-06-08 08:00:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kigo -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="An open-source implementation of the popular Go game" url="http://kde.org/applications/games/kigo/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'gnugo') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kigo-${pkgver}.tar.xz") -sha1sums=('370656ff032a8980579b5a478a7868598035c897') +sha1sums=('caad098497bdd71184983cc22cfd23fe71bb243a') build() { mkdir build diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD index b8c74c993..4ec19ff9c 100644 --- a/extra/kdegames-killbots/PKGBUILD +++ b/extra/kdegames-killbots/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184922 2013-05-09 09:43:55Z andrea $ +# $Id: PKGBUILD 188000 2013-06-08 08:00:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-killbots -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A simple game of evading killer robots" url="http://kde.org/applications/games/killbots/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/killbots-${pkgver}.tar.xz") -sha1sums=('9b580830f82468351fb91306f30a085519432b10') +sha1sums=('5fef75ba6d3c849ce271164a532eaddde1c41cd4') build() { mkdir build diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD index e58006502..c26f2f174 100644 --- a/extra/kdegames-kiriki/PKGBUILD +++ b/extra/kdegames-kiriki/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184923 2013-05-09 09:43:56Z andrea $ +# $Id: PKGBUILD 188001 2013-06-08 08:00:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kiriki -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="An addictive and fun dice game" url="http://kde.org/applications/games/kiriki/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiriki-${pkgver}.tar.xz") -sha1sums=('9ec35954ba2eab34d6a760d17f3ab5ebfa193a61') +sha1sums=('a724586705a9bb66d4a9af684a0b56239d395e5e') build() { mkdir build diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD index 6e0cb1db2..49b7addda 100644 --- a/extra/kdegames-kjumpingcube/PKGBUILD +++ b/extra/kdegames-kjumpingcube/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184924 2013-05-09 09:43:58Z andrea $ +# $Id: PKGBUILD 188002 2013-06-08 08:00:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kjumpingcube -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A simple tactical game" url="http://kde.org/applications/games/kjumpingcube/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kjumpingcube-${pkgver}.tar.xz") -sha1sums=('9c46888572703e2f1d632e09ba5330e8434c51c1') +sha1sums=('012a89130cb95f8ae223f1dfb8380e1316ac91be') build() { mkdir build diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD index bd02c3d26..4e17debf7 100644 --- a/extra/kdegames-klickety/PKGBUILD +++ b/extra/kdegames-klickety/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184925 2013-05-09 09:43:59Z andrea $ +# $Id: PKGBUILD 188003 2013-06-08 08:00:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klickety -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="An adaptation of the Clickomania game" url="http://kde.org/applications/games/klickety/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klickety-${pkgver}.tar.xz") -sha1sums=('2ac5e9e52b3312bc54b9d02a5210caccc83f7f39') +sha1sums=('e7540d663a36a580e68d8ac69ba229c42db724f6') build() { mkdir build diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD index a02ae4ec3..66fed7127 100644 --- a/extra/kdegames-klines/PKGBUILD +++ b/extra/kdegames-klines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184926 2013-05-09 09:44:00Z andrea $ +# $Id: PKGBUILD 188004 2013-06-08 08:00:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klines -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A simple but highly addictive, one player game" url="http://kde.org/applications/games/klines/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klines-${pkgver}.tar.xz") -sha1sums=('474bab91de2112f55c5286f754778cd638d0862c') +sha1sums=('6cbd46188030e3f495812a5d50e34be9936cdb08') build() { mkdir build diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD index f630b6392..6d7c80f1e 100644 --- a/extra/kdegames-kmahjongg/PKGBUILD +++ b/extra/kdegames-kmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184927 2013-05-09 09:44:03Z andrea $ +# $Id: PKGBUILD 188005 2013-06-08 08:00:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmahjongg -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A tile matching game for one or two players" url="http://kde.org/applications/games/kmahjongg/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkmahjongg' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmahjongg-${pkgver}.tar.xz") -sha1sums=('8c1168da227c5be6775ae71adfaa7be39ce69a28') +sha1sums=('ebecd24f0da87165d0b8859444d035019a7bcd5a') build() { mkdir build diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD index 66abc5ec5..4158ddc30 100644 --- a/extra/kdegames-kmines/PKGBUILD +++ b/extra/kdegames-kmines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184928 2013-05-09 09:44:05Z andrea $ +# $Id: PKGBUILD 188006 2013-06-08 08:00:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmines -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="The classic Minesweeper game" url="http://kde.org/applications/games/kmines/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmines-${pkgver}.tar.xz") -sha1sums=('9f0130c4ce1276bbc0b8d89880d5db73efdc3aef') +sha1sums=('950f28e722db36daee4ee187f696eaa51415b752') build() { mkdir build diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD index 96676a096..973c9f00a 100644 --- a/extra/kdegames-knavalbattle/PKGBUILD +++ b/extra/kdegames-knavalbattle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184929 2013-05-09 09:44:06Z andrea $ +# $Id: PKGBUILD 188007 2013-06-08 08:00:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knavalbattle -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A ship sinking game" url="http://kde.org/applications/games/knavalbattle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/knavalbattle-${pkgver}.tar.xz") -sha1sums=('aa6e06896e93c5e33623a55c0b5d2c15cd49ea97') +sha1sums=('cf55f549029647b59b082bc2ab9383a5375a416c') build() { mkdir build diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD index 1423d4617..9f801cec5 100644 --- a/extra/kdegames-knetwalk/PKGBUILD +++ b/extra/kdegames-knetwalk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184930 2013-05-09 09:44:08Z andrea $ +# $Id: PKGBUILD 188008 2013-06-08 08:00:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knetwalk -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Connect all the terminals to the server, in as few turns as possible" url="http://kde.org/applications/games/knetwalk/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/knetwalk-${pkgver}.tar.xz") -sha1sums=('13dfaa5039b53fc6b50e5c8e4998324b283806f0') +sha1sums=('482d4ba187a55ba32841e141ce3717ad94306377') build() { mkdir build diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD index 7eda18ba8..528a232ab 100644 --- a/extra/kdegames-kolf/PKGBUILD +++ b/extra/kdegames-kolf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184931 2013-05-09 09:44:09Z andrea $ +# $Id: PKGBUILD 188009 2013-06-08 08:00:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kolf -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A miniature golf game with 2d top-down view" url="http://kde.org/applications/games/kolf/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolf-${pkgver}.tar.xz") -sha1sums=('f35c94f3e184e8b1bcaab50e519b424e580c5665') +sha1sums=('ec61e9d436c59cc738f340b7ca27e8ccef017b2f') build() { mkdir build diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD index 96b12cf1c..bbc850b5c 100644 --- a/extra/kdegames-kollision/PKGBUILD +++ b/extra/kdegames-kollision/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184932 2013-05-09 09:44:10Z andrea $ +# $Id: PKGBUILD 188010 2013-06-08 08:00:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kollision -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A simple ball dodging game" url="http://kde.org/applications/games/kollision/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kollision-${pkgver}.tar.xz") -sha1sums=('196770d3b15a74c4399348549efea5f1b5f2808e') +sha1sums=('bd7839e85789894010a2df0171e417a008afd753') build() { mkdir build diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD index 904796aa1..0ec218ceb 100644 --- a/extra/kdegames-konquest/PKGBUILD +++ b/extra/kdegames-konquest/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184933 2013-05-09 09:44:13Z andrea $ +# $Id: PKGBUILD 188011 2013-06-08 08:00:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-konquest -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="The KDE version of Gnu-Lactic" url="http://kde.org/applications/games/konquest/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/konquest-${pkgver}.tar.xz") -sha1sums=('7034913a42475d21af4adb28257b088172e771da') +sha1sums=('a238dee4a52ad6a051d53843112f85a7a912355f') build() { mkdir build diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD index 3f8b92166..44d6e7211 100644 --- a/extra/kdegames-kpatience/PKGBUILD +++ b/extra/kdegames-kpatience/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184934 2013-05-09 09:44:16Z andrea $ +# $Id: PKGBUILD 188012 2013-06-08 08:01:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kpatience -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Offers a selection of solitaire card games" url="http://kde.org/applications/games/kpat/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kpat-${pkgver}.tar.xz") -sha1sums=('b2c9a9c65ab4a3760400cf51d055989f08464851') +sha1sums=('c5ab4a1a27c4fe2f88e456af08aca3a4d2d1340e') build() { mkdir build diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD index cc45473ff..f9cbf9bff 100644 --- a/extra/kdegames-kreversi/PKGBUILD +++ b/extra/kdegames-kreversi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184935 2013-05-09 09:44:18Z andrea $ +# $Id: PKGBUILD 188013 2013-06-08 08:01:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kreversi -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A simple one player strategy game played against the computer" url="http://kde.org/applications/games/kreversi/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kreversi-${pkgver}.tar.xz") -sha1sums=('a2b35641a39706de0deda9ea4777ff0b2ebde367') +sha1sums=('b30a93287348fd2394b9abf4e60b07f29bdccbfb') build() { mkdir build diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD index 8d11f38a5..28532127a 100644 --- a/extra/kdegames-kshisen/PKGBUILD +++ b/extra/kdegames-kshisen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184936 2013-05-09 09:44:19Z andrea $ +# $Id: PKGBUILD 188014 2013-06-08 08:01:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kshisen -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A solitaire-like game played using the standard set of Mahjong tiles" url="http://kde.org/applications/games/kshisen/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'libkmahjongg') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kshisen-${pkgver}.tar.xz") -sha1sums=('36f8e99e64d9fd29e6b264c9c83fda38f5f09423') +sha1sums=('c09157433df05f409046606d890b0935c167b877') build() { mkdir build diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD index 05e95403c..34f4d08ff 100644 --- a/extra/kdegames-ksirk/PKGBUILD +++ b/extra/kdegames-ksirk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184937 2013-05-09 09:44:20Z andrea $ +# $Id: PKGBUILD 188015 2013-06-08 08:01:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksirk -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A computerized version of a well known strategy game" url="http://kde.org/applications/games/ksirk/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksirk-${pkgver}.tar.xz") -sha1sums=('69181f4ac4338e76295cd25926b23a38bbba36dd') +sha1sums=('f0145f13d8ead33d37855298f8732ac82ea7dbe1') build() { mkdir build diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD index 0f33ac599..de3357ee0 100644 --- a/extra/kdegames-ksnakeduel/PKGBUILD +++ b/extra/kdegames-ksnakeduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184938 2013-05-09 09:44:22Z andrea $ +# $Id: PKGBUILD 188016 2013-06-08 08:01:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksnakeduel -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A simple snake duel game" url="http://kde.org/applications/games/ksnakeduel/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnakeduel-${pkgver}.tar.xz") -sha1sums=('e492edb83f0c7c284934d6b7eec53c737cbe197a') +sha1sums=('21fec5a9e979065958ccb670a7198ecd82a334fb') build() { mkdir build diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD index cf575aca8..6197885c6 100644 --- a/extra/kdegames-kspaceduel/PKGBUILD +++ b/extra/kdegames-kspaceduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184939 2013-05-09 09:44:24Z andrea $ +# $Id: PKGBUILD 188017 2013-06-08 08:01:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kspaceduel -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Each of two possible players controls a satellite spaceship orbiting the sun" url="http://kde.org/applications/games/kspaceduel/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kspaceduel-${pkgver}.tar.xz") -sha1sums=('20fe3641363fc8a7a6d21bf8c2da810b4687bc76') +sha1sums=('e4e8667c2961bae7a96143ccc7dc342d3c959799') build() { mkdir build diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD index a19925138..573eed219 100644 --- a/extra/kdegames-ksquares/PKGBUILD +++ b/extra/kdegames-ksquares/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184940 2013-05-09 09:44:25Z andrea $ +# $Id: PKGBUILD 188018 2013-06-08 08:01:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksquares -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A modeled after the well known pen and paper based game of Dots and Boxes" url="http://kde.org/applications/games/ksquares/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksquares-${pkgver}.tar.xz") -sha1sums=('1def07ebcfed0d2edc8771cb2c3c25de9ea9e0c5') +sha1sums=('6553d30c4f983fd3346ad85e551afbbdb590442c') build() { mkdir build diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD index c083d1644..15d22736f 100644 --- a/extra/kdegames-ksudoku/PKGBUILD +++ b/extra/kdegames-ksudoku/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184941 2013-05-09 09:44:26Z andrea $ +# $Id: PKGBUILD 188019 2013-06-08 08:01:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksudoku -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A logic-based symbol placement puzzle" url="http://kde.org/applications/games/ksudoku/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksudoku-${pkgver}.tar.xz") -sha1sums=('5421c4693119defc9001e59a044e5b197f1ebc91') +sha1sums=('563d086f2b8fe844c7ae5b3fcecef496cb851d20') build() { mkdir build diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD index 6548e2ea1..440498402 100644 --- a/extra/kdegames-ktuberling/PKGBUILD +++ b/extra/kdegames-ktuberling/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184942 2013-05-09 09:44:28Z andrea $ +# $Id: PKGBUILD 188020 2013-06-08 08:01:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ktuberling -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A simple constructor game suitable for children and adults alike" url="http://kde.org/applications/games/ktuberling/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktuberling-${pkgver}.tar.xz") -sha1sums=('223838a37bcdc0b1b45ef04140437a1a59b1c2a8') +sha1sums=('209f64812e1aa9a6bd4f5ae87a83e6cb096d42f7') build() { mkdir build diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD index 31400c8af..10b923e99 100644 --- a/extra/kdegames-kubrick/PKGBUILD +++ b/extra/kdegames-kubrick/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184943 2013-05-09 09:44:30Z andrea $ +# $Id: PKGBUILD 188021 2013-06-08 08:01:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kubrick -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Based on the famous Rubik's Cube" url="http://kde.org/applications/games/kubrick/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kubrick-${pkgver}.tar.xz") -sha1sums=('54680f556ff5678e5091fcd254c3576c11396a39') +sha1sums=('4b40f130930594908b0764744947c9a2deb1954e') build() { mkdir build diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD index eabcdb6b1..bb83e6700 100644 --- a/extra/kdegames-lskat/PKGBUILD +++ b/extra/kdegames-lskat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184944 2013-05-09 09:44:31Z andrea $ +# $Id: PKGBUILD 188022 2013-06-08 08:01:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-lskat -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Lieutenant Skat is a fun and engaging card game for two players" url="http://kde.org/applications/games/lskat/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/lskat-${pkgver}.tar.xz") -sha1sums=('3223e7680c81d09e926d6c04b59f7b403e1b41b0') +sha1sums=('060cdb3f02655a82442b8eff9ef3d3b2be12fd9c') build() { mkdir build diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD index dfc7107ce..d9d5a7e00 100644 --- a/extra/kdegames-palapeli/PKGBUILD +++ b/extra/kdegames-palapeli/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184945 2013-05-09 09:44:33Z andrea $ +# $Id: PKGBUILD 188023 2013-06-08 08:01:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-palapeli -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A single-player jigsaw puzzle game" url="http://kde.org/applications/games/palapeli/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/palapeli-${pkgver}.tar.xz") -sha1sums=('251df2913548628f245516341a6c91a7edc1632c') +sha1sums=('595572e46a0dbd31fe3bb8cb623602dadf3d8753') build() { mkdir build diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD index f1d7d6f2d..ab0817b38 100644 --- a/extra/kdegames-picmi/PKGBUILD +++ b/extra/kdegames-picmi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184946 2013-05-09 09:44:34Z andrea $ +# $Id: PKGBUILD 188024 2013-06-08 08:01:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-picmi -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A nonogram logic game for KDE" url="http://kde.org/applications/games/picmi/" @@ -15,7 +15,7 @@ replaces=('picmi') conflicts=('picmi') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/picmi-${pkgver}.tar.xz") -sha1sums=('af60a275f0b06a4ae2fe552cf7973a510e2a7f6b') +sha1sums=('ef1a3c217432e44f4f3f146a54513b9ea56b4c96') build() { mkdir build diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index 8e5f6b71b..b620ba2f7 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184947 2013-05-09 09:44:36Z andrea $ +# $Id: PKGBUILD 188025 2013-06-08 08:01:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'mesa') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('1b020d9689a3b401f254ae6f26bc0f1e2455e11e') +sha1sums=('0cd301a65f800a201a57295984374612db7d6377') build() { mkdir build diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index dc48d1ea3..a04834fc3 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184948 2013-05-09 09:44:37Z andrea $ +# $Id: PKGBUILD 188026 2013-06-08 08:01:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libgphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") -sha1sums=('72a724c99cada0ed81c18dde1ad2e93b4907631f') +sha1sums=('022c0ab35f4a57e6bbf200caff0a8f2688f47b2a') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index 7eddc4926..1c099ce00 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184949 2013-05-09 09:44:39Z andrea $ +# $Id: PKGBUILD 188027 2013-06-08 08:01:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz") -sha1sums=('5d76ce1018f9852f0de2a5f8fa2affde8021c834') +sha1sums=('baa625095edbee3b943a0e09287a7c2bff7c20af') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index b2833dd41..6f1b36ca2 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184950 2013-05-09 09:44:40Z andrea $ +# $Id: PKGBUILD 188028 2013-06-08 08:01:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz") -sha1sums=('7e246704a1e639886925d794dcb4bfab7bb993ca') +sha1sums=('e9441c3358e2be76912a5879decedfa911809247') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index 410a35c96..471cd21ad 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184951 2013-05-09 09:44:41Z andrea $ +# $Id: PKGBUILD 188029 2013-06-08 08:01:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz") -sha1sums=('8e1b458bd98c25bf5ab4a8dfaa883fd314ee4232') +sha1sums=('8578d6e50f60955392ac7c9e6aff93696126247f') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 25c0f49c3..9b6857ffc 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184952 2013-05-09 09:44:44Z andrea $ +# $Id: PKGBUILD 188030 2013-06-08 08:01:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz") -sha1sums=('fba61042b5a5f9cfac5b078238cd350f6ffa0bdf') +sha1sums=('f762162c9fcb276c6c52508c70eea95ba135e4be') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index 7514a15e4..6dcde696c 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184953 2013-05-09 09:44:45Z andrea $ +# $Id: PKGBUILD 188031 2013-06-08 08:01:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz") -sha1sums=('5620639393632a68a30c6e726aa8925f455c2f7a') +sha1sums=('34a8f6c379aa2defca2441c7f2583f1d75f99441') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index c23d196ce..25fa594d6 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184954 2013-05-09 09:44:47Z andrea $ +# $Id: PKGBUILD 188032 2013-06-08 08:01:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz") -sha1sums=('c0b2b72cd26b64a930d3a14c0508ab2685caed5a') +sha1sums=('6550523e0270447a00b7c498fbe03f67b425626b') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index 339519ec4..0cea57133 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184955 2013-05-09 09:44:49Z andrea $ +# $Id: PKGBUILD 188033 2013-06-08 08:01:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" @@ -15,7 +15,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('fe06feea93d3f38196a29dc410ee1427cfefa382') +sha1sums=('f4b58972ce05a4bdfcb94c972b023f168d3172e9') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index e442a99f6..ca290f5a5 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184854 2013-05-09 09:42:25Z andrea $ +# $Id: PKGBUILD 187932 2013-06-08 07:59:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('b9e7cd50a430b215b2d802e2f2bdd3a254bdd700') +sha1sums=('7659ac1e1d9832f541f605abbfc47da9d3ab2356') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index 8b67e1038..0f81b4a15 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184956 2013-05-09 09:44:51Z andrea $ +# $Id: PKGBUILD 188034 2013-06-08 08:01:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('6e71181e30e003641893bbdbcfca508d1fde41a4') +sha1sums=('70feca363d1a5d5aa9d784d62819a34eb701054f') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index 9fd230548..f7c1e3e11 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184957 2013-05-09 09:44:53Z andrea $ +# $Id: PKGBUILD 188035 2013-06-08 08:01:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A KPart for viewing SVGs" url="https://projects.kde.org/projects/kde/kdegraphics/svgpart" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz") -sha1sums=('61869d8bac977faa151356583475f324a29f9d68') +sha1sums=('356f0bb93514b240a67b0a02edad15ac5e107fdb') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index 3a6386469..f24d37a01 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184958 2013-05-09 09:44:54Z andrea $ +# $Id: PKGBUILD 188036 2013-06-08 08:01:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('c128aef92f9bd61b18ca9f9db9a43e6652454313') +sha1sums=('e9c939d22a4dd6c17cdda9da964434e014d6b771') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD index dd2f171fd..9a24d7cf5 100644 --- a/extra/kdemultimedia-audiocd-kio/PKGBUILD +++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184959 2013-05-09 09:44:55Z andrea $ +# $Id: PKGBUILD 188037 2013-06-08 08:01:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-audiocd-kio -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Kioslave for accessing audio CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio' @@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz") -sha1sums=('5539c665dd3173493d0a45fb775c27a4a84a2b3d') +sha1sums=('7dbd0c6b08fe0b4223012f7332e661c9cd046697') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD index 91ff2b4b7..8d5cdc6f4 100644 --- a/extra/kdemultimedia-dragonplayer/PKGBUILD +++ b/extra/kdemultimedia-dragonplayer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184960 2013-05-09 09:44:57Z andrea $ +# $Id: PKGBUILD 188038 2013-06-08 08:01:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-dragonplayer -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A multimedia player where the focus is on simplicity, instead of features" @@ -14,7 +14,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz") -sha1sums=('9ebb61b985a6054f690ff8f89e638ad8da6a483a') +sha1sums=('c7ff43b01890318ed0c629eed64fe36cc2e15db6') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index 6fcb30472..57c08ecc1 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184961 2013-05-09 09:45:00Z andrea $ +# $Id: PKGBUILD 188039 2013-06-08 08:01:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' @@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia') depends=('kdelibs' 'ffmpeg') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz") -sha1sums=('1b4508d3f1c74a8d1a6136f27ba233ae3fb84eda') +sha1sums=('6c1e4fcb3fe8ecabca3a49718b815eda0f20c5cc') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD index d26c00cbe..042db5183 100644 --- a/extra/kdemultimedia-juk/PKGBUILD +++ b/extra/kdemultimedia-juk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184962 2013-05-09 09:45:01Z andrea $ +# $Id: PKGBUILD 188040 2013-06-08 08:01:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-juk -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='A jukebox, tagger and music collection manager' url='http://kde.org/applications/multimedia/juk/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz") -sha1sums=('d889a49e4cafef2ed10879a7e314e1d14bb09dd5') +sha1sums=('92af1645405b88aef85505649e68e3fcab4a7841') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD index 70ee10891..5fdf38288 100644 --- a/extra/kdemultimedia-kmix/PKGBUILD +++ b/extra/kdemultimedia-kmix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184963 2013-05-09 09:45:03Z andrea $ +# $Id: PKGBUILD 188041 2013-06-08 08:01:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kmix -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="KDE volume control program" url='http://kde.org/applications/multimedia/kmix/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz") -sha1sums=('09289c9bb6bd5e592d214f3f665078010e9a7dd2') +sha1sums=('d392101358196e0b99bc15846b895dff9c88cafc') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD index ba59de64a..d3d9ad7a5 100644 --- a/extra/kdemultimedia-kscd/PKGBUILD +++ b/extra/kdemultimedia-kscd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184964 2013-05-09 09:45:04Z andrea $ +# $Id: PKGBUILD 188042 2013-06-08 08:01:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kscd -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="KDE CD player" url='http://kde.org/applications/multimedia/kscd/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libmusicbrainz3') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz") -sha1sums=('e2cbfef5d1cdfcc7145fae803971d799f8739c37') +sha1sums=('e3e3c0b60897559ce3f5ff8a0f5dfe7bcd10ae98') build() { mkdir build diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD index 82392b8a2..cb09a4512 100644 --- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184965 2013-05-09 09:45:06Z andrea $ +# $Id: PKGBUILD 188043 2013-06-08 08:01:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-mplayerthumbs -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="MPlayer based thumbnail generator for video files" url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs' @@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime' 'mplayer') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz") -sha1sums=('f6446375ff72ffa841c223252dea1f0f95d73939') +sha1sums=('3b82041ae4a297c448971bb3faeb9e5492654310') build() { cd "${srcdir}" diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index ef9b57c2b..d85b87a86 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184966 2013-05-09 09:45:08Z andrea $ +# $Id: PKGBUILD 188553 2013-06-15 11:11:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -9,26 +9,27 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.10.3 -pkgrel=1 +pkgver=4.10.4 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdenetwork') -makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' +makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' - 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') + 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('9c5e14b1ebc575777d1e6d09b593f62940a4fd1d' +sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') -build() { +prepare() { cd ${pkgbase}-${pkgver} patch -p1 -i "${srcdir}"/use-libotr3.patch - cd ../ +} +build() { mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 92ba11dc4..fd6e82a1f 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186222 2013-05-22 07:16:17Z andrea $ +# $Id: PKGBUILD 187929 2013-06-08 07:59:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.10.3 -pkgrel=2 +pkgver=4.10.4 +pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepim-runtime' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkgapi' 'libkolab') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('43a9cf46818d1d7b26253e08e8cee99a554a736a') +sha1sums=('1ef9a4b6224363db2c3b50199dd302cea57c3a27') build() { mkdir build diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 8eab686ca..7d4aad653 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185544 2013-05-14 21:40:23Z andrea $ +# $Id: PKGBUILD 187925 2013-06-08 07:59:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.10.3 -pkgrel=3 +pkgver=4.10.4 +pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepimlibs' @@ -13,7 +13,7 @@ depends=('nepomuk-core' 'gpgme' 'akonadi' 'libical' 'prison' 'qjson') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('7ede01b2f169c066c98f553606e99817d83f252b') +sha1sums=('58f785dbc07932aad01bd7beeeceacc8fefac0bd') build() { mkdir build diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index f58b37c9b..dabd76d63 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184968 2013-05-09 09:45:14Z andrea $ +# $Id: PKGBUILD 188046 2013-06-08 08:01:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -77,7 +77,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-qmlwallpapers' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -86,7 +86,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('e1d2f452e4560c4c8d13573505cc4c3538f36e46') +sha1sums=('bdc8f5db0253132f8007d52fc79d8aa2ea2f9e0a') build() { mkdir build diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index f9df83069..d0ad3cb44 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,7 +4,7 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=0.9.0.8 +pkgver=0.9.0.9 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic 'openconnect: Cisco AnyConnect compatible VPN client') install=${pkgname}.install source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2") -sha256sums=('c3b4458faf3bea75c5952ffe20b55724246c9cc3cd751a484b3e1832240d3ad6') +sha256sums=('d6a7603df2a48e14cef4c44dcaee5773d7ed3cad5b8780307b356df4639231ca') build() { mkdir build diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 6245dee7b..6fb1ea26a 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 184856 2013-05-09 09:42:28Z andrea $ +# $Id: PKGBUILD 188716 2013-06-18 14:20:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.10.3 -pkgrel=1 +pkgver=4.10.4 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('6fe0e8c0cee9a21df4c4271861e10e249896d873' +sha1sums=('167c7bc7f9f83f4017f006e2b4c2a3ec24eb6c9d' 'dc70306c507083cf9b4bb1c536858742292fa1bf') -build() { +prepare() { cd kate-${pkgver} patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch - cd ../ +} +build() { mkdir build cd build cmake ../kate-${pkgver} \ diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index a4933395f..6d615223f 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184969 2013-05-09 09:45:18Z andrea $ +# $Id: PKGBUILD 188047 2013-06-08 08:01:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -16,7 +16,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-poxml' 'kdesdk-strigi-analyzers' 'kdesdk-umbrello') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -26,16 +26,17 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('84d16fb8ecea59118c4bbe273d1b8149c6739c0a' +sha1sums=('da886df4ddebb12e760db7469de1350feed2b338' '07db42bbcae402c292eebf002e549b04162621c5') -build() { - cd ${srcdir}/${pkgbase}-${pkgver} +prepare() { + cd ${pkgbase}-${pkgver} # Fix hardcoded python2 cmd patch -Np1 -i ${srcdir}/fix-python2-path.patch +} - cd ${srcdir} +build() { mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index a471fdb12..6eac7a25e 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184970 2013-05-09 09:45:19Z andrea $ +# $Id: PKGBUILD 188048 2013-06-08 08:01:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('1272b33ff3ef669ab309c8c230d3609d597c743b') +sha1sums=('ad148c0b8acdcc8062d832ca21bb84284bcab841') build() { cd $srcdir diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index f9fc23194..64a1eb1f0 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184972 2013-05-09 09:45:22Z andrea $ +# $Id: PKGBUILD 188050 2013-06-08 08:02:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='View disk usage information' url='http://kde.org/applications/utilities/filelight' @@ -15,7 +15,7 @@ replaces=('filelight') conflicts=('filelight') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz") -sha1sums=('ebfa5a9cc39abf311208d6a9d058e5003cb4daf8') +sha1sums=('acc3004826ae3afd3f87463b6c36661c566a8c7b') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index b7bad19bb..92475c793 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184973 2013-05-09 09:45:23Z andrea $ +# $Id: PKGBUILD 188051 2013-06-08 08:02:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='Scientific Calculator' url='http://kde.org/applications/utilities/kcalc/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz") -sha1sums=('c80f91c2f41a60cca670c8cb1b5e2c395e935fac') +sha1sums=('8c8aa571a6e3541e276128503358c6de6bf8e20a') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index 52de8daba..9a2e544ea 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184974 2013-05-09 09:45:25Z andrea $ +# $Id: PKGBUILD 188052 2013-06-08 08:02:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='Character Selector' url="http://kde.org/applications/utilities/kcharselect/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz") -sha1sums=('15360b8b7d1878b146cc38030e8ab59d2fa76acc') +sha1sums=('bd3525ffc4fbd2e0f8fbbdd377b00ac21ae9241d') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index b58775b06..3cd9bc54b 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184975 2013-05-09 09:45:26Z andrea $ +# $Id: PKGBUILD 188053 2013-06-08 08:02:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz") -sha1sums=('a88a393714a127a5629c2b50690ee6766c6ed484') +sha1sums=('9d0c6f9a476610670cc7775b6bb5cc5f014f8536') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index 3bb9765ac..bf389fc13 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184976 2013-05-09 09:45:28Z andrea $ +# $Id: PKGBUILD 188054 2013-06-08 08:02:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='Floppy Formatter' url='http://kde.org/applications/utilities/kfloppy/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz") -sha1sums=('25ff13f6551542eb58384c7606837c05a452fb54') +sha1sums=('12160f2b5e7bb94cd72d090627f39b4eaa2ae03e') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index 1949395fe..cef8c9182 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184977 2013-05-09 09:45:29Z andrea $ +# $Id: PKGBUILD 188055 2013-06-08 08:02:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='A GnuPG frontend' url='http://kde.org/applications/utilities/kgpg/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz") -sha1sums=('ba92c6edcf6ce857fec7969aab5a8b8afce2d43c') +sha1sums=('b4d9773326dfe16f3b50b6f16b52c906b7c3180e') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index 03445586e..85f9325fc 100644 --- a/extra/kdeutils-kremotecontrol/PKGBUILD +++ b/extra/kdeutils-kremotecontrol/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kremotecontrol -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='Configure your remote controls for use with applications' url='http://kde.org/applications/utilities/kremotecontrol/' @@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc') conflicts=('kdeutils-kdelirc') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz") -sha1sums=('5a3df78e08688647224c63418363940b222abe21') +sha1sums=('9e8ee623f83a7d909b1e4385430c9716807bfa2e') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index 1b82fc623..6c5b89040 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184979 2013-05-09 09:45:32Z andrea $ +# $Id: PKGBUILD 188057 2013-06-08 08:02:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='Countdown Launcher' url='http://kde.org/applications/utilities/ktimer/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz") -sha1sums=('c39948abf291f0ddd9e07cdc6b9d48922f62b317') +sha1sums=('f98109823013dd6ee7cff81e55f338dbd8695eab') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index 7ebde17ed..7aa80414e 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184980 2013-05-09 09:45:34Z andrea $ +# $Id: PKGBUILD 188058 2013-06-08 08:02:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='Wallet Management Tool' url='http://kde.org/applications/system/kwalletmanager/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") -sha1sums=('41a32b861ea2dcf4892c0161bce90996e9c8bd3d') +sha1sums=('47198c116fab656279090e9461daf334381554b2') build() { cd "${srcdir}" diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD index bf3b026e5..7106e1082 100644 --- a/extra/kdeutils-print-manager/PKGBUILD +++ b/extra/kdeutils-print-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184981 2013-05-09 09:45:35Z andrea $ +# $Id: PKGBUILD 188059 2013-06-08 08:02:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-print-manager -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A tool for managing print jobs and printers" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ replaces=('print-manager' 'kdeutils-printer-applet' 'kdeadmin-system-config-prin conflicts=('print-manager') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/print-manager-${pkgver}.tar.xz") -sha1sums=('91b98fd9827e61bc9b351fc7027df8212764f817') +sha1sums=('a2adfbb31a78f1f7978997844c1d758fac53098a') build() { mkdir build diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index 3c5cfc950..28f62fd27 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184982 2013-05-09 09:45:37Z andrea $ +# $Id: PKGBUILD 188060 2013-06-08 08:02:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='An engine for cool desktop eyecandy' url='http://kde.org/applications/utilities/superkaramba/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz") -sha1sums=('b74241f3357a91149bbb1610ee7e944e053b25ff') +sha1sums=('0c5addd5093d676ba2733c7132d4a231f0e6955e') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index f61c8d971..75890f0c0 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184983 2013-05-09 09:45:38Z andrea $ +# $Id: PKGBUILD 188061 2013-06-08 08:02:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='System Cleaner' url='http://kde.org/applications/utilities/sweeper' @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz") -sha1sums=('978f599562a6c9b2792fa7383f333d7048309ab6') +sha1sums=('646e60691f68bfbff9b5ecc57cf0e198a6229a53') build() { cd "${srcdir}" diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index 663bfa15e..0cca96ed0 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184984 2013-05-09 09:45:40Z andrea $ +# $Id: PKGBUILD 188062 2013-06-08 08:02:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdewebdev') makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('ea30f3187bd40eb0b972f2a9a7275674d6cee286') +sha1sums=('d54b8a154350795613080a5f28f56bbf80c10ed2') build() { cd $srcdir diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD index a50a798fc..b06e04747 100644 --- a/extra/kismet/PKGBUILD +++ b/extra/kismet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186877 2013-05-31 13:31:02Z andrea $ +# $Id: PKGBUILD 187862 2013-06-07 09:24:58Z tomegun $ # Maintainer: # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> @@ -7,12 +7,12 @@ pkgname=kismet pkgver=2013_03_R1b _realver="${pkgver//_/-}" -pkgrel=1 +pkgrel=2 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" arch=('i686' 'x86_64' 'mips64el') url="http://www.kismetwireless.net/" license=('GPL') -depends=('libpcap' 'pcre' 'bluez') +depends=('libpcap' 'pcre' 'bluez-libs' 'libcap') optdepends=('gpsd: log coordinates of detected networks' 'wireshark-cli: provide OUI files used to determine device manufacturer' 'wireshark-cli: mergecap, to merge multiple capture files' diff --git a/extra/kscreen/PKGBUILD b/extra/kscreen/PKGBUILD new file mode 100644 index 000000000..ff0a6b34a --- /dev/null +++ b/extra/kscreen/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 188671 2013-06-17 16:27:52Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: birdflesh <antkoul at gmail dot com> + +pkgname=kscreen +pkgver=1.0 +pkgrel=1 +pkgdesc="KDE's screen management software" +arch=('i686' 'x86_64') +url='https://projects.kde.org/kscreen' +license=('GPL' 'LGPL') +depends=('kdebase-runtime' "libkscreen>=${pkgver}") +makedepends=('cmake' 'automoc4') +install=$pkgname.install +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('52a0fef238ed71c08ee853f55e53f8bb') + +prepare() { + mkdir build +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} diff --git a/extra/kscreen/kscreen.install b/extra/kscreen/kscreen.install new file mode 100644 index 000000000..53d2ba911 --- /dev/null +++ b/extra/kscreen/kscreen.install @@ -0,0 +1,16 @@ +post_install() { + printf "==> To enable KSceen, run in a terminal:\n" + printf " qdbus org.kde.kded /kded org.kde.kded.unloadModule randrmonitor\n" + printf " qdbus org.kde.kded /kded org.kde.kded.setModuleAutoloading randrmonitor false\n" + printf " qdbus org.kde.kded /kded org.kde.kded.loadModule kscreen\n" + + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD index abce75267..1fbc25589 100644 --- a/extra/leveldb/PKGBUILD +++ b/extra/leveldb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178002 2013-02-13 01:27:04Z dreisner $ +# $Id: PKGBUILD 188250 2013-06-13 13:52:03Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: feydaykyn <feydaykyn@yahoo.fr> pkgname=leveldb -pkgver=1.9.0 +pkgver=1.10.0 pkgrel=1 pkgdesc="A fast and lightweight key/value database library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="https://code.google.com/p/leveldb/" license=('BSD') depends=('gperftools' 'snappy') source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha1sums=('4d832277120912211998a2334fb975b995d51885') +sha1sums=('d5b234658138d07f6edc2de24e01d9b0585c03cb') build() { make -C "$pkgname-$pkgver" diff --git a/extra/libatasmart/PKGBUILD b/extra/libatasmart/PKGBUILD index d73898bd6..0b8127c56 100644 --- a/extra/libatasmart/PKGBUILD +++ b/extra/libatasmart/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165610 2012-08-27 09:02:59Z jgc $ +# $Id: PKGBUILD 187061 2013-06-03 11:16:38Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libatasmart pkgver=0.19 -pkgrel=1.1 +pkgrel=2 pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -18,6 +18,7 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --disable-static make } diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD index 04b1f6cc2..a64cadc07 100644 --- a/extra/libbluedevil/PKGBUILD +++ b/extra/libbluedevil/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 180983 2013-03-29 12:07:34Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 187863 2013-06-07 09:24:59Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=libbluedevil pkgver=1.9.3 -pkgrel=1 +pkgrel=2 pkgdesc='A Qt4 wrapper for bluez used in the new KDE bluetooth stack' arch=('i686' 'x86_64' 'mips64el') url="https://projects.kde.org/projects/playground/libs/libbluedevil" license=('GPL') -depends=('qt4' 'bluez') +depends=('qt4' 'bluez4') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") md5sums=('fcb1480feba45dcd076b3ee54150bdf5') diff --git a/extra/libbonobo/PKGBUILD b/extra/libbonobo/PKGBUILD index 582deca83..4a2759600 100644 --- a/extra/libbonobo/PKGBUILD +++ b/extra/libbonobo/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 177011 2013-02-04 08:29:28Z jgc $ +# $Id: PKGBUILD 187062 2013-06-03 11:16:40Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libbonobo pkgver=2.32.1 -pkgrel=3 +pkgrel=4 pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components" arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') -depends=('orbit2' 'libxml2' 'glib2') +depends=('orbit2' 'libxml2' 'glib2' 'popt') makedepends=('intltool' 'pkgconfig') options=('!libtool') backup=('etc/bonobo-activation/bonobo-activation-config.xml') @@ -18,9 +18,14 @@ install=libbonobo.install sha256sums=('9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b' '081de245c42de10ebeea3cbcd819c5ce5d0a15b9bdde9c2098302b1e14965af2') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s#-DG_DISABLE_DEPRECATED##" activation-server/Makefile.in +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/bonobo make diff --git a/extra/libbsd/LICENSE b/extra/libbsd/LICENSE deleted file mode 100644 index 7dcbfc2ba..000000000 --- a/extra/libbsd/LICENSE +++ /dev/null @@ -1,28 +0,0 @@ -/*- - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD index 9fdf78b95..703d14ace 100644 --- a/extra/libbsd/PKGBUILD +++ b/extra/libbsd/PKGBUILD @@ -1,30 +1,48 @@ -# $Id: PKGBUILD 180872 2013-03-27 14:45:32Z tpowa $ +# $Id: PKGBUILD 188690 2013-06-18 01:22:22Z heftig $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=libbsd -pkgver=0.4.2 -pkgrel=1.1 +pkgver=0.5.2 +pkgrel=2 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" arch=('i686' 'x86_64' 'mips64el') url="http://libbsd.freedesktop.org" license=('custom') depends=('glibc') -source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) -md5sums=('591fc9de4ca22f78cf87a94e648a92f4') +options=('!libtool') +source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc} + spt.patch) +md5sums=('be8b2e0dc4614699834c49693574fd1a' + 'SKIP' + '56236fb72c8ec6cbdbd0daa5f404bccb') + +prepare() { + cd $pkgname-$pkgver + + # Paper over a firefox crash + # http://lists.freedesktop.org/archives/libbsd/2013-June/000085.html + patch -Np1 -i ../spt.patch +} build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr make } +check() { + cd $pkgname-$pkgver + + make check +} + package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver - make DESTDIR=$pkgdir install - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE + make DESTDIR="$pkgdir" install + install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/extra/libbsd/spt.patch b/extra/libbsd/spt.patch new file mode 100644 index 000000000..b19dc9b87 --- /dev/null +++ b/extra/libbsd/spt.patch @@ -0,0 +1,50 @@ +diff -u -r libbsd-0.5.2-orig/src/setproctitle.c libbsd-0.5.2/src/setproctitle.c +--- libbsd-0.5.2-orig/src/setproctitle.c 2013-06-08 18:26:04.000000000 +0200 ++++ libbsd-0.5.2/src/setproctitle.c 2013-06-18 02:35:59.441393418 +0200 +@@ -86,7 +86,7 @@ + if (environ != envp) + return 0; + +- /* Make a copy of the old environ array of pointers, in case ++ /* Make a deep copy of the old environ array of pointers, in case + * clearenv() or setenv() is implemented to free the internal + * environ array, because we will need to access the old environ + * contents to make the new copy. */ +@@ -94,11 +94,13 @@ + envcopy = malloc(envsize); + if (envcopy == NULL) + return errno; +- memcpy(envcopy, envp, envsize); ++ for (i = 0; envp[i]; i++) envcopy[i] = strdup(envp[i]); ++ envcopy[i] = NULL; + + error = spt_clearenv(); + if (error) { + environ = envp; ++ for(i = 0; envcopy[i]; i++) free(envcopy[i]); + free(envcopy); + return error; + } +@@ -116,18 +118,20 @@ + if (error) { + #ifdef HAVE_CLEARENV + /* Because the old environ might not be available +- * anymore we will make do with the shallow copy. */ ++ * anymore we will make do with the deep copy. */ + environ = envcopy; + #else + environ = envp; ++ for(i = 0; envcopy[i]; i++) free(envcopy[i]); + free(envcopy); + #endif + return error; + } + } + +- /* Dispose of the shallow copy, now that we've finished transfering ++ /* Dispose of the deep copy, now that we've finished transfering + * the old environment. */ ++ for(i = 0; envcopy[i]; i++) free(envcopy[i]); + free(envcopy); + + return 0; diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD index 0352443e1..3b5e6e174 100644 --- a/extra/libcanberra/PKGBUILD +++ b/extra/libcanberra/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 173082 2012-12-10 12:00:17Z jgc $ +# $Id: PKGBUILD 187881 2013-06-07 18:21:07Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libcanberra pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) pkgver=0.30 -pkgrel=3 +pkgrel=4 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" arch=(i686 x86_64 'mips64el') license=(LGPL) depends=(libvorbis libltdl alsa-lib tdb sound-theme-freedesktop) -makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3) +makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3 git) options=(!emptydirs) -url=http://0pointer.de/lennart/projects/libcanberra -source=("$url/$pkgbase-$pkgver.tar.xz" - libcanberra.xinit) -sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72' +url="http://0pointer.de/lennart/projects/libcanberra" +source=("git://git.0pointer.de/libcanberra.git#commit=c0620e4" libcanberra.xinit) +sha256sums=('SKIP' '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3') _plugindir=usr/lib/$pkgbase-$pkgver +prepare() { + cd $pkgbase + ./autogen.sh +} + build() { - cd $pkgbase-$pkgver + cd $pkgbase ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ --disable-static --with-builtin=dso --enable-null --disable-oss \ --enable-alsa --enable-gstreamer --enable-pulse \ - --with-systemdsystemunitdir=/usr/lib/systemd/system + --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-gtk-doc # Fight unused direct deps sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool @@ -37,7 +41,7 @@ package_libcanberra() { optdepends=("$pkgbase-pulse: PulseAudio driver" "$pkgbase-gstreamer: GStreamer driver") - cd $pkgbase-$pkgver + cd $pkgbase make -j1 DESTDIR="$pkgdir" install rm "$pkgdir"/usr/lib/libcanberra-gtk*.la diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD index c33f5eb13..a85a15626 100644 --- a/extra/libdmtx/PKGBUILD +++ b/extra/libdmtx/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 149704 2012-02-09 14:15:34Z andrea $ +# $Id: PKGBUILD 188766 2013-06-19 20:23:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: jose <jose1711 [at] gmail (dot) com> pkgname=libdmtx pkgver=0.7.4 -pkgrel=3.1 +pkgrel=4 pkgdesc="A software for reading and writing Data Matrix 2D barcodes" url="http://www.libdmtx.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') depends=('glibc') +options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('d3a4c0becd92895eb606dbdb78b023e2') -options=('!libtool') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD index 9569ef05a..ff458ed14 100644 --- a/extra/libgphoto2/PKGBUILD +++ b/extra/libgphoto2/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 179978 2013-03-13 20:08:25Z jgc $ +# $Id: PKGBUILD 188179 2013-06-11 19:26:15Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=libgphoto2 -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs." arch=(i686 x86_64 'mips64el') url="http://www.gphoto.org" license=(LGPL) -depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat' 'libusb') +depends=('libexif' 'libjpeg' 'gd' 'libltdl' 'libusb') install=libgphoto2.install options=('libtool') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz) -md5sums=('92780eb4baf7b512b86b5e7300ec91a5') +md5sums=('d9f4462957e59bf2b2eb3b1ea8423570') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libhangul/PKGBUILD b/extra/libhangul/PKGBUILD index 0bd75b576..a10af3943 100644 --- a/extra/libhangul/PKGBUILD +++ b/extra/libhangul/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 140549 2011-10-17 07:24:10Z bisson $ +# $Id: PKGBUILD 188501 2013-06-15 04:42:48Z bisson $ # Contributor: damir <damir@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libhangul pkgver=0.1.0 -pkgrel=1 -_filecode=6000 +pkgrel=2 pkgdesc='Input method library for Korean' -arch=('i686' 'x86_64' 'mips64el') -url='http://kldp.net/projects/hangul/' +url='http://code.google.com/p/libhangul/' license=('LGPL') -options=('!libtool') -source=("https://libhangul.googlecode.com/files/libhangul-${pkgver}.tar.gz") +arch=('i686' 'x86_64' 'mips64el') +source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") sha1sums=('9c6f3a82f2d4068771215f1b9f13a0d4bdbbfc77') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-static=no + ./configure --prefix=/usr --disable-static make } diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD index df025d12b..e1ba0323e 100644 --- a/extra/libindi/PKGBUILD +++ b/extra/libindi/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 62098 2010-01-02 09:13:44Z tpowa $ +# $Id: PKGBUILD 188185 2013-06-11 20:41:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libindi pkgver=0.9.6 -pkgrel=1.1 +pkgrel=2 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation" url="http://www.indilib.org/index.php?title=Main_Page" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('libnova' 'cfitsio' 'boost-libs' 'libusb-compat') -makedepends=('pkgconfig' 'cmake' 'boost') +makedepends=('cmake' 'boost') options=('!libtool') source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz") md5sums=('c1456544a36f543e2884f88913cf3eb0') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -26,6 +25,11 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}"/usr/lib/udev/rules.d + mv "${pkgdir}"/etc/udev/rules.d/99-gpusb.rules \ + "${pkgdir}"/usr/lib/udev/rules.d/ + rmdir "${pkgdir}"/etc/udev/rules.d "${pkgdir}"/etc/udev "${pkgdir}"/etc } diff --git a/extra/libiodbc/PKGBUILD b/extra/libiodbc/PKGBUILD index 106baf027..6b6227807 100644 --- a/extra/libiodbc/PKGBUILD +++ b/extra/libiodbc/PKGBUILD @@ -1,36 +1,35 @@ -# $Id: PKGBUILD 4453 2009-10-23 09:11:19Z spupykin $ +# $Id: PKGBUILD 188768 2013-06-19 20:32:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libiodbc pkgver=3.52.8 -pkgrel=1 +pkgrel=2 pkgdesc='Independent Open DataBase Connectivity for Linux' arch=('i686' 'x86_64' 'mips64el') url="http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/" license=('LGPL') -depends=('glibc' 'sh') +depends=('sh') makedepends=('chrpath') -replaces=('iodbc') -conflicts=('iodbc') options=('!libtool') source=("http://downloads.sourceforge.net/iodbc/${pkgname}-${pkgver}.tar.gz") md5sums=('9889f95f632f10895ff53b8a22162810') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --disable-static \ --includedir=/usr/include/libiodbc \ --disable-gui \ - --disable-libodbc + --disable-libodbc make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir} install + chrpath -d ${pkgdir}/usr/bin/iodbctest{,w} rm -rf ${pkgdir}/usr/share/libiodbc/ } diff --git a/extra/libiscsi/PKGBUILD b/extra/libiscsi/PKGBUILD index 26f3c5381..022c26a78 100644 --- a/extra/libiscsi/PKGBUILD +++ b/extra/libiscsi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186551 2013-05-28 18:43:28Z tpowa $ +# $Id: PKGBUILD 187826 2013-06-06 15:44:51Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libiscsi pkgver=1.7.0 -pkgrel=1 +pkgrel=2 depends=('glibc' 'popt') -pkgdesc="Library that provides generic access to USB device" +pkgdesc="Clientside library to implement the iSCSI protocol" arch=(i686 x86_64) url="https://github.com/sahlberg/libiscsi" license=('LGPL') diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD index e0654b595..b58503776 100644 --- a/extra/libkcddb/PKGBUILD +++ b/extra/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184872 2013-05-09 09:42:45Z andrea $ +# $Id: PKGBUILD 187950 2013-06-08 07:59:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcddb -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="KDE CDDB library" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1ca7e92544a1d3c49e5ddf3583c3c2b976a7990b') +sha1sums=('a9017c1922ee56f51c16c617e9046ccb6149ccd5') build() { cd "${srcdir}" diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD index d4c8b4b9d..68225a978 100644 --- a/extra/libkcompactdisc/PKGBUILD +++ b/extra/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184873 2013-05-09 09:42:46Z andrea $ +# $Id: PKGBUILD 187951 2013-06-08 07:59:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcompactdisc -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A library for interfacing with CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('cc6ad902a6c94c68a1b8d27aabdbcac1df547cd8') +sha1sums=('d442e7d4257b68f182815f3a4330982a026b7dc3') build() { cd "${srcdir}" diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 611e3870e..819d7d53c 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184867 2013-05-09 09:42:40Z andrea $ +# $Id: PKGBUILD 187945 2013-06-08 07:59:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('801770f6eefc85b0939304bc0c5acf399fa988ed') +sha1sums=('3390eb344d62f7e44fe5db65eb171d397142fa96') build() { mkdir build diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index 7c020e14f..8c3ea236d 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184865 2013-05-09 09:42:38Z andrea $ +# $Id: PKGBUILD 187943 2013-06-08 07:59:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('99e781b0c6ab8907e15f9d2dff6f3a778e40c331') +sha1sums=('78b56f1388be8fcbfc0d9f4f9e395a6ae5f25d7f') build() { cd "${srcdir}" diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD index fd6f082cc..4f9ffb501 100644 --- a/extra/libkdegames/PKGBUILD +++ b/extra/libkdegames/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184874 2013-05-09 09:42:47Z andrea $ +# $Id: PKGBUILD 187952 2013-06-08 07:59:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdegames -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Common code and data for many KDE games" url="https://projects.kde.org/projects/kde/kdegames/libkdegames" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegames-libkdegames') conflicts=('kdegames-libkdegames') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1a6385ee9bbbfc1f8d992df6efd716727e9ba3a4') +sha1sums=('5c3ff5f9ac6c7f4c80044e67cad1863631c0a7e6') build() { mkdir build diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index ac09d4206..bc614dfea 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184868 2013-05-09 09:42:41Z andrea $ +# $Id: PKGBUILD 187946 2013-06-08 07:59:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('57f3d52c8ff6b58af55fb83d38d7479688bd681b') +sha1sums=('88db6d3eae13ac1dd0113e456cb1f6ad8f31c7b3') build() { cd "${srcdir}" diff --git a/extra/libkeybinder3/PKGBUILD b/extra/libkeybinder3/PKGBUILD new file mode 100644 index 000000000..55bbfa97b --- /dev/null +++ b/extra/libkeybinder3/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 188643 2013-06-17 09:55:24Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor: speps <speps at aur dot archlinux dot org> + +pkgname=libkeybinder3 +pkgver=0.3.0 +pkgrel=3 +pkgdesc="A library for registering global keyboard shortcuts" +arch=('i686' 'x86_64') +url="http://kaizer.se/wiki/keybinder/" +license=('MIT') +depends=('gtk3') +makedepends=('gtk-doc' 'gobject-introspection') +optdepends=('lua-lgi: lua bindings') +options=('!libtool') +source=(http://archive.ubuntu.com/ubuntu/pool/universe/k/keybinder-3.0/keybinder-3.0_${pkgver}.orig.tar.gz) +sha1sums=('53167d295ffa1d356bfad6f9360b90bd85e8fb26') + +build() { + cd keybinder-3.0-${pkgver} + ./configure --prefix=/usr --enable-gtk-doc + make +} + +package() { + cd keybinder-3.0-${pkgver} + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index fe054d4c5..805629acf 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('5b8ac6703026cd0fe1bcc29f6f3dc1e6cf724b15') +sha1sums=('f4d96eddaad6e160c3ca579420117ed2deec74f6') build() { cd "${srcdir}" diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD index 7961301f8..c3fc14617 100644 --- a/extra/libkmahjongg/PKGBUILD +++ b/extra/libkmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184875 2013-05-09 09:42:48Z andrea $ +# $Id: PKGBUILD 187953 2013-06-08 07:59:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkmahjongg -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Common code, backgrounds and tile sets for games using Mahjongg tiles" url="https://projects.kde.org/projects/kde/kdegames/libmahjongg" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegames-libkmahjongg') conflicts=('kdegames-libkmahjongg') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('d33446dcd5cbc455fdd2bf09406b5a4ce15d683b') +sha1sums=('5bb8fbcc696702489fb12dde5f8a098aecdd9a3a') build() { mkdir build diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index 7df552562..d72ffc11f 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184870 2013-05-09 09:42:43Z andrea $ +# $Id: PKGBUILD 187948 2013-06-08 07:59:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="An image scanning library" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1b9af8bf3b0ed24211115d16937f56414222738c') +sha1sums=('6bb65bd85a9e65dfc20448a359df77c11e6aca55') build() { cd "${srcdir}" diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD new file mode 100644 index 000000000..00d84af60 --- /dev/null +++ b/extra/libkscreen/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 188666 2013-06-17 16:24:53Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: birdflesh <antkoul at gmail dot com> + +pkgname=libkscreen +pkgver=1.0 +pkgrel=1 +pkgdesc="KDE's screen management library" +arch=('i686' 'x86_64') +url='https://projects.kde.org/libkscreen' +license=('GPL') +depends=('kdelibs' 'qjson') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('83dc38c6ff5d33f253f7d9a43bc986cb') + +prepare() { + mkdir build +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD index 901429d4c..b00ae9f5b 100644 --- a/extra/libmbim/PKGBUILD +++ b/extra/libmbim/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186608 2013-05-30 04:01:37Z heftig $ +# $Id: PKGBUILD 188603 2013-06-16 20:32:24Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libmbim -pkgver=1.0.0 +pkgver=1.2.0 pkgrel=1 pkgdesc="MBIM modem protocol helper library" arch=(i686 x86_64) @@ -11,14 +11,8 @@ license=(GPL2) depends=(glib2 bash systemd) makedepends=(gtk-doc python) options=('!libtool') -source=($url/snapshot/$pkgname-$pkgver.tar.xz format.patch) -sha256sums=('c3d668a5dc51700749a62fb5d50f149900e8dd4265e4d132c1d9cc4cb77eef0c' - 'fbf54d12660c132f756c59cebd448a38750e3bbc9de8a7a97ceda466440dcb41') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../format.patch -} +source=(http://cgit.freedesktop.org/libmbim/libmbim/snapshot/$pkgname-$pkgver.tar.xz) +sha256sums=('0b00085486bb34b772e56643d6605eaffc3b2dd620485bc598cab8b0c6051825') build() { cd $pkgname-$pkgver diff --git a/extra/libmbim/format.patch b/extra/libmbim/format.patch deleted file mode 100644 index 4bd4c0eea..000000000 --- a/extra/libmbim/format.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -u -r libmbim-1.0.0/cli/mbimcli-basic-connect.c libmbim-1.0.0-format/cli/mbimcli-basic-connect.c ---- libmbim-1.0.0/cli/mbimcli-basic-connect.c 2013-05-22 16:20:29.000000000 +0200 -+++ libmbim-1.0.0-format/cli/mbimcli-basic-connect.c 2013-05-30 05:53:49.269777442 +0200 -@@ -909,8 +909,8 @@ - "\t Network error: '%s'\n" - "\t Packet service state: '%s'\n" - "\tAvailable data classes: '%s'\n" -- "\t Uplink speed: '%lu bps'\n" -- "\t Downlink speed: '%lu bps'\n", -+ "\t Uplink speed: '%" G_GUINT64_FORMAT " bps'\n" -+ "\t Downlink speed: '%" G_GUINT64_FORMAT " bps'\n", - mbim_device_get_path_display (device), - VALIDATE_UNKNOWN (mbim_nw_error_get_string (nw_error)), - VALIDATE_UNKNOWN (mbim_packet_service_state_get_string (packet_service_state)), diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD index bfac9d035..cb2b98529 100644 --- a/extra/libpeas/PKGBUILD +++ b/extra/libpeas/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183434 2013-04-21 22:11:27Z heftig $ +# $Id: PKGBUILD 188712 2013-06-18 13:46:20Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libpeas -pkgver=1.8.0 -pkgrel=2 +pkgver=1.8.1 +pkgrel=1 pkgdesc="A GObject-based plugins engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -19,17 +19,30 @@ options=('!libtool') install=libpeas.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz js17.patch) -sha256sums=('ffbad2d2aad8237722342432f9737a2ba5a2022e1b8171ab57db67995ce2e0fe' - '1a023c402e34203f13f3ffbb27afc9bbe46003cf2c911ceb2a0fc02742e9c889') +sha256sums=('ff0e7cd1f0da5dc1289efdd4662a06188f8f0fb088eac67abe05ffa66ba7751d' + '094f28f911de979167c870b3ed51df09dbe3cacc271b375d891d7601c51ad44f') -build() { +prepare() { cd $pkgname-$pkgver patch -Np1 -i ../js17.patch +} + +build() { + cd $pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var --enable-compile-warnings=no + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install diff --git a/extra/libpeas/js17.patch b/extra/libpeas/js17.patch index b0f7d041d..7f54a1803 100644 --- a/extra/libpeas/js17.patch +++ b/extra/libpeas/js17.patch @@ -1,24 +1,46 @@ -diff -u -r libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c ---- libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c 2013-01-05 20:32:04.000000000 +0100 -+++ libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c 2013-04-03 00:22:56.726029598 +0200 -@@ -362,7 +362,7 @@ +From 8c54d0ee9c929d9141f74a0c047fed2e28347aa3 Mon Sep 17 00:00:00 2001 +From: Garrett Regier <garrettregier@gmail.com> +Date: Sat, 27 Apr 2013 11:36:13 +0000 +Subject: Fix Gjs plugin loader + +The garbage collection now takes a runtime instead of a contex +so just use Gjs's gc method to do the right thing and jsvals +cannot be compared anymore. +--- +diff --git a/loaders/gjs/peas-extension-gjs.c b/loaders/gjs/peas-extension-gjs.c +index 2a71ff8..0ec418c 100644 +--- a/loaders/gjs/peas-extension-gjs.c ++++ b/loaders/gjs/peas-extension-gjs.c +@@ -362,7 +362,7 @@ peas_extension_gjs_call (PeasExtensionWrapper *exten, if (!JS_GetElement (gexten->js_context, JSVAL_TO_OBJECT (js_retval), nth_out_arg++, &js_value) || - js_value == JSVAL_VOID) -+ js_value.asBits == JSVAL_VOID.asBits) ++ JSVAL_IS_VOID (js_value)) { g_warning ("Error failed to get out argument %i", nth_out_arg); return FALSE; -diff -u -r libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c ---- libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c 2012-08-15 12:40:31.000000000 +0200 -+++ libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c 2013-04-03 00:19:12.884403305 +0200 -@@ -279,7 +279,7 @@ +diff --git a/loaders/gjs/peas-plugin-loader-gjs.c b/loaders/gjs/peas-plugin-loader-gjs.c +index d9acfdf..8cea724 100644 +--- a/loaders/gjs/peas-plugin-loader-gjs.c ++++ b/loaders/gjs/peas-plugin-loader-gjs.c +@@ -279,7 +279,7 @@ peas_plugin_loader_gjs_create_extension (PeasPluginLoader *loader, if (!JS_GetPropertyById (js_context, ginfo->extensions, prop_name_id, &prop_extension_ctor) || - prop_extension_ctor != extension_ctor) -+ prop_extension_ctor.asBits != extension_ctor.asBits) ++ JSVAL_TO_OBJECT (prop_extension_ctor) != JSVAL_TO_OBJECT (extension_ctor)) continue; if (!JS_IdToValue (js_context, prop_name_id, &prop_name_val) || +@@ -327,7 +327,7 @@ static void + garbage_collect (PeasPluginInfo *info, + GjsInfo *ginfo) + { +- JS_GC (gjs_context_get_native_context (ginfo->context)); ++ gjs_context_gc (ginfo->context); + } + + static void +-- +cgit v0.9.2 diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index a81628eb0..eb350d700 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186348 2013-05-25 05:24:32Z foutrelis $ +# $Id: PKGBUILD 188760 2013-06-19 19:35:08Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -19,9 +19,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.3.3 -pkgver=4.0.3 -pkgrel=3 +_LOver=4.0.4.2 +pkgver=4.0.4 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -29,7 +29,7 @@ makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost' 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez' + 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez-libs' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" @@ -74,9 +74,9 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - ${_additional_source_url}/libcdr-0.0.12.tar.bz2 - ${_additional_source_url}/libmspub-0.0.5.tar.bz2 - ${_additional_source_url}/libvisio-0.0.26.tar.bz2 + ${_additional_source_url}/libcdr-0.0.14.tar.bz2 + ${_additional_source_url}/libmspub-0.0.6.tar.bz2 + ${_additional_source_url}/libvisio-0.0.28.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff libreoffice-common.sh libreoffice-common.csh) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 @@ -108,12 +108,12 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - libcdr-0.0.12.tar.bz2 - libmspub-0.0.5.tar.bz2 - libvisio-0.0.26.tar.bz2) -md5sums=('7bcde561375f3bbce08f6d05451c8ad7' - '994b1f3015668335c30b53ddd3d60dc8' - '05b9ba0e86181bda3afeadcaba9202a3' + libcdr-0.0.14.tar.bz2 + libmspub-0.0.6.tar.bz2 + libvisio-0.0.28.tar.bz2) +md5sums=('19462798bbf6e1dc75a8b12bd1775ea2' + 'a4d5e6504a3251b7a7fbe17216f8d6e7' + '0ba553eea7284abe1370157bb35bd355' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -143,9 +143,9 @@ md5sums=('7bcde561375f3bbce08f6d05451c8ad7' '0168229624cfac409e766913506961a8' '17410483b5b5f267aa18b7e00b65e6e0' '185d60944ea767075d27247c3162b3bc' - '6db2c96a4ae5977da8b84893c1441038' - '881c4628ec5f54d47f35d5d19e335662' - '2f638cf6f92cec59c9205ac3cbf1702e' + 'd88f9b94df880d2c05be943b000ca112' + '1120705cd0f0d9bd5506360bf57b6c2e' + '05574c2ec54dd0c29d75cacdf9419f44' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') diff --git a/extra/libreoffice/PKGBUILD.41 b/extra/libreoffice/PKGBUILD.41 new file mode 100644 index 000000000..30930fce4 --- /dev/null +++ b/extra/libreoffice/PKGBUILD.41 @@ -0,0 +1,660 @@ +# $Id: PKGBUILD 186347 2013-05-25 05:23:41Z foutrelis $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> + +pkgbase="libreoffice" +pkgname=('libreoffice-common' + 'libreoffice-base' + 'libreoffice-calc' + 'libreoffice-draw' + 'libreoffice-gnome' + 'libreoffice-impress' + 'libreoffice-kde4' + 'libreoffice-math' + 'libreoffice-sdk' + 'libreoffice-sdk-doc' + 'libreoffice-writer' + 'libreoffice-en-US' + 'libreoffice-postgresql-connector' + 'libreoffice-extension-presentation-minimizer' + 'libreoffice-extension-wiki-publisher' + 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) +_LOver=4.1.0.0.beta2 +pkgver=4.1.0 +pkgrel=0.2 #beta2 +arch=('i686' 'x86_64') +license=('LGPL3') +url="http://www.libreoffice.org/" +makedepends=( # makedepends + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost' + 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit' + 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' + 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' + 'clucene' 'bluez-libs' # 'harfbuzz' + # the runtime dependencies + "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.4' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' + 'ttf-dejavu') # to satisfy regression tests + +# http://download.documentfoundation.org/mirrors/all.html +# http://wiki.documentfoundation.org/Mirrors + +_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +_additional_source_url="http://dev-www.libreoffice.org/src" +_additional_source_url2="http://dev-www.libreoffice.org/extern" +source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz + ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + ${_additional_source_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz + ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + ${_additional_source_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz + ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ${_additional_source_url}/08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 + ${_additional_source_url}/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 + ${_additional_source_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz + ${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 + ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 + ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + ${_additional_source_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 + ${_additional_source_url}/c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 + ${_additional_source_url}/libcdr-0.0.14.tar.bz2 + ${_additional_source_url}/libmspub-0.0.6.tar.bz2 + ${_additional_source_url}/libmwaw-0.1.9.tar.bz2 + ${_additional_source_url}/libvisio-0.0.28.tar.bz2 + make-pyuno-work-with-system-wide-module-install.diff + libreoffice-common.sh libreoffice-common.csh + fix_install.diff) +noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + 185d60944ea767075d27247c3162b3bc-unowinreg.dll + 08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 + b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz + 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz + eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 + 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 + c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 + libcdr-0.0.14.tar.bz2 + libmspub-0.0.6.tar.bz2 + libmwaw-0.1.9.tar.bz2 + libvisio-0.0.28.tar.bz2 ) +md5sums=('a785e1ed4809246edc39d0b55a807cdd' + '96ea39853d9058cb9e98749539827187' + '6ecbe09a87d5c2c1a186671d24643111' + 'f02578f5218f217a9f20e9c30e119c6a' + '1f24ab1d39f4a51faf22244c94a6203f' + '35c94d2df8893241173de1d16b6034c0' + '798b2ffdc8bcfe7bca2cf92b62caf685' + '2a177023f9ea8ec8bd00837605c5df1b' + 'a7983f859eafb2677d7ff386a023bc40' + '3c219630e4302863a9a83d0efde889db' + '625ff5f2f968dd908bca43c9469d6e6b' + '2c9b0f83ed5890af02c0df1c1776f39b' + '2e482c7567908d334785ce7d69ddfff7' + 'eeb2c7ddf0d302fba4bfc6e97eac9624' + '39bb3fcea1514f1369fcfc87542390fd' + '3404ab6b1792ae5f16bbd603bd1e1d03' + '97b2d4dba862397f446b217e2b623e71' + 'f94d9870737518e3b597f9265f4e9803' + '8ce2fcd72becf06c41f7201d15373ed9' + 'd8bd5eed178db6e2b18eeed243f85aa8' + '3bdf40c0d199af31923e900d082ca2dd' + 'ace6ab49184e329db254e454a010f56d' + 'db60e4fde8dd6d6807523deb71ee34dc' + 'ba2930200c9f019c2d93a8c88c651a0f' + '08c85a6d6d793daee14e10e22eefdc4b' + 'dc3d21a3921931096d6e80f6701f6763' + 'b2371dc7cf4811c9d32146eec913d296' + 'ea2acaf140ae40a87a952caa75184f4d' + '36271d3fa0d9dec1632029b6d7aac925' + '0168229624cfac409e766913506961a8' + '17410483b5b5f267aa18b7e00b65e6e0' + '185d60944ea767075d27247c3162b3bc' + '8473296c671b6e3dd8197f4145e0854b' + 'c48827713e93539dc7285f9e86ffbdc5' + 'd88f9b94df880d2c05be943b000ca112' + '1120705cd0f0d9bd5506360bf57b6c2e' + '2090daf6e8a27b52e8c5f26c915bd7c5' + '05574c2ec54dd0c29d75cacdf9419f44' + '07d2bf5ad839a394cca008b3ec6e7bb1' + '4195735a80876ae812fca5736b50192a' + 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' + 'd1fa6b1b1820cc5a7154720a1dcb0a4a') + +prepare() { + + cd ${srcdir}/libreoffice-$_LOver + + # fix exttextcat build error + # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] + unset CPPFLAGS + + # move external sources into place + mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + popd + + # fix not upstreamable pyuno paths - patch taken from Debian + patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + + # fix file-lists + # http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-1&id=8ce82f83fb8146b684bec5d903d76f034ba37d4a + patch -Np1 -i ${srcdir}/fix_install.diff + + #use the CFLAGS but remove the LibO overridden ones + for i in $CFLAGS; do + case "$i" in + -O?|-pipe|-Wall|-g|-fexceptions) continue;; + esac + ARCH_FLAGS="$ARCH_FLAGS $i" + done + + + # qt4 fix + sed -i "s:qmake:qmake-qt4:g" configure.ac +} + +build() { + cd ${srcdir}/libreoffice-$_LOver + + #autoconf -f + + # non-SMP test build + #export MAKEFLAGS="-j1" + #./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ + + ./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ + --enable-split-app-modules \ + --with-parallelism=${MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --disable-fetch-external \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib --mandir=/usr/share/man \ + --with-lang="" \ + --enable-crashdump \ + --enable-dbus \ + --enable-evolution2\ + --enable-gio\ + --disable-gnome-vfs\ + --disable-kde\ + --enable-kde4\ + --enable-gtk3 \ + --enable-gstreamer \ + --enable-lockdown\ + --enable-opengl \ + --enable-odk\ + --enable-python=system \ + --enable-scripting-beanshell \ + --enable-scripting-javascript \ + --enable-ext-wiki-publisher \ + --enable-ext-nlpsolver \ + --without-fonts\ + --without-afms\ + --without-system-libwps\ + --without-system-libcdr \ + --without-system-mdds\ + --without-myspell-dicts \ + --without-system-libvisio \ + --without-system-libcmis \ + --without-system-libmspub \ + --without-system-libexttextcat \ + --without-system-orcus \ + --without-system-liblangtag \ + --without-system-jfreereport \ + --without-system-apache-commons \ + --without-system-libodfgen \ + --without-system-libmwaw \ + --without-system-harfbuzz \ + --with-system-dicts \ + --with-external-dict-dir=/usr/share/hunspell \ + --with-external-hyph-dir=/usr/share/hyphen \ + --with-external-thes-dir=/usr/share/mythes \ + --with-system-beanshell \ + --with-system-cppunit\ + --with-system-graphite\ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --without-system-npapi-headers \ + --with-ant-home="/usr/share/apache-ant"\ + --without-system-boost\ + --with-system-cairo\ + --with-system-libs\ + --with-system-mythes\ + --with-system-headers\ + --without-system-hsqldb \ + --with-alloc=system\ + --with-system-clucene\ + --without-system-servlet-api + +# --enable-mergelibs \ # https://bugs.archlinux.org/task/34414 + +# --without-ppds\ # breaks spadmin permission + +#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool + + touch src.downloaded + #./download + make + # fake installation to create split file lists + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package_libreoffice-common() { + + pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" + install=libreoffice-common.install + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.4" + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') + optdepends=('libreoffice-langpack: additional language support' + 'java-runtime: adds java support' + 'libcups: adds printing support' + 'pstoedit: translates PostScript and PDF graphics into other vector formats' + 'libmythes: for use in thesaurus' + 'beanshell: interactive java -- good for prototyping /macros' + 'vigra: C++ computer vision library, usable in Basebmp' + 'libmspack: library for Microsoft compression formats for use in FontOOo' + 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import' + 'sane: for scanner access' + 'unixodbc: adds ODBC database support' + 'gst-plugins-base-libs: + some gstr-plugins to support multimedia content, e.g. in impress' + 'gtk2: for browser plugin') + backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf) + groups=('libreoffice') + provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' + 'libreoffice-extension-report-builder') + conflicts=('go-openoffice') + replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' + 'libreoffice-extension-report-builder') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/common_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # put configuration files into place + install -dm755 ${pkgdir}/etc/libreoffice + install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ + # install dummy links to make them found by LibO + cd ${pkgdir}/usr/lib/libreoffice/program/ + ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . + cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ + ln -vsf /etc/libreoffice/psprint.conf . + + # allow to preset desired VLC + install -dm755 ${pkgdir}/etc/profile.d + install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ + + # move bash-completion files to its new place + install -dm755 ${pkgdir}/usr/share/bash-completion/completions + mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh + rm -rf ${pkgdir}/etc/bash_completion.d + + # some files would conflict + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb + + # make pyuno find its modules + install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages + ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py + ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py + + # workaround all packages now depend on that file + cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd +} + +package_libreoffice-base() { + pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI." + install=libreoffice-base.install + depends=('libreoffice-common') + optdepends=('libreoffice-postgresql-connector') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/base_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/base_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-postgresql-connector() { + pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice" + depends=('libreoffice-base' 'postgresql-libs') + groups=('libreoffice') + replaces=('libreoffice') + + # workaround double entries in the file list + mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig + sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-calc() { + pkgdesc="Spreadsheet application for LibreOffice." + install=libreoffice-calc.install + depends=('libreoffice-common' 'lpsolve' ) + #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332 + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/calc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-draw() { + pkgdesc="Drawing Application for LibreOffice." + install=libreoffice-draw.install + depends=('libreoffice-common') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/draw_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-gnome() { + pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." + depends=('libreoffice-common' 'gtk2' 'gconf') # gconf pulls in gtk3 + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/gnome_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-impress() { + pkgdesc="Presentation Application for LibreOffice." + install=libreoffice-impress.install + depends=('libreoffice-common') + optdepends=('glu: for the OGLTrans extension') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/impress_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-kde4() { + pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." + depends=('libreoffice-common' 'kdelibs') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde4_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-math() { + pkgdesc="Equation Editor Application for LibreOffice." + depends=('libreoffice-common') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/math_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-sdk() { + pkgdesc="Software Development Kit for LibreOffice." + depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # fix environment path to keep compatibility with other java-environments + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} +} + +package_libreoffice-sdk-doc() { + pkgdesc="Software Development Kit documentation for LibreOffice" + depends=('libreoffice-common' 'libreoffice-sdk') + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + #fix permissions + find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; +} + +package_libreoffice-writer() { + pkgdesc="Word Processor Application for LibreOffice." + install=libreoffice-writer.install + depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') + optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/writer_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/writer_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # for workaround this file belongs now to common + rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd +} + +package_libreoffice-en-US() { + pkgdesc="English (US) language pack for LibreOffice" + #arch=('any') + provides=('openoffice-en-US' 'libreoffice-langpack') + replaces=(openoffice-en-US) + conflicts=(openoffice-en-US) + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-extension-presentation-minimizer() { + + pkgdesc="This extension reduce the file size of the current presentation" + depends=('libreoffice-common' 'gcc-libs') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer +} + +package_libreoffice-extension-wiki-publisher() { + + pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher +} + +package_libreoffice-extension-nlpsolver() { + + pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver +} diff --git a/extra/libreoffice/fix_install.diff b/extra/libreoffice/fix_install.diff new file mode 100644 index 000000000..b16320a22 --- /dev/null +++ b/extra/libreoffice/fix_install.diff @@ -0,0 +1,82 @@ +From 8ce82f83fb8146b684bec5d903d76f034ba37d4a Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmladek@suse.cz> +Date: Fri, 07 Jun 2013 12:13:24 +0000 +Subject: distro-install-file-lists: handle new filelists created for 4.1 + +Change-Id: I2d7a52b396a46f1f6546b92eb5612958a2cb7397 +--- +diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists +index d83855b..bbd462b 100755 +--- a/bin/distro-install-file-lists ++++ b/bin/distro-install-file-lists +@@ -80,6 +80,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + gid_Module_Root_Files_[0-9] \ + gid_Module_Root_Hack \ + gid_Module_Oo_Linguistic \ ++ gid_Module_Root_Extension_Dictionary_* \ + gid_Module_Root_Ure_Hidden ; do + merge_flists $module $FILELISTSDIR/common_list.txt + done +@@ -100,6 +101,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/math_list.txt + merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/impress_list.txt + merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/writer_list.txt ++ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/base_list.txt ++ merge_flists gid_Module_Pdfimport $FILELISTSDIR/draw_list.txt ++ + # FIXME: small; low dependencies; why optional module? + merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/impress_list.txt + else +@@ -115,6 +119,8 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Pdfimport $FILELISTSDIR/common_list.txt + # FIXME: small; low dependencies; why optional module? + merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt + fi +@@ -133,26 +139,26 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/draw_list.txt + merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt +- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt +- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt + else + merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/mailmerge_list.txt +- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt +- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/filters_list.txt + fi + else + merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/common_list.txt +- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Pyuno $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/common_list.txt +- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt + fi + +@@ -413,7 +419,7 @@ else + create_package_directory gid_Module_Brand_Prg_Wrt pkg/libreoffice-writer + create_package_directory gid_Module_Brand_Prg_Impress pkg/libreoffice-impress + create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base +- create_package_directory gid_Module_Optional_Pyuno pkg/python-uno ++ create_package_directory gid_Module_Pyuno pkg/python-uno + create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome + create_package_directory gid_Module_Optional_Tde pkg/libreoffice-tde + create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/librelogo.diff b/extra/libreoffice/librelogo.diff deleted file mode 100644 index c17143225..000000000 --- a/extra/libreoffice/librelogo.diff +++ /dev/null @@ -1,43 +0,0 @@ -From 939daba04c25a9a3b7be2f3df39692453cf9a304 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Thu, 21 Mar 2013 14:57:18 +0000 -Subject: Missing dependency of librelogo on writer - -...at least due to dependency of librelogo.xcd on writer.xcd, see -82c53d537a05dadf4d7fd7ea41292897bf2d47c7 "Missing dependency." - -Otherwise, having librelogo installed but not writer will cause an uncaught -RuntimeException from configmgr::Components::parseXcdFiles -(configmgr/source/components.cxx) early on in soffice.bin. - -(cherry picked from commit 4e69b35674882d8d675a677940805b187cad0bc3) -Conflicts: - setup_native/source/packinfo/packinfo_office.txt - -Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08 -Reviewed-on: https://gerrit.libreoffice.org/2898 -Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> -Reviewed-by: Andras Timar <atimar@suse.com> -Reviewed-by: Petr Mladek <pmladek@suse.cz> -Tested-by: Petr Mladek <pmladek@suse.cz> ---- -diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt -index 3e8c89e..cbf8c490 100644 ---- a/setup_native/source/packinfo/packinfo_office.txt -+++ b/setup_native/source/packinfo/packinfo_office.txt -@@ -314,10 +314,10 @@ End - Start - module = "gid_Module_Optional_Pyuno_LibreLogo" - solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo" --solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWPython" -+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython" - packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" --freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" --requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" -+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" -+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" - copyright = "2012 The Document Foundation" - solariscopyright = "solariscopyrightfile" - vendor = "The Document Foundation" --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libsmbios/PKGBUILD b/extra/libsmbios/PKGBUILD index d13dd6dce..d7dab5cf0 100644 --- a/extra/libsmbios/PKGBUILD +++ b/extra/libsmbios/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 144413 2011-12-05 15:46:35Z jgc $ +# $Id: PKGBUILD 187063 2013-06-03 11:16:41Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> # Contributor: daniel g. siegel <dgsiegel@gmail.com> pkgname=libsmbios pkgver=2.2.28 -pkgrel=1 +pkgrel=2 pkgdesc="A library for providing access to as much BIOS information as possible" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://linux.dell.com/libsmbios/main/index.html" license=('GPL' 'custom') depends=('gcc-libs') @@ -21,7 +21,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" mkdir build cd build - PYTHON=python2 ../configure --prefix=/usr --sysconfdir=/etc --disable-static + PYTHON=python2 ../configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --disable-static mkdir -p out/libsmbios_c mkdir -p out/libsmbios_c++ make @@ -31,7 +31,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install - chrpath -d "${pkgdir}/usr/sbin/smbios-sys-info-lite" + chrpath -d "${pkgdir}/usr/bin/smbios-sys-info-lite" cp -a ../src/include/* "${pkgdir}/usr/include/" cp -a out/public-include/* "${pkgdir}/usr/include/" @@ -40,7 +40,7 @@ package() { rm -rf "${pkgdir}/usr/lib/yum-plugins" sed -e 's|#!/usr/bin/python|#!/usr/bin/python2|g' \ - -i "${pkgdir}"/usr/sbin/smbios-{{wakeup,token,wireless}-ctl,lcd-brightness,rbu-bios-update,passwd,sys-info} + -i "${pkgdir}"/usr/bin/smbios-{{wakeup,token,wireless}-ctl,lcd-brightness,rbu-bios-update,passwd,sys-info} install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 ../COPYING-OSL "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/libspiro/PKGBUILD b/extra/libspiro/PKGBUILD index 706f208fe..3ff349f22 100644 --- a/extra/libspiro/PKGBUILD +++ b/extra/libspiro/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 145163 2011-12-18 12:09:22Z bisson $ -# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr> +# $Id: PKGBUILD 188499 2013-06-15 04:42:05Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr> pkgname=libspiro pkgver=20071029 -pkgrel=2.2 +pkgrel=3 pkgdesc='Simplifies the drawing of beautiful curves' url='http://libspiro.sourceforge.net/' license=('GPL') -options=('!libtool') arch=('i686' 'x86_64' 'mips64el') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_src-${pkgver}.tar.bz2") sha1sums=('d8b407b835b35289af2914877a4c6000b4fdd382') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr diff --git a/extra/libsrtp/PKGBUILD b/extra/libsrtp/PKGBUILD index 1013f6bc8..c6d6294f8 100644 --- a/extra/libsrtp/PKGBUILD +++ b/extra/libsrtp/PKGBUILD @@ -1,30 +1,42 @@ -# $Id: PKGBUILD 159152 2012-05-16 20:08:38Z andrea $ +# $Id: PKGBUILD 188535 2013-06-15 10:01:17Z andrea $ # Maintainer: # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Yejun Yang <yejunx AT gmail DOT com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=libsrtp -pkgver=1.4.4 -pkgrel=2 +pkgver=15.1c9bd90 +pkgrel=1 pkgdesc="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)" url="http://srtp.sourceforge.net/srtp.html" arch=('i686' 'x86_64' 'mips64el') license=('BSD') -source=("http://downloads.sourceforge.net/srtp/srtp-${pkgver}.tgz" - "mips.patch") -md5sums=('9b449edb011c934ca97009e7e0566d22' +depends=('glibc') +makedepends=('git') +source=("git://git.linphone.org/srtp.git#commit=1c9bd90" + "mips.patch") +md5sums=('SKIP' 'bfb3ec203daf786b9ffb33f30cb126ea') -build() { - cd "${srcdir}"/srtp +pkgver() { + cd srtp + echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) +} + +prepare() { + cd srtp patch -Np1 -i "$srcdir/mips.patch" + autoconf +} + +build() { + cd srtp ./configure --prefix=/usr - make CFLAGS="${CFLAGS} -fPIC" + make } package() { - cd "${srcdir}"/srtp + cd srtp make DESTDIR="${pkgdir}" install install -Dm0644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/extra/libusb-compat/PKGBUILD b/extra/libusb-compat/PKGBUILD new file mode 100644 index 000000000..8094d64fc --- /dev/null +++ b/extra/libusb-compat/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 188653 2013-06-17 10:53:32Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: arjan <arjan@archlinux.org> + +pkgname=libusb-compat +pkgver=0.1.5 +pkgrel=1 +pkgdesc="Library to enable user space application programs to communicate with USB devices" +arch=('i686' 'x86_64' 'mips64el') +url="http://libusb.sourceforge.net/" +license=('LGPL') +depends=('libusb' 'sh') +options=('!libtool') +source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2") + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +md5sums=('2780b6a758a1e2c2943bdbf7faf740e4') diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index 867f03f25..762f82dfc 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178618 2013-02-25 20:45:01Z andyrtr $ +# $Id: PKGBUILD 187152 2013-06-04 16:06:29Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.5.0 -pkgrel=2 +pkgver=1.6.0 +pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto') options=('!libtool') license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2) -sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86') +sha256sums=('53131412343ec252307fe14903deaf54c356f9414d72d49180c2091dcd7019fa') build() { cd "${srcdir}/libX11-${pkgver}" diff --git a/extra/libx11/xorg.csh b/extra/libx11/xorg.csh deleted file mode 100644 index 39d5a9715..000000000 --- a/extra/libx11/xorg.csh +++ /dev/null @@ -1,15 +0,0 @@ -setenv XDG_DATA_HOME ${HOME}/.local/share -setenv XDG_CONFIG_HOME ${HOME}/.config -setenv XDG_CACHE_HOME ${HOME}/.cache - -if (! ($?XDG_DATA_DIRS) ) then - setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/ -else - setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/:${XDG_DATA_DIRS} -endif - -if (! ($?XDG_CONFIG_DIRS) ) then - setenv XDG_CONFIG_DIRS /etc/xdg -else - setenv XDG_CONFIG_DIRS /etc/xdg:${XDG_CONFIG_DIRS} -endif diff --git a/extra/libx11/xorg.sh b/extra/libx11/xorg.sh deleted file mode 100644 index 4fc02e322..000000000 --- a/extra/libx11/xorg.sh +++ /dev/null @@ -1,15 +0,0 @@ -export XDG_DATA_HOME=$HOME/.local/share -export XDG_CONFIG_HOME=$HOME/.config -export XDG_CACHE_HOME=$HOME/.cache - -if [ -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=/usr/local/share/:/usr/share/ -else - export XDG_DATA_DIRS=/usr/local/share/:/usr/share/:$XDG_DATA_DIRS -fi - -if [ -z $XDG_CONFIG_DIRS ]; then - export XDG_CONFIG_DIRS=/etc/xdg -else - export XDG_CONFIG_DIRS=/etc/xdg:$XDG_CONFIG_DIRS -fi diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD index 7a4dd7345..1651fda73 100644 --- a/extra/libxkbcommon/PKGBUILD +++ b/extra/libxkbcommon/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181161 2013-04-01 20:10:49Z heftig $ +# $Id: PKGBUILD 188191 2013-06-12 13:53:24Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel Micay <danielmicay@gmail.com> # Contributor: Mladen Pejakovic <pejakm@gmail.com> pkgname=libxkbcommon -pkgver=0.3.0 +pkgver=0.3.1 pkgrel=1 pkgdesc="Keyboard handling library using XKB data" arch=(i686 x86_64 mips64el) @@ -14,7 +14,8 @@ depends=(xkeyboard-config) makedepends=(doxygen xorg-util-macros) options=('!libtool') source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz") -md5sums=('22a046100738f99b4cc0297aa210f4e4') +#source=("$pkgname-$pkgver::git://github.com/xkbcommon/$pkgname.git") +md5sums=('7287ea51df79c0f80e92b970a30b95e9') build() { cd $pkgname-$pkgver diff --git a/extra/libxml2/PKGBUILD b/extra/libxml2/PKGBUILD index e288114dc..89d193dfa 100644 --- a/extra/libxml2/PKGBUILD +++ b/extra/libxml2/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 185108 2013-05-11 07:24:50Z bpiotrowski $ +# $Id: PKGBUILD 187170 2013-06-04 17:39:43Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: John Proctor <jproctor@prium.net> pkgname=libxml2 pkgver=2.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="XML parsing library, version 2" -arch=(i686 x86_64 'mips64el') -license=('custom') -depends=('zlib>=1.2.4' 'readline>=6.1' 'ncurses>=5.7' 'xz') +arch=(i686 x86_64 mips64el) +license=('MIT') +depends=('zlib' 'readline' 'ncurses' 'xz') makedepends=('python2') options=('!libtool') url="http://www.xmlsoft.org/" diff --git a/extra/libxrender/PKGBUILD b/extra/libxrender/PKGBUILD index 24de8a9f4..24785f486 100644 --- a/extra/libxrender/PKGBUILD +++ b/extra/libxrender/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152786 2012-03-09 16:24:03Z andyrtr $ +# $Id: PKGBUILD 188444 2013-06-14 06:38:04Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxrender -pkgver=0.9.7 -pkgrel=1.2 +pkgver=0.9.8 +pkgrel=1 pkgdesc="X Rendering Extension client library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libx11>=1.3.4' 'renderproto') makedepends=('pkgconfig') options=('!libtool') source=(${url}/releases/individual/lib/libXrender-${pkgver}.tar.bz2) -sha1sums=('6e4d75d8316d5217324258f555eba3a5d383feb2') +sha256sums=('1d14b02f0060aec5d90dfdcf16a996f17002e515292906ed26e3dcbba0f4fc62') build() { cd "${srcdir}/libXrender-${pkgver}" diff --git a/extra/libxvmc/PKGBUILD b/extra/libxvmc/PKGBUILD index 38f6b369e..8b10db470 100644 --- a/extra/libxvmc/PKGBUILD +++ b/extra/libxvmc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152797 2012-03-09 16:34:16Z andyrtr $ +# $Id: PKGBUILD 188450 2013-06-14 09:23:32Z lcarlier $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxvmc -pkgver=1.0.7 -pkgrel=1.1 +pkgver=1.0.8 +pkgrel=1 pkgdesc="X11 Video Motion Compensation extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libxv') makedepends=('pkgconfig') options=('!libtool') source=("${url}/releases/individual/lib/libXvMC-${pkgver}.tar.bz2") -sha1sums=('b8ee482514dfdf226694c830bdf292cc14e1cb91') +sha256sums=('5e1a401efa433f959d41e17932b8c218c56b931348f494b8fa4656d7d798b204') build() { cd ${srcdir}/libXvMC-${pkgver} diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index eabfb6a73..99ad5a40a 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183248 2013-04-19 14:20:16Z giovanni $ +# $Id: PKGBUILD 188255 2013-06-13 15:52:39Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=link-grammar -pkgver=4.7.11 +pkgver=4.7.12 pkgrel=1 pkgdesc="A Grammar Checking library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('aspell') options=('!libtool' '!makeflags') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('1a990ecf0b517813a4c7b3b6f9c01f00') +md5sums=('f4f0b731dc0bbd1c7adfe9a8ef7ab116') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 4d4a02319..960b8092c 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186968 2013-06-01 19:28:52Z giovanni $ +# $Id: PKGBUILD 188257 2013-06-13 16:04:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.05.30 +pkgver=2013.06.06 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=('c3f776e18b3aa5f1cafc7a551fcf8059') +md5sums=('81431f6217725e2b1c3f1a16fca19221') build() { cd ${srcdir}/live diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index ac62f6ed0..c77faf380 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183300 2013-04-20 23:37:12Z foutrelis $ +# $Id: PKGBUILD 188592 2013-06-16 17:21:04Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -9,90 +9,48 @@ # Contributor: Roberto Alsina <ralsina@kde.org> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> -pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') -pkgver=3.2 -pkgrel=6 +pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer') +pkgver=3.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') makedepends=('libffi' 'python2' 'ocaml' 'python-sphinx') -source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz - http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz - http://dev.archlinux.org/~foutrelis/sources/compiler-rt/compiler-rt-$pkgver.src.tar.xz +source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz + http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz + http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz + clang-3.3-use-gold-linker.patch llvm-Config-config.h - llvm-Config-llvm-config.h - cindexer-clang-path.patch - enable-lto.patch - llvm-3.1-fix-debug-line-info.patch - clang-3.2-fix-std-thread-with-libstdc++.patch - clang-3.1-fix-libprofile_rt.a-location.patch) -sha256sums=('125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343' - '2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658' - 'a9a6b73a1bd5fc763f3b3826a6ce796cb150042d37d319e06e72d3d9778aaac1' + llvm-Config-llvm-config.h) +sha256sums=('68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578' + 'b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996' + '0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423' + '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09' '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' - '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48' - '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92' - 'fe3969d9ec93263814d9892a15b6a1eb60ad756fe7c3985a45d8cd82bc9b7a7b' - 'db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d' - '02b2c0fd29bc165140eb4524700254bfdd88369706719acb3f3be3134f1e67e8' - '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137') + '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48') prepare() { - cd "$srcdir/$pkgname-$pkgver.src" + cd "$srcdir/llvm-$pkgver.src" # At the present, clang must reside inside the LLVM source code tree to build # See http://llvm.org/bugs/show_bug.cgi?id=4840 - mv "$srcdir/clang-$pkgver.src" tools/clang + mv "$srcdir/cfe-$pkgver.src" tools/clang mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt - # Fix symbolic links from OCaml bindings to LLVM libraries - sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml - - # Fix installation directories, ./configure doesn't seem to set them right - sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ - -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \ - -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ + # Fix docs installation directory + sed -i 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ Makefile.config.in - sed -i '/ActiveLibDir = ActivePrefix/s:lib:lib/llvm:' \ - tools/llvm-config/llvm-config.cpp - sed -i 's:LLVM_LIBDIR="${prefix}/lib":LLVM_LIBDIR="${prefix}/lib/llvm":' \ - autoconf/configure.ac \ - configure # Fix insecure rpath (http://bugs.archlinux.org/task/14017) sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) - patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" - - # Make -flto work - # Use gold instead of default linker, and always use the plugin - patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" - - # Fix FS#34861: crash on apps built using C++11's std::thread - # http://llvm.org/bugs/show_bug.cgi?id=12730 - patch -d tools/clang -Np2 -i \ - "$srcdir/clang-3.2-fix-std-thread-with-libstdc++.patch" - - # Fix FS#29984: [clang] -coverage is broken - patch -d tools/clang -Np1 -i \ - "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch" - - # Fix FS#31098: LLVM 3.1 produces invalid debug information - # http://llvm.org/bugs/show_bug.cgi?id=13211 - patch -Np1 -i "$srcdir/llvm-3.1-fix-debug-line-info.patch" - - # Drop "svn" suffix from version string - sed -i 's/3\.2svn/3.2/g' configure - - # Prepare Python 2 override - mkdir "$srcdir/python2-path" - ln -s /usr/bin/python2 "$srcdir/python2-path/python" + # Make -flto work; use ld.gold instead of the default linker + patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch" } build() { - cd "$srcdir/$pkgname-$pkgver.src" + cd "$srcdir/llvm-$pkgver.src" # Apply strip option to configure _optimized_switch="enable" @@ -101,34 +59,33 @@ build() { # Include location of libffi headers in CPPFLAGS CPPFLAGS+=" $(pkg-config --cflags libffi)" - # Use Python 2 - export PATH="$srcdir/python2-path:$PATH" - # Force the use of GCC instead of clang CC=gcc CXX=g++ \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib/llvm \ --sysconfdir=/etc \ --enable-shared \ --enable-libffi \ --enable-targets=all \ + --enable-experimental-targets=R600 \ --disable-expensive-checks \ --disable-debug-runtime \ --disable-assertions \ --with-binutils-include=/usr/include \ + --with-python=/usr/bin/python2 \ --$_optimized_switch-optimized make REQUIRES_RTTI=1 make -C docs -f Makefile.sphinx man make -C docs -f Makefile.sphinx html + make -C tools/clang/docs -f Makefile.sphinx html } package_llvm() { pkgdesc="Low Level Virtual Machine" - depends=('perl' 'libffi') + depends=("llvm-libs=$pkgver-$pkgrel" 'perl') - cd "$srcdir/$pkgname-$pkgver.src" + cd "$srcdir/llvm-$pkgver.src" # We move the clang directory out of the tree so it won't get installed and # then we bring it back in for the clang package @@ -138,27 +95,26 @@ package_llvm() { make -j1 DESTDIR="$pkgdir" install mv "$srcdir/clang" tools + # The runtime library goes into llvm-libs + mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir" + # OCaml bindings go to a separate package rm -rf "$srcdir"/{ocaml,ocamldoc} mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir" # Remove duplicate files installed by the OCaml bindings - rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz} + rm "$pkgdir"/usr/{lib/libllvm*,share/doc/llvm/ocamldoc.tar.gz} # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a + chmod -x "$pkgdir"/usr/lib/*.a # Get rid of example Hello transformation - rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* - - # Add ld.so.conf.d entry - install -d "$pkgdir/etc/ld.so.conf.d" - echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf" + rm "$pkgdir"/usr/lib/*LLVMHello.* # Symlink LLVMgold.so into /usr/lib/bfd-plugins # (https://bugs.archlinux.org/task/28479) install -d "$pkgdir/usr/lib/bfd-plugins" - ln -s ../llvm/LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so" + ln -s ../LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so" if [[ $CARCH == x86_64 ]]; then # Needed for multilib (https://bugs.archlinux.org/task/29951) @@ -175,12 +131,22 @@ package_llvm() { cp docs/_build/man/*.1 "$pkgdir/usr/share/man/man1/" # Install html docs - cp -r docs/_build/html/* "$pkgdir/usr/share/doc/llvm/html/" - rm -r "$pkgdir/usr/share/doc/llvm/html/_sources" + cp -r docs/_build/html/* "$pkgdir/usr/share/doc/$pkgname/html/" + rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources" install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } +package_llvm-libs() { + pkgdesc="Low Level Virtual Machine (runtime library)" + depends=('gcc-libs' 'zlib' 'libffi') + + install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.so" + + install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + package_llvm-ocaml() { pkgdesc="OCaml bindings for LLVM" depends=("llvm=$pkgver-$pkgrel" 'ocaml') @@ -210,12 +176,16 @@ package_clang() { make DESTDIR="$pkgdir" install # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a + chmod -x "$pkgdir"/usr/lib/*.a # Revert the path change in case we want to do a repackage later sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ "$srcdir/llvm-$pkgver.src/Makefile.config" + # Install html docs + cp -r docs/_build/html/* "$pkgdir/usr/share/doc/$pkgname/html/" + rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources" + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE" } diff --git a/extra/llvm/cindexer-clang-path.patch b/extra/llvm/cindexer-clang-path.patch deleted file mode 100644 index ddaab690e..000000000 --- a/extra/llvm/cindexer-clang-path.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 -+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 -@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP - - // We now have the CIndex directory, locate clang relative to it. - LibClangPath.eraseComponent(); -+ LibClangPath.eraseComponent(); - #endif - - LibClangPath.appendComponent("clang"); diff --git a/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch b/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch deleted file mode 100644 index 080aa4fca..000000000 --- a/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr clang-3.1.src.orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp ---- clang-3.1.src.orig/lib/Driver/Tools.cpp 2012-04-19 00:32:25.000000000 +0300 -+++ clang-3.1.src/lib/Driver/Tools.cpp 2012-05-23 21:12:08.000000000 +0300 -@@ -193,7 +193,7 @@ static void addProfileRT(const ToolChain - // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is - // not supported by old linkers. - std::string ProfileRT = -- std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a"; -+ std::string(TC.getDriver().Dir) + "/../lib/llvm/libprofile_rt.a"; - - CmdArgs.push_back(Args.MakeArgString(ProfileRT)); - } diff --git a/extra/llvm/clang-3.2-fix-std-thread-with-libstdc++.patch b/extra/llvm/clang-3.2-fix-std-thread-with-libstdc++.patch deleted file mode 100644 index 6963603b1..000000000 --- a/extra/llvm/clang-3.2-fix-std-thread-with-libstdc++.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- cfe/trunk/lib/Basic/Targets.cpp 2013/04/04 23:51:36 178815 -+++ cfe/trunk/lib/Basic/Targets.cpp 2013/04/04 23:53:43 178816 -@@ -2730,6 +2730,14 @@ - case NoMMX3DNow: - break; - } -+ -+ if (CPU >= CK_i486) { -+ Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1"); -+ Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2"); -+ Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4"); -+ } -+ if (CPU >= CK_i586) -+ Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8"); - } - - bool X86TargetInfo::hasFeature(StringRef Feature) const { diff --git a/extra/llvm/clang-3.3-use-gold-linker.patch b/extra/llvm/clang-3.3-use-gold-linker.patch new file mode 100644 index 000000000..76905a64e --- /dev/null +++ b/extra/llvm/clang-3.3-use-gold-linker.patch @@ -0,0 +1,12 @@ +diff -upr cfe.src.orig/lib/Driver/ToolChains.cpp cfe.src/lib/Driver/ToolChains.cpp +--- cfe.src.orig/lib/Driver/ToolChains.cpp 2013-06-08 16:17:19.000000000 +0300 ++++ cfe.src/lib/Driver/ToolChains.cpp 2013-06-08 16:17:33.000000000 +0300 +@@ -2220,7 +2220,7 @@ Linux::Linux(const Driver &D, const llvm + PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + + GCCInstallation.getTriple().str() + "/bin").str()); + +- Linker = GetProgramPath("ld"); ++ Linker = GetProgramPath("ld.gold"); + + Distro Distro = DetectDistro(Arch); + diff --git a/extra/llvm/enable-lto.patch b/extra/llvm/enable-lto.patch deleted file mode 100644 index 9f43e657e..000000000 --- a/extra/llvm/enable-lto.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1398,7 +1398,7 @@ - PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + - GCCInstallation.getTriple() + "/bin").str()); - -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld.gold"); - - LinuxDistro Distro = DetectLinuxDistro(Arch); - -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3412,11 +3412,11 @@ - // Tell the linker to load the plugin. This has to come before AddLinkerInputs - // as gold requires -plugin to come before any -plugin-opt that -Wl might - // forward. - if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) { - CmdArgs.push_back("-plugin"); -- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; -+ std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); - } - - AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs); - } diff --git a/extra/llvm/llvm-3.1-fix-debug-line-info.patch b/extra/llvm/llvm-3.1-fix-debug-line-info.patch deleted file mode 100644 index de2d46b61..000000000 --- a/extra/llvm/llvm-3.1-fix-debug-line-info.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 737fdba46f2b2b7d39bc728d15ea2334c44779e0 Mon Sep 17 00:00:00 2001 -From: Ben Longbons <b.r.longbons@gmail.com> -Date: Fri, 29 Jun 2012 12:58:34 -0700 -Subject: [PATCH] Revert "Patch to set is_stmt a little better for prologue - lines in a function." - -This meants that the debugger could find meaningful line information. - -This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850. ---- - lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 7 ++----- - test/DebugInfo/X86/ending-run.ll | 6 ++---- - 2 files changed, 4 insertions(+), 9 deletions(-) - -diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -index 3e79a6d..24aedfb 100644 ---- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -@@ -1093,15 +1093,12 @@ void DwarfDebug::beginInstruction(const MachineInstr *MI) { - if (!MI->isDebugValue()) { - DebugLoc DL = MI->getDebugLoc(); - if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { -- unsigned Flags = 0; -+ unsigned Flags = DWARF2_FLAG_IS_STMT; - PrevInstLoc = DL; - if (DL == PrologEndLoc) { - Flags |= DWARF2_FLAG_PROLOGUE_END; - PrologEndLoc = DebugLoc(); - } -- if (PrologEndLoc.isUnknown()) -- Flags |= DWARF2_FLAG_IS_STMT; -- - if (!DL.isUnknown()) { - const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext()); - recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags); -@@ -1382,7 +1379,7 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) { - MF->getFunction()->getContext()); - recordSourceLine(FnStartDL.getLine(), FnStartDL.getCol(), - FnStartDL.getScope(MF->getFunction()->getContext()), -- 0); -+ DWARF2_FLAG_IS_STMT); - } - } - -diff --git a/test/DebugInfo/X86/ending-run.ll b/test/DebugInfo/X86/ending-run.ll -index 6935c47..0cd3de1 100644 ---- a/test/DebugInfo/X86/ending-run.ll -+++ b/test/DebugInfo/X86/ending-run.ll -@@ -1,11 +1,9 @@ - ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj - ; RUN: llvm-dwarfdump %t | FileCheck %s - --; Check that the line table starts at 7, not 4, but that the first --; statement isn't until line 8. -+; Check that the line table starts at 7, not 4. - --; CHECK-NOT: 0x0000000000000000 7 0 1 0 is_stmt --; CHECK: 0x0000000000000000 7 0 1 0 -+; CHECK: 0x0000000000000000 7 0 1 0 is_stmt - ; CHECK: 0x0000000000000004 8 18 1 0 is_stmt prologue_end - - define i32 @callee(i32 %x) nounwind uwtable ssp { --- -1.7.10 - diff --git a/extra/lsof/PKGBUILD b/extra/lsof/PKGBUILD index e11622b06..1ac9d3db7 100644 --- a/extra/lsof/PKGBUILD +++ b/extra/lsof/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179524 2013-03-06 00:34:51Z tomegun $ +# $Id: PKGBUILD 187064 2013-06-03 11:16:43Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -7,7 +7,7 @@ pkgname=lsof pkgver=4.87 -pkgrel=1 +pkgrel=2 pkgdesc="Lists open files for running Unix processes" arch=('i686' 'x86_64' 'mips64el') url="http://people.freebsd.org/~abe/" @@ -34,7 +34,7 @@ package() { $pkgdir/usr/share/doc/$pkgname/$file done - install -Dm0755 -o root -g root lsof ${pkgdir}/usr/sbin/lsof + install -Dm0755 -o root -g root lsof ${pkgdir}/usr/bin/lsof install -Dm0644 -o root -g root lsof.8 ${pkgdir}/usr/share/man/man8/lsof.8 install -D -m0644 -o root -g root ${srcdir}/license.txt \ diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 007735319..784354ec1 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185029 2013-05-10 12:32:47Z juergen $ +# $Id: PKGBUILD 187812 2013-06-06 11:09:25Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.30.0 -pkgrel=1 +pkgrel=2 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net" if [ "${CARCH}" == "mips64el" ] ; then depends=('clisp' 'texinfo' 'sh') else - depends=('sbcl=1.1.7' 'texinfo' 'sh') + depends=('sbcl=1.1.8' 'texinfo' 'sh') fi makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index cd31148ff..db347f8d2 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,29 +1,23 @@ -# $Id: PKGBUILD 183011 2013-04-16 22:29:29Z eric $ +# $Id: PKGBUILD 188540 2013-06-15 10:10:22Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Adrià Arrufat <swiftscythe@gmail.com> pkgname=mediastreamer -pkgver=2.8.2 -pkgrel=5 +pkgver=2.9.0 +pkgrel=1 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/" license=('GPL') -depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') -makedepends=('intltool') +depends=('ortp' 'ffmpeg' 'libxv' 'glew' 'libupnp') +# xxd from Vim is needed to build +makedepends=('intltool' 'vim') options=('!libtool') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} - mediastreamer-ffmpeg.patch) -md5sums=('e51ea9d5fce1396b374d10473dfbadec' - '805da7def98f367e621363fa0c951fe8' - '553d5d47ea4a8c8dfeabdc0281849d5f') - -prepare() { - cd $pkgname-$pkgver - patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch -} +source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) +md5sums=('f2ea0fe731a363749a81b6eaac22a62c' + 'SKIP') build() { cd $pkgname-$pkgver diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch deleted file mode 100644 index 3304e9f56..000000000 --- a/extra/mediastreamer/mediastreamer-ffmpeg.patch +++ /dev/null @@ -1,57 +0,0 @@ -commit f586917ea4d66f9ba8910f0967a8830e54d50784 -Author: Yann Diorcet <yann.diorcet@belledonne-communications.com> -Date: Tue Jun 5 11:07:48 2012 +0200 - - Fixes for new versions of ffmpeg - -diff --git a/src/h264dec.c b/src/h264dec.c -index c4a84ee..5229b5e 100644 ---- a/src/h264dec.c -+++ b/src/h264dec.c -@@ -45,7 +45,9 @@ typedef struct _DecData{ - static void ffmpeg_init(){ - static bool_t done=FALSE; - if (!done){ -+#ifdef FF_API_AVCODEC_INIT - avcodec_init(); -+#endif - avcodec_register_all(); - done=TRUE; - } -diff --git a/src/videoenc.c b/src/videoenc.c -index 21d016f..fb35760 100644 ---- a/src/videoenc.c -+++ b/src/videoenc.c -@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - static bool_t avcodec_initialized=FALSE; - -+#ifndef FF_I_TYPE -+#define FF_I_TYPE AV_PICTURE_TYPE_I -+#endif -+ - #ifdef ENABLE_LOG_FFMPEG - - void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) -@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) - - void ms_ffmpeg_check_init(){ - if(!avcodec_initialized){ -+#ifdef FF_API_AVCODEC_INIT - avcodec_init(); -+#endif - avcodec_register_all(); - avcodec_initialized=TRUE; - #ifdef ENABLE_LOG_FFMPEG -@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){ - if (s->profile==0){ - s->codec=CODEC_ID_H263; - }else{ -+ /* - c->flags|=CODEC_FLAG_H263P_UMV; - c->flags|=CODEC_FLAG_AC_PRED; - c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; -- /* - c->flags|=CODEC_FLAG_OBMC; - c->flags|=CODEC_FLAG_AC_PRED; - */ diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index f8407e622..fcf5d170a 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185603 2013-05-15 19:30:15Z giovanni $ +# $Id: PKGBUILD 187158 2013-06-04 16:22:02Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.6.1 +pkgver=2.6.2 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=('db34e6085b71c33ba250e689b1535101' +md5sums=('55f6ea5982cf87836113376174826e8c' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD index 540845fad..4ef875761 100644 --- a/extra/modemmanager/PKGBUILD +++ b/extra/modemmanager/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 183639 2013-04-25 18:36:08Z heftig $ +# $Id: PKGBUILD 187818 2013-06-06 13:48:42Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=modemmanager _realname=ModemManager -pkgver=0.7.990 -pkgrel=4 +pkgver=0.7.991 +pkgrel=1 pkgdesc="Mobile broadband modem management service" arch=('i686' 'x86_64' 'mips64el') url="http://cgit.freedesktop.org/ModemManager/ModemManager/" license=(GPL2) -depends=(udev ppp libqmi polkit hicolor-icon-theme) +depends=(udev ppp libqmi libmbim polkit hicolor-icon-theme) makedepends=(intltool git gtk-doc) optdepends=('usb_modeswitch: install if your modem shows up as a storage drive') options=('!libtool') install=modemmanager.install #source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz) -source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=135bec6") +source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=a00f1d7") sha256sums=('SKIP') build() { @@ -24,6 +24,7 @@ build() { ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --with-udev-base-dir=/usr/lib/udev \ --disable-static \ --with-polkit diff --git a/extra/modemmanager/modemmanager.install b/extra/modemmanager/modemmanager.install index be187f2b4..d0e87bc18 100644 --- a/extra/modemmanager/modemmanager.install +++ b/extra/modemmanager/modemmanager.install @@ -1,6 +1,7 @@ post_install() { - type -P gtk-update-icon-cache &>/dev/null && + if type -P gtk-update-icon-cache &>/dev/null; then gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + fi } post_upgrade() { diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index 8b2870dc0..2e0cf0f28 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185614 2013-05-16 03:14:17Z eric $ +# $Id: PKGBUILD 187066 2013-06-03 11:16:46Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=msmtp pkgname=('msmtp' 'msmtp-mta') pkgver=1.4.31 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://msmtp.sourceforge.net" @@ -48,7 +48,6 @@ package_msmtp-mta() { provides=('smtp-forwarder') conflicts=('smtp-forwarder') - install -d "${pkgdir}"/usr/{s,}bin + install -d "${pkgdir}"/usr/bin ln -s msmtp "${pkgdir}/usr/bin/sendmail" - ln -s ../bin/msmtp "${pkgdir}/usr/sbin/sendmail" } diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 6df2b9bed..d3e701687 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186664 2013-05-30 12:25:27Z heftig $ +# $Id: PKGBUILD 187901 2013-06-07 22:39:54Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.8.2 -pkgrel=2 +pkgver=3.8.3 +pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64 mips64el) license=('GPL') @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2dddb1f699a94e9d294c36127e0642f5afa1fa8853cb1b47187ece16457fce65') +sha256sums=('3078162c3adef95fb207cc1945b863575ff180709d6394f5cf14e7d0f49b6c2a') build() { cd "$pkgname-$pkgver" diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index e807f3ef0..7cee1de43 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183320 2013-04-21 22:06:39Z heftig $ +# $Id: PKGBUILD 188611 2013-06-16 23:57:46Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=nautilus pkgname=(nautilus libnautilus-extension) -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="GNOME file manager" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ makedepends=(intltool gobject-introspection python) url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz) -sha256sums=('9827e939aa0621041754379ca0227ceb82877785f013dd5935ecc4b791314892') +sha256sums=('dbddfdaac52d077d46d48a2f8dbecf6d13788d8f6b5fc9aa70826a24681d8a75') build() { cd $pkgbase-$pkgver diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index a2e14c4dd..cedf8841f 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184846 2013-05-09 09:42:16Z andrea $ +# $Id: PKGBUILD 187924 2013-06-08 07:59:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('205cb87512c3d24f41295a534770779e41051a29') +sha1sums=('28d9641ffc1b877f0cd0d27343b56563ed2bc74d') build() { mkdir build diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD index f70b3fae9..5a5d121d3 100644 --- a/extra/nepomuk-widgets/PKGBUILD +++ b/extra/nepomuk-widgets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184863 2013-05-09 09:42:35Z andrea $ +# $Id: PKGBUILD 187941 2013-06-08 07:59:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-widgets -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="The Library containing the Nepomuk Widgets" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-widgets" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('nepomuk-core') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('19a02e2ea861f69da51eef24ae951fef449c3bfb') +sha1sums=('fb7379a3b324b2660f220094c8273860722fe3f1') build() { mkdir build diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index 18c8e0007..ffd23bb15 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184181 2013-05-03 08:14:17Z foutrelis $ +# $Id: PKGBUILD 187895 2013-06-07 21:36:22Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,31 +6,20 @@ # Contributor: Will Rea <sillywilly@gmail.com> pkgname=network-manager-applet -pkgver=0.9.8.0 -pkgrel=3 +pkgver=0.9.8.2 +pkgrel=1 pkgdesc="GNOME frontends to NetWorkmanager" arch=('i686' 'x86_64' 'mips64el') license=(GPL) url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver::5}" libgnome-keyring gtk3 libnotify +depends=("networkmanager>=${pkgver::5}" libsecret gtk3 libnotify gnome-icon-theme mobile-broadband-provider-info iso-codes) makedepends=(intltool gnome-bluetooth gobject-introspection) optdepends=('gnome-bluetooth: for PAN/DUN support') options=('!libtool' '!emptydirs') install=network-manager-applet.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz - fixed-signal-icons.tar.xz) -noextract=(fixed-signal-icons.tar.xz) -sha256sums=('1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590' - '08ffd9d045c98119eb1991c036f41e51950e72eea5638549075239256c000e91') - -prepare() { - cd ${pkgname}-${pkgver} - - # Fix signal icons to work with libpng 1.6 - # https://bugzilla.gnome.org/show_bug.cgi?id=697286 - tar xf ${srcdir}/fixed-signal-icons.tar.xz -} +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) +sha256sums=('a540c743971c199a7b8663a8d0a38eb66a4c13a6b5124cd3a7495c75560aadc7') build() { cd ${pkgname}-${pkgver} @@ -39,7 +28,8 @@ build() { --libexecdir=/usr/lib/networkmanager \ --disable-static \ --disable-maintainer-mode \ - --disable-migration + --disable-migration \ + --with-modem-manager-1 make } diff --git a/extra/network-manager-applet/fixed-signal-icons.tar.xz b/extra/network-manager-applet/fixed-signal-icons.tar.xz Binary files differdeleted file mode 100644 index 1f85541dc..000000000 --- a/extra/network-manager-applet/fixed-signal-icons.tar.xz +++ /dev/null diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD index b406ae5d5..55bcf19ff 100644 --- a/extra/networkmanager-openconnect/PKGBUILD +++ b/extra/networkmanager-openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179569 2013-03-07 11:54:27Z foutrelis $ +# $Id: PKGBUILD 187896 2013-06-07 21:36:56Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openconnect -pkgver=0.9.8.0 +pkgver=0.9.8.2 pkgrel=1 pkgdesc="NetworkManager VPN integration for openconnect" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) -sha256sums=('c12487f57ad2f2386db4b103397e3cb66bf34ba589c5f48c3c5ec0b5547e4d9b') +sha256sums=('8c3b393d155448d41f5de539d4920f0e5205a087aa5b25ed65601d6a370c44eb') build() { cd NetworkManager-openconnect-${pkgver} diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD index 5a963c814..39387b87a 100644 --- a/extra/networkmanager-openvpn/PKGBUILD +++ b/extra/networkmanager-openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179570 2013-03-07 11:54:28Z foutrelis $ +# $Id: PKGBUILD 187897 2013-06-07 21:37:29Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openvpn -pkgver=0.9.8.0 +pkgver=0.9.8.2 pkgrel=1 pkgdesc="NetworkManager VPN plugin for OpenVPN" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') install=networkmanager-openvpn.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) -sha256sums=('4196f4c124426884657c8d0e2578f4d35205b8981a46bf645fd599fb238395ce') +sha256sums=('d1c032f30e3c58d6d6bc371aad6d7e757f748d23a9240c077294492753078359') build() { cd NetworkManager-openvpn-${pkgver} diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD index ed14fbc72..80d46e896 100644 --- a/extra/networkmanager-pptp/PKGBUILD +++ b/extra/networkmanager-pptp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179571 2013-03-07 11:54:28Z foutrelis $ +# $Id: PKGBUILD 187898 2013-06-07 21:38:15Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-pptp -pkgver=0.9.8.0 +pkgver=0.9.8.2 pkgrel=1 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64' 'mips64el') @@ -15,12 +15,16 @@ options=('!libtool') install=networkmanager-pptp.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz gtk_table_to_gtk_grid.patch) -sha256sums=('34d0981462d8948ace0dd4f49478c86017b53516afbbf62e2a4c6c0adc679cc8' +sha256sums=('7f46ea61376d13d03685eca3f26a26e0022f6e92e6f1fc356034ca9717eb6dac' '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215') -build() { +prepare() { cd NetworkManager-pptp-${pkgver} patch -Np1 -i ../gtk_table_to_gtk_grid.patch +} + +build() { + cd NetworkManager-pptp-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index 84be26b9f..f0c4a178e 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185909 2013-05-19 18:47:29Z dreisner $ +# $Id: PKGBUILD 187899 2013-06-07 21:38:48Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc -pkgver=0.9.8.0 -pkgrel=2 +pkgver=0.9.8.2 +pkgrel=1 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,15 +13,8 @@ makedepends=('intltool') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz - "vpnc-paths.patch") -sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1' - '0b07abc21823b316bfd9a9faf7bf34ded35d66e904d081c5e285f8dc8ce30a54') - -prepare() { - cd NetworkManager-vpnc-${pkgver} - patch -Np1 <"$srcdir/vpnc-paths.patch" -} +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) +sha256sums=('adf6f4abd29d3f0384ef55fdfea75e6cd56088a0ecdfed2454305fd9e08318a1') build() { cd NetworkManager-vpnc-${pkgver} diff --git a/extra/networkmanager-vpnc/vpnc-paths.patch b/extra/networkmanager-vpnc/vpnc-paths.patch deleted file mode 100644 index eccdf65b2..000000000 --- a/extra/networkmanager-vpnc/vpnc-paths.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/nm-vpnc-service.c 2013-05-19 14:21:35.465816746 -0400 -+++ b/src/nm-vpnc-service.c 2013-05-19 14:23:57.554908088 -0400 -@@ -54,6 +54,7 @@ - - static const char *vpnc_binary_paths[] = - { -+ "/usr/bin/vpnc", - "/usr/sbin/vpnc", - "/sbin/vpnc", - "/usr/local/sbin/vpnc", diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index fb381f16c..f8826c1ea 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183447 2013-04-21 22:11:49Z heftig $ +# $Id: PKGBUILD 187894 2013-06-07 21:35:29Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -8,50 +8,50 @@ pkgname=networkmanager _pkgname=NetworkManager -pkgver=0.9.8.0 -pkgrel=3 +pkgver=0.9.8.2 +pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org/projects/$_pkgname/" depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client libsoup systemd modemmanager) -makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc) +makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git) optdepends=('dhclient: DHCPv6 support' - 'iptables: Connection sharing' 'dnsmasq: Connection sharing' - 'bluez: Bluetooth support' + 'bluez4: Bluetooth support' 'openresolv: resolvconf support' 'ppp: Dialup connection support') options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install +#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz - NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch) -sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b' + NetworkManager.conf disable_set_hostname.patch) +sha256sums=('5c0b2f71b2f61e0dfbe95cebad83001758db252d5cdf5b6f7ceebac9c6bd7ead' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') -build() { +prepare() { cd $_pkgname-$pkgver - patch -Np1 -i ../disable_set_hostname.patch - patch -Np1 -i ../dnsmasq-path.patch - #AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi +} +build() { + cd $_pkgname-$pkgver ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/networkmanager \ + --sbindir=/usr/bin \ --with-crypto=nss \ - --with-dhclient=/usr/sbin/dhclient \ - --with-dhcpcd=/usr/sbin/dhcpcd \ - --with-iptables=/usr/sbin/iptables \ + --with-dhclient=/usr/bin/dhclient \ + --with-dhcpcd=/usr/bin/dhcpcd \ + --with-iptables=/usr/bin/iptables \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-udev-dir=/usr/lib/udev \ - --with-resolvconf=/usr/sbin/resolvconf \ + --with-resolvconf=/usr/bin/resolvconf \ --with-session-tracking=systemd \ --with-modem-manager-1 \ --disable-static \ diff --git a/extra/networkmanager/dnsmasq-path.patch b/extra/networkmanager/dnsmasq-path.patch deleted file mode 100644 index c0e713266..000000000 --- a/extra/networkmanager/dnsmasq-path.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c ---- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200 -+++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100 -@@ -52,8 +52,11 @@ - find_dnsmasq (void) - { - static const char *paths[] = { -+ "/usr/local/bin/dnsmasq", - "/usr/local/sbin/dnsmasq", -+ "/usr/bin/dnsmasq", - "/usr/sbin/dnsmasq", -+ "/bin/dnsmasq", - "/sbin/dnsmasq", - NULL - }; -diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c ---- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200 -+++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100 -@@ -170,8 +170,11 @@ - nm_find_dnsmasq (void) - { - static const char *dnsmasq_binary_paths[] = { -+ "/usr/local/bin/dnsmasq", - "/usr/local/sbin/dnsmasq", -+ "/usr/bin/dnsmasq", - "/usr/sbin/dnsmasq", -+ "/bin/dnsmasq", - "/sbin/dnsmasq", - NULL - }; diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD index f9c429c43..daec052c4 100644 --- a/extra/nmap/PKGBUILD +++ b/extra/nmap/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173177 2012-12-12 00:31:59Z eric $ +# $Id: PKGBUILD 188110 2013-06-10 00:00:35Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -18,7 +18,7 @@ sha1sums=('769943a1a5c10f67bf9738e26da42b3312db752f') build() { cd "${srcdir}/${pkgname}-${pkgver}" - + export PYTHON=python2 ./configure \ --prefix=/usr \ --libexecdir=/usr/lib \ @@ -29,9 +29,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm "${pkgdir}"/usr/bin/uninstall_zenmap install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index 17a50e340..af2212d26 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186962 2013-06-01 15:32:06Z eric $ +# $Id: PKGBUILD 187105 2013-06-03 20:13:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,12 +6,12 @@ pkgname=obex-data-server pkgver=0.4.6 -pkgrel=6 +pkgrel=7 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64' 'mips64el') url="http://wiki.muiline.com/obex-data-server" license=('GPL') -depends=('dbus-glib' 'openobex' 'imagemagick') +depends=('dbus-glib' 'openobex' 'imagemagick' 'libusb-compat') source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz" "obex-data-server-openobex17.patch") md5sums=('961ca5db6fe9c97024e133cc6203cc4d' diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD index 2f851ddfb..083752d7c 100644 --- a/extra/obexd/PKGBUILD +++ b/extra/obexd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 170095 2012-11-01 11:22:52Z andrea $ +# $Id: PKGBUILD 187865 2013-06-07 09:25:01Z tomegun $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> @@ -6,16 +6,17 @@ pkgbase=obexd pkgname=('obexd-client' 'obexd-server') epoch=1 pkgver=0.46 -pkgrel=1 +pkgrel=2 url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -makedepends=('bluez' 'libical') +makedepends=('bluez4' 'bluez-libs' 'libical' 'glib2') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2") md5sums=('625f0417d119437429c9cce29479cfa4') build() { cd ${pkgbase}-${pkgver} + sed -i 's/#include <string.h>/&\n#include <stdio.h>/' plugins/mas.c ./configure --prefix=/usr \ --libexecdir=/usr/lib/obexd make @@ -23,7 +24,7 @@ build() { package_obexd-client() { pkgdesc="D-Bus service providing high-level OBEX client side functionality" - depends=('bluez') + depends=('bluez4' 'bluez-libs' 'glib2') provides=("obexd=${pkgver}") replaces=('obexd') conflicts=('obexd') @@ -37,7 +38,7 @@ package_obexd-client() { package_obexd-server() { pkgdesc="D-Bus service providing high-level OBEX server side functionality" - depends=('bluez' 'libical') + depends=('bluez4' 'bluez-libs' 'libical' 'glib2') conflicts=('obex-data-server') cd ${pkgbase}-${pkgver}/src diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD index 17a5926d3..ef2ca5730 100644 --- a/extra/opengtl/PKGBUILD +++ b/extra/opengtl/PKGBUILD @@ -1,25 +1,32 @@ -# $Id: PKGBUILD 184417 2013-05-06 19:39:02Z foutrelis $ +# $Id: PKGBUILD 188593 2013-06-16 17:21:06Z foutrelis $ # Maintainer: # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Andries Radu <admiral0@live.it> pkgname=opengtl pkgver=0.9.18 -pkgrel=2 +pkgrel=3 pkgdesc="A set of libraries for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" url="http://www.opengtl.org" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('gcc-libs' 'llvm') -makedepends=('cmake' 'libpng') +depends=('gcc-libs' 'llvm-libs') +makedepends=('cmake' 'libpng' 'llvm') optdepends=('libpng: for using the png extension') source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2 + opengtl-0.9.18-llvm-3.3.patch opengtl-0.9.18-memcpy.patch) sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8' + 'c43418bc039660ae86cb86b8b8175342793cb1361c699faa9b6342bc896e3d6c' '357cc2e538bbaaffe7d58956959d8a7fbae09741d4a87488a5a8c51ec645d23a') prepare() { mkdir build + + # Fix build with LLVM 3.3 (patch from Fedora) + patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-llvm-3.3.patch" + + # Fix build with libpng 1.6 patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-memcpy.patch" } diff --git a/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch b/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch new file mode 100644 index 000000000..80280979f --- /dev/null +++ b/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch @@ -0,0 +1,732 @@ +diff -up OpenGTL-0.9.18/CMakeLists.txt.jx OpenGTL-0.9.18/CMakeLists.txt +--- OpenGTL-0.9.18/CMakeLists.txt.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/CMakeLists.txt 2013-05-08 15:39:25.090057193 -0400 +@@ -78,8 +78,8 @@ else(MSVC) + FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "native bitwriter linker bitreader jit interpreter support ipo" LLVM_LIBS LLVM_NATIVE_OBJECTS ) + endif(MSVC) + +-if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" OR LLVM_VERSION STREQUAL "3.2svn" OR LLVM_VERSION STREQUAL "3.2" ) ) # There is no way with MSVC to know the llvm version +- message(FATAL_ERROR "LLVM 3.0 or 3.1 or 3.2 is required.") ++if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.3svn" OR LLVM_VERSION STREQUAL "3.3" ) ) # There is no way with MSVC to know the llvm version ++ message(FATAL_ERROR "LLVM 3.3 is required.") + endif() + + if(MSVC) +diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp +--- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp 2013-05-08 15:39:25.091057197 -0400 +@@ -27,10 +27,10 @@ + #include <climits> + + // LLVM +-#include <llvm/InstrTypes.h> ++#include <llvm/IR/InstrTypes.h> + // #include <llvm/Linker.h> +-#include <llvm/DerivedTypes.h> +-#include <llvm/Module.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Module.h> + // #include <llvm/Transforms/Utils/Cloning.h> + // Library Loader + #ifdef LLVM_27_OR_28 +@@ -214,7 +214,7 @@ bool Compiler::compile(bool _isStandardL + return success; + } + +-#include <llvm/ValueSymbolTable.h> ++#include <llvm/IR/ValueSymbolTable.h> + + bool Compiler::importModule(const GTLCore::String& name) + { +diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp +--- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp 2013-05-08 15:39:25.091057197 -0400 +@@ -19,9 +19,9 @@ + + #include "ParserNG.h" + +-#include <llvm/Constants.h> +-#include <llvm/DerivedTypes.h> +-#include <llvm/Type.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Type.h> + + #include <GTLCore/LLVMBackend/CodeGenerator_p.h> + #include <GTLCore/CompilationMessage.h> +diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp +--- OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp 2013-05-08 15:39:25.091057197 -0400 +@@ -38,7 +38,7 @@ + using namespace OpenCTL; + + // LLVM +-#include <llvm/Module.h> ++#include <llvm/IR/Module.h> + #include <llvm/Bitcode/ReaderWriter.h> + #ifdef LLVM_27_OR_28 + #include <llvm/System/Path.h> +@@ -47,8 +47,7 @@ using namespace OpenCTL; + #include <llvm/Support/Path.h> + #include <llvm/Support/DynamicLibrary.h> + #endif +-#include <llvm/Module.h> +-#include <llvm/LLVMContext.h> ++#include <llvm/IR/LLVMContext.h> + + struct Module::Private { + Private() : moduleData(0), isStandardLibrary(false) {} +diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp +--- OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp 2013-05-08 15:39:25.091057197 -0400 +@@ -20,16 +20,16 @@ + #include "Program.h" + + // LLVM +-#include <llvm/DerivedTypes.h> +-#include <llvm/Instructions.h> +-#include <llvm/Module.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Module.h> + #include <llvm/Transforms/Utils/Cloning.h> + + // Passes + #include <llvm/PassManager.h> + #include <llvm/Analysis/LoopPass.h> + #include <llvm/Analysis/Verifier.h> +-#include <llvm/GlobalVariable.h> ++#include <llvm/IR/GlobalVariable.h> + + // GTLCore + #include "GTLCore/Buffer.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp 2013-05-08 15:39:25.092057201 -0400 +@@ -20,9 +20,9 @@ + #include "AccessorExpression.h" + + #include <llvm/ADT/ArrayRef.h> +-#include <llvm/Constants.h> +-#include <llvm/Function.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Instructions.h> + + #include "../LLVMBackend/CodeGenerator_p.h" + #include "../LLVMBackend/ExpressionResult_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp 2013-05-08 15:39:25.092057201 -0400 +@@ -19,7 +19,7 @@ + + #include "BinaryExpression.h" + +-#include <llvm/Instructions.h> ++#include <llvm/IR/Instructions.h> + + #include <GTLCore/Debug.h> + #include <GTLCore/LLVMBackend/CodeGenerator_p.h> +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp 2013-05-08 15:39:25.092057201 -0400 +@@ -19,10 +19,10 @@ + + #include "CompoundExpression.h" + +-#include <llvm/Constants.h> +-#include <llvm/DerivedTypes.h> +-#include <llvm/GlobalVariable.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/GlobalVariable.h> ++#include <llvm/IR/Instructions.h> + + #include "../LLVMBackend/CodeGenerator_p.h" + #include "../Debug.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp 2013-05-08 15:39:25.092057201 -0400 +@@ -19,10 +19,10 @@ + + #include "ConstantCompoundExpression.h" + +-#include <llvm/Constants.h> +-#include <llvm/DerivedTypes.h> +-#include <llvm/GlobalVariable.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/GlobalVariable.h> ++#include <llvm/IR/Instructions.h> + + #include "../LLVMBackend/CodeGenerator_p.h" + #include "../Debug.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp 2013-05-08 15:39:25.093057205 -0400 +@@ -19,11 +19,11 @@ + + #include "Expression.h" + +-#include <llvm/Constant.h> +-#include <llvm/Constants.h> +-#include <llvm/Function.h> +-#include <llvm/GlobalVariable.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Constant.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/GlobalVariable.h> ++#include <llvm/IR/Instructions.h> + + #include "GTLCore/LLVMBackend/CodeGenerator_p.h" + #include "GTLCore/LLVMBackend/ExpressionResult_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp 2013-05-08 15:39:25.093057205 -0400 +@@ -19,10 +19,10 @@ + + #include "FunctionDeclaration.h" + +-#include <llvm/DerivedTypes.h> +-#include <llvm/Function.h> +-#include <llvm/Instructions.h> +-#include <llvm/Type.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Type.h> + + #include <GTLCore/LLVMBackend/CodeGenerator_p.h> + #include <GTLCore/LLVMBackend/ExpressionResult_p.h> +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp 2013-05-08 15:39:25.093057205 -0400 +@@ -21,8 +21,8 @@ + + #include <stdlib.h> + +-#include <llvm/Constant.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Constant.h> ++#include <llvm/IR/Instructions.h> + + #include "../Type.h" + #include "../LLVMBackend/CodeGenerator_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp 2013-05-08 15:39:25.093057205 -0400 +@@ -21,12 +21,12 @@ + + // LLVM + #include <llvm/ADT/ArrayRef.h> +-#include <llvm/BasicBlock.h> +-#include <llvm/Constants.h> +-#include <llvm/Function.h> +-#include <llvm/GlobalVariable.h> +-#include <llvm/Instructions.h> +-#include <llvm/Module.h> ++#include <llvm/IR/BasicBlock.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/GlobalVariable.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Module.h> + + // GTLCore + #include <GTLCore/LLVMBackend/CodeGenerator_p.h> +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp 2013-05-08 15:39:25.094057209 -0400 +@@ -19,9 +19,9 @@ + + #include "Tree.h" + +-#include <llvm/Constant.h> +-#include <llvm/GlobalVariable.h> +-#include <llvm/Type.h> ++#include <llvm/IR/Constant.h> ++#include <llvm/IR/GlobalVariable.h> ++#include <llvm/IR/Type.h> + + #include "FunctionDeclaration.h" + +@@ -37,8 +37,8 @@ + #include "GTLCore/LLVMBackend/Visitor_p.h" + + #include "Expression.h" +-#include <llvm/Module.h> +-#include <llvm/DerivedTypes.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/DerivedTypes.h> + + using namespace GTLCore::AST; + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp 2013-05-08 15:39:25.094057209 -0400 +@@ -22,9 +22,9 @@ + #include <map> + #include <fstream> + +-#include <llvm/Module.h> +-#include <llvm/Value.h> +-#include <llvm/Type.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/Value.h> ++#include <llvm/IR/Type.h> + #include <llvm/Support/Path.h> + #include <llvm/Support/raw_ostream.h> + +@@ -418,9 +418,9 @@ namespace GTLCore { + + #ifdef OPENGTL_ENABLE_DEBUG_OUTPUT + +-#include <llvm/DerivedTypes.h> +-#include <llvm/Function.h> +-#include <llvm/Type.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Type.h> + + void compareFunctionParameters( llvm::Value* func, const std::vector<llvm::Value*>& params ) + { +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp 2013-05-08 15:39:25.094057209 -0400 +@@ -21,9 +21,9 @@ + + #include <llvm/ExecutionEngine/GenericValue.h> + #include <llvm/ExecutionEngine/ExecutionEngine.h> +-#include <llvm/Function.h> +- +-#include <llvm/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output + + #include "VirtualMachine_p.h" + +@@ -35,7 +35,6 @@ + #include "LLVMBackend/GenerationContext_p.h" + #include "ModuleData_p.h" + #include "LLVMBackend/CodeGenerator_p.h" +-#include <llvm/Instructions.h> + #include "Type_p.h" + #include <GTLCore/Parameter.h> + #include "PrimitiveTypesTraits_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp 2013-05-08 15:39:25.094057209 -0400 +@@ -21,9 +21,9 @@ + + #include <cstdarg> + +-#include <llvm/DerivedTypes.h> +-#include <llvm/Module.h> +-#include <llvm/Type.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/Type.h> + + #include "Parameter.h" + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp 2013-05-08 15:39:25.095057213 -0400 +@@ -19,12 +19,12 @@ + + #include "CodeGenerator_p.h" + +-#include <llvm/CallingConv.h> +-#include <llvm/Constants.h> +-#include <llvm/Function.h> +-#include <llvm/Instructions.h> +-#include <llvm/Module.h> +-#include <llvm/Value.h> ++#include <llvm/IR/CallingConv.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/Value.h> + + #include "GTLCore/Debug.h" + #include "ExpressionResult_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp 2013-05-08 15:39:25.095057213 -0400 +@@ -20,7 +20,7 @@ + #include "ContextManager_p.h" + + #include <llvm/Support/ThreadLocal.h> +-#include <llvm/LLVMContext.h> ++#include <llvm/IR/LLVMContext.h> + + using namespace LLVMBackend; + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp 2013-05-08 15:39:25.095057213 -0400 +@@ -20,7 +20,7 @@ + #include "ExpressionGenerationContext_p.h" + + #include "GTLCore/Debug.h" +-#include <llvm/BasicBlock.h> ++#include <llvm/IR/BasicBlock.h> + + #include "GTLCore/Macros_p.h" + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp 2013-05-08 15:39:25.095057213 -0400 +@@ -19,8 +19,8 @@ + + #include "ExpressionResult_p.h" + +-#include "llvm/Constant.h" +-#include "llvm/DerivedTypes.h" ++#include "llvm/IR/Constant.h" ++#include "llvm/IR/DerivedTypes.h" + + #include "../Type.h" + #include "../Type_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp 2013-05-08 15:39:25.096057217 -0400 +@@ -22,8 +22,8 @@ + #include "GTLCore/ModuleData_p.h" + #include "GTLCore/Debug.h" + +-#include "llvm/BasicBlock.h" +-#include "llvm/Function.h" ++#include "llvm/IR/BasicBlock.h" ++#include "llvm/IR/Function.h" + + #include "GTLCore/AST/Statement.h" + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp 2013-05-08 15:39:25.096057217 -0400 +@@ -20,12 +20,12 @@ + #include "Visitor_p.h" + + // LLVM +-#include <llvm/BasicBlock.h> +-#include <llvm/Constants.h> +-#include <llvm/Function.h> +-#include <llvm/Instructions.h> +-#include <llvm/Module.h> +-#include <llvm/GlobalVariable.h> ++#include <llvm/IR/BasicBlock.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/GlobalVariable.h> + + // GTLCore + #include "CodeGenerator_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp 2013-05-08 15:41:21.422512114 -0400 +@@ -21,7 +21,7 @@ + + #include <sstream> + +-#include <llvm/Module.h> ++#include <llvm/IR/Module.h> + #include <llvm/PassManager.h> + #include <llvm/Target/TargetMachine.h> + #include <llvm/Analysis/Verifier.h> +@@ -242,7 +242,7 @@ void ModuleData::doLink() + GTL_ASSERT( not m_llvmLinkedModule ); + m_llvmLinkedModule = m_llvmModule; + m_llvmModule = llvm::CloneModule( m_llvmModule ); +- llvm::Linker linker("", m_llvmLinkedModule); ++ llvm::Linker linker(m_llvmLinkedModule); + std::string errorMessage; + foreach( const llvm::Module* mod, m_linkModuleWith ) + { +@@ -270,18 +270,11 @@ void ModuleData::doLink() + hide.push_back(name); + } + } +- linker.LinkInModule( clone, &errorMessage ); ++ linker.linkInModule( clone, &errorMessage ); + + GTL_DEBUG("Linking error: " << errorMessage ); + delete clone; + } +- foreach( const GTLCore::String& mod, m_linkModuleWithArchives ) +- { +- bool v = false; +- linker.LinkInArchive( llvm::sys::Path( (const std::string&) mod), v); +- } +- +- linker.releaseModule(); + + // Hide symbols + foreach(GTLCore::String name, hide) +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp 2013-05-08 15:39:25.096057217 -0400 +@@ -25,7 +25,7 @@ + + #include <iostream> + +-#include <llvm/DerivedTypes.h> ++#include <llvm/IR/DerivedTypes.h> + + #include "wrappers/StructWrap.h" + #include "SharedPointer.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -30,8 +30,8 @@ + + using namespace GTLCore; + +-#include <llvm/Type.h> +-#include <llvm/DerivedTypes.h> ++#include <llvm/IR/Type.h> ++#include <llvm/IR/DerivedTypes.h> + + Type::StructDataMember::Information::~Information() + { +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -19,8 +19,8 @@ + + #include "Value_p.h" + +-#include <llvm/DerivedTypes.h> +-#include <llvm/Type.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Type.h> + + #include "Debug.h" + #include "Value.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -19,8 +19,8 @@ + + #include "VariableNG_p.h" + +-#include <llvm/Constants.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Instructions.h> + + #include "LLVMBackend/CodeGenerator_p.h" + #include "Debug.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -21,10 +21,10 @@ + + // JIT + #include <llvm/ExecutionEngine/ExecutionEngine.h> +-#include <llvm/Module.h> +-#include <llvm/DerivedTypes.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/DerivedTypes.h> + #include <llvm/Target/TargetOptions.h> +-#include <llvm/LLVMContext.h> ++#include <llvm/IR/LLVMContext.h> + #include <llvm/Support/CommandLine.h> + #include <llvm/Support/Threading.h> + #include <llvm/Support/ErrorHandling.h> +@@ -48,7 +48,8 @@ struct VirtualMachine::Private { + VirtualMachine* VirtualMachine::Private::virtualMachine = 0; + int VirtualMachine::Private::optimLevel = 2; + +-void gtl_llvm_error_handler(void *user_data, const std::string& reason) ++void gtl_llvm_error_handler(void *user_data, const std::string& reason, ++ bool gen_crash_diag) + { + GTL_ABORT(reason); + } +@@ -58,11 +59,7 @@ VirtualMachine::VirtualMachine() : d(new + { + d->executionEngine = 0; + +-#ifdef LLVM_27 +- llvm::llvm_install_error_handler(>l_llvm_error_handler); +-#else +- llvm::install_fatal_error_handler(>l_llvm_error_handler); +-#endif ++ llvm::install_fatal_error_handler(gtl_llvm_error_handler); + + llvm::llvm_start_multithreaded(); + +diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -19,7 +19,7 @@ + + #include "Compiler_p.h" + +-#include <llvm/Module.h> ++#include <llvm/IR/Module.h> + #include <llvm/PassManager.h> + + #include "GTLCore/AST/Expression.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp 2013-05-08 15:39:25.098057225 -0400 +@@ -22,9 +22,9 @@ + + #include <sstream> + +-#include <llvm/Module.h> ++#include <llvm/IR/Module.h> + #include <llvm/Support/DynamicLibrary.h> +-#include <llvm/LLVMContext.h> ++#include <llvm/IR/LLVMContext.h> + + #include "GTLCore/CompilationMessage.h" + #include "GTLCore/Function.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp 2013-05-08 15:39:25.098057225 -0400 +@@ -29,7 +29,7 @@ + + #include "Library.h" + #include <GTLCore/Function_p.h> +-#include <llvm/Module.h> ++#include <llvm/IR/Module.h> + #include <GTLCore/Type_p.h> + + using namespace GTLFragment; +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp 2013-05-08 15:39:25.098057225 -0400 +@@ -21,14 +21,14 @@ + + #include <vector> + +-#include <llvm/CallingConv.h> +-#include <llvm/Constants.h> +-#include <llvm/Constant.h> +-#include <llvm/DerivedTypes.h> +-#include <llvm/Function.h> +-#include <llvm/Instructions.h> +-#include <llvm/Module.h> +-#include <llvm/Value.h> ++#include <llvm/IR/CallingConv.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/Constant.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Module.h> ++#include <llvm/IR/Value.h> + + #include "GTLCore/LLVMBackend/CodeGenerator_p.h" + #include "GTLCore/LLVMBackend/ExpressionResult_p.h" +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp 2013-05-08 15:39:25.098057225 -0400 +@@ -28,13 +28,13 @@ + #include "CodeGenerator_p.h" + #include <GTLFragment/wrappers/ColorWrap_p.h> + #include <GTLCore/Type_p.h> +-#include <llvm/Value.h> +-#include <llvm/DerivedTypes.h> +-#include <llvm/CallingConv.h> +-#include <llvm/Module.h> ++#include <llvm/IR/Value.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/CallingConv.h> ++#include <llvm/IR/Module.h> + #include <GTLCore/LLVMBackend/ExpressionGenerationContext_p.h> + #include <GTLCore/LLVMBackend/CodeGenerator_p.h> +-#include <llvm/Instructions.h> ++#include <llvm/IR/Instructions.h> + #include <GTLCore/TypesManager.h> + + using namespace OpenShiva; +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp 2013-05-08 15:39:25.099057228 -0400 +@@ -22,7 +22,7 @@ + #include <sstream> + #include <fstream> + +-#include <llvm/Module.h> ++#include <llvm/IR/Module.h> + + #include "GTLCore/CompilationMessage.h" + #include "GTLCore/Function.h" +@@ -48,7 +48,7 @@ + #include "wrappers/ImageWrap_p.h" + #include "wrappers/RegionWrap_p.h" + #include <GTLCore/AST/Tree.h> +-#include <llvm/DerivedTypes.h> ++#include <llvm/IR/DerivedTypes.h> + + using namespace OpenShiva; + +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp 2013-05-08 15:39:25.099057228 -0400 +@@ -19,7 +19,8 @@ + + #include "PixelConvertExpressionFactory_p.h" + +-#include <llvm/Instructions.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Function.h> + + #include "GTLCore/Type.h" + #include "GTLCore/AST/ConvertExpression.h" +@@ -34,7 +35,6 @@ + #include <GTLCore/VariableNG_p.h> + #include <GTLCore/LLVMBackend/Visitor_p.h> + #include <GTLFragment/wrappers/ColorWrap_p.h> +-#include <llvm/Function.h> + #include <GTLCore/Type_p.h> + + using namespace OpenShiva; +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp 2013-05-08 15:39:25.099057228 -0400 +@@ -20,11 +20,11 @@ + #include "PixelVisitor_p.h" + + // LLVM +-#include <llvm/Constant.h> +-#include <llvm/Constants.h> +-#include <llvm/BasicBlock.h> +-#include <llvm/Instructions.h> +-#include <llvm/Function.h> ++#include <llvm/IR/Constant.h> ++#include <llvm/IR/Constants.h> ++#include <llvm/IR/BasicBlock.h> ++#include <llvm/IR/Instructions.h> ++#include <llvm/IR/Function.h> + + #include "GTLCore/LLVMBackend/ExpressionResult_p.h" + #include "GTLCore/LLVMBackend/ExpressionGenerationContext_p.h" +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp 2013-05-08 15:39:25.099057228 -0400 +@@ -22,9 +22,9 @@ + #include <map> + #include <vector> + +-#include <llvm/DerivedTypes.h> +-#include <llvm/Function.h> +-#include <llvm/Module.h> ++#include <llvm/IR/DerivedTypes.h> ++#include <llvm/IR/Function.h> ++#include <llvm/IR/Module.h> + + #include "GTLCore/Function_p.h" + #include "GTLCore/Macros.h" diff --git a/extra/openobex/PKGBUILD b/extra/openobex/PKGBUILD index 4c9edf088..5d153c9bc 100644 --- a/extra/openobex/PKGBUILD +++ b/extra/openobex/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186964 2013-06-01 15:32:09Z eric $ +# $Id: PKGBUILD 187866 2013-06-07 09:25:02Z tomegun $ # Maintainer: # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,12 +6,12 @@ pkgname=openobex pkgver=1.7 -pkgrel=5 +pkgrel=6 pkgdesc="Implementation of the OBject EXchange (OBEX) protocol" url="http://dev.zuckschwerdt.org/openobex/" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') -depends=('bluez' 'libusbx') +depends=('libusbx' 'bluez-libs') makedepends=('cmake') options=('!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-Source.tar.gz) @@ -19,12 +19,6 @@ md5sums=('11031f6f0b876bb6259bd27106491528') prepare() { mkdir build - - cd ${pkgname}-${pkgver}-Source - - # Fix path to obex-check-device in udev rule - # https://bugs.archlinux.org/task/35547 - sed -i 's:/sbin/:/bin/:' udev/openobex.rules.in } build() { @@ -33,8 +27,8 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_INSTALL_SBINDIR=bin + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_SBINDIR=/usr/bin make all openobex-apps } @@ -43,4 +37,9 @@ package() { make DESTDIR="${pkgdir}" install cp ../${pkgname}-${pkgver}-Source/apps/lib/*.h "${pkgdir}/usr/include/openobex/" install -m644 apps/lib/libopenobex-apps-common.a "${pkgdir}/usr/lib/libopenobex-apps-common.a" + + # usrmove + cd "$pkgdir" + mv lib/udev usr/lib/ + rmdir lib } diff --git a/extra/ortp/PKGBUILD b/extra/ortp/PKGBUILD index b1747f65e..68a44139d 100644 --- a/extra/ortp/PKGBUILD +++ b/extra/ortp/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 162825 2012-07-01 07:46:57Z andrea $ +# $Id: PKGBUILD 188538 2013-06-15 10:09:55Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=ortp -pkgver=0.20.0.20120701 -pkgrel=1.1 +pkgver=0.22.0 +pkgrel=1 pkgdesc="A Real-time Transport Protocol (RTP) library" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/index.php/eng/code_review/ortp" license=('GPL3') depends=('libzrtpcpp' 'libsrtp') options=('!libtool') -#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig} -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('91b66787c6ac3e8d4d43946beb7611ce') +source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig}) +sha1sums=('3f4712307ceba27c6498abd2090f411e02084dbd' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} - ./autogen.sh ./configure --prefix=/usr \ --enable-zrtp \ --disable-strict @@ -28,6 +27,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD index be6f51b14..53cb50634 100644 --- a/extra/perl-dbd-sqlite/PKGBUILD +++ b/extra/perl-dbd-sqlite/PKGBUILD @@ -1,33 +1,30 @@ -# $Id: PKGBUILD 186400 2013-05-26 09:25:06Z bluewind $ +# $Id: PKGBUILD 188483 2013-06-14 22:43:41Z eric $ # Maintainer: -# Contributor: Tom Killian <tomk@runbox.com> -# Contributor: francois at archlinux dot org pkgname=perl-dbd-sqlite -_cpanname=DBD-SQLite -pkgver=1.37 -pkgrel=2 +pkgver=1.39 +pkgrel=1 pkgdesc="Self-contained RDBMS in a DBI driver" arch=('i686' 'x86_64' 'mips64el') -url="http://search.cpan.org/dist/${_cpanname}" +url="http://search.cpan.org/dist/DBD-SQLite" license=('GPL' 'PerlArtistic') depends=('perl-dbi' 'sqlite') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) -md5sums=('b8ac1c584befa63cd5ffc391b2366e84') +source=(http://www.cpan.org/authors/id/I/IS/ISHIGAKI/DBD-SQLite-${pkgver}.tar.gz) +md5sums=('8ca0719852fcbcbbee470c705eeff24a') build() { - cd "${srcdir}/${_cpanname}-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + cd DBD-SQLite-${pkgver} + perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_cpanname}-${pkgver}" + cd DBD-SQLite-${pkgver} make test } package() { - cd "${srcdir}/${_cpanname}-${pkgver}" + cd DBD-SQLite-${pkgver} make install DESTDIR="${pkgdir}" } diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index 115fcee5f..50c9121ac 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186413 2013-05-26 09:25:31Z bluewind $ +# $Id: PKGBUILD 188575 2013-06-15 17:19:47Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.54 -pkgrel=2 +pkgver=1.55 +pkgrel=1 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64' 'mips64el') license=('custom:BSD') @@ -15,7 +15,7 @@ options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('26e758fff1c90cb00e9358fea7e1e22f') +md5sums=('473b8d66ca69d5784bb0e428721f58e0') build() { cd ${srcdir}/${_cpanname}-${pkgver} diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index 14940a564..fe8f71b77 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,37 +1,31 @@ -# $Id: PKGBUILD 186421 2013-05-26 09:25:51Z bluewind $ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 187097 2013-06-03 18:17:55Z eric $ +# Maintainer: pkgname=perl-yaml-syck -_realname=YAML-Syck -pkgver=1.25 -pkgrel=2 +pkgver=1.27 +pkgrel=1 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64' 'mips64el') -license=('custom') -url="http://search.cpan.org/dist/${_realname}/" +url="http://search.cpan.org/dist/YAML-Syck/" +license=('BSD' 'custom') depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) -md5sums=('847f315cbd074b42c44f360383ac13e9') +source=(http://www.cpan.org/authors/id/T/TO/TODDR/YAML-Syck-$pkgver.tar.gz) +md5sums=('8920091e68a078cfa9c42041e5759162') build() { - cd "${srcdir}/${_realname}-$pkgver" - - # install module in vendor directories. + cd YAML-Syck-$pkgver perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_realname}-$pkgver" + cd YAML-Syck-$pkgver make test } package() { - cd "${srcdir}/${_realname}-$pkgver" + cd YAML-Syck-$pkgver make install DESTDIR="${pkgdir}" - - # license. install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index aa0950a3b..2e9035390 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185573 2013-05-15 08:05:33Z bpiotrowski $ +# $Id: PKGBUILD 187846 2013-06-07 04:00:16Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,24 +21,24 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.15 -pkgrel=3 +pkgver=5.4.16 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' - 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') + 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('145ea5e845e910443ff1eddb3dbcf56a' +md5sums=('3d2c694d28861d707b2622c3cc941cff' '44c1bb1df346b3b9d3e092c7df9a37d0' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' 'e036c721e5ad927cd1613c7475a58b3a' - '4af4d94f3db58437eef8db87d16a5fab' + 'cc2940f5312ba42e7aa1ddfab74b84c4' 'c60343df74f8e1afb13b084d5c0e47ed') prepare() { @@ -84,6 +84,7 @@ build() { --with-curl=shared \ --with-db4=/usr \ --with-enchant=shared,/usr \ + --with-fpm-systemd \ --with-freetype-dir=/usr \ --with-gd=shared \ --with-gdbm \ diff --git a/extra/php/php-fpm.service b/extra/php/php-fpm.service index 1ae62051f..6e2faafd8 100644 --- a/extra/php/php-fpm.service +++ b/extra/php/php-fpm.service @@ -3,10 +3,10 @@ Description=The PHP FastCGI Process Manager After=syslog.target network.target [Service] -Type=forking +Type=notify PIDFile=/run/php-fpm/php-fpm.pid PrivateTmp=true -ExecStart=/usr/bin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid +ExecStart=/usr/bin/php-fpm --nodaemonize --pid /run/php-fpm/php-fpm.pid ExecReload=/bin/kill -USR2 $MAINPID [Install] diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 92622c22a..65e20e86f 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186354 2013-05-25 09:05:56Z andyrtr $ +# $Id: PKGBUILD 188729 2013-06-18 15:46:36Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,12 +7,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.2.2 +_dcpkgver=2.2.3 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/extra/pm-utils/PKGBUILD b/extra/pm-utils/PKGBUILD index 5722959a4..fcb190d32 100644 --- a/extra/pm-utils/PKGBUILD +++ b/extra/pm-utils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 159434 2012-05-24 09:48:16Z bluewind $ +# $Id: PKGBUILD 187068 2013-06-03 11:16:50Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=pm-utils pkgver=1.4.1 -pkgrel=5.1 +pkgrel=6 pkgdesc="Utilities and scripts for suspend and hibernate power management" arch=('i686' 'x86_64' 'mips64el') url="http://pm-utils.freedesktop.org" @@ -31,6 +31,7 @@ build() { patch -Np1 -i "${srcdir}/14-disable-sata-alpm.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --localstatedir=/var make } diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD index d0b97eadc..9bcfbe2c2 100644 --- a/extra/polkit/PKGBUILD +++ b/extra/polkit/PKGBUILD @@ -1,29 +1,27 @@ -# $Id: PKGBUILD 183452 2013-04-21 22:11:58Z heftig $ +# $Id: PKGBUILD 188528 2013-06-15 09:16:15Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=polkit -pkgver=0.110 -pkgrel=2 +pkgver=0.111 +pkgrel=1 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(i686 x86_64 'mips64el') license=(LGPL) url="http://www.freedesktop.org/wiki/Software/polkit" -depends=(glib2 pam expat libsystemd js185) +depends=(glib2 pam expat libsystemd js) makedepends=(intltool gtk-doc gobject-introspection) options=('!libtool') install=polkit.install source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz polkit.pam) -md5sums=('06e0d3b72e566ac277fc35c8206d2a28' - '6564f95878297b954f0572bc1610dd15') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --disable-static --enable-gtk-doc + --enable-libsystemd-login=yes --disable-static \ + --enable-gtk-doc make } @@ -36,3 +34,5 @@ package() { install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1" } +md5sums=('81b116edf986d8e13502929a171f4e0d' + '6564f95878297b954f0572bc1610dd15') diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 9711c7064..777ad72d2 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186342 2013-05-25 02:56:35Z foutrelis $ +# $Id: PKGBUILD 188733 2013-06-18 15:55:17Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.22.4 +pkgver=0.22.5 pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') @@ -13,11 +13,10 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('49d55921ce795778c7231fe9f2fe923b' +md5sums=('1cd27460f7e3379d1eb109cfd7bcdb39' '9dc64c254a31e570507bdd4ad4ba629a') build() { -# . /etc/profile.d/qt4.sh cd "${srcdir}" ln -sf test-${_testtag} test diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 2b245e213..6c00f6326 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185572 2013-05-15 08:05:31Z bpiotrowski $ +# $Id: PKGBUILD 187156 2013-06-04 16:15:46Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix pkgver=2.10.0 -pkgrel=5 +pkgrel=7 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') @@ -15,12 +15,10 @@ depends=('pcre' 'libsasl' 'libldap' 'db' backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} 'aliases.patch' - 'service' - 'rc.d') + 'service') sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' 'SKIP' '5fc3de6c7df1e5851a0a379e825148868808318b' - '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6' - '40c6be2eb55e6437a402f43775cdb3d22ea87a66') + '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6') provides=('smtp-server' 'smtp-forwarder') conflicts=('smtp-server' 'smtp-forwarder') @@ -38,10 +36,12 @@ build() { -DHAS_PGSQL -I/usr/include/postgresql \ -DHAS_SQLITE \ -DHAS_CDB \ - -DDEF_MANPAGE_DIR=\"/usr/share/man\" \ + -DDEF_COMMAND_DIR=\"/usr/bin\" \ -DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \ - -DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \ + -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\" \ -DDEF_README_DIR=\"/usr/share/doc/postfix\" \ + -DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \ + -DDEF_MANPAGE_DIR=\"/usr/share/man\" \ ' AUXLIBS=' \ -lsasl2 \ -lldap -llber \ @@ -60,7 +60,6 @@ package() { sh postfix-install -non-interactive install_root="${pkgdir}" - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" diff --git a/extra/postfix/install b/extra/postfix/install index 7230359fc..c7e06b07e 100644 --- a/extra/postfix/install +++ b/extra/postfix/install @@ -1,5 +1,5 @@ post_upgrade() { - /usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix upgrade-package + /usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix command_directory=/usr/bin upgrade-package chown postfix var/lib/postfix } diff --git a/extra/postfix/rc.d b/extra/postfix/rc.d deleted file mode 100755 index fa314bb84..000000000 --- a/extra/postfix/rc.d +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=postfix - -case "$1" in -start) - stat_busy "Starting $name daemon" - /usr/sbin/postfix start &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - /usr/sbin/postfix stop &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - /usr/sbin/postfix reload &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 70575cf3a..580ebf716 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181159 2013-04-01 19:36:12Z heftig $ +# $Id: PKGBUILD 188177 2013-06-11 17:10:36Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,20 +7,20 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" -pkgver=3.0 -pkgrel=3 +pkgver=4.0 +pkgrel=2 arch=(i686 x86_64 mips64el) url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit - speex tdb udev dbus-core avahi bluez gconf intltool jack sbc - openssl fftw orc json-c gtk2 webrtc-audio-processing - systemd check) + speex tdb systemd dbus avahi bluez4 bluez-libs gconf intltool jack sbc + openssl fftw orc json-c gtk3 webrtc-audio-processing + check) [ "$CARCH" != "mips64el" ] && makedepends+=(lirc-utils) options=(!emptydirs !libtool) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz pulseaudio.xinit) -sha256sums=('c90bfda29605942d08e3e218ef10e3c660506a06651a616bfbb6a6df8392836d' +sha256sums=('35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae' 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') build() { @@ -43,10 +43,11 @@ build() { } package_pulseaudio() { - depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb udev fftw orc - libsamplerate webrtc-audio-processing systemd sbc) + depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc + libsamplerate webrtc-audio-processing sbc) optdepends=('avahi: zeroconf support' - 'bluez: bluetooth support' + 'bluez4: bluetooth support' + 'bluez-libs: bluetooth support' 'gconf: configuration through gconf (paprefs)' 'jack: jack support' 'openssl: RAOP support' @@ -56,7 +57,8 @@ package_pulseaudio() { install=pulseaudio.install cd $pkgbase-$pkgver - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" install \ + bashcompletiondir=/usr/share/bash-completion/completions # Disable autospawn by default sed -e '/autospawn/iautospawn=no' \ @@ -87,6 +89,9 @@ package_pulseaudio() { # cap is handled in .install chmod 755 "$pkgdir/usr/lib/pulse/proximity-helper" + install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \ + "$pkgdir/usr/share/zsh/site-functions/_pulseaudio" + ### Split libpulse mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{bin,lib/pulseaudio,share/man/man{1,5}}} @@ -117,7 +122,7 @@ package_pulseaudio() { package_libpulse() { pkgdesc="$pkgdesc (client library)" - depends=(dbus-core libasyncns libcap libxtst libsm libsndfile json-c) + depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c) optdepends=('alsa-plugins: ALSA support' 'avahi: zeroconf support') backup=(etc/pulse/client.conf) diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt4/PKGBUILD index ff4e2ca59..8fba5379f 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt4/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 183563 2013-04-23 13:10:46Z andrea $ +# $Id: PKGBUILD 188683 2013-06-17 19:05:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> -pkgbase=pyqt -pkgname=('pyqt-common' 'pyqt' 'python2-pyqt') -pkgver=4.10.1 -pkgrel=1 +pkgbase=pyqt4 +pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4') +pkgver=4.10.2 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa' 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') -source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('e5973c4ec0b0469f329bc00209d2ad9c') +source=("http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-${pkgver}.tar.gz") +md5sums=('9257e12fec9b1b21e5a0d76d455d1691') build() { cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} @@ -43,9 +43,12 @@ build() { make } -package_pyqt-common(){ - pkgdesc="Common PyQt files shared between pyqt and python2-pyqt" +package_pyqt4-common(){ + pkgdesc="Common PyQt files shared between python-pyqt4 and python2-pyqt4" depends=('qt4') + replaces=('pyqt-common') + conflicts=('pyqt-common') + provides=("pyqt-common=${pkgver}") cd PyQt-x11-gpl-${pkgver} make -C pyrcc DESTDIR="${pkgdir}" install @@ -54,12 +57,15 @@ package_pyqt-common(){ install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api } -package_pyqt(){ +package_python-pyqt4(){ pkgdesc="A set of Python 3.x bindings for the Qt toolkit" - depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common') + depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt4-common') optdepends=('phonon: enable audio and video in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') + replaces=('pyqt') + conflicts=('pyqt') + provides=("pyqt=${pkgver}") cd PyQt-x11-gpl-${pkgver} # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR @@ -70,24 +76,26 @@ package_pyqt(){ rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api } -package_python2-pyqt(){ +package_python2-pyqt4(){ pkgdesc="A set of Python 2.x bindings for the Qt toolkit" - depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common') + depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt4-common') optdepends=('phonon: enable audio and video in PyQt applications' 'python2-opengl: enable OpenGL 3D graphics in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') - provides=('python2-qt') + replaces=('python2-pyqt') + conflicts=('python2-pyqt') + provides=("python2-pyqt=${pkgver}") cd Py2Qt-x11-gpl-${pkgver} # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - # Fix conflicts with pyqt + # Fix conflicts with python-pyqt4 mv "${pkgdir}"/usr/bin/{,python2-}pyuic4 - # Provided by pyqt + # Provided by python-pyqt4 rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} - rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpythonplugin.so + rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpyqt4.so rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api } diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 3985812b8..c8272f0d2 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 183648 2013-04-26 02:48:29Z angvp $ +# $Id: PKGBUILD 188212 2013-06-13 03:55:11Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> pkgbase=python-lxml pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs') -pkgver=3.1.2 +pkgver=3.2.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('BSD' 'custom') url="http://lxml.de/" -makedepends=('python2' 'python' 'libxslt') +makedepends=('python2' 'python' 'libxslt' 'python-cssselect' 'python2-cssselect') source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -md5sums=('6f2173f4fd5b13fbc9f8a5096d23d524' +md5sums=('d183ccd6bbd5ca139e9db9e9a675787e' 'SKIP') -check() { - cd lxml-$pkgver - make PYTHON=python2 test - make PYTHON=python test -} +# Temporary commented due a conflict with devtools and lxml +#check() { +# cd lxml-$pkgver +# make PYTHON=python2 test +# make PYTHON=python test +#} package_python2-lxml() { pkgdesc="Python2 binding for the libxml2 and libxslt libraries" @@ -39,8 +40,7 @@ package_python2-lxml() { package_python-lxml() { pkgdesc="Python3 binding for the libxml2 and libxslt libraries" depends=('python' 'libxslt') - optdepends=('python-cssselect' - 'python-lxml-docs: offline docs') + optdepends=('python-lxml-docs: offline docs') cd lxml-$pkgver python setup.py install --root="${pkgdir}" --optimize=1 diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 2c9cdb73d..d97731c19 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,35 +1,31 @@ # $Id: PKGBUILD 185570 2013-05-15 08:05:29Z bpiotrowski $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=1.4.1 -pkgrel=3 +pkgver=1.4.2 +pkgrel=2 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" makedepends=('texi2html' 'perl' 'python2') -depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng') +depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' 'libiscsi') backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 - doc-fix-sheepdog-invalid-texi-table-list-syntax.patch 65-kvm.rules) replaces=('qemu-kvm') -options=(!strip) +options=(!strip !libtool) prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld - # fix building with tex version 5.0 - # https://bugs.launchpad.net/qemu/+bug/1130533 - patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch } build () { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=alsa,sdl,pa \ --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu @@ -57,6 +53,5 @@ package() { done } -md5sums=('eb2d696956324722b5ecfa46e41f9a75' - 'b431782f310bfc6af4ef21a8068f866b' +md5sums=('b3eafa033ae4b8faba584f9f141b888f' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch b/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch deleted file mode 100644 index bacc87e80..000000000 --- a/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/qemu-options.hx b/qemu-options.hx -index 4bc9c85..3af60bf 100644 ---- a/qemu-options.hx -+++ b/qemu-options.hx -@@ -2095,18 +2095,13 @@ QEMU supports using either local sheepdog devices or remote networked - devices. - - Syntax for specifying a sheepdog device --@table @list --``sheepdog:<vdiname>'' -- --``sheepdog:<vdiname>:<snapid>'' -- --``sheepdog:<vdiname>:<tag>'' -- --``sheepdog:<host>:<port>:<vdiname>'' -- --``sheepdog:<host>:<port>:<vdiname>:<snapid>'' -- --``sheepdog:<host>:<port>:<vdiname>:<tag>'' -+@table @code -+@item sheepdog:<vdiname> -+@item sheepdog:<vdiname>:<snapid> -+@item sheepdog:<vdiname>:<tag> -+@item sheepdog:<host>:<port>:<vdiname> -+@item sheepdog:<host>:<port>:<vdiname>:<snapid> -+@item sheepdog:<host>:<port>:<vdiname>:<tag> - @end table - - Example diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 6583f720d..aa335c293 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 179562 2013-03-07 08:19:46Z andrea $ +# $Id: PKGBUILD 188708 2013-06-18 12:21:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.7.1 -pkgrel=1 +pkgver=2.7.2 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" -makedepends=('python2-pyqt' 'pyqt' 'chrpath') +makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath') source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') -md5sums=('da8939b5679a075e30c6632e54dc5abf' +md5sums=('0fbfb06078f206a241a62c94861cce21' 'eae1bd23117c5f1f7f172a1c1e11f600') build() { @@ -21,21 +21,21 @@ build() { patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" cd Qt4Qt5 - qmake qscintilla.pro + qmake-qt4 qscintilla.pro make cd ../designer-Qt4Qt5 - qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 + qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 make cd ../ cp -rf Python Python2 cd Python - python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c + python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 make cd ../Python2 - python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c + python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 make } @@ -63,7 +63,7 @@ package_python-qscintilla-common() { package_python-qscintilla() { pkgdesc="Python 3.x bindings for QScintilla2" - depends=('python-qscintilla-common' 'pyqt') + depends=('python-qscintilla-common' 'python-pyqt4') cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" install -Dm755 Qsci.so \ @@ -72,7 +72,7 @@ package_python-qscintilla() { package_python2-qscintilla() { pkgdesc="Python 2.x bindings for QScintilla2" - depends=('python-qscintilla-common' 'python2-pyqt') + depends=('python-qscintilla-common' 'python2-pyqt4') cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" install -Dm755 Qsci.so \ diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD index 7925e4a87..f1a873c99 100644 --- a/extra/racket/PKGBUILD +++ b/extra/racket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185732 2013-05-18 02:31:12Z eric $ +# $Id: PKGBUILD 188741 2013-06-19 03:52:40Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=racket -pkgver=5.3.4 +pkgver=5.3.5 pkgrel=1 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!strip') install=racket.install source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \ drracket.desktop racket-libpng16.patch) -sha1sums=('7e37738e34c73a25bc7d51aeb53cf3dc5b0d533d' +sha1sums=('8a895454a9e0fdf689368fa54ce63ba88d432c5e' 'a20808f6b250225704856f82a544681a962a299d' '5b0260f92fc1ec4dc09d90a5264683bd3b5eed5e') diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD index 5906558de..1b19b9e24 100644 --- a/extra/rtmpdump/PKGBUILD +++ b/extra/rtmpdump/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172942 2012-12-07 18:25:31Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 187070 2013-06-03 11:16:53Z allan $ +# Maintainer: # Contributor: xduugu # Contributor: Elis Hughes <elishughes@googlemail.com> pkgname=rtmpdump pkgver=20121203 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to download rtmp streams" arch=('i686' 'x86_64' 'mips64el') url="http://rtmpdump.mplayerhq.hu/" @@ -22,4 +22,8 @@ build() { package() { make -C "$pkgname-$pkgver" prefix=/usr mandir=/usr/share/man DESTDIR="$pkgdir" install + # usrmove + cd "$pkgdir" + mv usr/sbin/* usr/bin + rmdir usr/sbin } diff --git a/extra/sane/1.0.23-hp2400c.patch b/extra/sane/1.0.23-hp2400c.patch new file mode 100644 index 000000000..8bfd29b66 --- /dev/null +++ b/extra/sane/1.0.23-hp2400c.patch @@ -0,0 +1,81 @@ +From 9a8b640d8da2190ff1695169bfa45ce633b5e8c2 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr> +Date: Mon, 3 Jun 2013 06:33:08 +0200 +Subject: [PATCH] bug 314293 fix + +- don't use non-existent end of records +--- + ChangeLog | 3 +++ + backend/genesys_gl646.c | 14 +++++++------- + 2 files changed, 10 insertions(+), 7 deletions(-) + +diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c +index c6a5af5..2d5cddc 100644 +--- a/backend/genesys_gl646.c ++++ b/backend/genesys_gl646.c +@@ -550,7 +550,7 @@ get_lowest_resolution (int sensor, SANE_Bool color) + i = 0; + dpi = 9600; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + /* computes distance and keep mode if it is closer than previous */ + if (sensor == sensor_master[i].sensor +@@ -584,7 +584,7 @@ get_closest_resolution (int sensor, int required, SANE_Bool color) + dpi = 0; + dist = 9600; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + /* exit on perfect match */ + if (sensor == sensor_master[i].sensor +@@ -627,7 +627,7 @@ is_half_ccd (int sensor, int required, SANE_Bool color) + + i = 0; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + /* exit on perfect match */ + if (sensor == sensor_master[i].sensor +@@ -658,7 +658,7 @@ get_cksel (int sensor, int required, SANE_Bool color) + + i = 0; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + /* exit on perfect match */ + if (sensor == sensor_master[i].sensor +@@ -746,7 +746,7 @@ gl646_setup_registers (Genesys_Device * dev, + * sensor mode setting */ + i = 0; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + if (dev->model->ccd_type == sensor_master[i].sensor + && sensor_master[i].dpi == xresolution +@@ -768,7 +768,7 @@ gl646_setup_registers (Genesys_Device * dev, + * motor mode setting */ + i = 0; + nb = sizeof (motor_master) / sizeof (Motor_Master); +- while (motor_master[i].motor != -1 && i < nb) ++ while (i < nb) + { + if (dev->model->motor_type == motor_master[i].motor + && motor_master[i].dpi == resolution +@@ -789,7 +789,7 @@ gl646_setup_registers (Genesys_Device * dev, + /* now we can search for the specific sensor settings */ + i = 0; + nb = sizeof (sensor_settings) / sizeof (Sensor_Settings); +- while (sensor_settings[i].sensor != -1 && i < nb) ++ while (i < nb) + { + if (sensor->sensor == sensor_settings[i].sensor + && sensor->cksel == sensor_settings[i].cksel) +-- +1.7.2.5 + diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index 494ff622e..82f211b7b 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186914 2013-05-31 19:37:31Z tpowa $ +# $Id: PKGBUILD 187017 2013-06-03 10:25:11Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,7 +6,7 @@ pkgname=sane pkgver=1.0.23 -pkgrel=6 +pkgrel=7 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64' 'mips64el') @@ -19,12 +19,14 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'saned.socket' 'saned.service' 'kodakaio.c.patch' - 'network.patch') + 'network.patch' + '1.0.23-hp2400c.patch') options=(!libtool) prepare() { cd "${srcdir}/${pkgname}-backends-${pkgver}" - + # fix FS#35549 + patch -Np1 -i ${srcdir}/1.0.23-hp2400c.patch # 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 @@ -74,4 +76,5 @@ md5sums=('e226a89c54173efea80e91e9a5eb6573' 'e57e9e15528f47f5f1b3f1411135ed5d' '3f9fe36b0c4ff0b01b53b1cffa5d9700' 'e65dbefb7c3d69955fb6eb3ace14aa12' - '44e77692c52db15b0f530a1d9a8e1296') + '44e77692c52db15b0f530a1d9a8e1296' + '0c8bfabcaa499c4a2583aa2fe53d1686') diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 2d46784a0..dbeffd68b 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185032 2013-05-10 12:58:50Z juergen $ +# $Id: PKGBUILD 187814 2013-06-06 11:10:02Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pk "arch-fixes.lisp" "ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz" "texinfo-4.13a-data_types.patch") -md5sums=('ca3dd0ce2943e10a1c86ff5f40db3f85' +md5sums=('118dea06e26151d8315a118169ec16ec' '7ac0c1936547f4278198b8bf7725204d' '71ba711519209b5fb583fed2b3d86fcb' 'd8574782ff7def1e2dc5c291dbeaec18') diff --git a/extra/scim-anthy/PKGBUILD b/extra/scim-anthy/PKGBUILD index ea6422191..660a683df 100644 --- a/extra/scim-anthy/PKGBUILD +++ b/extra/scim-anthy/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 148916 2012-02-05 11:55:48Z ibiru $ -# Contributor: damir <damir@archlinux.org> +# $Id: PKGBUILD 188489 2013-06-15 00:05:53Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: damir <damir@archlinux.org> pkgname=scim-anthy pkgver=1.2.7 -pkgrel=3 +pkgrel=4 _filecode=37309 pkgdesc='Japanese input method module for SCIM' -arch=('i686' 'x86_64' 'mips64el') url='http://sourceforge.jp/projects/scim-imengine/' +arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('scim' 'anthy') -options=('!libtool') source=("http://osdn.dl.sourceforge.jp/scim-imengine/${_filecode}/${pkgname}-${pkgver}.tar.gz") sha1sums=('1429cf202f5cdcfc4733220acbe27dd9edb75db8') +options=('!libtool') + build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --disable-static diff --git a/extra/scim-chewing/PKGBUILD b/extra/scim-chewing/PKGBUILD index c3cdb0257..6afc9a65a 100644 --- a/extra/scim-chewing/PKGBUILD +++ b/extra/scim-chewing/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 176853 2013-02-01 14:44:22Z bisson $ -# Contributor: damir <damir@archlinux.org> -# Contributor: whisky <archlinux.cle(at)gmail.com> +# $Id: PKGBUILD 188490 2013-06-15 00:05:54Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: whisky <archlinux.cle(at)gmail.com> +# Contributor: damir <damir@archlinux.org> pkgname=scim-chewing pkgver=0.3.5 -pkgrel=1 +pkgrel=2 pkgdesc='Traditional Chinese input method module for SCIM' url='http://chewing.csie.net/' license=('GPL') -options=('!libtool') arch=('i686' 'x86_64' 'mips64el') makedepends=('intltool') depends=('scim' 'libchewing') source=("http://chewing.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") sha1sums=('f26ced990f0c9e5d43e271cd6e77583de81a008d') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static diff --git a/extra/scim-hangul/PKGBUILD b/extra/scim-hangul/PKGBUILD index 7b7631e83..6a5f52d94 100644 --- a/extra/scim-hangul/PKGBUILD +++ b/extra/scim-hangul/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 165326 2012-08-15 15:47:04Z bisson $ -# Contributor: damir <damir@archlinux.org> +# $Id: PKGBUILD 188491 2013-06-15 00:05:55Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: damir <damir@archlinux.org> pkgname=scim-hangul pkgver=0.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='Korean input method module for SCIM' url='http://www.scim-im.org/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('libhangul' 'scim') -options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz" '2012.patch') sha1sums=('2ba06a6d851a1d86c5a9b659c573bfd87e6a7555' 'a046c40b78521f85418b8ad2138b51815d47abec') -build() { +options=('!libtool') + +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../2012.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --enable-skim-support make } diff --git a/extra/scim-m17n/PKGBUILD b/extra/scim-m17n/PKGBUILD index 8e52e1311..c600b5193 100644 --- a/extra/scim-m17n/PKGBUILD +++ b/extra/scim-m17n/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 149048 2012-02-05 15:25:52Z bisson $ +# $Id: PKGBUILD 188492 2013-06-15 00:05:56Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Camille Moncelier <pix@devlife.org> # Contributor: damir <damir@archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=scim-m17n pkgver=0.2.3 -pkgrel=4 +pkgrel=5 pkgdesc='Multilingual input method module for SCIM' url='http://www.scim-im.org/' license=('GPL') -options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('scim' 'm17n-lib') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz") sha1sums=('96172846eaa211d2bde0f76184990d13e5ecdaea') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-static=no + ./configure --prefix=/usr --disable-static make } diff --git a/extra/scim-pinyin/PKGBUILD b/extra/scim-pinyin/PKGBUILD index 905db2a4c..d3c3833bc 100644 --- a/extra/scim-pinyin/PKGBUILD +++ b/extra/scim-pinyin/PKGBUILD @@ -1,27 +1,23 @@ -# $Id: PKGBUILD 165322 2012-08-15 15:28:33Z bisson $ +# $Id: PKGBUILD 188493 2013-06-15 00:05:57Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributer: Gan Lu <rhythm.gan@gmail.com> pkgname=scim-pinyin pkgver=0.5.92 -pkgrel=1 +pkgrel=2 pkgdesc='Chinese pinyin input for SCIM' url='http://www.scim-im.org/' arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('scim') -options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz") sha1sums=('d7c2d52a5712753af241a5301db23527ba438ea1') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static \ - + ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD index 8af63073b..1810ec6dc 100644 --- a/extra/scim-tables/PKGBUILD +++ b/extra/scim-tables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183256 2013-04-19 15:20:34Z bisson $ -# Contributor: damir <damir@archlinux.org> -# Contributor: Gan Lu <rhythm.gan@gmail.com> +# $Id: PKGBUILD 188494 2013-06-15 00:05:58Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Gan Lu <rhythm.gan@gmail.com> +# Contributor: damir <damir@archlinux.org> pkgname=scim-tables -pkgver=0.5.12 +pkgver=0.5.13 pkgrel=1 pkgdesc='Generic table input method module for SCIM' url='http://www.scim-im.org/' @@ -13,7 +13,7 @@ license=('GPL') depends=('scim') makedepends=('intltool') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz") -sha1sums=('c83515c1c3ce0c40fb7cf30f576d8837a06a626f') +sha1sums=('75363466cfca30e3cdff804e0dad713f12521776') options=('!libtool') diff --git a/extra/scim-uim/PKGBUILD b/extra/scim-uim/PKGBUILD index 0a5f38545..0f4395780 100644 --- a/extra/scim-uim/PKGBUILD +++ b/extra/scim-uim/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 166977 2012-09-24 04:57:10Z bisson $ -# Contributor: damir <damir@archlinux.org> +# $Id: PKGBUILD 188495 2013-06-15 00:05:59Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org +# Contributor: damir <damir@archlinux.org> pkgname=scim-uim pkgver=0.2.0 -pkgrel=6 +pkgrel=7 pkgdesc='UIM bridging input engine for SCIM' url='http://www.scim-im.org/' license=('GPL') -options=('!libtool') depends=('scim' 'uim') arch=('i686' 'x86_64' 'mips64el') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz" @@ -18,10 +17,16 @@ sha1sums=('456621d5969b6552c3c33c83cf295aa4134fff0a' 'a9d67946f956d0572c73065e2b4b268bfdf149e3' '3b083260910f7855b5446960ab1203c052f4b56c') -build() { +options=('!libtool') + +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../fix-gcc43-build.patch patch -p1 -i ../uim-1.5.5-header.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index 78426f80f..cb888f1ff 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,34 +1,35 @@ -# $Id: PKGBUILD 185781 2013-05-18 17:19:08Z bisson $ +# $Id: PKGBUILD 188488 2013-06-15 00:05:52Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim pkgver=1.4.14 -pkgrel=3 +pkgrel=4 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' license=('LGPL') -options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('libltdl' 'gtk2') -makedepends=('intltool' 'optipng') -backup=('etc/scim/config' 'etc/scim/global') +optdepends=('qt4: qt4 immodule' + 'gtk3: gtk3 immodule') +makedepends=('intltool' 'qt4' 'gtk3' 'optipng') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") sha1sums=('73391be371dd7ef9f9af8b3a211e2bedec0cf71b') +backup=('etc/scim/config' 'etc/scim/global') +options=('!libtool') install=install -prepare() { - find -name '*.png' -exec optipng -quiet -force -fix {} + -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" + find -name '*.png' -exec optipng -quiet -force -fix {} + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --disable-static \ + --with-qt4-moc=/usr/bin/moc-qt4 \ + --with-gtk-version=2 # no gtk3 support in scim-anthy make } diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD index 38d4ea6e4..6f6f4ea70 100644 --- a/extra/serf/PKGBUILD +++ b/extra/serf/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 179622 2013-03-08 20:38:44Z eric $ +# $Id: PKGBUILD 188137 2013-06-10 13:00:19Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=serf -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="High-performance asynchronous HTTP client library" url="http://code.google.com/p/serf/" @@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('Apache') depends=('apr' 'apr-util' 'openssl' 'zlib') source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('30b29bd9214d50887abcc20cf82096aaaf5d1d61') +sha1sums=('f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd') options=('!libtool') build() { diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD index 88611c74a..061a34bc0 100644 --- a/extra/sg3_utils/PKGBUILD +++ b/extra/sg3_utils/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 180167 2013-03-18 13:36:39Z jgc $ +#$Id: PKGBUILD 188647 2013-06-17 10:00:27Z jgc $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=sg3_utils -pkgver=1.35 +pkgver=1.36 pkgrel=1 pkgdesc="Generic SCSI utilities" arch=(i686 x86_64 'mips64el') @@ -10,8 +10,8 @@ url="http://sg.danny.cz/sg/sg3_utils.html" license=('GPL' 'custom:BSD') depends=('glibc') options=('!libtool') -source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz) -md5sums=('55c32fb95a5b3907687b023f392fbd3c') +source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz) +md5sums=('5d1846c8aa03a2e39e1368cf05bf1cfd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 6465992f3..75950afcd 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 183493 2013-04-22 09:21:24Z andrea $ +# $Id: PKGBUILD 188678 2013-06-17 18:06:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python-sip' 'python2-sip') -pkgver=4.14.6 +pkgver=4.14.7 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") -md5sums=('d6493b9f0a7911566545f694327314c4') +md5sums=('f5c8001f16ecffd711708de0e07d542f') build() { cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/extra/sonata/PKGBUILD b/extra/sonata/PKGBUILD index 1737dc6f6..59491036f 100644 --- a/extra/sonata/PKGBUILD +++ b/extra/sonata/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 175943 2013-01-25 08:23:07Z andrea $ +# $Id: PKGBUILD 188210 2013-06-13 03:01:29Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=sonata pkgver=1.6.2.1 -pkgrel=9 +pkgrel=10 pkgdesc="Elegant GTK+ music client for MPD" arch=('i686' 'x86_64' 'mips64el') url="http://sonata.berlios.de/" license=('GPL3') depends=('pygtk' 'python2-mpd') -optdepends=('gnome-python-extras: Enhanced system tray support' +optdepends=('python2-egg: Enhanced system tray support' 'python2-tagpy: Metadata editing support' 'python2-dbus: Various extra functionality (e.g. multimedia keys support)') +provides=('python2-mmkeys') source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz info.py.patch) md5sums=('0b912325e7175abad3bf6c0edc071e05' diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD index daa7eeafb..2344af353 100644 --- a/extra/spamassassin/PKGBUILD +++ b/extra/spamassassin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185272 2013-05-12 17:03:55Z bluewind $ +# $Id: PKGBUILD 187368 2013-06-05 15:55:32Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=spamassassin pkgver=3.3.2 -pkgrel=8 +pkgrel=9 pkgdesc="A mail filter to identify spam." arch=('i686' 'x86_64' 'mips64el') license=('APACHE') @@ -12,7 +12,7 @@ url="http://spamassassin.apache.org" depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl' 'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http' 'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay') -makedepends=('razor' 'perl-dbi') +makedepends=('razor' 'perl-dbi') optdepends=('razor: to identify collaborately-flagged spam') backup=('etc/mail/spamassassin/local.cf' 'etc/mail/spamassassin/init.pre' @@ -23,9 +23,17 @@ backup=('etc/mail/spamassassin/local.cf' install="${pkgname}.install" options=('!emptydirs') source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz" - 'spamassassin.service') + 'spamassassin.service' + 'perl-5.18-fixes.patch') md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' - 'ded3e012a4d502df001f2d97c495cc4e') + 'b8dcea016fb73b074b941e832cfae5c9' + '6cf63928eeeaea25967c2ffd875d106a') + +prepare() { + cd "${srcdir}/Mail-SpamAssassin-${pkgver}" + + patch -p0 -d lib -i "$srcdir/perl-5.18-fixes.patch" +} build() { cd "${srcdir}/Mail-SpamAssassin-${pkgver}" diff --git a/extra/spamassassin/perl-5.18-fixes.patch b/extra/spamassassin/perl-5.18-fixes.patch new file mode 100644 index 000000000..74277fc8b --- /dev/null +++ b/extra/spamassassin/perl-5.18-fixes.patch @@ -0,0 +1,97 @@ +--- Mail/SpamAssassin/AsyncLoop.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/AsyncLoop.pm 2013-05-29 01:37:58.000000000 +0200 +@@ -361,5 +361,12 @@ + $now = time; # capture new timestamp, after possible sleep in 'select' + +- while (my($key,$ent) = each %$pending) { ++ # A callback routine may generate another DNS query, which may insert ++ # an entry into the %$pending hash thus invalidating the each() context. ++ # So, make sure that callbacks are not called while the each() context ++ # is open, or avoid using each(). [Bug 6937] ++ # ++ # while (my($key,$ent) = each %$pending) { ++ foreach my $key (keys %$pending) { ++ my $ent = $pending->{$key}; + my $id = $ent->{id}; + if (defined $ent->{poll_callback}) { # call a "poll_callback" if exists +@@ -449,5 +456,6 @@ + my $foundcnt = 0; + my $now = time; +- while (my($key,$ent) = each %$pending) { ++ foreach my $key (keys %$pending) { ++ my $ent = $pending->{$key}; + dbg("async: aborting after %.3f s, %s: %s", + $now - $ent->{start_time}, +--- Mail/SpamAssassin/Conf/Parser.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/Conf/Parser.pm 2013-05-29 01:32:06.000000000 +0200 +@@ -1249,5 +1249,5 @@ + my $mods = ''; + local ($1,$2); +- if ($re =~ s/^m{//) { ++ if ($re =~ s/^m\{//) { + $re =~ s/}([a-z]*)$//; $mods = $1; + } +--- Mail/SpamAssassin/DnsResolver.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/DnsResolver.pm 2013-05-29 01:32:06.000000000 +0200 +@@ -441,8 +441,14 @@ + if (!defined($timeout) || $timeout > 0) + { $timer = $self->{main}->time_method("poll_dns_idle") } ++ $! = 0; + ($nfound, $timeleft) = select($rout=$rin, undef, undef, $timeout); + } + if (!defined $nfound || $nfound < 0) { +- warn "dns: select failed: $!"; ++ if ($!) { warn "dns: select failed: $!\n" } ++ else { info("dns: select interrupted") } ++ return; ++ } elsif (!$nfound) { ++ if (!defined $timeout) { warn("dns: select returned empty-handed\n") } ++ elsif ($timeout > 0) { dbg("dns: select timed out %.3f s", $timeout) } + return; + } +--- Mail/SpamAssassin/Message.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/Message.pm 2013-05-29 01:32:06.000000000 +0200 +@@ -567,5 +567,5 @@ + # bug 5557: windows requires tmp file be closed before it can be rm'd + if (ref $part->{'raw'} eq 'GLOB') { +- close($part->{'raw'}) or die "error closing input file: $!"; ++ close($part->{'raw'}) or warn "error closing input file: $!"; + } + +--- Mail/SpamAssassin/PerMsgStatus.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/PerMsgStatus.pm 2013-05-29 01:32:06.000000000 +0200 +@@ -421,6 +421,6 @@ + } + +- # ignore tests with 0 score in this scoreset +- next if ($scores->{$test} == 0); ++ # ignore tests with 0 score (or undefined) in this scoreset ++ next if !$scores->{$test}; + + # Go ahead and add points to the proper locations +@@ -1253,11 +1253,10 @@ + my $line = ''; + foreach my $test (sort @{$self->{test_names_hit}}) { +- if (!$line) { +- $line .= $test . "=" . $self->{conf}->{scores}->{$test}; +- } else { +- $line .= $arg . $test . "=" . $self->{conf}->{scores}->{$test}; +- } ++ my $score = $self->{conf}->{scores}->{$test}; ++ $score = '0' if !defined $score; ++ $line .= $arg if $line ne ''; ++ $line .= $test . "=" . $score; + } +- $line ? $line : 'none'; ++ $line ne '' ? $line : 'none'; + }, + +--- Mail/SpamAssassin/Util.pm~ 2013-05-29 01:29:59.000000000 +0200 ++++ Mail/SpamAssassin/Util.pm 2013-05-29 01:33:16.000000000 +0200 +@@ -1588,5 +1588,5 @@ + return undef; # invalid + } +- elsif ($re =~ s/^m{//) { # m{foo/bar} ++ elsif ($re =~ s/^m\{//) { # m{foo/bar} + $delim = '}'; + } diff --git a/extra/spamassassin/spamassassin.service b/extra/spamassassin/spamassassin.service index 2ccfa5b11..e9c9c07fd 100644 --- a/extra/spamassassin/spamassassin.service +++ b/extra/spamassassin/spamassassin.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=forking PIDFile=/var/run/spamd.pid -ExecStart=/usr/bin/vendor_perl/spamd -d --pidfile /var/run/spamd.pid -c +ExecStart=/usr/bin/vendor_perl/spamd -d --pidfile /var/run/spamd.pid -c -c -x --virtual-config-dir=/var/lib/spamassassin -u nobody StandardOutput=syslog StandardError=syslog Restart=always diff --git a/extra/ssmtp/PKGBUILD b/extra/ssmtp/PKGBUILD index ac2b8bb4f..b821e2889 100644 --- a/extra/ssmtp/PKGBUILD +++ b/extra/ssmtp/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 151206 2012-02-25 07:42:28Z pierre $ -# Maintainer: Hugo Doria <hugo@archlinux.org> +# $Id: PKGBUILD 187071 2013-06-03 11:16:54Z allan $ +# Maintainer: pkgname=ssmtp pkgver=2.64 -pkgrel=3.1 +pkgrel=4 pkgdesc="Extremely simple MTA to get mail off the system to a mailhub" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://packages.debian.org/stable/mail/ssmtp" -depends=('openssl') +depends=('openssl' 'inetutils') conflicts=('exim') provides=('smtp-forwarder') backup=('etc/ssmtp/ssmtp.conf' 'etc/ssmtp/revaliases') @@ -40,4 +40,7 @@ package() { ln -s ssmtp "${pkgdir}/usr/sbin/sendmail" ln -s ssmtp "${pkgdir}/usr/sbin/newaliases" ln -s ssmtp "${pkgdir}/usr/sbin/mailq" + # usrmove + cd "$pkgdir" + mv usr/sbin usr/bin } diff --git a/extra/strace/PKGBUILD b/extra/strace/PKGBUILD index 094abadd2..3cb8d7ddf 100644 --- a/extra/strace/PKGBUILD +++ b/extra/strace/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158298 2012-05-03 15:18:30Z giovanni $ +# $Id: PKGBUILD 187820 2013-06-06 14:47:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=strace -pkgver=4.7 +pkgver=4.8 pkgrel=1 pkgdesc="A useful diagnositic, instructional, and debugging tool" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://sourceforge.net/projects/strace/" license=('custom') depends=('perl') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.xz") -md5sums=('6054c3880a00c6703f83b57f15e04642') +md5sums=('c575ef43829586801f514fd91bfe7575') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -24,5 +24,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/" install - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD index 6bf0c5f97..6b2f06e48 100644 --- a/extra/strigi/PKGBUILD +++ b/extra/strigi/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 178998 2013-03-01 10:25:57Z andrea $ +# $Id: PKGBUILD 187012 2013-06-03 08:51:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=strigi pkgver=0.7.8 -pkgrel=2 +pkgrel=3 pkgdesc="Fast crawling desktop search engine with Qt GUI" arch=('i686' 'x86_64' 'mips64el') url='http://strigi.sourceforge.net/' license=('GPL2') -depends=('exiv2' 'libxml2' 'boost-libs' 'qt4') +depends=('dbus' 'exiv2' 'libxml2' 'boost-libs') makedepends=('cmake' 'pkg-config' 'boost') optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file' 'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK') -source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('d69443234f4286d71997db9de543331a') +source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'gcc48.patch') +md5sums=('d69443234f4286d71997db9de543331a' + 'd48d65014650644ba61821813101c2f4') -build() { - . /etc/profile.d/qt4.sh +prepare() { + cd ${pkgname}-${pkgver}/libstreams + patch -p1 -i "${srcdir}"/gcc48.patch +} +build() { mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -31,24 +36,12 @@ build() { -DENABLE_FAM=OFF \ -DENABLE_CLUCENE=OFF \ -DENABLE_CLUCENE_NG=OFF \ - -DENABLE_FFMPEG=OFF + -DENABLE_FFMPEG=OFF \ + -DENABLE_QT4=OFF make } package() { - pushd build/libstreams - make DESTDIR="${pkgdir}" install - popd - - pushd build/libstreamanalyzer - make DESTDIR="${pkgdir}" install - popd - - pushd build/strigiclient/lib/searchclient/qtdbus - make DESTDIR="${pkgdir}" install - popd - - pushd build/strigiutils + cd build make DESTDIR="${pkgdir}" install - popd } diff --git a/extra/strigi/gcc48.patch b/extra/strigi/gcc48.patch new file mode 100644 index 000000000..ed60e4fbb --- /dev/null +++ b/extra/strigi/gcc48.patch @@ -0,0 +1,12 @@ +--- a/include/strigi/bufferedstream.h ++++ b/include/strigi/bufferedstream.h +@@ -34,7 +34,7 @@ + * BufferedStream will do the rest. + */ + template <class T> +-class BufferedStream : public StreamBase<T> { ++class STREAMS_EXPORT BufferedStream : public StreamBase<T> { + private: + StreamBuffer<T> buffer; + bool finishedWritingToBuffer; + diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index a5a36561f..3169b1d34 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186427 2013-05-26 09:26:08Z bluewind $ +# $Id: PKGBUILD 188189 2013-06-12 11:20:08Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.7.9 -pkgrel=6 +pkgver=1.7.10 +pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') license=('APACHE') @@ -28,7 +28,7 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.as svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -md5sums=('8d532025771a67c06c23f299699f056f' +md5sums=('4088a77e14232876c9b4ff1541e6e200' 'a0db6dd43af33952739b6ec089852630' 'c459e299192552f61578f3438abf0664' 'bb2857eceafcfac35dde39dcffad2314' diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD index cb2f95646..be0e5829f 100644 --- a/extra/swig/PKGBUILD +++ b/extra/swig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173268 2012-12-17 16:30:15Z stephane $ +# $Id: PKGBUILD 188138 2013-06-10 13:01:07Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=swig -pkgver=2.0.9 +pkgver=2.0.10 pkgrel=1 pkgdesc="Generate scripting interfaces to C/C++ code" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://www.swig.org/" license=('custom') depends=('zlib' 'pcre') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('7984bf1043f522e88ea51d4bd21c97d3c68342be') +sha1sums=('ad6f95ce9b9da4a8f5b80ac1848d26c76f518d84') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD index 3c54082b4..006459cbb 100644 --- a/extra/syslog-ng/PKGBUILD +++ b/extra/syslog-ng/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185556 2013-05-15 00:48:48Z dreisner $ +# $Id: PKGBUILD 188171 2013-06-11 16:24:06Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=syslog-ng -pkgver=3.4.1 -pkgrel=3 +pkgver=3.4.2 +pkgrel=1 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64') license=('GPL2') @@ -21,7 +21,7 @@ install=$pkgname.install source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz" syslog-ng.conf syslog-ng.logrotate) -sha1sums=('e75892262863b77f74a401d19661164154f716e7' +sha1sums=('96474f955fb51d4f31ce1154c84b0cb48c8748d2' '0aaf695ea6756b59198ff2e4af237b4a6186525d' '949128fe3d7f77a7aab99048061f885bc758000c') diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD index c81afb68e..8ae557e05 100644 --- a/extra/texmacs/PKGBUILD +++ b/extra/texmacs/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 179001 2013-03-01 10:26:20Z andrea $ +# $Id: PKGBUILD 188082 2013-06-08 11:18:26Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Contributor: Christopher Reimer <c.reimer1993@gmail.com> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Christopher Reimer <c.reimer1993@gmail.com> pkgname=texmacs -pkgver=1.0.7.16 +pkgver=1.0.7.19 pkgrel=2 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one." arch=('i686' 'x86_64' 'mips64el') url="http://www.texmacs.org/" license=('GPL') -depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2' 'shared-mime-info' +depends=('perl' 'guile1.8' 'texlive-core' 'python2' 'libxext' 'freetype2' 'shared-mime-info' 'desktop-file-utils' 'qt4') # do not remove texlive-core dependency, as it is needed! optdepends=('transfig: convert images using fig2ps' @@ -19,7 +18,7 @@ optdepends=('transfig: convert images using fig2ps' source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz) install=texmacs.install options=('!emptydirs') -sha1sums=('bd73a8ff1c5361161cc65c57dfe8e706a1859231') +sha1sums=('855b8252f561b69deb45a3b80f4531a9055ea465') build() { cd ${srcdir}/TeXmacs-${pkgver}-src @@ -28,6 +27,9 @@ build() { TeXmacs/misc/inkscape_plugin/texmacs_reedit.py sed -i 's/"python"/"python2"/' plugins/python/progs/init-python.scm sed -i '/^LDPATH/d' src/makefile.in + sed -i -e 's/guile /guile1.8 /g' \ + -e 's/guile-config/guile-config1.8/g' \ + configure # Don't generate icon-cache and mime-database (namcap tells that they should not be in a package) sed -i '/update-mime-database/d' Makefile.in @@ -36,7 +38,10 @@ build() { # Unused i386 binary making strip fail. rm plugins/maxima/bin/maxima_filter - + + export QMAKE=qmake-qt4 + export MOC=moc-qt4 + export UIC=uic-qt4 ./configure --prefix=/usr \ --mandir=/usr/share/man \ --libexecdir=/usr/lib diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD index becc1ec6c..8b589160f 100644 --- a/extra/udisks2/PKGBUILD +++ b/extra/udisks2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186142 2013-05-21 09:11:21Z tpowa $ +# $Id: PKGBUILD 187072 2013-06-03 11:16:56Z allan $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=udisks2 pkgver=2.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Disk Management Service, version 2" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -19,6 +19,7 @@ sha256sums=('310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8') build() { cd "udisks-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ + --sbindir=/usr/bin \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --localstatedir=/var --disable-static make diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD index dd234ef85..92176aa3b 100644 --- a/extra/usbmuxd/PKGBUILD +++ b/extra/usbmuxd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164371 2012-07-31 19:43:35Z eric $ +# $Id: PKGBUILD 187073 2013-06-03 11:16:58Z allan $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=usbmuxd pkgver=1.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="USB Multiplex Daemon" url="http://marcansoft.com/blog/iphonelinux/usbmuxd/" arch=('i686' 'x86_64' 'mips64el') @@ -32,10 +32,13 @@ package() { # fix udev dir being hardcoded mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" rmdir "${pkgdir}/lib" + # usrmove + mv "${pkgdir}/usr/sbin/"* "${pkgdir}/usr/bin/" + rmdir "${pkgdir}/usr/sbin" # install systemd service file install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service # use udev rule that works with systemd - install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/ + install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/ } md5sums=('87fd27773a84e97ac6e2dc28b08d682e' 'dae0660f972510a6483992b5b81e1b5a' diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index 7de2cf5c4..83c9ac161 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184233 2013-05-04 14:56:27Z thomas $ +# $Id: PKGBUILD 187074 2013-06-03 11:16:59Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils pkgver=0.9.5 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64' 'mips64el') url="http://freshmeat.net/projects/libv4l" @@ -23,7 +23,7 @@ options=(!libtool) build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } diff --git a/extra/v86d/PKGBUILD b/extra/v86d/PKGBUILD index 4557f28db..e336788a2 100644 --- a/extra/v86d/PKGBUILD +++ b/extra/v86d/PKGBUILD @@ -1,36 +1,41 @@ -# $Id: PKGBUILD 159626 2012-05-25 23:57:39Z dreisner $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> +# $Id: PKGBUILD 187075 2013-06-03 11:17:01Z allan $ +# Maintainer: pkgname=v86d pkgver=0.1.10 -pkgrel=4 +pkgrel=5 pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment" arch=("i686" "x86_64" 'mips64el') -url="http://dev.gentoo.org/~spock/projects/uvesafb/" +url="https://github.com/mjanusz/v86d" license=('GPL2') depends=('glibc') +makedepends=('git') options=('!makeflags') -source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2 - v86d +source=("git://github.com/mjanusz/v86d.git#tag=$pkgname-$pkgver" + v86d_install v86d_hook modprobe.uvesafb) -md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0' +md5sums=(SKIP '66ab32602ab29cc5635eaac7f3e42283' '5f75b8bc4a7ddf595014591e5db263cb' '2d7cc8dc6a41916a13869212d0191147') build() { - cd "$srcdir/v86d-$pkgver" + cd "$pkgname" ./configure --with-x86emu # we only need /usr/include/video/uvesafb.h make KDIR=/usr } package() { - cd "$srcdir/v86d-$pkgver" + cd "$pkgname" make DESTDIR="$pkgdir" install - install -D -m644 "$srcdir/v86d" "$pkgdir/usr/lib/initcpio/install/v86d" + install -D -m644 "$srcdir/v86d_install" "$pkgdir/usr/lib/initcpio/install/v86d" install -D -m644 "$srcdir/v86d_hook" "$pkgdir/usr/lib/initcpio/hooks/v86d" install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/usr/lib/modprobe.d/uvesafb.conf" + + # usrmove + cd "$pkgdir" + mv sbin usr/bin } diff --git a/extra/v86d/v86d b/extra/v86d/v86d_install index 840b34eec..840b34eec 100644 --- a/extra/v86d/v86d +++ b/extra/v86d/v86d_install diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index 0905938e4..5b31b6d97 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 185368 2013-05-13 17:51:30Z dreisner $ +# $Id: PKGBUILD 188735 2013-06-18 17:08:27Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Douglas Soares de Andrade # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=varnish -pkgver=3.0.3 -pkgrel=3 +pkgver=3.0.4 +pkgrel=1 pkgdesc="High-performance HTTP accelerator" arch=('i686' 'x86_64' 'mips64el') url="http://www.varnish-cache.org/" @@ -18,17 +18,13 @@ options=('!libtool') source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" varnish-vcl-reload varnish.service) -md5sums=('714310c83fdbd2061d897dacd3f63d8b' +md5sums=('a130ce9c3504b9603a46542635e18701' '03196dee7fc68e75069393d52c370762' 'a59b17d8e3066abcf3dd7755a2212dd4') build() { cd "$pkgname-$pkgver" - # disable JIT compilation, as it's crashy crashy (bug in PCRE) - # this is flagged out and disabled by default in $nextrelease of Varnish. - sed -i '/pcre_study/ s/PCRE_STUDY_JIT_COMPILE/0/' lib/libvarnish/vre.c - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 89e79b0ef..2fa15ab4c 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186492 2013-05-27 19:38:42Z giovanni $ +# $Id: PKGBUILD 188100 2013-06-09 13:12:36Z 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.7 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -69,6 +69,10 @@ build() { [ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc" + # fix for flac-1.3.0 + sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c + sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c + CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \ ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD index 5357adaec..346232971 100644 --- a/extra/vte/PKGBUILD +++ b/extra/vte/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142691 2011-11-12 18:51:31Z ibiru $ +# $Id: PKGBUILD 188481 2013-06-14 22:21:14Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vte @@ -12,9 +12,9 @@ depends=('gtk2' 'vte-common') makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-$pkgver.tar.xz -make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) + make_alt_work.patch) sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae' - '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') + '978c989fb63884289068bcee05a92614a3a2be9e5d9386ab789dfb87163b92c8') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/vte/make_alt_work.patch b/extra/vte/make_alt_work.patch new file mode 100644 index 000000000..8e6e3fcad --- /dev/null +++ b/extra/vte/make_alt_work.patch @@ -0,0 +1,21 @@ +From b73782a28894e25ed146271f9d6c6775a6836199 Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod <behdad@behdad.org> +Date: Fri, 04 Jun 2010 18:36:45 +0000 +Subject: Bug 601926 - Don't hardcode meta to alt + +--- +diff --git a/src/keymap.h b/src/keymap.h +index 3a4cefe..243e22e 100644 +--- a/src/keymap.h ++++ b/src/keymap.h +@@ -27,7 +27,7 @@ + + G_BEGIN_DECLS + +-#define VTE_META_MASK GDK_MOD1_MASK ++#define VTE_META_MASK GDK_META_MASK + #define VTE_NUMLOCK_MASK GDK_MOD2_MASK + + /* Map the specified keyval/modifier setup, dependent on the mode, to either +-- +cgit v0.9.2 diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index 29bb4fc41..a2cc1a60a 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185394 2013-05-13 18:51:37Z heftig $ +# $Id: PKGBUILD 188151 2013-06-10 16:21:56Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.34.5 +pkgver=0.34.6 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz) -sha256sums=('8847fb75b620a94ba62c2ffd9e1653396978106f294574ba24a19ced259a7351') +sha256sums=('e1dcc30ec8df24ec5f7f100ca231ab96da0e560b0bfddec3617c962943d8f3f3') build() { cd "vte-$pkgver" diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD index cd262f582..560eb2945 100644 --- a/extra/watchdog/PKGBUILD +++ b/extra/watchdog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178840 2013-02-27 15:05:46Z thomas $ +# $Id: PKGBUILD 187076 2013-06-03 11:17:02Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=watchdog pkgver=5.13 -pkgrel=1 +pkgrel=2 pkgdesc="Watchdog daemon" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/watchdog" @@ -15,14 +15,18 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz watchdog.systemd) md5sums=('153455f008f1cf8f65f6ad9586a21ff1' 'c90c2686975b5254f82b3de683f1f442' - 'a835ae5cbdbb21c19a468dedb5d734e4') + '06677f094ec76b7fbb7b0db141209dec') +prepare() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch +} build() { cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --mandir=/usr/share/man \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/watchdog/watchdog.systemd b/extra/watchdog/watchdog.systemd index 57c73fb45..4bd08f95c 100644 --- a/extra/watchdog/watchdog.systemd +++ b/extra/watchdog/watchdog.systemd @@ -4,7 +4,7 @@ Description=Watchdog Daemon [Service] Type=forking PIDFile=/run/watchdog.pid -ExecStart=/usr/sbin/watchdog +ExecStart=/usr/bin/watchdog [Install] WantedBy=multi-user.target diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index e95bccc34..bc3cf4a87 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 185357 2013-05-13 17:34:56Z heftig $ +# $Id: PKGBUILD 188207 2013-06-12 20:16:30Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> -pkgbase=webkitgtk -pkgname=('webkitgtk3') -pkgver=2.0.2 +pkgname=webkitgtk +pkgver=2.0.3 pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +arch=(i686 x86_64 mips64el) url="http://webkitgtk.org/" -license=('custom') -makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python' 'mesa' 'ruby' 'gtk-doc' 'libsecret' 'libwebp') -options=('!libtool' '!emptydirs') -source=(http://webkitgtk.org/releases/$pkgbase-$pkgver.tar.xz - 0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch) -sha256sums=('c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2' - '7b4c1419342bafcca642d7a41abe92713810401591906b081fe476169cb9a3aa') +license=(custom) +depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk3 gst-plugins-base-libs + libsecret libwebp harfbuzz-icu) +makedepends=(gtk2 gperf gobject-introspection python mesa ruby gtk-doc) +optdepends=('gtk2: Netscape plugin support') +provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}") +conflicts=(webkitgtk3 libwebkit3) +replaces=(webkitgtk3 libwebkit3) +options=(!libtool !emptydirs) +source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz) +sha256sums=('9bf8a32afbf087c4fc2c652b193a52c44b180735ba9c7c8db88137904d458e1b') prepare() { cd $pkgbase-$pkgver - mkdir build-gtk3 + if [ "$CARCH" = "mips64el" ]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ @@ -27,15 +30,12 @@ prepare() { Source/WTF/wtf/Platform.h fi - # Fix build on 32-bit platforms. - patch -p1 -i "$srcdir/0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch" - # Won't be made before files there. - mkdir -p build-gtk3/Programs/resources + mkdir -p Programs/resources } build() { - cd $pkgbase-$pkgver/build-gtk3 + cd $pkgname-$pkgver if [ "$CARCH" = "mips64el" ]; then # Optimizations make it segfault when running; without @@ -47,19 +47,19 @@ build() { extra="--disable-fast-malloc --disable-optimizations" fi - ../configure --prefix=/usr --libexecdir=/usr/lib/webkitgtk3 --enable-introspection $extra + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/$pkgname \ + --enable-introspection \ + ${extra} + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make all stamp-po } -package_webkitgtk3() { - pkgdesc="GTK+ Web content engine library for GTK+ 3.0" - depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk3' 'gst-plugins-base-libs' 'libsecret' 'libwebp') - conflicts=('libwebkit3') - provides=("libwebkit3=${pkgver}") - replaces=('libwebkit3') - optdepends=('gtk2: Webkit2 plugin support') - - cd $pkgbase-$pkgver/build-gtk3 +package() { + cd $pkgname-$pkgver make -j1 DESTDIR="$pkgdir" install - install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD index 035ad7e92..c7a7d2206 100644 --- a/extra/webkitgtk2/PKGBUILD +++ b/extra/webkitgtk2/PKGBUILD @@ -1,20 +1,29 @@ -# $Id: PKGBUILD 184447 2013-05-06 19:40:08Z foutrelis $ +# $Id: PKGBUILD 188485 2013-06-14 23:12:24Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=webkitgtk2 pkgver=1.10.2 -pkgrel=5 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=7 +pkgdesc="GTK+ Web content engine library for GTK+ 2.0" +arch=(i686 x86_64 mips64el) url="http://webkitgtk.org/" -license=('custom') -makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc') -options=('!libtool' '!emptydirs') +license=(custom) +depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk2 gstreamer0.10-base + icu) +makedepends=(gperf gobject-introspection python2 mesa ruby gtk-doc) +optdepends=() +provides=("libwebkit=${pkgver}") +conflicts=(libwebkit) +replaces=(libwebkit) +options=(!libtool !emptydirs) source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz) sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c') build() { - cd "$srcdir/webkitgtk-$pkgver" - mkdir build-gtk2 + cd webkitgtk-$pkgver + + # Suppress a *lot* of gcc 4.8 warnings + CPPFLAGS+=" -Wno-unused-local-typedefs" if [ "$CARCH" = "mips64el" ]; then # Fix MIPS N32 support. @@ -30,25 +39,23 @@ build() { extra="--disable-fast-malloc --disable-optimizations" fi - cd build-gtk2 - PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --libexecdir=/usr/lib/$pkgname \ --enable-introspection \ - --disable-silent-rules \ - --libexecdir=/usr/lib/webkitgtk2 \ + --disable-webkit2 \ --with-gstreamer=0.10 \ --with-gtk=2.0 \ - --disable-webkit2 $extra + $extra + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make all stamp-po } package() { - pkgdesc="GTK+ Web content engine library for GTK+ 2.0" - depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base') - conflicts=('libwebkit') - provides=("libwebkit=${pkgver}") - replaces=('libwebkit') - - cd "$srcdir/webkitgtk-$pkgver/build-gtk2" + cd webkitgtk-$pkgver make -j1 DESTDIR="$pkgdir" install - install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -r "$pkgdir/usr/share/gtk-doc/html/webkitgtk" } diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index a2e21d979..20aae0027 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185261 2013-05-12 16:27:13Z giovanni $ +# $Id: PKGBUILD 187179 2013-06-04 21:40:01Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois pkgver=5.0.25 -pkgrel=1 +pkgrel=2 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64' 'mips64el') url="http://www.linux.it/~md/software/" @@ -17,7 +17,7 @@ md5sums=('8f873c1c51592ee419b2a46b0a3c8432') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make prefix=/usr CFLAGS="$CFLAGS" HAVE_LIBIDN=1 + make prefix=/usr CFLAGS="$CFLAGS" HAVE_LIBIDN=1 HAVE_ICONV=1 } package() { diff --git a/extra/wireshark/01_fix_encoding_asn2deb_pod.patch b/extra/wireshark/01_fix_encoding_asn2deb_pod.patch new file mode 100644 index 000000000..0b8b91363 --- /dev/null +++ b/extra/wireshark/01_fix_encoding_asn2deb_pod.patch @@ -0,0 +1,77 @@ +--- doc/asn2deb.pod.orig 2013-06-06 21:30:28.314150100 +0200 ++++ doc/asn2deb.pod 2013-06-06 21:31:59.448850746 +0200 +@@ -5,8 +5,21 @@ + + =head1 SYNOPSIS + +-B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] +-[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] ++B<asn2deb> ++S<[ B<-a> E<lt>ASN.1 fileE<gt> ]> ++S<[ B<--asn>=E<lt>ASN.1 fileE<gt> ]> ++S<[ B<-d> E<lt>optsE<gt> ]> ++S<[ B<--dbopts>=E<lt>optsE<gt> ]> ++S<[ B<-e> E<lt>addressE<gt> ]> ++S<[ B<--email>=E<lt>addressE<gt> ]> ++S<[ B<-h> ]> ++S<[ B<--help> ]> ++S<[ B<-n> E<lt>nameE<gt> ]> ++S<[ B<--name>=E<lt>nameE<gt> ]> ++S<[ B<-p> ]> ++S<[ B<--preserve> ]> ++S< [B<-v> ]> ++S<[ B<--version> ]> + + =head1 DESCRIPTION + +@@ -19,31 +32,31 @@ + + =over 4 + +-=item B<-a >I<ASN.1 file> B<--asn=>I<ASN.1 file> ++=item -a E<lt>ASN.1 fileE<gt> --asn=E<lt>ASN.1 fileE<gt> + + ASN.1 file to use (mandatory). + +-=item B<-d >I<opts> B<--dbopts=>I<opts> ++=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt> + + options for dpkg-buildpackage. + +-=item B<-e >I<address> B<--email=>I<address> ++=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt> + + use e-mail address. + +-=item B<-h> B<--help> ++=item -h --help + + print help and exit. + +-=item B<-n >I<name> B<--name=>I<name> ++=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt> + + use user name. + +-=item B<-p> B<--preserve> ++=item -p --preserve + + do not overwrite files. + +-=item B<-v> B<--version> ++=item -v --version + + print version and exit. + +@@ -68,8 +81,8 @@ + + =head1 AUTHOR + +-B<W. Borgert> Author. ++B<W. Borgert> Author. + + =head1 COPYRIGHT + +-Copyright (C) 2003, 2005 W. Borger +\ No newline at end of file ++Copyright (C) 2003, 2005 W. Borger diff --git a/extra/wireshark/02_enable-version.diff b/extra/wireshark/02_enable-version.diff deleted file mode 100644 index db2f3726e..000000000 --- a/extra/wireshark/02_enable-version.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.init 2013-02-02 22:11:42.863854681 +0100 -+++ configure.in 2013-02-02 22:13:40.888683191 +0100 -@@ -185,7 +185,7 @@ - [use GnuTLS library @<:@default=yes@:>@]), - with_gnutls="$withval", with_gnutls="yes") - if test "x$with_gnutls" = "xyes"; then -- PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3], -+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0], - [ - echo "GnuTLS found, enabling SSL decryption" - AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library]) diff --git a/extra/wireshark/02_fix_encoding_idl2deb_pod.patch b/extra/wireshark/02_fix_encoding_idl2deb_pod.patch new file mode 100644 index 000000000..bc4000b8f --- /dev/null +++ b/extra/wireshark/02_fix_encoding_idl2deb_pod.patch @@ -0,0 +1,77 @@ +--- doc/idl2deb.pod.orig 2013-06-06 21:31:06.674726010 +0200 ++++ doc/idl2deb.pod 2013-06-06 21:35:38.522125866 +0200 +@@ -5,9 +5,21 @@ + + =head1 SYNOPSIS + +-B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>] +-[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] +- ++B<idl2deb> ++S< [ B<-d> E<lt>optsE<gt> ]> ++S< [ B<--dbopts>=E<lt>optsE<gt> ]> ++S< [ B<-e> E<lt>addressE<gt> ]> ++S< [ B<--email>=E<lt>addressE<gt> ]> ++S< [ B<-h> ]> ++S< [ B<--help> ]> ++S< [ B<-i> E<lt>idlfileE<gt> ]> ++S< [ B<--idl>=E<lt>idlfileE<gt> ]> ++S< [ B<-n> E<lt>nameE<gt> ]> ++S< [ B<--name>=E<lt>nameE<gt> ]> ++S< [ B<-p> ]> ++S< [ B<--preserve> ]> ++S< [ B<-v> ]> ++S< [ B<--version> ]> + + =head1 DESCRIPTION + +@@ -19,31 +31,31 @@ + + =over 4 + +-=item B<-d>I<opts> B<--dbopts=>I<opts> ++=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt> + + options for dpkg-buildpackage. + +-=item B<-e >I<address> B<--email=>I<address> ++=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt> + + use e-mail address. + +-=item B<-i >I<idlfile> B<--idl=>I<idlfile> ++=item -h --help + +-IDL file to use (mandatory) ++print help and exit. + +-=item B<-h> B<--help> ++=item -i E<lt>idlfileE<gt> --idl=E<lt>idlfileE<gt> + +-print help and exit. ++IDL file to use (mandatory) + +-=item B<-n >I<name> B<--name=>I<name> ++=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt> + + use user name. + +-=item B<-p> B<--preserve> ++=item -p --preserve + + do not overwrite files. + +-=item B<-v> B<--version> ++=item -v --version + + print version and exit. + +@@ -67,7 +79,7 @@ + + =head1 AUTHOR + +-B<W. Borgert> Author. ++B<W. Borgert> Author. + + =head1 COPYRIGHT + diff --git a/extra/wireshark/03_force_utf8_for_pod2man.patch b/extra/wireshark/03_force_utf8_for_pod2man.patch new file mode 100644 index 000000000..ace641100 --- /dev/null +++ b/extra/wireshark/03_force_utf8_for_pod2man.patch @@ -0,0 +1,22 @@ +--- doc/Makefile.am (revision 49837) ++++ doc/Makefile.am (working copy) +@@ -123,6 +123,7 @@ + $(AM_V_POD2MAN)$(POD2MAN) \ + --center="The Wireshark Network Analyzer" \ + --release=$(VERSION) \ ++ --utf8 \ + $< > $@ + + .pod.html: ../config.h $(top_srcdir)/docbook/ws.css +--- doc/wireshark.pod.template (revision 49837) ++++ doc/wireshark.pod.template (working copy) +@@ -1,4 +1,9 @@ ++=begin man ++ ++=encoding utf8 ++ ++=end man + + =head1 NAME + + wireshark - Interactively dump and analyze network traffic diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 4e7d51f14..3db3d41be 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,32 +1,43 @@ -# $Id: PKGBUILD 186024 2013-05-20 14:35:40Z guillaume $ +# $Id: PKGBUILD 188206 2013-06-12 20:04:04Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.8.7 -pkgrel=1 +pkgver=1.10.0 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' +makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua51' 'python') url='http://www.wireshark.org/' options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 - 02_enable-version.diff) -sha256sums=('5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842' - 'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b') + 01_fix_encoding_asn2deb_pod.patch + 02_fix_encoding_idl2deb_pod.patch + 03_force_utf8_for_pod2man.patch) +sha256sums=('1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add' + '0dfe86b1e4bbf4090035fc1fcd36c2790d418a5749e23a2a7e7285699a6c147d' + 'a46f6e87477fcbf8289bfde5e525e6c0b4c3268bd1a2e189e3120bd3ad4f7c27' + '902f72132b9e0dd95f89ca0bcb216ef9c866ac11c842866781d239b6b7873daf') build() { cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p0 < ${srcdir}/02_enable-version.diff + # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8774 + for p in 01_fix_encoding_asn2deb_pod.patch \ + 02_fix_encoding_idl2deb_pod.patch \ + 03_force_utf8_for_pod2man.patch; + do + patch -p0 <${srcdir}/${p} + done ./autogen.sh ./configure \ --prefix=/usr \ --with-ssl \ --with-zlib=yes \ - --with-lua + --with-lua \ + --with-gtk3=yes make all } @@ -56,7 +67,7 @@ package_wireshark-cli() { package_wireshark-gtk() { pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend' - depends=('gtk2' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') + depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') install=wireshark-gtk.install replaces=(wireshark) conflicts=(wireshark) diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD index a14ed2300..5ed7de404 100644 --- a/extra/wpa_supplicant_gui/PKGBUILD +++ b/extra/wpa_supplicant_gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179006 2013-03-01 10:27:04Z andrea $ +# $Id: PKGBUILD 187078 2013-06-03 11:17:10Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant_gui pkgver=2.0 -pkgrel=2 +pkgrel=3 pkgdesc="A Qt frontend to wpa_supplicant" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64' 'mips64el') @@ -13,16 +13,15 @@ source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz") sha256sums=('2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09') build() { - . /etc/profile.d/qt4.sh cd wpa_supplicant-${pkgver} cd wpa_supplicant/wpa_gui-qt4 - qmake QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" + qmake-qt4 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" make } package() { cd "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/wpa_gui-qt4" - install -Dm755 wpa_gui "${pkgdir}/usr/sbin/wpa_gui" + install -Dm755 wpa_gui "${pkgdir}/usr/bin/wpa_gui" install -Dm644 icons/wpa_gui.svg "${pkgdir}/usr/share/pixmaps/wpa_gui.svg" install -Dm644 wpa_gui.desktop "${pkgdir}/usr/share/applications/wpa_gui.desktop" install -Dm644 "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/doc/docbook/wpa_gui.8" \ diff --git a/extra/x11-ssh-askpass/PKGBUILD b/extra/x11-ssh-askpass/PKGBUILD index 5d3d0f2f1..9e88da1da 100644 --- a/extra/x11-ssh-askpass/PKGBUILD +++ b/extra/x11-ssh-askpass/PKGBUILD @@ -1,5 +1,4 @@ -# $Id: PKGBUILD 140828 2011-10-19 22:29:39Z bisson $ - +# $Id: PKGBUILD 188167 2013-06-11 06:50:06Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Mike Sampson <mike at sambodata dot com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -7,7 +6,7 @@ pkgname=x11-ssh-askpass pkgver=1.2.4.1 -pkgrel=3 +pkgrel=4 pkgdesc='Lightweight passphrase dialog for SSH' url='http://www.jmknoble.net/software/x11-ssh-askpass/' license=('custom') @@ -22,7 +21,6 @@ sha1sums=('78c992951685d4dbffb77536f37b83ae2a6eafc7' build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --mandir=/usr/share/man \ --libexecdir=/usr/lib/ssh \ @@ -35,10 +33,8 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install install.man - install -Dm755 ../profile.d "${pkgdir}/etc/profile.d/${pkgname}.sh" - install -d "${pkgdir}/usr/share/licenses/${pkgname}" sed '109,174p;d' README > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm755 ../profile.d "${pkgdir}/etc/profile.d/${pkgname}.sh" } diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index 298458759..9cc8a9e2e 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186036 2013-05-20 18:09:21Z andyrtr $ +# $Id: PKGBUILD 188542 2013-06-15 10:17:06Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -7,8 +7,8 @@ # Contributor: Milan KnÞek <knizek@volny.cz> pkgname=x2goserver -pkgver=4.0.0.2 -pkgrel=2 +pkgver=4.0.1.1 +pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64' 'mips64el') url="http://www.x2go.org/" @@ -20,19 +20,13 @@ options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz - x2goserver.service - revert.patch) -md5sums=('6b8cecfdd31a8877203f50d3666c265f' - 'f76081c01e40b6206895d194dc949707' - 'c487c31e7c0aa9a73323313007497764') + x2goserver.service) +md5sums=('d970699f1df8d7096a7d3151c0ede447' + 'f76081c01e40b6206895d194dc949707') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # revert an upstream commit that breaks sessions showing up - # http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=011d14ae076ba6fec96cd1e019c4f82444ab0f9f - patch -Rp1 -i ${srcdir}/revert.patch - # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) for Makefile in $(find . -type f -name Makefile); do @@ -45,7 +39,7 @@ build() { sed -i "s:-o root -g root ::g" $Makefile done - make + make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" } package() { @@ -60,8 +54,8 @@ package() { install -dm 770 $pkgdir/var/spool/x2go # load fuse module at system start - install -dm755 $pkgdir/lib/modules-load.d - echo "fuse" > $pkgdir/lib/modules-load.d/x2goserver.conf + install -dm755 $pkgdir/usr/lib/modules-load.d + echo "fuse" > $pkgdir/usr/lib/modules-load.d/x2goserver.conf install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN" diff --git a/extra/x2goserver/revert.patch b/extra/x2goserver/revert.patch deleted file mode 100644 index 023bbd18c..000000000 --- a/extra/x2goserver/revert.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 011d14ae076ba6fec96cd1e019c4f82444ab0f9f Mon Sep 17 00:00:00 2001 -From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Date: Sun, 19 May 2013 00:41:32 +0200 -Subject: [PATCH] Security fix for setgid wrapper x2gosqlitewrapper.c. - Hard-code path to x2gosqlitewrapper.pl during build via - defining a macro in the Makefile. Thanks to Richard - Weinberger for spotting this!!! - ---- - Makefile | 2 +- - debian/changelog | 3 +++ - debian/rules | 4 +-- - x2goserver/Makefile | 4 +-- - x2goserver/x2gosqlitewrapper.c | 54 +++------------------------------------- - 5 files changed, 12 insertions(+), 55 deletions(-) - -diff --git a/Makefile b/Makefile -index 3be40f9..588084f 100755 ---- a/Makefile -+++ b/Makefile -@@ -4,7 +4,7 @@ RM_FILE=rm -f - RM_DIR=rmdir -p --ignore-fail-on-non-empty - - DESTDIR= --PREFIX=/usr/local -+PREFIX ?= /usr/local - ETCDIR=/etc/x2go - LIBDIR=$(PREFIX)/lib/x2go - SHAREDIR=$(PREFIX)/share/x2go -diff --git a/debian/changelog b/debian/changelog -index 470a502..2cf2dde 100644 ---- a/debian/changelog -+++ b/debian/changelog -@@ -12,6 +12,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low - * New upstream version (4.0.0.2): - - Use make_path from File::Path in x2godbadmin to create user directory if - not present. (Fixes: #200). -+ - Security fix for setgid wrapper x2gosqlitewrapper.c. Hard-code path to -+ x2gosqlitewrapper.pl during build via defining a macro in the Makefile. -+ Thanks to Richard Weinberger for spotting this!!! - /debian/control: - + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: - #163). -diff --git a/debian/rules b/debian/rules -index b32e08d..5bb94b2 100755 ---- a/debian/rules -+++ b/debian/rules -@@ -1,10 +1,10 @@ - #!/usr/bin/make -f - - %: -- dh $@ -+ PREFIX=/usr dh $@ - - override_dh_auto_install: -- make -f Makefile build-arch -+ PREFIX=/usr make -f Makefile build-arch - - override_dh_auto_clean: - rm -fv x2gosqlitewrapper -diff --git a/x2goserver/Makefile b/x2goserver/Makefile -index 4287478..e9d56e6 100755 ---- a/x2goserver/Makefile -+++ b/x2goserver/Makefile -@@ -15,7 +15,7 @@ RM_FILE=rm -f - RM_DIR=rmdir -p --ignore-fail-on-non-empty - - DESTDIR= --PREFIX=/usr/local -+PREFIX ?= /usr/local - ETCDIR=/etc/x2go - BINDIR=$(PREFIX)/bin - SBINDIR=$(PREFIX)/sbin -@@ -41,7 +41,7 @@ build: build-arch build-indep - build-arch: build_setgidwrappers - - build_setgidwrappers: -- $(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c - - build-indep: build_man2html - -diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c -index a134efc..ad95eff 100644 ---- a/x2goserver/x2gosqlitewrapper.c -+++ b/x2goserver/x2gosqlitewrapper.c -@@ -21,58 +21,12 @@ - * - */ - --#include <stdio.h> --#include <stdlib.h> --#include <unistd.h> --#include <libgen.h> --#include <errno.h> -- - int main( int argc, char *argv[] ) { -- char * x2gosqlitewrapper = NULL; -- size_t path_max; -- --/* -- The following snippet is taken from the realpath manpage --*/ --#ifdef PATH_MAX -- path_max = PATH_MAX; --#else -- path_max = pathconf (".", _PC_PATH_MAX); -- if (path_max <= 0){ -- path_max = 4096; -- } --#endif -- { -- // allocate dynamic buffer in stack: this needs C99 or gnu?? -- char buffer[path_max]; -- ssize_t rvrl; -- int rvap; -- -- // resolve link of /proc/self/exe to find out where we are -- rvrl = readlink("/proc/self/exe", buffer, path_max); -- if(rvrl == -1){ -- perror("readlink(\"/proc/self/exe\",buffer,path_max)"); -- exit(EXIT_FAILURE); -- } -- if(rvrl >= path_max){ -- fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max); -- exit(EXIT_FAILURE); -- } -- -- // derive the full path of x2gosqlitewrapper.pl from path of this binary -- rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl"); -- if(rvap == -1){ -- fprintf(stderr, "Failed to allocate memory calling asprintf\n"); -- exit(EXIT_FAILURE); -- } -- -- // execute the script, running with user-rights of this binary -- execv(x2gosqlitewrapper, argv); - -- } -+ char x2gosqlitewrapper[] = TRUSTED_BINARY; - -- // ...fail -- fprintf(stderr, "Failed to execute %s: %s\n", x2gosqlitewrapper, strerror(errno)); -- return EXIT_FAILURE; -+ argv[0] = "x2gosqlitewrapper.pl"; -+ // execute the script, running with user-rights of this binary -+ execv(x2gosqlitewrapper, argv); - - } --- -1.7.9.5 - diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 2f0f13e72..c936481fc 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186484 2013-05-27 13:17:23Z andyrtr $ +# $Id: PKGBUILD 187885 2013-06-07 20:50:17Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.8 +pkgver=2.21.9 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=('4d850c0515012ca370a72469dfbfa6161aa9ee5bb39779fab5f496f2d94acf8f') +sha256sums=('1359cbc9e494a284faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD index 7f55ea4f5..51ac07260 100644 --- a/extra/xf86-video-modesetting/PKGBUILD +++ b/extra/xf86-video-modesetting/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180914 2013-03-27 23:14:30Z andyrtr $ +# $Id: PKGBUILD 188204 2013-06-12 19:08:23Z lcarlier $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=xf86-video-modesetting -pkgver=0.7.0 +pkgver=0.8.0 pkgrel=1 pkgdesc="X.org generic modesetting video driver" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2bc55f776eaee7b4e13df13238d36c4facf1cdca095a11519baf2376f5c996ac') +sha256sums=('13dc349e9aa50987ab2479d27d6879cda2c1f9ad8c8d3a1422a2f53c36f047f8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index 5de63e725..c3a3570fb 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180916 2013-03-27 23:16:59Z andyrtr $ +# $Id: PKGBUILD 188202 2013-06-12 18:59:24Z lcarlier $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: buddabrod <buddabrod@gmail.com> pkgname=xf86-video-nouveau -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 pkgdesc="Open Source 2D acceleration driver for nVidia cards" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg') options=('!libtool') install=$pkgname.install source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2) -sha256sums=('d187c658e1823ca829c941f3f601f8e7220d427e079c3e52b94ecff45bc2e131') +sha256sums=('9b904314b8e9c7a5800724a6a31038ed88fa3fcfd35da6f4015fc104c8283617') build() { cd $pkgname-$pkgver diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD index ca81d3f20..4d0c167c0 100644 --- a/extra/yp-tools/PKGBUILD +++ b/extra/yp-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184213 2013-05-03 22:54:47Z tomegun $ +# $Id: PKGBUILD 187079 2013-06-03 11:17:12Z allan $ # Mantainer: Tom Gundersen <teg@jklm.no> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -6,7 +6,7 @@ pkgname=yp-tools pkgver=2.14 -pkgrel=2 +pkgrel=3 pkgdesc='Linux NIS Tools' arch=('i686' 'x86_64' 'mips64el') url='http://www.linux-nis.org/nis/yp-tools/' @@ -29,6 +29,10 @@ package() { make DESTDIR="$pkgdir" install install -D -m644 ../domainname.conf "${pkgdir}/etc/nisdomainname" install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/system/domainname.service" + # usrmove + cd "$pkgdir" + mv usr/sbin/* usr/bin + rmdir usr/sbin } md5sums=('ba1f121c17e3ad65368be173b977cd13' '5a78cd2218936241133e5f61383a2dc8' diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index ca388b4aa..3abcbe7a7 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173826 2012-12-24 15:21:31Z pierre $ +# $Id: PKGBUILD 187080 2013-06-03 11:17:13Z allan $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh pkgver=5.0.2 -pkgrel=1.1 +pkgrel=2 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64' 'mips64el') url='http://www.zsh.org/' @@ -11,7 +11,7 @@ license=('custom') depends=('pcre' 'libcap' 'gdbm') backup=('etc/zsh/zprofile') install=zsh.install -source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'zprofile') md5sums=('b8f2ad691acf58b3252225746480dcad' '24a9335edf77252a7b5f52e079f7aef7') @@ -19,12 +19,6 @@ md5sums=('b8f2ad691acf58b3252225746480dcad' build() { cd "${srcdir}/${pkgname}-${pkgver}" - # FS#16360 - sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \ - Doc/zsh.texi \ - Completion/Unix/Type/_services \ - Completion/Unix/Command/_init_d - # Set correct keymap path sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys @@ -34,7 +28,6 @@ build() { rm -f Completion/Unix/Command/_osc ./configure --prefix=/usr \ - --bindir=/bin \ --enable-etcdir=/etc/zsh \ --enable-zshenv=/etc/zsh/zshenv \ --enable-zlogin=/etc/zsh/zlogin \ @@ -51,7 +44,7 @@ build() { --enable-pcre \ --enable-cap \ --enable-zsh-secure-free - make all info + make } check() { @@ -61,7 +54,7 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}/" install install.info + make DESTDIR="${pkgdir}/" install install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile" install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/zsh/zsh.install b/extra/zsh/zsh.install index 8e54d92ee..a2aafa252 100644 --- a/extra/zsh/zsh.install +++ b/extra/zsh/zsh.install @@ -1,12 +1,5 @@ -infodir=usr/share/info -filelist=(zsh.info zsh.info-1 zsh.info-2 zsh.info-3 zsh.info-4 zsh.info-5 zsh.info-6) - post_install() { - grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done + grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells } post_upgrade() { @@ -14,9 +7,5 @@ post_upgrade() { } pre_remove() { - sed -i '/^\/bin\/zsh/d' etc/shells - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done + sed -i -r '/^(\/usr)?\/bin\/zsh$/d' etc/shells } diff --git a/extra/zvbi/PKGBUILD b/extra/zvbi/PKGBUILD index c07603a1c..7c87dc2b9 100644 --- a/extra/zvbi/PKGBUILD +++ b/extra/zvbi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184458 2013-05-06 19:40:33Z foutrelis $ +# $Id: PKGBUILD 187081 2013-06-03 11:17:17Z allan $ # Maintainer: # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=zvbi pkgver=0.2.33 -pkgrel=5 +pkgrel=6 pkgdesc="VBI capture and decoding library" url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome" arch=('i686' 'x86_64' 'mips64el') @@ -35,4 +35,9 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + + # usrmove + cd "$pkgdir" + mv usr/sbin/* usr/bin/ + rmdir usr/sbin } |