diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-07-04 19:48:31 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-07-04 19:48:31 +0200 |
| commit | ee9c1a601c6ce156c295e4a4608ad50535192954 (patch) | |
| tree | 49757b312b758e793ffd8bfedd2d6665cd0b3e29 /extra | |
| parent | 2690b2e42de85dbcbca602f3299ae4404918e94d (diff) | |
| parent | e9eb2503b10fe4c4aefbee39226c8962d72d58bd (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/calc/PKGBUILD
community/fcitx/PKGBUILD
community/gloobus-preview/PKGBUILD
community/linux-tools/PKGBUILD
community/smc/PKGBUILD
extra/elfutils/PKGBUILD
extra/freenx/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/lcms2/PKGBUILD
extra/libmspack/PKGBUILD
extra/libtheora/PKGBUILD
extra/mesa/PKGBUILD
extra/nx-common/PKGBUILD
extra/opennx/PKGBUILD
extra/perl-tk/PKGBUILD
extra/qt4/PKGBUILD
extra/soprano/PKGBUILD
extra/wireshark/PKGBUILD
extra/xmlsec/PKGBUILD
extra/xorg-server/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
libre/ipsec-tools-libre/PKGBUILD
libre/tomoyo-tools-libre/PKGBUILD
pcr/amsynth/PKGBUILD
Diffstat (limited to 'extra')
221 files changed, 2279 insertions, 3262 deletions
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index 1bc3eb9ec..877faf646 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182614 2013-04-11 09:00:27Z schiv $ +# $Id: PKGBUILD 189213 2013-06-29 15:55:30Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: see .contrib pkgname=ardour _pkgname=Ardour3 -pkgver=3.1 +pkgver=3.2 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64' 'mips64el') @@ -15,9 +15,9 @@ depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0' 'aubio' 'libgnomecanvasmm' 'suil>=0.6.12') makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') install=$pkgname.install -source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2" +source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('6291ee6e6519a801a6c7255eb005895f' +md5sums=('17028a3106f870cd62f6a60930a28590' '316bd21ece5e2208a104fd09cac521af') prepare() { diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install index 555d7377d..78d8f7734 100644 --- a/extra/ardour/ardour.install +++ b/extra/ardour/ardour.install @@ -3,6 +3,11 @@ post_install() { > Ardour 3 has support for native "Linux" VSTs. You may want to export > LXVST_PATH to include any custom directories of *.so VST plug-ins. + > Ardour 3 also supports video (timeline and monitoring), but aside from + > xjadeo (AUR) the required external programs need to be retrieved from: + + http://x42.github.io/harvid/ + > Please consider supporting Paul Davis, lead developer of Ardour, by > either subscribing or at least donating to the project's cause: @@ -15,7 +20,21 @@ MSG } post_upgrade() { - post_install + cat << MSG + > Ardour now supports video timeline. To use this feature, please get + > static builds of the required external runtime dependencies from: + + http://x42.github.io/harvid/ + + > You may then install the binaries in /usr/local/bin and import a video + > via Session > Open Video. + + > Due to uncertainties with regards to program stability, 'harvid' is + > currently not packaged in our repositories. + + > In addition to the timeline, video can be monitored with xjadeo, which + > is presently available in the AUR. It will be in our repositories soon. +MSG } # vim:set ts=2 sw=2 et: diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 65e47dd71..0e921fda8 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177006 2013-02-04 00:32:16Z bisson $ +# $Id: PKGBUILD 189207 2013-06-29 12:06:19Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=audacious -pkgver=3.3.4 +pkgver=3.4 pkgrel=1 pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' @@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('unzip-libre: zipped skins support') source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d1050fb88a59b46c0c9bbb1af0e7efc2b02f2b4d') +sha1sums=('2a40e41a8689e90456ce1f7aeabb6a49c1b2f385') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD index 58d6e2d16..6c8c45481 100644 --- a/extra/cfitsio/PKGBUILD +++ b/extra/cfitsio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180514 2013-03-22 13:00:52Z andrea $ +# $Id: PKGBUILD 189244 2013-07-01 10:04:11Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=cfitsio -pkgver=3.340 +pkgver=3.350 pkgrel=1 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('custom') depends=('glibc') options=('!libtool') source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz") -md5sums=('99210838af46b7bf2d945ccbb05e3ad3') +md5sums=('3e61f17731fe8db503b1b39873e4a8c4') build() { cd ${pkgname} diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD index 7ef5204a5..69e11f31c 100644 --- a/extra/clutter-gtk/PKGBUILD +++ b/extra/clutter-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183341 2013-04-21 22:08:42Z heftig $ +# $Id: PKGBUILD 189249 2013-07-01 11:24:00Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=clutter-gtk pkgver=1.4.4 -pkgrel=1 +pkgrel=2 pkgdesc="GTK clutter widget" arch=('i686' 'x86_64' 'mips64el') url="http://clutter-project.org/" @@ -11,8 +11,15 @@ options=('!libtool') license=('LGPL') depends=('clutter' 'gtk3') makedepends=('gobject-introspection') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch) +sha256sums=('bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e' + '45e86e364756d6ac86c646ee1bcab6c9b94316673963e0b83b1140d9c4978bef') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch b/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch new file mode 100644 index 000000000..e3eb8ce13 --- /dev/null +++ b/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch @@ -0,0 +1,29 @@ +From 6b1093d903f4605dcb974a3b299ed47f3e15edc1 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Wed, 27 Mar 2013 11:08:46 +0000 +Subject: util: Don't use clutter_x11_set_use_argb_visual() on non-X11 + +We shouldn't be running this on non-X11 windowing systems. + +https://bugzilla.gnome.org/show_bug.cgi?id=696687 +--- +diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c +index 38e3ced..d4a9fa5 100644 +--- a/clutter-gtk/gtk-clutter-util.c ++++ b/clutter-gtk/gtk-clutter-util.c +@@ -249,8 +249,11 @@ gtk_clutter_init_with_args (int *argc, + return CLUTTER_INIT_SUCCESS; + + #if defined(CLUTTER_WINDOWING_X11) +- /* enable ARGB visuals by default for Clutter */ +- clutter_x11_set_use_argb_visual (TRUE); ++ if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) ++ { ++ /* enable ARGB visuals by default for Clutter */ ++ clutter_x11_set_use_argb_visual (TRUE); ++ } + #endif + + /* we let gtk+ open the display */ +-- +cgit v0.9.2 diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 1f01a480d..3998489f2 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185329 2013-05-13 11:18:43Z heftig $ +# $Id: PKGBUILD 188955 2013-06-27 04:04:12Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="System daemon for managing color devices" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!libtool') install=colord.install backup=(etc/colord.conf) source=($url/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('a01547080f0905dacca37c5ded3886431144a36a') +sha1sums=('d480eb23a3de67cab090c810c894cc68069a278d') build() { cd $pkgname-$pkgver diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 0c74200e2..841c951ac 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188728 2013-06-18 15:46:35Z andyrtr $ +# $Id: PKGBUILD 188926 2013-06-25 16:51:14Z 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.3 +pkgver=2.2.4 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=('306664f09560d2c6515ba80e1dd7f353' +md5sums=('984cfc921a83c580c52c86e128e9dac2' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index 9ccf17eb3..b09cf7948 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166543 2012-09-10 09:44:48Z stephane $ +# $Id: PKGBUILD 189328 2013-07-03 01:24:05Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> @@ -20,21 +20,26 @@ sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b' 'fcd0ebd029b305bf030983daf151a2a1ab5294af' '8a8be7c0686c6311c1ce969ba10494e704ead48c') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch + sed -i -e 's:-Werror::g' $(find -name Makefile.in) +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} CFLAGS+=" -g" # required for test-suite success - patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch ./configure --prefix=/usr --program-prefix="eu-" make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} [ "$CARCH" = "mips64el" ] && return 0 # Known to fail, no benefit from running. make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD deleted file mode 100644 index 6a4b8e41c..000000000 --- a/extra/freenx/PKGBUILD +++ /dev/null @@ -1,99 +0,0 @@ -# $Id: PKGBUILD 174925 2013-01-09 04:17:20Z andyrtr $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -#Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=freenx -pkgver=0.7.3 -pkgrel=15 -pkgdesc="Free Software (GPL) Implementation of the NX Server" -arch=(i686 x86_64 'mips64el') -url="http://freenx.berlios.de" -license=('GPL') -depends=('nx-common' 'nx-x11>=3.5.0.17' 'nxagent' 'nxproxy' 'netcat' 'inetutils' 'openssh' 'expect' 'python2' 'python2-gobject' - 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') -optdepends=('cups: adds printing support') -makedepends=('imake') -options=('!makeflags') -conflicts=('nxserver') -provides=('nxserver') -backup=(etc/nxserver/node.conf) -install=freenx.install -source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz - keymap.patch - nxagent-startup.patch - freenx-latest-svn.patch - remove-dialog.patch - freenx-server-0.7.3-nxipp.patch) -md5sums=('856f597e139018f7ed62713c9d6c9ed5' - 'f0867659c925f6363fb2b7661f349248' - '30dc16d8e2093ff71d5834a169ad9d00' - '788f30322783cf2c2dc833e2e4d5e8ad' - 'cae1773312506eeefe6a8de07c492bd8' - 'b3244c52a6bafc6d9b528eb4d4426e36') - -build() { - # patch and install nxserver - cd $srcdir/$pkgname-server-$pkgver - # add latest svn fixes - patch -Np3 -i ../freenx-latest-svn.patch - # patch from inside nx - patch < gentoo-nomachine.diff - # patch broken keymap remapping - patch -Np0 -i ${srcdir}/keymap.patch - # patch nxagent startup to avoid login issues - patch -Np0 -i ${srcdir}/nxagent-startup.patch - # check for cups existance and then symlinks the backend - patch -Np1 -i ${srcdir}/freenx-server-0.7.3-nxipp.patch - # remove broken dialog function - patch -Np0 -i ${srcdir}/remove-dialog.patch - sed -i -e 's,authorized_keys2,authorized_keys,g' nxloadconfig - sed -i -e 's,\/usr\/NX,\/usr\/lib/nx,g' nxloadconfig node.conf.sample - sed -i -e "s:NX_DIR\/lib:NX_DIR\/X11:" nxloadconfig - sed -i -e 's,netcat,nc,g' nxloadconfig - sed -i -e 's/utmp/nx/g' nxsetup - sed -i -e 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig - sed -i -e 's,COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile",COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile",g' nxloadconfig - sed -i -e 's,COMMAND_MD5SUM="openssl md5",COMMAND_MD5SUM="md5sum",g' nxloadconfig node.conf.sample - sed -i -e 's|AGENT_EXTRA_OPTIONS_X=""|AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11/rgb -fp /usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 -xkbdir /usr/share/X11/xkb"|g' nxloadconfig - sed -i -e 's/ENABLE_AUTORECONNECT_BEFORE_140="1"/ENABLE_AUTORECONNECT_BEFORE_140="0"/g' nxloadconfig - sed -i -e 's,/etc/init.d/ssh,/etc/rc.d/sshd,g' nxsetup - sed -i -e 's,libXcomp.so,libXcomp.so.3,g' nxloadconfig - sed -i -e 's,libXcompext.so,libXcompext.so.3,g' nxloadconfig - sed -i -e 's,libXrender.so.1.2,libXrender.so.1.2.2:$APPLICATION_LIBRARY_PATH/libXcompsh.so.3:$APPLICATION_LIBRARY_PATH/libXcompshad.so.3,g' nxloadconfig - sed -i -e 's:NX_ETC_DIR\=$NX_DIR\/etc:NX_ETC_DIR=\/etc\/nxserver:g' nxloadconfig - sed -i -e 's:NX_SESS_DIR=$NX_DIR\/var\/db:NX_SESS_DIR=\/var\/lib\/nxserver\/db:g' nxloadconfig - sed -i -e 's:NX_HOME_DIR=$NX_DIR:NX_HOME_DIR=\/var\/lib\/nxserver:g' nxloadconfig - sed -i -e 's:NOMACHINE_NX_HOME_DIR="/usr/lib/nx/home/nx":NOMACHINE_NX_HOME_DIR="/var/lib/nxserver/home/nx":g' nxloadconfig node.conf.sample - sed -i -e 's:\/usr\/NX:\/usr\/lib\/nx:g' nxdialog - - # python2 fix - sed -i -e 's:\/usr\/bin\/env\ python:\/usr\/bin\/env\ python2:' nx-session-launcher/nx-session-launcher - - # fix key generation - sed -i -e 's,AUTOMATIC="no",AUTOMATIC="yes",g' nxsetup - - make -} - -package() { - cd $srcdir/$pkgname-server-$pkgver - - make install DESTDIR="${pkgdir}" - - # create symlinks - install -dm755 ${pkgdir}/usr/bin - cd ${pkgdir}/usr/bin - for file in ${pkgdir}/usr/lib/nx/bin/*; do - ln -sv /usr/lib/nx/bin/`basename $file` . - done - - mv $pkgdir/etc/nxserver/node.conf.sample $pkgdir/etc/nxserver/node.conf - - # create some missing nxserver directories - mkdir -m700 -p $pkgdir/var/lib/nxserver/{home/nx,db} - mkdir -m700 -p $pkgdir/usr/lib/nx/share - - # remove files that are part of nxclient - rm -f ${pkgdir}/usr/lib/nx/bin/nxprint - rm -f ${pkgdir}/usr/bin/nxprint -} diff --git a/extra/freenx/freenx-latest-svn.patch b/extra/freenx/freenx-latest-svn.patch deleted file mode 100644 index bcc8ddd17..000000000 --- a/extra/freenx/freenx-latest-svn.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -ur freenx-server-0.7.3//ChangeLog ../trunk/freenx-server//ChangeLog ---- freenx-server-0.7.3//ChangeLog 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//ChangeLog 2011-01-26 23:23:36.850005855 +0100 -@@ -1,3 +1,20 @@ -+xx.11.2008 FreeNX 0.7.4 -+ * Opened the 0.7.4 development. -+ * Fixed missing export of NX_ETC_DIR in Makefile, -+ so node.conf.sample is installed correctly. -+ (fabianx@bat.berlios.de) -+ * Fixed broken round-robin load balance algorithm. -+ (fabianx@bat.berlios.de) -+ * Fixed --terminate|--suspend|--force-terminate for -+ load balancing case. -+ (fabianx@bat.berlios.de) -+ * Fixed --terminate|--suspend|--force-terminate for -+ usermode case. -+ (fabianx@bat.berlios.de) -+ * Fixed non-encrypted session mode. You might need to -+ set EXTERNAL_PROXY_IP in node.conf. -+ (fabianx@bat.berlios.de) -+ - 18.08.2008 FreeNX 0.7.3 "Priscilla One Year Edition" - * Opened the 0.7.3 development. - * Added logging of failed authentication attempts -diff -ur freenx-server-0.7.3//Makefile ../trunk/freenx-server//Makefile ---- freenx-server-0.7.3//Makefile 2008-08-18 04:16:25.000000000 +0200 -+++ ../trunk/freenx-server//Makefile 2011-01-26 23:23:36.856672521 +0100 -@@ -8,7 +8,7 @@ - all: - cd nxviewer-passwd && xmkmf && make Makefiles && make depend - source nxloadconfig &&\ -- export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ -+ export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ - for i in $(SUBDIRS) ; \ - do\ - echo "making" all "in $$i..."; \ -@@ -44,5 +44,5 @@ - - install: - source nxloadconfig &&\ -- export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ -+ export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ - $(MAKE) nxenv_install -diff -ur freenx-server-0.7.3//node.conf.sample ../trunk/freenx-server//node.conf.sample ---- freenx-server-0.7.3//node.conf.sample 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//node.conf.sample 2011-01-26 23:23:36.850005855 +0100 -@@ -37,7 +37,7 @@ - # - # https://mail.kde.org/mailman/listinfo/freenx-knx - # --# SVN: $Id: node.conf.sample 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: node.conf.sample 613 2008-09-01 20:42:31Z fabianx $ - - ######################################################################### - # General FreeNX directives -@@ -47,6 +47,11 @@ - # different than the default hostname (as returned by `hostname`) - #SERVER_NAME="$(hostname)" - -+# The node ip which is used by NX Node in unecnrypted session mode. -+# Set it if you want to use a specific external ip or the autodetection -+# is not working. -+#EXTERNAL_PROXY_IP="" -+ - # The port number where local 'sshd' is listening. - #SSHD_PORT=22 - -diff -ur freenx-server-0.7.3//nxloadconfig ../trunk/freenx-server//nxloadconfig ---- freenx-server-0.7.3//nxloadconfig 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxloadconfig 2011-01-26 23:23:36.856672521 +0100 -@@ -5,7 +5,7 @@ - # - # License: GPL, version 2 - # --# SVN: $Id: nxloadconfig 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxloadconfig 613 2008-09-01 20:42:31Z fabianx $ - # - # ======================================================================== - -@@ -52,7 +52,7 @@ - # DO NOT TOUCH unless you REALLY know what you are doing - ######################################################################### - --NX_VERSION=3.2.0-73 -+NX_VERSION=3.2.0-74-SVN - NX_LICENSE="OS (GPL, using backend: %BACKEND%)" - - # Where can different nx components be found -@@ -85,6 +85,7 @@ - # General FreeNX directives - - SERVER_NAME="$(hostname)" -+EXTERNAL_PROXY_IP="" - SSHD_PORT=22 - - # Authentication / Security directives -diff -ur freenx-server-0.7.3//nxnode ../trunk/freenx-server//nxnode ---- freenx-server-0.7.3//nxnode 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxnode 2011-01-26 23:23:36.853339188 +0100 -@@ -13,7 +13,7 @@ - # - # License: GNU GPL, version 2 - # --# SVN: $Id: nxnode 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxnode 613 2008-09-01 20:42:31Z fabianx $ - # - # 21.06.2004: - Full reconnection support - -@@ -1184,6 +1184,17 @@ - [ -z "$userip" -a "$host" = "127.0.0.1" ] && userip="127.0.0.1" - [ -z "$userip" ] && userip="*" - fi -+ -+ # We need our own external IP -+ proxyip="$EXTERNAL_PROXY_IP" -+ -+ if [ -z "$proxyip" -a -n "$host" ] -+ then -+ [ "$host" = "127.0.0.1" ] && host=$(hostname) -+ proxyip=$(ping -c1 "$host" | grep 'PING' | cut -d'(' -f2 | cut -d')' -f1) -+ fi -+ -+ [ -z "$proxyip" ] && proxyip="127.0.0.1" - - # ok, lets make the session dir first: - -@@ -1316,7 +1327,7 @@ - NX> 705 Session display: $display - NX> 703 Session type: $type - NX> 701 Proxy cookie: $proxy_cookie --NX> 702 Proxy IP: $userip -+NX> 702 Proxy IP: $proxyip - NX> 706 Agent cookie: $cookie - NX> 704 Session cache: $type - NX> 707 SSL tunneling: $ssl_tunnel -diff -ur freenx-server-0.7.3//nxserver ../trunk/freenx-server//nxserver ---- freenx-server-0.7.3//nxserver 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxserver 2011-01-26 23:23:36.856672521 +0100 -@@ -11,7 +11,7 @@ - # - # License: GNU GPL, version 2 - # --# SVN: $Id: nxserver 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxserver 612 2008-08-25 03:28:15Z fabianx $ - # - - # Read the config file -@@ -1192,7 +1192,7 @@ - # Lock held - - SERVER_LB_NR=$(cat $NX_SESS_DIR/round-robin 2>/dev/null) -- let SERVER_LB_NR=(SERVER_LB_NR+1) % SERVER_LB_NR_OF_HOSTS -+ let SERVER_LB_NR=(SERVER_LB_NR+1)%SERVER_LB_NR_OF_HOSTS - echo $SERVER_LB_NR >$NX_SESS_DIR/round-robin - - # Exit critical section -@@ -1961,71 +1961,71 @@ - session_history "$user" "$sessid" - } - --cmd_terminate() -+cmd_execute() - { -- CMD_PARAMS=$(cmd_parse_3_params "$2") -- [ -z "$CMD_PARAMS" ] && exit 1 -- for i in $CMD_PARAMS; -+ cmd_host="$1" -+ cmd_user="$2" -+ cmd_cmd="$3" -+ -+ if [ "$ENABLE_USERMODE_AUTHENTICATION" = "1" ] -+ then -+ sh -c "$cmd_cmd" -+ elif [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ] -+ then -+ su - "$cmd_user" -c "$cmd_cmd" -+ else -+ ssh "$cmd_host" su - "$cmd_user" -c "'$cmd_cmd'" -+ fi -+} -+ -+cmd_terminate_or_send() -+{ -+ CMD="$1" -+ -+ if [ "$CMD" = "--broadcast" ] -+ then -+ CMD_PARAMS=$(session_find_all) -+ [ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found." -+ else -+ CMD_PARAMS=$(cmd_parse_3_params "$2") -+ [ -z "$CMD_PARAMS" ] && exit 1 -+ shift -+ fi -+ shift -+ -+ for i in $CMD_PARAMS - do - CMDLINE=$(session_get_cmdline $i) - cmd_sessionid=$(getparam sessionId) -+ cmd_display=$(getparam display) - cmd_user=$(getparam userName) - cmd_type=$(getparam type) - cmd_status=$(getparam status) -+ cmd_host=$(getparam host) - - # is it a "good" session? -- case "$1" in -+ case "$CMD" in - --suspend) - if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" - then -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --suspend" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --suspend" - fi - ;; - --terminate) -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate" - ;; - --force-terminate) -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate" - session_close $cmd_sessionid - ;; -- esac -- done -- --} -- --cmd_send() --{ -- if [ "$1" = "--broadcast" ] -- then -- CMD_PARAMS=$(session_find_all) -- [ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found." -- else -- CMD_PARAMS=$(cmd_parse_3_params "$2") -- [ -z "$CMD_PARAMS" ] && exit 1 -- shift -- fi -- shift -- for i in $CMD_PARAMS; -- do -- CMDLINE=$(session_get_cmdline $i) -- cmd_display=$(getparam display) -- cmd_user=$(getparam userName) -- cmd_type=$(getparam type) -- cmd_status=$(getparam status) -- cmd_host=$(getparam host) -- -- # is it a "good" session? -- if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" -- then -- if [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ] -+ --send|--broadcast) -+ # is it a "good" session? -+ if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" - then -- su - "$cmd_user" -c "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &" -- else -- ssh $cmd_host su - "$cmd_user" -c "'$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &'" -+ cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &" - fi -- fi -+ esac - done -- #nxnode_start --send "$CMD_PARAMS" - } - - # -@@ -2099,13 +2099,13 @@ - cmd_history "$@" - ;; - --terminate|--suspend|--force-terminate) -- cmd_terminate "$@" -+ cmd_terminate_or_send "$@" - ;; - --cleanup) -- cmd_terminate "--force-terminate" "*" -+ cmd_terminate_or_send "--force-terminate" "*" - ;; - --send|--broadcast) -- cmd_send "$@" -+ cmd_terminate_or_send "$@" - ;; - *) - cmd_abort "Error: Function $CMD not implemented yet." diff --git a/extra/freenx/freenx-server-0.7.3-nxipp.patch b/extra/freenx/freenx-server-0.7.3-nxipp.patch deleted file mode 100644 index 81b286593..000000000 --- a/extra/freenx/freenx-server-0.7.3-nxipp.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up freenx-server-0.7.3/nxsetup~ freenx-server-0.7.3/nxsetup ---- freenx-server-0.7.3/nxsetup~ 2011-12-30 23:04:53.515194711 +0200 -+++ freenx-server-0.7.3/nxsetup 2011-12-30 23:05:55.499954085 +0200 -@@ -366,11 +366,10 @@ EOF - - echo "done" - -- if [ -d "$CUPS_BACKEND" ] -+ if [ -d "$CUPS_BACKEND" ] && [ ! -f "$CUPS_IPP_BACKEND" ] - then - echo -n "Setting up cups nxipp backend ..." -- cp -af "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND" -- chmod 755 "$CUPS_IPP_BACKEND" -+ ln -sf "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND" - echo "done" - fi - } diff --git a/extra/freenx/freenx.install b/extra/freenx/freenx.install deleted file mode 100644 index 0f3260166..000000000 --- a/extra/freenx/freenx.install +++ /dev/null @@ -1,59 +0,0 @@ -post_install() { - # Make sure the group and user "nx" exists on this system and have the correct values - if grep -q "^nx:" /etc/group &> /dev/null ; then - groupmod -g 85 -n nx nx &> /dev/null - else - groupadd -g 85 nx &> /dev/null - fi - - if grep -q "^nx:" /etc/passwd 2> /dev/null ; then - usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null - else - useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null - fi - - # setting up freenx - echo 'Generating keys ...' - /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null - - echo "ATTENTION FREENX:" - echo "For correct setup please take a look at the wiki:" - echo "http://wiki.archlinux.org/index.php/FreeNX" -} - -post_upgrade() { - # Make sure the group and user "nx" exists on this system and have the correct values - if grep -q "^nx:" /etc/group &> /dev/null ; then - groupmod -g 85 -n nx nx &> /dev/null - else - groupadd -g 85 nx &> /dev/null - fi - - if grep -q "^nx:" /etc/passwd 2> /dev/null ; then - usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null - else - useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null - fi - - # setting up freenx - echo "Rerunning nxsetup ..." - /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null - - if [ "`vercmp $2 0.7.3-10.1`" -lt 0 ]; then - # important upgrade notice - echo "*** config file location has been moved ***" - echo "Please apply your local settings from /opt/NX/etc/node.conf.pacsave" - echo "into /etc/nxserver/node.conf. A new key set is required." - echo "Please copy to your clients the new client key:" - echo "\"/var/lib/nxserver/home/nx/.ssh/client.id_dsa.key\"" - echo "When you have FreeNX server running clean up with \"rm -rf /opt/NX\"." - fi -} - -# arg 1: the old package version -pre_remove() { - /usr/lib/nx/bin/nxsetup --uninstall --purge 2>&1 >/dev/null -# usr/sbin/groupdel nx &>/dev/null - userdel nx &> /dev/null - groupdel nx &> /dev/null || /bin/true -} diff --git a/extra/freenx/keymap.patch b/extra/freenx/keymap.patch deleted file mode 100644 index a0bb678e4..000000000 --- a/extra/freenx/keymap.patch +++ /dev/null @@ -1,32 +0,0 @@ -=== modified file 'nxnode' ---- nxnode 2009-01-14 04:22:40 +0000 -+++ nxnode 2009-01-14 04:24:02 +0000 -@@ -555,7 +555,8 @@ - - # Start the agent - -- PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & -+ #PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & -+ PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & - fi - - # -@@ -1094,6 +1095,8 @@ - # Rootless fix from 2x nxserver 1.5.0 - realtype=$type - [ "$type" = "unix-application" -o "$type" = "unix-default" ] && realtype="unix-desktop" -+ [ "$type" = "unix-gnome" ] && realtype="gnome" -+ [ "$type" = "unix-kde" ] && realtype="kde" - - # NX 2.1.0 file-sharing port options - client=$(getparam client) -@@ -1272,7 +1275,7 @@ - umask 0077 - - cat << EOF > "$USER_FAKE_HOME/.nx/C-$sess_id/options" --${keyboard:+keyboard=$keyboard,}${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${aux:+,aux=$aux}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}${clipboard:+,clipboard=$clipboard}${menu:+,menu=$menu}:$display -+nx/nx,${keyboard:+keyboard=$keyboard,}${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${geometry:+geometry=$geometry,}${client:+client=$client,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype${clipboard:+,clipboard=$clipboard}${composite:+composite=$composite},cleanup=0,product=LFE/None/LFEN/None,shmem=1,${backingstore:+backingstore=$backingstore,}shpix=1,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${aux:+,aux=$aux}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}${menu:+,menu=$menu}:$display - EOF - umask $OLD_UMASK - #samba=$samba, - diff --git a/extra/freenx/nxagent-startup.patch b/extra/freenx/nxagent-startup.patch deleted file mode 100644 index e3c5497c1..000000000 --- a/extra/freenx/nxagent-startup.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nxnode~ 2010-04-30 15:42:46.000000000 +0200 -+++ nxnode 2010-04-30 15:42:46.000000000 +0200 -@@ -328,6 +328,9 @@ - NODE_WM_PID=$! - fi - -+ # Patch - delay to allow nxagent to complete launching -+ sleep 4 -+ - echo "Xft.dpi: 96" | DISPLAY=:$display xrdb -merge >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 - [ -d /etc/X11/Xresources ] && xrdb -display :$display -merge /etc/X11/Xresources/* >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 - diff --git a/extra/freenx/remove-dialog.patch b/extra/freenx/remove-dialog.patch deleted file mode 100644 index 054f1f6c4..000000000 --- a/extra/freenx/remove-dialog.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- nxdialog~ 2011-02-01 09:05:28.993333438 +0100 -+++ nxdialog 2011-02-01 09:05:29.010000106 +0100 -@@ -85,29 +85,6 @@ - then - dialog_interface="xdialog" - DIALOG=/usr/bin/Xdialog # just in case that we have no good path --elif [ -x /usr/bin/dialog ] --then -- #JJK: Added 'dialog_interface=dialog' option because Xdialog not standard -- #JJK: on some distros such as Fedora and xmessage won't handle long -- #JJK: lists of ppd files while the combination of 'dialog' and 'xterm' -- #JJK: should be present on most setups. -- -- dialog_interface="dialog" -- DIALOG=/usr/bin/dialog -- if [ -z "$NXCLIENT_FIRST_TIME" ] -- then -- # Run only once in case of subdialogs. Capture result in tempfile -- TMPFILE=$(mktemp /tmp/nxclient.XXXXX) -- export NXCLIENT_FIRST_TIME=1 -- -- xterm -geometry 120x24+100+100 +sb -title "NXclient" -e \ -- /bin/bash -c "$DIALOG --infobox 'Please wait...' 3 25; $0 $INPUTS | tee $TMPFILE" || exit 1 -- -- #Need to recover the last line output (and not remove non-printing chars, because --stdout is used) -- tail -1 $TMPFILE -- rm -f $TMPFILE -- exit 0 -- fi - else - dialog_interface="xmessage" - xmessage=$(which xmessage 2>/dev/null) diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index f6fe3449e..e6f2bfad4 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185748 2013-05-18 10:42:24Z andyrtr $ +# $Id: PKGBUILD 188918 2013-06-25 14:14:01Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 -pkgver=2.4.12 +pkgver=2.5.0.1 pkgrel=1 pkgdesc="TrueType font rendering library" arch=(i686 x86_64 'mips64el') @@ -11,18 +11,32 @@ url="http://freetype.sourceforge.net" depends=('zlib' 'bzip2' 'sh') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 + freetype-2.2.1-enable-valid.patch freetype-2.3.0-enable-spr.patch - freetype-2.2.1-enable-valid.patch) -md5sums=('3463102764315eb86c0d3c2e1f3ffb7d' + freetype-2.4.11-enable-sph.patch) +md5sums=('c72e9010b1d986d556fc0b2b5fcbf31a' + '214119610444c9b02766ccee5e220680' '816dc8619a6904a7385769433c0a8653' - '214119610444c9b02766ccee5e220680') + '2422f8902224fedb46ae9eec08c8ceac') -build() { +prepare() { cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" + patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" + + # Disabled for now due to resistance + # Kept here for easier rebuilds via ABS + # https://bugs.archlinux.org/task/35274 + #patch -Np1 -i "${srcdir}/freetype-2.4.11-enable-sph.patch" +} + +build() { + cd "${srcdir}/freetype-${pkgver}" + + # PNG support is useless if FT_CONFIG_OPTION_USE_PNG is disabled + ./configure --prefix=/usr --disable-static \ + --without-png - ./configure --prefix=/usr make } diff --git a/extra/freetype2/freetype-2.4.11-enable-sph.patch b/extra/freetype2/freetype-2.4.11-enable-sph.patch new file mode 100644 index 000000000..34c8d63bf --- /dev/null +++ b/extra/freetype2/freetype-2.4.11-enable-sph.patch @@ -0,0 +1,13 @@ +diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h +index a73fff4..0a081bf 100644 +--- i/include/freetype/config/ftoption.h ++++ w/include/freetype/config/ftoption.h +@@ -577,7 +577,7 @@ FT_BEGIN_HEADER + /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ + /* defined. */ + /* */ +-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */ ++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING + + + /*************************************************************************/ diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 1e7fc883c..b8552eba1 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185365 2013-05-13 17:49:32Z heftig $ +# $Id: PKGBUILD 188910 2013-06-25 07:42:51Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="A text editor for GNOME" arch=(i686 x86_64 mips64el) @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1b7450cb194d4dadb7a82635d0e7f92da2b65a8487341e0410b676d9f33e19d2') +sha256sums=('dfbc2d9cf975b247c6a6b8bd1ae1b72d8e8a1f862f5f3d084a404853092cf9d3') build() { cd $pkgname-$pkgver diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD index 7d14e7a82..fb5089c9a 100644 --- a/extra/giflib/PKGBUILD +++ b/extra/giflib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187002 2013-06-03 07:04:28Z bpiotrowski $ +# $Id: PKGBUILD 189261 2013-07-01 19:08:45Z 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=2 +pkgrel=3 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2 giflib-4.2.1-quantize.patch) md5sums=('bbd3324af24156d5d7e66ab1cee8508d' - '67e46b344340ac10f4f597d772679f23') + '26174405ba886a89b8a4db18fe653a99') prepare() { cd ${pkgname}-${pkgver} diff --git a/extra/giflib/giflib-4.2.1-quantize.patch b/extra/giflib/giflib-4.2.1-quantize.patch index 197f88b77..f6745d2c0 100644 --- a/extra/giflib/giflib-4.2.1-quantize.patch +++ b/extra/giflib/giflib-4.2.1-quantize.patch @@ -1,39 +1,39 @@ -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 \ +From 7b01ed05d6c16172bd11a62d9b334f0eb7c5fc1e Mon Sep 17 00:00:00 2001 +From: "Eric S. Raymond" <esr@thyrsus.com> +Date: Sun, 3 Jun 2012 07:59:30 -0400 +Subject: [PATCH] Return QuantizeBuffer() to the core library. + +Fulfils SourceForge FR 3531618. +--- + NEWS | 2 + + lib/Makefile.am | 3 +- + lib/gif_lib.h | 9 ++ + lib/quantize.c | 309 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + util/rgb2gif.c | 302 ------------------------------------------------------ + 5 files changed, 322 insertions(+), 303 deletions(-) + create mode 100644 lib/quantize.c + +index 813a2f8..ae6d5fa 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -13,7 +13,8 @@ libgif_la_SOURCES = dgif_lib.c \ gif_hash.h \ gifalloc.c \ gif_err.c \ -+ quantize.c \ - gif_lib_private.h +- gif_lib_private.h ++ gif_lib_private.h \ ++ quantize.c - 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@ + libgif_la_LDFLAGS = -version-info @SHLIBVERSION@ $(LT_LDFLAGS) + libgif_la_LIBADD = @DEVS@ +diff --git a/lib/gif_lib.h b/lib/gif_lib.h +index e942089..73bc437 100644 +--- a/lib/gif_lib.h ++++ b/lib/gif_lib.h +@@ -207,6 +207,15 @@ int DGifGetLZCodes(GifFileType *GifFile, int *GifCode); - .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, @@ -42,37 +42,29 @@ diff -up giflib-4.2.1/lib/gif_lib.h.quantize giflib-4.2.1/lib/gif_lib.h + 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 @@ ++/****************************************************************************** + * O.K., here are the routines from GIF_LIB file GIF_ERR.C. + ******************************************************************************/ + extern int GifError(void); /* new in 2012 - ESR */ +diff --git a/lib/quantize.c b/lib/quantize.c +new file mode 100644 +index 0000000..feb1dc7 +--- /dev/null ++++ b/lib/quantize.c +@@ -0,0 +1,309 @@ +/***************************************************************************** -+ * "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. ++ * quantize.c - quantize a high resolution image into lower one ++ * ++ * Based on: "Color Image Quantization for frame buffer Display", by ++ * Paul Heckbert SIGGRAPH 1982 page 297-307. ++ * ++ * This doesn't really belong in the core library, was undocumented, ++ * and was removed in 4.2. Then it turned out some client apps were ++ * actually using it, so it was restored in 5.0. ++ * + *****************************************************************************/ + -+#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" @@ -80,20 +72,9 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c + +#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; + @@ -114,7 +95,7 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c +static int SubdivColorMap(NewColorMapType * NewColorSubdiv, + unsigned int ColorMapSize, + unsigned int *NewColorMapSize); -+static int SortCmpRtn(const VoidPtr Entry1, const VoidPtr Entry2); ++static int SortCmpRtn(const void *Entry1, const void *Entry2); + +/****************************************************************************** + * Quantize high resolution image into lower one. Input image consists of a @@ -226,10 +207,7 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c + 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 @@ -375,30 +353,327 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c + * Routine called by qsort to compare to entries. + ****************************************************************************/ +static int -+SortCmpRtn(const VoidPtr Entry1, -+ const VoidPtr Entry2) { ++SortCmpRtn(const void *Entry1, ++ const void *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."); ++ ++/* end */ +diff --git a/util/rgb2gif.c b/util/rgb2gif.c +index 56386c7..46d9654 100644 +--- a/util/rgb2gif.c ++++ b/util/rgb2gif.c +@@ -69,308 +69,6 @@ static void SaveGif(GifByteType *OutputBuffer, + static void QuitGifError(GifFileType *GifFile); -- if (QuantizeBuffer(Width, Height, &ColorMapSize, -+ if (GifQuantizeBuffer(Width, Height, &ColorMapSize, - RedBuffer, GreenBuffer, BlueBuffer, - OutputBuffer, OutputColorMap->Colors) == GIF_ERROR) - QuitGifError(NULL); + /****************************************************************************** +- * Code to quantize 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. +- *****************************************************************************/ +- +-#define ABS(x) ((x) > 0 ? (x) : (-(x))) +- +-#define COLOR_ARRAY_SIZE 32768 +-#define BITS_PER_PRIM_COLOR 5 +-#define MAX_PRIM_COLOR 0x1f +- +-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 void *Entry1, const void *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. +- ******************************************************************************/ +-static 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) { +- 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 (QuantizedColor->Pnext != NULL && +- (Sum -= QuantizedColor->Pnext->Count) >= 0 && +- 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 */ +- /* coverity[var_deref_op] */ +- 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 two entries. +- ****************************************************************************/ +-static int +-SortCmpRtn(const void *Entry1, +- const void *Entry2) { +- +- return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] - +- (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis]; +-} +-/****************************************************************************** + * Interpret the command line and scan the given GIF file. + ******************************************************************************/ + int main(int argc, char **argv) +-- +1.8.3.2 + diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 8eeac789d..d0afe870f 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188161 2013-06-10 22:30:55Z dan $ +# $Id: PKGBUILD 189217 2013-06-29 20:32:47Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.3.1 +pkgver=1.8.3.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -111,7 +111,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('35401b410e7f248b13e35a1069aca2e2' - '3f801cc82a58c2c2ceeab95975114113' +md5sums=('83b792fd06066c77e1d4911ebba2d701' + 'f850829e1e7f32e388d2ffb61759fcc9' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index 246240e89..08415356b 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178917 2013-02-28 18:49:48Z ioni $ +# $Id: PKGBUILD 189227 2013-06-30 19:58:41Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gmime -pkgver=2.6.15 +pkgver=2.6.16 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib') [ "$CARCH" != "mips64el" ] && makedepends=('gtk-sharp-2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b4c2a0b99b82063387cd750a38421ebaa0636f339e67984a84371bcb697dc99a') +sha256sums=('1093c2c9b4644d53b9c2df30042b3c4c2e9141d3e65e299030d227485d95c8af') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/gnome-alsamixer/02_change_gconf-keys_path.diff b/extra/gnome-alsamixer/02_change_gconf-keys_path.diff new file mode 100644 index 000000000..6df8bc903 --- /dev/null +++ b/extra/gnome-alsamixer/02_change_gconf-keys_path.diff @@ -0,0 +1,207 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_change_gconf-keys_path.dpatch.dpatch by Mohammed Adnène Trojette <adn+deb@diwi.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Replace path to gnome-alsamixer's gconf keys + +@DPATCH@ + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-slider.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-slider.c +@@ -481,7 +481,7 @@ + + disp_name = g_strndup (gam_slider_get_name (gam_slider), 8); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +@@ -508,7 +508,7 @@ + + priv = GAM_SLIDER_GET_PRIVATE (gam_slider); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +@@ -533,7 +533,7 @@ + + priv = GAM_SLIDER_GET_PRIVATE (gam_slider); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_sliders/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_sliders/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +@@ -557,7 +557,7 @@ + + priv = GAM_SLIDER_GET_PRIVATE (gam_slider); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_sliders/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_sliders/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-toggle.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-toggle.c +@@ -410,7 +410,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/toggle_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/toggle_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +@@ -433,7 +433,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/toggle_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/toggle_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +@@ -458,7 +458,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_toggles/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_toggles/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +@@ -482,7 +482,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_toggles/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_toggles/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-app.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-app.c +@@ -331,7 +331,7 @@ + gam_app_load_prefs (gam_app); + + /*gconf_client_notify_add (priv->gconf_client, +- "/apps/PAW/gnomealsamixer/preferences/tab_position", ++ "/apps/gnomealsamixer/preferences/tab_position", + (GConfClientNotifyFunc) pawed_app_gconf_notify_func, + pawed_app, + NULL, +@@ -351,10 +351,10 @@ + priv = GAM_APP_GET_PRIVATE (gam_app); + + width = gconf_client_get_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_width", ++ "/apps/gnome-alsamixer/geometry/main_window_width", + NULL); + height = gconf_client_get_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_height", ++ "/apps/gnome-alsamixer/geometry/main_window_height", + NULL); + + if ((height != 0) && (width != 0)) +@@ -376,11 +376,11 @@ + gdk_window_get_geometry (GDK_WINDOW (GTK_WIDGET (gam_app)->window), NULL, NULL, &width, &height, NULL); + + gconf_client_set_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_height", ++ "/apps/gnome-alsamixer/geometry/main_window_height", + height, + NULL); + gconf_client_set_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_width", ++ "/apps/gnome-alsamixer/geometry/main_window_width", + width, + NULL); + +@@ -630,7 +630,7 @@ + gint + gam_app_get_mixer_slider_style (GamApp *gam_app) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_style"; + gint style = 0; + + g_return_if_fail (GAM_IS_APP (gam_app)); +@@ -646,7 +646,7 @@ + void + gam_app_set_mixer_slider_style (GamApp *gam_app, gint style) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_style"; + + g_return_if_fail (GAM_IS_APP (gam_app)); + +@@ -661,7 +661,7 @@ + gint + gam_app_get_slider_toggle_style (GamApp *gam_app) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_toggle_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style"; + gint style = 1; + + g_return_if_fail (GAM_IS_APP (gam_app)); +@@ -677,7 +677,7 @@ + void + gam_app_set_slider_toggle_style (GamApp *gam_app, gint style) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_toggle_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style"; + + g_return_if_fail (GAM_IS_APP (gam_app)); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-slider-dual.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-slider-dual.c +@@ -446,7 +446,7 @@ + + priv = GAM_SLIDER_DUAL_GET_PRIVATE (gam_slider_dual); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_locked/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_locked/%s-%s", + gam_mixer_get_config_name (gam_slider_get_mixer (GAM_SLIDER (gam_slider_dual))), + gam_slider_get_config_name (GAM_SLIDER (gam_slider_dual))); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-mixer.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-mixer.c +@@ -478,7 +478,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_names/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_names/%s", + gam_mixer_get_config_name (gam_mixer)); + + name = gconf_client_get_string (gam_app_get_gconf_client (GAM_APP (priv->app)), +@@ -500,7 +500,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_names/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_names/%s", + gam_mixer_get_config_name (gam_mixer)); + + gconf_client_set_string (gam_app_get_gconf_client (GAM_APP (priv->app)), +@@ -526,7 +526,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_mixers/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_mixers/%s", + gam_mixer_get_config_name (gam_mixer)); + + if (gconf_client_dir_exists (gam_app_get_gconf_client (GAM_APP (priv->app)), key, NULL)) +@@ -549,7 +549,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_mixers/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_mixers/%s", + gam_mixer_get_config_name (gam_mixer)); + + gconf_client_set_bool (gam_app_get_gconf_client (GAM_APP (priv->app)), diff --git a/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff b/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff new file mode 100644 index 000000000..91630a6d3 --- /dev/null +++ b/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff @@ -0,0 +1,174 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_gnome-alsamixer.schemas.dpatch.dpatch by Mohammed Adnène Trojette <adn+deb@diwi.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Intent to guess gnome-alsamixer.schemas + +@DPATCH@ + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/gnome-alsamixer.schemas ++++ gnome-alsamixer-0.9.7.cvs20050822/gnome-alsamixer.schemas +@@ -0,0 +1,163 @@ ++<gconfschemafile> ++ <schemalist> ++ ++ <!-- Completion uris --> ++ ++ <!--schema> ++ <key>/schemas/apps/PAW/PAWed/preferences</key> ++ <applyto>/apps/PAW/PAWed/preferences</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type></type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnomealsamixer/preferences/tab_position</key> ++ <applyto>/apps/gnomealsamixer/preferences/tab_position</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>int</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema--> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/geometry/main_window_width</key> ++ <applyto>/apps/gnome-alsamixer/geometry/main_window_width</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>int</type> ++ <default>600</default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/geometry/main_window_height</key> ++ <applyto>/apps/gnome-alsamixer/geometry/main_window_height</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>int</type> ++ <default>380</default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/geometry/mixer_slider_style</key> ++ <applyto>/apps/gnome-alsamixer/geometry/mixer_slider_style</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default>false</default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style</key> ++ <applyto>/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default>true</default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <!--schema> ++ <key>/schemas/apps/gnome-alsamixer/display_names/%s</key> ++ <applyto>/apps/gnome-alsamixer/display_names/%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/display_mixers/%s</key> ++ <applyto>/apps/gnome-alsamixer/display_mixers/%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/slider_display_names/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/slider_display_names/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>string</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/display_sliders/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/display_sliders/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/slider_locked/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/slider_locked/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/toggle_display_names/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/toggle_display_names/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>string</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/display_toggles/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/display_toggles/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema--> ++ ++ ++ </schemalist> ++</gconfschemafile> diff --git a/extra/gnome-alsamixer/04_ignore-delimiters.diff b/extra/gnome-alsamixer/04_ignore-delimiters.diff new file mode 100644 index 000000000..3e00e9205 --- /dev/null +++ b/extra/gnome-alsamixer/04_ignore-delimiters.diff @@ -0,0 +1,15 @@ +# Fixes: #400667 + +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-app.h 2008-01-04 00:43:39.000000000 +0100 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.h 2008-01-04 00:44:18.000000000 +0100 +@@ -26,7 +26,7 @@ + + G_BEGIN_DECLS + +-#define GAM_CONFIG_DELIMITERS " &()+/" ++#define GAM_CONFIG_DELIMITERS " &()+/," + + #define GAM_TYPE_APP (gam_app_get_type ()) + #define GAM_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAM_TYPE_APP, GamApp)) diff --git a/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch b/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch new file mode 100644 index 000000000..0a352867b --- /dev/null +++ b/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch @@ -0,0 +1,111 @@ +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-mixer.c 2011-09-12 21:01:20.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.c 2011-09-12 21:02:41.000000000 +0200 +@@ -439,7 +439,7 @@ + NULL); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_mixer_get_mixer_name (GamMixer *gam_mixer) + { + GamMixerPrivate *priv; +@@ -451,7 +451,7 @@ + return priv->mixer_name; + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_mixer_get_config_name (GamMixer *gam_mixer) + { + GamMixerPrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-mixer.h 2011-09-12 21:01:43.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.h 2011-09-12 21:03:36.000000000 +0200 +@@ -57,8 +57,8 @@ + GType gam_mixer_get_type (void) G_GNUC_CONST; + GtkWidget *gam_mixer_new (GamApp *gam_app, + const gchar *card_id); +-G_CONST_RETURN gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer); +-G_CONST_RETURN gchar *gam_mixer_get_config_name (GamMixer *gam_mixer); ++const gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer); ++const gchar *gam_mixer_get_config_name (GamMixer *gam_mixer); + gchar *gam_mixer_get_display_name (GamMixer *gam_mixer); + void gam_mixer_set_display_name (GamMixer *gam_mixer, + const gchar *name); +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-slider.c 2011-09-12 21:01:49.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.c 2011-09-12 21:03:47.000000000 +0200 +@@ -440,7 +440,7 @@ + g_signal_emit (gam_slider, signals[REFRESH], 0); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_slider_get_name (GamSlider *gam_slider) + { + GamSliderPrivate *priv; +@@ -452,7 +452,7 @@ + return snd_mixer_selem_get_name (priv->elem); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_slider_get_config_name (GamSlider *gam_slider) + { + GamSliderPrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-slider.h 2011-09-12 21:01:28.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.h 2011-09-12 21:03:13.000000000 +0200 +@@ -58,8 +58,8 @@ + #include "gam-mixer.h" + + GType gam_slider_get_type (void) G_GNUC_CONST; +-G_CONST_RETURN gchar *gam_slider_get_name (GamSlider *gam_slider); +-G_CONST_RETURN gchar *gam_slider_get_config_name (GamSlider *gam_slider); ++const gchar *gam_slider_get_name (GamSlider *gam_slider); ++const gchar *gam_slider_get_config_name (GamSlider *gam_slider); + gchar *gam_slider_get_display_name (GamSlider *gam_slider); + void gam_slider_set_display_name (GamSlider *gam_slider, + const gchar *name); +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-toggle.c 2011-09-12 21:01:36.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.c 2011-09-12 21:03:26.000000000 +0200 +@@ -371,7 +371,7 @@ + internal_state); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_toggle_get_name (GamToggle *gam_toggle) + { + GamTogglePrivate *priv; +@@ -383,7 +383,7 @@ + return snd_mixer_selem_get_name (priv->elem); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_toggle_get_config_name (GamToggle *gam_toggle) + { + GamTogglePrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-toggle.h 2011-09-12 21:01:55.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.h 2011-09-12 21:04:00.000000000 +0200 +@@ -55,8 +55,8 @@ + gboolean gam_toggle_get_state (GamToggle *gam_toggle); + void gam_toggle_set_state (GamToggle *gam_toggle, + gboolean state); +-G_CONST_RETURN gchar *gam_toggle_get_name (GamToggle *gam_toggle); +-G_CONST_RETURN gchar *gam_toggle_get_config_name (GamToggle *gam_toggle); ++const gchar *gam_toggle_get_name (GamToggle *gam_toggle); ++const gchar *gam_toggle_get_config_name (GamToggle *gam_toggle); + gchar *gam_toggle_get_display_name (GamToggle *gam_toggle); + void gam_toggle_set_display_name (GamToggle *gam_toggle, + const gchar *name); diff --git a/extra/gnome-alsamixer/06-use-libgnome-headers.patch b/extra/gnome-alsamixer/06-use-libgnome-headers.patch new file mode 100644 index 000000000..5c431f02b --- /dev/null +++ b/extra/gnome-alsamixer/06-use-libgnome-headers.patch @@ -0,0 +1,26 @@ +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-main.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-main.c 2005-07-06 17:14:57.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-main.c 2011-10-26 02:47:47.000000000 +0200 +@@ -22,7 +22,7 @@ + #include <config.h> + #endif + +-#include <gnome.h> ++#include <libgnomeui/gnome-ui-init.h> + #include <glib/gi18n.h> + + #include "gam-app.h" +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-app.c 2011-10-26 02:47:21.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.c 2011-10-26 02:47:21.000000000 +0200 +@@ -27,7 +27,7 @@ + #include <gtk/gtkmenuitem.h> + #include <glib/gi18n.h> + #include <libgnomeui/gnome-about.h> +-#include <libgnomeui/gnome-app-helper.h> ++/*#include <libgnomeui/gnome-app-helper.h>*/ + #include <libgnomeui/gnome-stock-icons.h> + + #include "gam-app.h" diff --git a/extra/gnome-alsamixer/PKGBUILD b/extra/gnome-alsamixer/PKGBUILD index b36e9d567..5afe3f74b 100644 --- a/extra/gnome-alsamixer/PKGBUILD +++ b/extra/gnome-alsamixer/PKGBUILD @@ -1,33 +1,50 @@ -# $Id: PKGBUILD 136003 2011-08-21 09:18:58Z eric $ +# $Id: PKGBUILD 189332 2013-07-03 05:25:03Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gnome-alsamixer -pkgver=0.9.6 -pkgrel=4 +pkgver=0.9.7 +pkgrel=1 pkgdesc="Gnome ALSA mixer" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/gnome-alsamixer" license=('GPL') depends=('libgnomeui') -source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz - gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop) -md5sums=('387623cfeb079d78325eed2d6bc94251' - '82b95a0df43429da5098b4da883f6bd0' - 'c7dbc44207bede96e4fafc24a7c7beb3') -sha1sums=('faece601a4329d2b01b9efe65200021538fc066d' - 'b4e3b871676025600170ba54f59db4977b853c08' +options=('!emptydirs') +install=gnome-alsamixer.install +source=(https://launchpad.net/ubuntu/+archive/primary/+files/gnome-alsamixer_0.9.7~cvs.20060916.ds.1.orig.tar.gz + 02_change_gconf-keys_path.diff 03_gnome-alsamixer.schemas.diff 04_ignore-delimiters.diff + 05-remove-G_CONST_RETURN.patch 06-use-libgnome-headers.patch gnome-alsamixer.desktop) +sha1sums=('98e716cd14fe46cb9c77034de7558ef113da26f5' + 'ee7743abfc8d6005be6fcb0fb47b45e636db5fdc' + '6b3148bab4ed53bc9a0a123b33585cd81b138225' + 'd4a7f9a5868c5af52f9b3c7a146ae34ddc45adf7' + '6b19224d0346cf53b864333b191fa99fc8e7ebdc' + '2731a7ef249aac51eeab1717c645c995780f36a7' '31639f7932d088ca76a18c79839682be811f23d0') +prepare() { + cd ${pkgname}-${pkgver}~cvs.20060916 + patch -Np1 -i ../02_change_gconf-keys_path.diff + patch -Np1 -i ../03_gnome-alsamixer.schemas.diff + patch -Np1 -i ../04_ignore-delimiters.diff + patch -Np1 -i ../05-remove-G_CONST_RETURN.patch + patch -Np1 -i ../06-use-libgnome-headers.patch + + ln -sf /usr/share/automake-*/mkinstalldirs mkinstalldirs +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var LIBS=-lm - make + cd ${pkgname}-${pkgver}~cvs.20060916 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make MSGFMT_OPTS="-c" LIBS+="-lm" } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \ - "${pkgdir}/usr/share/applications/gnome-alsamixer.desktop" + cd ${pkgname}-${pkgver}~cvs.20060916 + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/gnome-alsamixer.desktop" "${pkgdir}/usr/share/applications/gnome-alsamixer.desktop" + + install -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch b/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch deleted file mode 100644 index 9e5f4eeb1..000000000 --- a/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur gnome-alsamixer-0.9.6/src/Makefile.in gnome-alsamixer-0.9.6.new/src/Makefile.in ---- gnome-alsamixer-0.9.6/src/Makefile.in 2003-09-09 12:44:25.000000000 +0100 -+++ gnome-alsamixer-0.9.6.new/src/Makefile.in 2004-04-04 18:51:36.000000000 +0100 -@@ -86,10 +86,6 @@ - -DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\" \ - -DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\" \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -- -DG_DISABLE_DEPRECATED \ -- -DGDK_DISABLE_DEPRECATED \ -- -DGTK_DISABLE_DEPRECATED \ -- -DGNOME_DISABLE_DEPRECATED \ - @PACKAGE_CFLAGS@ - - -Only in gnome-alsamixer-0.9.6.new/src: Makefile.in~ diff --git a/extra/gnome-alsamixer/gnome-alsamixer.install b/extra/gnome-alsamixer/gnome-alsamixer.install new file mode 100644 index 000000000..2787d5675 --- /dev/null +++ b/extra/gnome-alsamixer/gnome-alsamixer.install @@ -0,0 +1,19 @@ +pkgname=gnome-alsamixer + +post_install() { + gconfpkg --install ${pkgname} +} + +pre_upgrade() { + if [[ "$(vercmp $2 0.9.7)" -gt 0 ]]; then + pre_remove $1 + fi +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall ${pkgname} +} diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 35b067508..a9d5b9820 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187902 2013-06-07 22:40:58Z heftig $ +# $Id: PKGBUILD 189242 2013-07-01 09:11:00Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell pkgver=3.8.3 -pkgrel=1 +pkgrel=3 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64 mips64el) url="http://live.gnome.org/GnomeShell" @@ -19,15 +19,20 @@ 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) + nm-libexecdir.patch + git-fixes.patch) sha256sums=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607' + '3e08176d55c000eb88660349a4325e8134f4def66ef83efc7f45f0fb34a06e1c') prepare() { cd $pkgname-$pkgver # FS#30747 FS#32730 Problems due to libexecdir different from NM patch -Np1 -i ../nm-libexecdir.patch + + # Git fixes - up to 60225ef86d070a7999bd6cded43837ca87d3f24f + patch -Np1 -i ../git-fixes.patch } build() { diff --git a/extra/gnome-shell/git-fixes.patch b/extra/gnome-shell/git-fixes.patch new file mode 100644 index 000000000..989c881f0 --- /dev/null +++ b/extra/gnome-shell/git-fixes.patch @@ -0,0 +1,125 @@ +diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css +index 775b687..f4ea781 100644 +--- a/data/theme/gnome-shell.css ++++ b/data/theme/gnome-shell.css +@@ -2312,6 +2312,7 @@ StScrollBar StButton#vhandle:active { + font-weight: bold; + color: #666666; + padding-top: 1em; ++ padding-left: 2px; + } + + .login-dialog-not-listed-button:focus .login-dialog-not-listed-label, +diff --git a/js/gdm/util.js b/js/gdm/util.js +index 6075e66..cae3e1b 100644 +--- a/js/gdm/util.js ++++ b/js/gdm/util.js +@@ -164,6 +164,7 @@ const ShellUserVerifier = new Lang.Class({ + + answerQuery: function(serviceName, answer) { + if (!this._userVerifier.hasPendingMessages) { ++ this._clearMessageQueue(); + this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null); + } else { + let signalId = this._userVerifier.connect('no-more-messages', +diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js +index b07ea95..72bc010 100644 +--- a/js/ui/components/telepathyClient.js ++++ b/js/ui/components/telepathyClient.js +@@ -18,7 +18,7 @@ const Params = imports.misc.params; + const PopupMenu = imports.ui.popupMenu; + + // See Notification.appendMessage +-const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute ++const SCROLLBACK_IMMEDIATE_TIME = 3 * 60; // 3 minutes + const SCROLLBACK_RECENT_TIME = 15 * 60; // 15 minutes + const SCROLLBACK_RECENT_LENGTH = 20; + const SCROLLBACK_IDLE_LENGTH = 5; +@@ -967,7 +967,8 @@ const ChatNotification = new Lang.Class({ + let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate), + group: 'meta', + styles: ['chat-meta-message'], +- childProps: { expand: true, x_fill: false }, ++ childProps: { expand: true, x_fill: false, ++ x_align: St.Align.END }, + noTimestamp: true, + timestamp: lastMessageTime }); + +diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js +index d322581..ed61bf7 100644 +--- a/js/ui/endSessionDialog.js ++++ b/js/ui/endSessionDialog.js +@@ -420,6 +420,7 @@ const EndSessionDialog = new Lang.Class({ + _startTimer: function() { + let startTime = GLib.get_monotonic_time(); + this._secondsLeft = this._totalSecondsToStayOpen; ++ this._updateDescription(); + + this._timerId = Mainloop.timeout_add_seconds(1, Lang.bind(this, + function() { +diff --git a/js/ui/layout.js b/js/ui/layout.js +index 0bb887e..e25b3bd 100644 +--- a/js/ui/layout.js ++++ b/js/ui/layout.js +@@ -728,6 +728,8 @@ const LayoutManager = new Lang.Class({ + // and shown otherwise) + addChrome: function(actor, params) { + this.uiGroup.add_actor(actor); ++ if (this.uiGroup.contains(global.top_window_group)) ++ this.uiGroup.set_child_below_sibling(actor, global.top_window_group); + this._trackActor(actor, params); + }, + +diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js +index 7e7b536..7fa052e 100644 +--- a/js/ui/osdWindow.js ++++ b/js/ui/osdWindow.js +@@ -167,14 +167,17 @@ const OsdWindow = new Lang.Class({ + { opacity: 0, + time: FADE_TIME, + transition: 'easeOutQuad', +- onComplete: Lang.bind(this, this._reset) }); ++ onComplete: Lang.bind(this, function() { ++ this._reset(); ++ Meta.enable_unredirect_for_screen(global.screen); ++ }) ++ }); + }, + + _reset: function() { + this.actor.hide(); + this.setLabel(null); + this.setLevel(null); +- Meta.enable_unredirect_for_screen(global.screen); + }, + + _monitorsChanged: function() { +diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js +index fe9cd31..4264f01 100644 +--- a/js/ui/screenShield.js ++++ b/js/ui/screenShield.js +@@ -709,6 +709,8 @@ const ScreenShield = new Lang.Class({ + }, + + _onDragEnd: function(action, actor, eventX, eventY, modifiers) { ++ if (this._lockScreenState != MessageTray.State.HIDING) ++ return; + if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) { + // Complete motion automatically + let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0); +diff --git a/src/st/st-widget.c b/src/st/st-widget.c +index 42992ec..4875acc 100644 +--- a/src/st/st-widget.c ++++ b/src/st/st-widget.c +@@ -608,8 +608,9 @@ st_widget_get_theme_node (StWidget *widget) + + if (stage == NULL) + { +- g_error ("st_widget_get_theme_node called on the widget %s which is not in the stage.", +- st_describe_actor (CLUTTER_ACTOR (widget))); ++ g_critical ("st_widget_get_theme_node called on the widget %s which is not in the stage.", ++ st_describe_actor (CLUTTER_ACTOR (widget))); ++ return g_object_new (ST_TYPE_THEME_NODE, NULL); + } + + if (parent_node == NULL) diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 52c40c691..40b638520 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 186380 2013-05-26 09:24:31Z bluewind $ +# $Id: PKGBUILD 188945 2013-06-26 11:13:30Z foutrelis $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.12.2 -pkgrel=2 +pkgver=1.12.3 +pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/gnumeric/" license=('GPL') depends=('goffice' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils' - 'gobject-introspection' 'optipng') + 'gobject-introspection') optdepends=('python2-gobject: for python plugin support' 'perl: for perl plugin support' 'psiconv: for Psion 5 file support' @@ -19,27 +19,19 @@ optdepends=('python2-gobject: for python plugin support' install=gnumeric.install options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz - gnumeric-1.12.1-automake-1.13.patch revert-warnings.patch) -sha256sums=('d6fda191c1c76be2ede21fe78b8c9f96d39aea82ccfb537775a83bf88d781874' - '1eb57b931023d961e9d0f3675fe96b5559270fa38c97401cb06fc7aed9c8e275' +sha256sums=('b332e6785077a2e7febf26a6ccac73e9ae1813c365bc3bf851fb27a5477713a6' 'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../gnumeric-1.12.1-automake-1.13.patch patch -Np0 -i ../revert-warnings.patch # Remove invalid mime type. (FS#26338) sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in autoreconf -fi - - # Fix invalid PNG images to work with libpng 1.6 - # https://bugzilla.gnome.org/show_bug.cgi?id=699683 - # XXX: PNGs have been fixed upsteam; remove when gnumeric 1.12.3 is out - find -name '*.png' -exec optipng -quiet -force -fix {} + } build() { diff --git a/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch b/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch deleted file mode 100644 index 1ae1fb955..000000000 --- a/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff -up gnumeric-1.12.0/test/Makefile.am.automake-1_13 gnumeric-1.12.0/test/Makefile.am ---- gnumeric-1.12.0/test/Makefile.am.automake-1_13 2011-05-18 02:54:24.000000000 +0200 -+++ gnumeric-1.12.0/test/Makefile.am 2013-01-05 18:25:56.380686587 +0100 -@@ -25,7 +25,99 @@ - # - # 90xx: Misc stuff. - --TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl)) -+TESTS = \ -+t1000-statfuns.pl \ -+t1001-mathfuns.pl \ -+t1002-finfuns.pl \ -+t1003-engfuns.pl \ -+t1004-textfuns.pl \ -+t1005-logfuns.pl \ -+t1006-datefuns.pl \ -+t1007-dbfuns.pl \ -+t1008-infofuns.pl \ -+t1009-lookfuns.pl \ -+t1010-bitwise.pl \ -+t1011-yalta2008.pl \ -+t1100-chitest.pl \ -+t1101-ftest.pl \ -+t1102-ttest.pl \ -+t1103-sumif.pl \ -+t1104-linest.pl \ -+t1800-operators.pl \ -+t1900-array.pl \ -+t1901-regress.pl \ -+t1902-array-intersection.pl \ -+t2000-names-insdel.pl \ -+t2001-func-help.pl \ -+t2002-nonascii-numbers.pl \ -+t2003-random-generators.pl \ -+t2800-style-optimizer.pl \ -+t5900-sc.pl \ -+t5901-qpro.pl \ -+t5902-applix.pl \ -+t5903-sylk.pl \ -+t5904-mps.pl \ -+t6000-statfuns.pl \ -+t6001-mathfuns.pl \ -+t6002-objs.pl \ -+t6003-lookfuns.pl \ -+t6004-chart-tests.pl \ -+t6004-finfuns.pl \ -+t6100-statfuns-ods.pl \ -+t6101-mathfuns-ods.pl \ -+t6102-objs-ods.pl \ -+t6103-lookfuns-ods.pl \ -+t6104-finfuns-ods.pl \ -+t7000-goal-seek.pl \ -+t7100-solver-blend.pl \ -+t7101-solver-afiro.pl \ -+t7110-solver-Misra1a.pl \ -+t7111-solver-Chwirut2.pl \ -+t7112-solver-Chwirut1.pl \ -+t7113-solver-Lanczos3.pl \ -+t7114-solver-Gauss1.pl \ -+t7115-solver-Gauss2.pl \ -+t7116-solver-DanWood.pl \ -+t7117-solver-Misra1b.pl \ -+t7120-solver-Kirby2.pl \ -+t7121-solver-Hahn1.pl \ -+t7122-solver-Nelson.pl \ -+t7123-solver-MGH17.pl \ -+t7124-solver-Lanczos1.pl \ -+t7125-solver-Lanczos2.pl \ -+t7126-solver-Gauss3.pl \ -+t7127-solver-Misra1c.pl \ -+t7128-solver-Misra1d.pl \ -+t7129-solver-Roszman1.pl \ -+t7130-solver-ENSO.pl \ -+t7140-solver-MGH09.pl \ -+t7141-solver-Thurber.pl \ -+t7142-solver-BoxBOD.pl \ -+t7143-solver-Rat42.pl \ -+t7144-solver-MGH10.pl \ -+t7145-solver-Eckerle4.pl \ -+t7146-solver-Rat43.pl \ -+t7147-solver-Bennett5.pl \ -+t8000-valgrind.pl \ -+t8001-valgrind-xls.pl \ -+t8002-valgrind-gnumeric.pl \ -+t8003-valgrind-pdf.pl \ -+t8004-valgrind-xls-macro.pl \ -+t8005-valgrind-chart-fit.pl \ -+t8050-valgrind-sstest.pl \ -+t8100-null-false.pl \ -+t8101-gfree.pl \ -+t8102-glade-visible.pl \ -+t8103-gtk.pl \ -+t8104-glade-parsing.pl \ -+t8200-gslice1.pl \ -+t8201-gslice2.pl \ -+t8202-gslice3.pl \ -+t9000-ssindex.pl \ -+t9100-number-match.pl \ -+t9999-epilogue.pl -+ -+ - SUPPS = common.supp gui.supp t8003-valgrind-pdf.supp - - import-db: diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index 644bd459e..33cf7a38b 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183875 2013-04-29 09:27:35Z jgc $ +# $Id: PKGBUILD 188943 2013-06-26 11:06:57Z foutrelis $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=goffice -pkgver=0.10.2 +pkgver=0.10.3 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ options=('!libtool') makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') depends=('librsvg' 'gtk3' 'libgsf' 'libspectre') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7d38769a7af655c0f0373738c786318734400d71b6bbc8d1ce6b6de99bb95674') +sha256sums=('1fd0048b25f7687eede9b0a8d712922113995db74a095bf43ad150d01b236bf2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gtkmm/PKGBUILD b/extra/gtkmm/PKGBUILD index c9c4b3225..be91b660a 100644 --- a/extra/gtkmm/PKGBUILD +++ b/extra/gtkmm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 185348 2013-05-13 15:46:57Z jgc $ +# $Id: PKGBUILD 189082 2013-06-28 13:55:25Z lcarlier $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtkmm pkgname=('gtkmm' 'gtkmm-docs') -pkgver=2.24.3 +pkgver=2.24.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs') license=('LGPL') options=('!libtool' '!emptydirs') -url="http://gtkmm.sourceforge.net/" +url="http://www.gtkmm.org/" source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('c564a438677174b97d69dd70467cb03c933481006398dc9377417aa6abe02a39') +sha256sums=('443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 384f2d116..6c06f1cb0 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 188470 2013-06-14 19:24:13Z heftig $ +# $Id: PKGBUILD 189282 2013-07-02 08:23:35Z jgc $ # 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.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') 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=('02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345b73ac8d6f87bb91189c8e49') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz + imobiledevice-1.1.5.patch) +sha256sums=('02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345b73ac8d6f87bb91189c8e49' + '3faf3027ef40c5cea3f01cb9d37e4cf848ed2ecfe6cde3b7bf86087da4a2d2e1') + +prepare() { + cd $pkgbase-$pkgver + patch -Np1 -i ../imobiledevice-1.1.5.patch +} build() { cd "$pkgbase-$pkgver" + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gvfs \ diff --git a/extra/gvfs/imobiledevice-1.1.5.patch b/extra/gvfs/imobiledevice-1.1.5.patch new file mode 100644 index 000000000..00e9358dc --- /dev/null +++ b/extra/gvfs/imobiledevice-1.1.5.patch @@ -0,0 +1,221 @@ +From d71c6108901460842de25012d5ece727a0c70d27 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy <oholy@redhat.com> +Date: Tue, 11 Jun 2013 11:33:23 +0000 +Subject: afc: Update to libimobiledevice new api + +https://bugzilla.redhat.com/show_bug.cgi?id=951731 +https://bugzilla.gnome.org/show_bug.cgi?id=702577 +--- +diff --git a/configure.ac b/configure.ac +index 12dbdcd..2846d82 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -372,14 +372,11 @@ AFC_LIBS= + AFC_CFLAGS= + + if test "x$enable_afc" != "xno" ; then +- PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.0 libplist >= 0.15, msg_afc=yes) ++ PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.5 libplist >= 0.15, msg_afc=yes) + + if test "x$msg_afc" = "xyes"; then + PKG_CHECK_MODULES(AFC, libimobiledevice-1.0 libplist) + AC_DEFINE(HAVE_AFC, 1, [Define to 1 if AFC is going to be built]) +- PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.2, +- [AC_DEFINE(HAVE_LIBIMOBILEDEVICE_1_1_2, 1, +- [Define to 1 if libimobiledevice-1.1.2 found])]) + fi + fi + +diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c +index ab4a9ce..6b0b64f 100644 +--- a/daemon/gvfsbackendafc.c ++++ b/daemon/gvfsbackendafc.c +@@ -349,12 +349,7 @@ _idevice_event_cb (const idevice_event_t *event, void *user_data) + if (event->event != IDEVICE_DEVICE_REMOVE) + return; + +-#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2 + event_udid = event->udid; +-#else +- event_udid = event->uuid; +-#endif +- + if (g_str_equal (event_udid, afc_backend->uuid) == FALSE) + return; + +@@ -401,7 +396,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend, + const char *str; + char *tmp; + char *display_name = NULL; +- guint16 port; ++ lockdownd_service_descriptor_t lockdown_service = NULL; + int virtual_port; + GMountSpec *real_spec; + GVfsBackendAfc *self; +@@ -414,6 +409,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend, + char **dcim_afcinfo; + plist_t value; + lockdownd_error_t lerr; ++ afc_error_t aerr; + const gchar *choices[] = {_("Try again"), _("Cancel"), NULL}; /* keep in sync with the enum above */ + gboolean aborted = FALSE; + gchar *message = NULL; +@@ -649,41 +645,38 @@ g_vfs_backend_afc_mount (GVfsBackend *backend, + + switch (self->mode) { + case ACCESS_MODE_AFC: +- lerr = lockdownd_start_service (lockdown_cli, self->service, &port); ++ lerr = lockdownd_start_service (lockdown_cli, self->service, &lockdown_service); + if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job)))) + { + goto out_destroy_lockdown; + } +- if (G_UNLIKELY(g_vfs_backend_afc_check (afc_client_new (self->dev, +- port, &self->afc_cli), +- G_VFS_JOB(job)))) ++ aerr = afc_client_new (self->dev, lockdown_service, &self->afc_cli); ++ if (G_UNLIKELY(g_vfs_backend_afc_check (aerr, G_VFS_JOB(job)))) + { + goto out_destroy_lockdown; + } + break; + case ACCESS_MODE_HOUSE_ARREST: +- lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &port); ++ lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &lockdown_service); + if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job)))) + { + g_warning ("couldn't start inst proxy"); + goto out_destroy_lockdown; + } +- if (G_UNLIKELY(g_vfs_backend_inst_check (instproxy_client_new (self->dev, +- port, &self->inst), +- G_VFS_JOB(job)))) ++ aerr = instproxy_client_new (self->dev, lockdown_service, &self->inst); ++ if (G_UNLIKELY(g_vfs_backend_inst_check (aerr, G_VFS_JOB(job)))) + { + g_warning ("couldn't create inst proxy instance"); + goto out_destroy_lockdown; + } +- lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &port); ++ lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &lockdown_service); + if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job)))) + { + g_warning ("couldn't start SBServices proxy"); + goto out_destroy_lockdown; + } +- if (G_UNLIKELY(g_vfs_backend_sbs_check (sbservices_client_new (self->dev, +- port, &self->sbs), +- G_VFS_JOB(job)))) ++ aerr = sbservices_client_new (self->dev, lockdown_service, &self->sbs); ++ if (G_UNLIKELY(g_vfs_backend_sbs_check (aerr, G_VFS_JOB(job)))) + { + g_warning ("couldn't create SBServices proxy instance"); + goto out_destroy_lockdown; +@@ -705,6 +698,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend, + + /* lockdown connection is not needed anymore */ + lockdownd_client_free (lockdown_cli); ++ lockdownd_service_descriptor_free (lockdown_service); + + /* Add camera item if necessary */ + if (self->mode == ACCESS_MODE_AFC) +@@ -723,6 +717,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend, + + out_destroy_lockdown: + lockdownd_client_free (lockdown_cli); ++ lockdownd_service_descriptor_free (lockdown_service); + + out_destroy_dev: + idevice_free (self->dev); +@@ -794,10 +789,11 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self, + { + AppInfo *info; + lockdownd_client_t lockdown_cli; +- guint16 port; ++ lockdownd_service_descriptor_t lockdown_service = NULL; + house_arrest_client_t house_arrest; + afc_client_t afc; + plist_t dict, error; ++ lockdownd_error_t lerr; + + info = g_hash_table_lookup (self->apps, id); + +@@ -812,7 +808,8 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self, + g_warning ("Failed to get a lockdown to start house arrest for app %s", info->id); + return; + } +- if (lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS) ++ lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service); ++ if (lerr != LOCKDOWN_E_SUCCESS) + { + lockdownd_client_free (lockdown_cli); + g_warning ("Failed to start house arrest for app %s", info->id); +@@ -820,14 +817,17 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self, + } + + house_arrest = NULL; +- house_arrest_client_new (self->dev, port, &house_arrest); ++ house_arrest_client_new (self->dev, lockdown_service, &house_arrest); + if (house_arrest == NULL) + { + g_warning ("Failed to start house arrest for app %s", info->id); + lockdownd_client_free (lockdown_cli); ++ lockdownd_service_descriptor_free (lockdown_service); + return; + } + ++ lockdownd_service_descriptor_free (lockdown_service); ++ + dict = NULL; + if (house_arrest_send_command (house_arrest, "VendContainer", info->id) != HOUSE_ARREST_E_SUCCESS || + house_arrest_get_result (house_arrest, &dict) != HOUSE_ARREST_E_SUCCESS) +diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c +index 9829077..b7284b0 100644 +--- a/monitor/afc/afcvolume.c ++++ b/monitor/afc/afcvolume.c +@@ -80,6 +80,8 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self) + guint retries; + plist_t value; + char *model, *display_name; ++ lockdownd_service_descriptor_t lockdown_service = NULL; ++ lockdownd_error_t lerr; + + retries = 0; + do { +@@ -94,14 +96,14 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self) + + if (self->service != NULL) + { +- guint16 port; +- + if (lockdownd_client_new_with_handshake (dev, &lockdown_cli, "gvfs-afc-volume-monitor") != LOCKDOWN_E_SUCCESS) + { + idevice_free (dev); + return 0; + } +- if (lockdownd_start_service(lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS) ++ lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service); ++ lockdownd_service_descriptor_free (lockdown_service); ++ if (lerr != LOCKDOWN_E_SUCCESS) + { + idevice_free (dev); + return 0; +diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c +index 3545bdf..995ef4d 100644 +--- a/monitor/afc/afcvolumemonitor.c ++++ b/monitor/afc/afcvolumemonitor.c +@@ -89,12 +89,7 @@ g_vfs_afc_monitor_idevice_event (const idevice_event_t *event, void *user_data) + + self = G_VFS_AFC_VOLUME_MONITOR(user_data); + +-#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2 + event_udid = event->udid; +-#else +- event_udid = event->uuid; +-#endif +- + if (event->event == IDEVICE_DEVICE_ADD) + g_vfs_afc_monitor_create_volume (self, event_udid); + else +-- +cgit v0.9.2 diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 252085b35..0eba76bc6 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187911 2013-06-08 05:14:18Z eric $ +# $Id: PKGBUILD 188981 2013-06-27 18:52:49Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.5.10 +pkgver=6.8.6.2 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=('ae47754c676df262956d1c740cf4ff297dfda71b' +sha1sums=('58b09b94a59457a7c82a4db9cc29e9a5718129a2' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD index 543f99e93..985d1b765 100644 --- a/extra/intel-tbb/PKGBUILD +++ b/extra/intel-tbb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186302 2013-05-24 12:22:34Z stephane $ +# $Id: PKGBUILD 188979 2013-06-27 17:08:09Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Denis Martinez <deuns.martinez AT gmail.com> pkgname=intel-tbb -pkgver=4.1_20130314 +pkgver=4.1_20130613 pkgrel=1 pkgdesc='High level abstract threading library' arch=('i686' 'x86_64' 'mips64el') @@ -12,16 +12,16 @@ url='http://www.threadingbuildingblocks.org/' license=('GPL') depends=('gcc-libs') source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz") -sha1sums=('e2bf74c1e492b06faf3ecdf2321e64ca698c0921') +sha1sums=('b1322bd10c5b05a79f61edb236adc0513b4a1532') build() { - cd "${srcdir}"/tbb${pkgver/\./}oss + cd tbb${pkgver/\./}oss make } package() { - cd "${srcdir}"/tbb${pkgver/\./}oss + cd tbb${pkgver/\./}oss install -d "${pkgdir}"/usr/lib install -m755 build/linux_*/*.so* "${pkgdir}"/usr/lib diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index e0ef39ff2..838f0e9ec 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187927 2013-06-08 07:59:05Z andrea $ +# $Id: PKGBUILD 189490 2013-07-03 17:00:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.10.4 +pkgver=4.10.5 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=('a339ad9eeff20ba384a03d2dff5b4d3622f9e17d') +sha1sums=('6f0a7593ac5f7a4daf231bc403a78a658aae2db2') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index 5c8839f2f..8becbc971 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187954 2013-06-08 07:59:34Z andrea $ +# $Id: PKGBUILD 189517 2013-07-03 17:01:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.10.4 +pkgver=4.10.5 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=('3a4d718251fb8f5e66c127028dbca99607eb4b66') +sha1sums=('59d2e627b71e6ffe5c3f1f54a680522a114b74bc') build() { mkdir build diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index 3dcdb3506..b8f015c64 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187955 2013-06-08 07:59:35Z andrea $ +# $Id: PKGBUILD 189518 2013-07-03 17:01:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.10.4 +pkgver=4.10.5 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=('c7e6946120b34e6a5963f103430da1d3ca812ca8') +sha1sums=('b56172555573162636937587436ee30091a16f6f') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index ce6110987..de94250b5 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187956 2013-06-08 07:59:36Z andrea $ +# $Id: PKGBUILD 189519 2013-07-03 17:01:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.10.4 +pkgver=4.10.5 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=('68e9ec4b646db7b7711a08ecf62e1011be60024e') +sha1sums=('0054927193647296448329bbdce1438e62fc57da') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index 2787ba36d..8faa0eb2c 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187957 2013-06-08 07:59:37Z andrea $ +# $Id: PKGBUILD 189520 2013-07-03 17:01:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.10.4 +pkgver=4.10.5 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=('e3e635780254a2ac9ce94c5c1f21bfabc4b59121') +sha1sums=('ec4aac22da5499a484bd3b45a78c4a10b8ae4632') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index 89402afcf..b6b17d649 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187958 2013-06-08 07:59:38Z andrea $ +# $Id: PKGBUILD 189521 2013-07-03 17:01:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.10.4 +pkgver=4.10.5 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=('3236b2fcb79f95a1eb44928a2cd286243f0b128c') +sha1sums=('267079c968a59fd878eaff3e2986cfe82426513b') build() { cd "${srcdir}" diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index eb9b6cf89..9e224d891 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187959 2013-06-08 07:59:40Z andrea $ +# $Id: PKGBUILD 189522 2013-07-03 17:01:18Z 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.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') @@ -14,7 +14,7 @@ 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=('422b9cd97d40191080ee4a121fda24fb19759216' +sha1sums=('0b809772effe249d1ec581902fcecb73e7761134' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') prepare() { @@ -39,7 +39,7 @@ package_kdeadmin-kcron() { depends=('kdelibs') cd $srcdir/build/kcron make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kcron + cd $srcdir/build/kcron/doc make DESTDIR=$pkgdir install } @@ -49,7 +49,7 @@ package_kdeadmin-ksystemlog() { url="http://kde.org/applications/system/ksystemlog/" cd $srcdir/build/ksystemlog make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksystemlog + cd $srcdir/build/ksystemlog/doc make DESTDIR=$pkgdir install } @@ -60,6 +60,6 @@ package_kdeadmin-kuser() { install='kdeadmin.install' cd $srcdir/build/kuser make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kuser + cd $srcdir/build/kuser/doc make DESTDIR=$pkgdir install } diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index 7f36675eb..5fca4b83b 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187960 2013-06-08 07:59:41Z andrea $ +# $Id: PKGBUILD 189523 2013-07-03 17:01:19Z 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.4 +pkgver=4.10.5 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=('b41e00708a595f4ee310a69c7326a6f956e8c6e2') +sha1sums=('a6f9244b473ec01174ba85f9375438050be76daf') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index 11c370600..1d5cc2275 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187961 2013-06-08 07:59:42Z andrea $ +# $Id: PKGBUILD 189524 2013-07-03 17:01:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.10.4 +pkgver=4.10.5 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=('8fdc5965837f104ddc9923e97bb1499f6293c833') +sha1sums=('f6c08b19e2154dab6a7e86255ec254d79e305993') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 2bf2aafab..30cf83faa 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187940 2013-06-08 07:59:19Z andrea $ +# $Id: PKGBUILD 189503 2013-07-03 17:00:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') @@ -26,8 +26,9 @@ install="${pkgname}.install" 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=('9f3f4f63e6fe409eb2293ee361b481198fb852b5' + 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'fix-plasma-memory-leak.patch') +sha1sums=('d4986c1b4e3232f74a6348116908a13aee073a93' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' @@ -35,7 +36,8 @@ sha1sums=('9f3f4f63e6fe409eb2293ee361b481198fb852b5' 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' 'c079ebd157c836ba996190f0d2bcea1a7828d02c' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') + 'd509dac592bd8b310df27991b208c95b6d907514' + 'e453545568d20165f80b97dd270b5adc731d5f21') prepare() { cd ${_pkgname}-${pkgver} @@ -47,6 +49,9 @@ prepare() { # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch + + # KDEBUG#314919 + patch -p1 -i "${srcdir}"/fix-plasma-memory-leak.patch } build() { diff --git a/extra/kdebase-workspace/fix-plasma-memory-leak.patch b/extra/kdebase-workspace/fix-plasma-memory-leak.patch new file mode 100644 index 000000000..78ced11b7 --- /dev/null +++ b/extra/kdebase-workspace/fix-plasma-memory-leak.patch @@ -0,0 +1,53 @@ +commit ec8e405ca447ba5bc5a9f6a2a12e2fa90412a0d4 +Author: Andreas Hartmetz <ahartmetz@gmail.com> +Date: Tue Jul 2 18:35:35 2013 +0200 + + Fix pixmap leak when the tray icon changes (e.g. when it's animated). + + This could easily leak 4KB/second of X pixmap memory. + All the actual difference comes from the QPixmap::ExplicitlyShared + argument, the rest is making some wonky-looking but working code look + less wonky. + + BUG: 314919 + +diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp +index 1826512..a5bc826 100644 +--- a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp ++++ b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp +@@ -194,8 +194,7 @@ void X11EmbedContainer::paintEvent(QPaintEvent *event) + + // Taking a detour via a QPixmap is unfortunately the only way we can get + // the window contents into Qt's backing store. +- QPixmap pixmap(size()); +- pixmap = toX11Pixmap(pixmap); ++ QPixmap pixmap = toX11Pixmap(QPixmap(size())); + pixmap.fill(Qt::transparent); + XRenderComposite(x11Info().display(), PictOpSrc, d->picture, None, pixmap.x11PictureHandle(), + 0, 0, 0, 0, 0, 0, width(), height()); +@@ -232,16 +231,18 @@ void X11EmbedContainer::setBackgroundPixmap(QPixmap background) + // NOTE: The alpha-channel is not preserved if it exists, but for X pixmaps it generally should not be needed anyway. + QPixmap X11EmbedContainer::toX11Pixmap(const QPixmap& pix) + { +- if(pix.handle() != 0) // X11 pixmap ++ if (pix.handle() != 0) // X11 pixmap + return pix; ++ QPixmap ret; + Pixmap xpix = XCreatePixmap(pix.x11Info().display(), RootWindow(pix.x11Info().display(), pix.x11Info().screen()), + pix.width(), pix.height(), QX11Info::appDepth()); +- QPixmap wrk = QPixmap::fromX11Pixmap(xpix); +- QPainter paint(&wrk); +- paint.drawPixmap(0, 0, pix); +- paint.end(); +- QPixmap ret = wrk.copy(); +- wrk = QPixmap(); // reset, so that xpix can be freed (QPixmap does not own it) ++ { ++ QPixmap wrk = QPixmap::fromX11Pixmap(xpix, QPixmap::ExplicitlyShared); ++ QPainter paint(&wrk); ++ paint.drawPixmap(0, 0, pix); ++ paint.end(); ++ ret = wrk.copy(); ++ } // free resources so that xpix can be freed (QPixmap does not own it) + XFreePixmap(pix.x11Info().display(), xpix); + return ret; + } diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index efbd9f19d..5473aac99 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187942 2013-06-08 07:59:21Z andrea $ +# $Id: PKGBUILD 189505 2013-07-03 17:00:55Z 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.4 +pkgver=4.10.5 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=('5465fffdaea70a5ca225283f45b9504775d0432d') +sha1sums=('3953c441d508408becfbb1177d3a834775b92bf6') build() { cd ${srcdir} diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 1ae1a8126..1343f4cc0 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187962 2013-06-08 07:59:43Z andrea $ +# $Id: PKGBUILD 189525 2013-07-03 17:01:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.10.4 +pkgver=4.10.5 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=('87fb44759e2f4ffa1fbcbebb0f15b359f02875b8') +sha1sums=('b4ecd3d9a95966c7d290b45031da4550a1c71c09') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 1c8772651..2beb4befa 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187963 2013-06-08 07:59:44Z andrea $ +# $Id: PKGBUILD 189526 2013-07-03 17:01:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -15,18 +15,14 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' optdepends=('kdegraphics-okular: okular bindings' 'kdepimlibs: akonadi bindings') conflicts=('kdebindings-ruby') -source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" - 'ruby19.patch') -sha1sums=('d4b2920db047a10addbd1a8818878b2f93c75648' - 'c074f027bac3b9bffe70a2c2304a6a7be12be034') +source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz") +sha1sums=('fa3e3c8dfdd4a81e49f91aa264d64f700ec4241f') prepare() { - cd korundum-${pkgver} - patch -p1 -i "${srcdir}/ruby19.patch" + mkdir build } build() { - mkdir build cd build cmake ../korundum-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/kdebindings-korundum/ruby19.patch b/extra/kdebindings-korundum/ruby19.patch deleted file mode 100644 index c2468d9ce..000000000 --- a/extra/kdebindings-korundum/ruby19.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- korundum-4.9.0/src/krubypluginfactory.cpp~ 2012-07-27 10:44:19.544464612 +0000 -+++ korundum-4.9.0/src/krubypluginfactory.cpp 2012-07-27 10:53:15.247374749 +0000 -@@ -39,7 +39,6 @@ - extern "C" { - extern VALUE rb_load_path; - extern VALUE qt_internal_module; --void Init_prelude(void); - } - - // -@@ -165,7 +164,8 @@ - #if RUBY_VERSION >= 0x10900 - VALUE gem = rb_define_module("Gem"); - rb_const_set(gem, rb_intern("Enable"), Qtrue); -- Init_prelude(); -+ char *opts[] = { "ruby", "-e;" }; -+ ruby_options(2, opts); - #endif - - ruby_incpush(QFile::encodeName(program.path())); -@@ -342,7 +342,8 @@ - #if RUBY_VERSION >= 0x10900 - VALUE gem = rb_define_module("Gem"); - rb_const_set(gem, rb_intern("Enable"), Qtrue); -- Init_prelude(); -+ char *opts[] = { "ruby", "-e;" }; -+ ruby_options(2, opts); - #endif - - ruby_incpush(QFile::encodeName(program.path())); diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index b8d38e105..e56805e05 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187964 2013-06-08 07:59:45Z andrea $ +# $Id: PKGBUILD 189527 2013-07-03 17:01:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.10.4 +pkgver=4.10.5 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=('04ab37ee0c6fcf0a3d7824b49f73529d4f480a0d') +sha1sums=('58bb1c9fb45d20768c59e1147aa954d14d6dd18e') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 978794432..0bda66e57 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187965 2013-06-08 07:59:45Z andrea $ +# $Id: PKGBUILD 189528 2013-07-03 17:01:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" @@ -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=('034a5f0b98cb361cad8bb684a4834f47d16efb9c') +sha1sums=('a0eb27db883b8fd8411041373140f3d6a5bcdbfc') build() { mkdir build diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 8e1f3070e..df7d20acd 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187936 2013-06-08 07:59:15Z andrea $ +# $Id: PKGBUILD 189499 2013-07-03 17:00:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" @@ -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=('8b72c8c53d74b2bc8f38baca6c599067a6cfaac6') +sha1sums=('e4349b27791962188e8e56bd717a2ae7aec263c3') build() { mkdir build diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 1d709f430..adbf0b092 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 188702 2013-06-18 10:31:18Z andrea $ +# $Id: PKGBUILD 189496 2013-07-03 17:00:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2' 'kdebindings-python-common') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') @@ -14,7 +14,7 @@ groups=('kdebindings') 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=('4243f60d549b75ad734141ad2bfef884d12d014e') +sha1sums=('1e474e5d15756a6846902c11d6a7c95c5ca688da') build() { export PYTHONDONTWRITEBYTECODE="TRUE" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index c84ad53ff..8e92f8d95 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187938 2013-06-08 07:59:16Z andrea $ +# $Id: PKGBUILD 189501 2013-07-03 17:00:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.10.4 +pkgver=4.10.5 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=('70fa8ea5ee961ece5d29cb84cb37c57923f18d85') +sha1sums=('6fc117f8d046ae4f026015475792c43f80346d29') build() { mkdir build diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index 59acd2122..d58fef949 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187937 2013-06-08 07:59:15Z andrea $ +# $Id: PKGBUILD 189500 2013-07-03 17:00:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.10.4 +pkgver=4.10.5 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=('1a0503ef0117aa19cdffdddc9501fee83411d576') +sha1sums=('d79d5d67fe95aecb326edba4cf1200b6a22f394c') build() { mkdir build diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index beb566986..b28b18847 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187930 2013-06-08 07:59:08Z andrea $ +# $Id: PKGBUILD 189493 2013-07-03 17:00:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.10.4 +pkgver=4.10.5 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=('57c92b313bae5274b571c09f94cf599d1afd4846') +sha1sums=('d9d803c9d66d59ffc8d5a7372ee2176d355d3bb3') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 3ac063966..7a78d982c 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187935 2013-06-08 07:59:14Z andrea $ +# $Id: PKGBUILD 189498 2013-07-03 17:00:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.10.4 +pkgver=4.10.5 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=('557f3a888759cb3dd397466bd16246a1ef5858f2') +sha1sums=('22b2b717a8a81e3b4d52a65afd985044b5e77e3b') build() { mkdir build diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 544939e8a..fac287340 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187931 2013-06-08 07:59:09Z andrea $ +# $Id: PKGBUILD 189494 2013-07-03 17:00:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.10.4 +pkgver=4.10.5 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=('292285272998b096eef62812e65b5027cf2800ec') +sha1sums=('af5c3b4cf9bf82de15ddb26a5ab188e800fe7942') build() { cd "${srcdir}" diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index 4b63b0e41..9798ea9e4 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187949 2013-06-08 07:59:29Z andrea $ +# $Id: PKGBUILD 189512 2013-07-03 17:01:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.10.4 +pkgver=4.10.5 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=('46de1f60e149f6b5a526fa62e6dcf52ade9d4eff') +sha1sums=('e8f6810516838d94bb66db01c6ef19ebc8680ca7') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index 5c50b9b80..bec07471d 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187966 2013-06-08 07:59:47Z andrea $ +# $Id: PKGBUILD 189529 2013-07-03 17:01:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.10.4 +pkgver=4.10.5 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=('ea4d9363c6bf08683a5c9733d11ec7928a358f73') +sha1sums=('45c720a6b1566d941cfae8d8354d603331c1e258') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 565689876..49a5a9e88 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187967 2013-06-08 07:59:48Z andrea $ +# $Id: PKGBUILD 189530 2013-07-03 17:01:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -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=('3ecd559d6563945ed7730a524c2da5d637a340ba' +sha1sums=('b815ec8ceef27436bca46ee80d933912deb7c771' 'c02051c30ece57800d693da60280b0bdb5f45697') prepare() { diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index a4633d125..f270c1268 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187968 2013-06-08 07:59:49Z andrea $ +# $Id: PKGBUILD 189531 2013-07-03 17:01:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.10.4 +pkgver=4.10.5 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=('86032621d84ef5d8ea68cf9b0e7b696b96154ece') +sha1sums=('a762efe6ab7bedb5e5a1f97e7227fc48729c8b62') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index 2493416f2..f49bf7169 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187969 2013-06-08 07:59:50Z andrea $ +# $Id: PKGBUILD 189532 2013-07-03 17:01:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.10.4 +pkgver=4.10.5 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=('b8225cae39c1b27d1defabd08cd2e64e5c893602') +sha1sums=('b4429f34b85c507474cd33e2a1571de9acd70b5c') build() { mkdir build diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index b8e1b45ae..2a232f3f6 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187970 2013-06-08 07:59:51Z andrea $ +# $Id: PKGBUILD 189533 2013-07-03 17:01:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.10.4 +pkgver=4.10.5 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=('fa1635720602ba02cb0064d3c01c752d208f5e09') +sha1sums=('1db931a1796a090ffefc1d922b9bf689e045581a') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index b18b17ced..283471486 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187971 2013-06-08 07:59:53Z andrea $ +# $Id: PKGBUILD 189534 2013-07-03 17:01:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.10.4 +pkgver=4.10.5 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=('be9dd5ce3a0b8b7162faf1f78c22a7aeb5a8449c') +sha1sums=('f01c2b9f2bf1db8d5c2836fdff04862b311e3eac') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index 7cdaf68b6..893b1cdf2 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187972 2013-06-08 07:59:56Z andrea $ +# $Id: PKGBUILD 189535 2013-07-03 17:01:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.10.4 +pkgver=4.10.5 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=('a283d3521e853d040e7938e004fcbef6cf41aa82') +sha1sums=('22beaaada1a55aa5a5b107fa0eef9f3850aff2a1') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index ca5d48365..1bca9ef14 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187973 2013-06-08 07:59:58Z andrea $ +# $Id: PKGBUILD 189536 2013-07-03 17:01:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.10.4 +pkgver=4.10.5 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=('1d1a8d7dc99e59bcb006302d1bb7d9a8366041d9') +sha1sums=('b8347034cefa309850ac3099321179cd64ce4d2f') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index c88c5a4dd..b607867fa 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187974 2013-06-08 07:59:59Z andrea $ +# $Id: PKGBUILD 189537 2013-07-03 17:01:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.10.4 +pkgver=4.10.5 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=('91c0880d48ed16e05481c3ce424075d30f695bf4') +sha1sums=('8eb3dae04ce6599f911fa29e5109089dd0a5ca56') build() { mkdir build diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index ab2bdf211..bf8713107 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187975 2013-06-08 08:00:01Z andrea $ +# $Id: PKGBUILD 189538 2013-07-03 17:01:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.10.4 +pkgver=4.10.5 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=('970620fc621dd31c99c71bd3b446da4d1d3015c4') +sha1sums=('af9040043e03ef516e582c5a8d1219e358339aac') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index 37677c5d5..31e08126e 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187976 2013-06-08 08:00:03Z andrea $ +# $Id: PKGBUILD 189539 2013-07-03 17:01:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.10.4 +pkgver=4.10.5 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=('5141988a04d1a9e428c41cc751cd217a53fef13a') +sha1sums=('285ed3b40f7502fe90d319c434946a344b54246d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 0e69c0c3e..57ac8b2dd 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187977 2013-06-08 08:00:04Z andrea $ +# $Id: PKGBUILD 189540 2013-07-03 17:01:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.10.4 +pkgver=4.10.5 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=('e212aee5cdee0d767efd9d004a17238f043485a2') +sha1sums=('da01e941e4439223cacc03de29780c27d41455b0') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index 6971bf592..04f1540ac 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187978 2013-06-08 08:00:07Z andrea $ +# $Id: PKGBUILD 189541 2013-07-03 17:01:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.10.4 +pkgver=4.10.5 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=('9a434b7e2c9b67cce4611ad443cfd1ef9a190436') +sha1sums=('724acde654d7d66ec8bf6c088c2f892eaf9d103d') build() { mkdir build diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index caa89639d..cfb3c3b7c 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187979 2013-06-08 08:00:08Z andrea $ +# $Id: PKGBUILD 189542 2013-07-03 17:01:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.10.4 +pkgver=4.10.5 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=('dfda5d6f0af6bfc2853595a5af86c7a96cd66c33') +sha1sums=('87c772a43e164a557e8fed01a5c5064823eb29c9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index e1b7409f6..2f9f0a484 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187980 2013-06-08 08:00:10Z andrea $ +# $Id: PKGBUILD 189543 2013-07-03 17:01:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.10.4 +pkgver=4.10.5 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=('82cc5e6abb7ab10bf1da247f67293d45b3d38195') +sha1sums=('ca8b46766ea8135978b7e6f3b1f7f21e5a1b6639') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index 7f552dbbe..845969d75 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187981 2013-06-08 08:00:11Z andrea $ +# $Id: PKGBUILD 189544 2013-07-03 17:01:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.10.4 +pkgver=4.10.5 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=('3c321e7f4a9a136cc29227c98d10bd3f4551f32b') +sha1sums=('3d92e066adecd77ef4de5b3ab4ecb6e06251dd55') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 08459332f..838d819a1 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187944 2013-06-08 07:59:24Z andrea $ +# $Id: PKGBUILD 189507 2013-07-03 17:00:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.10.4 +pkgver=4.10.5 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=('664ff3564e2136566808d2ea801b42ede04d6a8d') +sha1sums=('15563a5f31bf1c655fe6afc6477bd3f8042e8a6f') build() { mkdir build diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD index 79610b18a..335de7626 100644 --- a/extra/kdeedu-pairs/PKGBUILD +++ b/extra/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187982 2013-06-08 08:00:13Z andrea $ +# $Id: PKGBUILD 189545 2013-07-03 17:01:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-pairs -pkgver=4.10.4 +pkgver=4.10.5 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=('20b4e8e98487bc05602a15969bac63ea64a6ac74') +sha1sums=('c42d6a0dab25e28173ab47f1e18dda40204aaf15') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index 7c7738207..1ed12bb43 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187983 2013-06-08 08:00:14Z andrea $ +# $Id: PKGBUILD 189546 2013-07-03 17:01:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.10.4 +pkgver=4.10.5 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=('d13d686b77a36ca488ab6f545e0871ad37f9b490') +sha1sums=('ff4361c225fe4e9530200ca169b1a0fc0f5b5852') build() { mkdir build diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index dfebfafa4..db921c813 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187984 2013-06-08 08:00:15Z andrea $ +# $Id: PKGBUILD 189547 2013-07-03 17:01:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.10.4 +pkgver=4.10.5 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=('c09ba436f60bf856733e50bd331e84a8b1f975fb') +sha1sums=('0f9e33b679f528918b682153447a5813d88c57ef') build() { cd "${srcdir}" diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index 8baf3884f..6e0febf85 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187985 2013-06-08 08:00:17Z andrea $ +# $Id: PKGBUILD 189548 2013-07-03 17:01:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.10.4 +pkgver=4.10.5 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=('3dcbd853ede5fbc6517d52faa8722395ecf0eb0b') +sha1sums=('e218cd5af527a815e222838b32bcffaaaa78e495') build() { cd "${srcdir}" diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD index 6ee2a6ff2..aa38c6dd9 100644 --- a/extra/kdegames-bomber/PKGBUILD +++ b/extra/kdegames-bomber/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187986 2013-06-08 08:00:18Z andrea $ +# $Id: PKGBUILD 189549 2013-07-03 17:02:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bomber -pkgver=4.10.4 +pkgver=4.10.5 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=('88f98c0179516cfd08952112fb6dc6ba6bb85231') +sha1sums=('9ccd0e60f5ada51aae2fd35b214a2350e7950351') build() { mkdir build diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD index 25008fee8..89957d7ef 100644 --- a/extra/kdegames-bovo/PKGBUILD +++ b/extra/kdegames-bovo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187987 2013-06-08 08:00:20Z andrea $ +# $Id: PKGBUILD 189550 2013-07-03 17:02:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bovo -pkgver=4.10.4 +pkgver=4.10.5 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=('102ceee58b4851b24cb23bd4907449cdd63aa3d7') +sha1sums=('cf6de267949be1900b9a74eb77118ed33f8fe389') build() { mkdir build diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD index b8cf9165a..a63d05050 100644 --- a/extra/kdegames-granatier/PKGBUILD +++ b/extra/kdegames-granatier/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187988 2013-06-08 08:00:21Z andrea $ +# $Id: PKGBUILD 189551 2013-07-03 17:02:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-granatier -pkgver=4.10.4 +pkgver=4.10.5 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=('b49be2c81a8b8670bfe8f53ae09e9aab9de5134a') +sha1sums=('5ba19a929dd4812ece1c3c1658e5d0457d737cb1') build() { mkdir build diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD index c636906f9..8cef66026 100644 --- a/extra/kdegames-kapman/PKGBUILD +++ b/extra/kdegames-kapman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187990 2013-06-08 08:00:24Z andrea $ +# $Id: PKGBUILD 189553 2013-07-03 17:02:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kapman -pkgver=4.10.4 +pkgver=4.10.5 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=('6dbb6b7f4a87aa2cd21d13330913d7a999b888e8') +sha1sums=('4da9e17243a87108bb55006a8d486d68d57f5e86') build() { mkdir build diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD index c89ad6099..edc6c00df 100644 --- a/extra/kdegames-katomic/PKGBUILD +++ b/extra/kdegames-katomic/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187991 2013-06-08 08:00:26Z andrea $ +# $Id: PKGBUILD 189554 2013-07-03 17:02:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-katomic -pkgver=4.10.4 +pkgver=4.10.5 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=('6c4893910a11f2c1bc20492a93d6475fa397f9df') +sha1sums=('79f8e11671cd67fac0aff8ed5ebf8a845ed0e2b8') build() { mkdir build diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD index 60dcbc11b..fc9ea8d03 100644 --- a/extra/kdegames-kblackbox/PKGBUILD +++ b/extra/kdegames-kblackbox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187992 2013-06-08 08:00:28Z andrea $ +# $Id: PKGBUILD 189555 2013-07-03 17:02:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblackbox -pkgver=4.10.4 +pkgver=4.10.5 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=('dd19f0c54740e5e0add1271ebd6595f237a670d5') +sha1sums=('3cfb90ce5810df96ab8893fd0c2da984825a3ed0') build() { mkdir build diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD index 6b5116b55..14632d22e 100644 --- a/extra/kdegames-kblocks/PKGBUILD +++ b/extra/kdegames-kblocks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187993 2013-06-08 08:00:29Z andrea $ +# $Id: PKGBUILD 189556 2013-07-03 17:02:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblocks -pkgver=4.10.4 +pkgver=4.10.5 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=('e6c9e5d3dc368d87afe82375d3537aeb03247edb') +sha1sums=('98965d0f09d072722d8a35a9aee982cb66b0b61e') build() { mkdir build diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD index 353e13dde..f71855671 100644 --- a/extra/kdegames-kbounce/PKGBUILD +++ b/extra/kdegames-kbounce/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187994 2013-06-08 08:00:30Z andrea $ +# $Id: PKGBUILD 189557 2013-07-03 17:02:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbounce -pkgver=4.10.4 +pkgver=4.10.5 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=('481fb1b98597ae0cceadcfb7d7b5d4b1171e1267') +sha1sums=('45ab0f6440933719d70d6f10ad091a7753100832') build() { mkdir build diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD index ae33ee756..2a263f746 100644 --- a/extra/kdegames-kbreakout/PKGBUILD +++ b/extra/kdegames-kbreakout/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187995 2013-06-08 08:00:32Z andrea $ +# $Id: PKGBUILD 189558 2013-07-03 17:02:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbreakout -pkgver=4.10.4 +pkgver=4.10.5 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=('c8c5acdf8ca4915b37c6fa8e5cf6725e21ab97fa') +sha1sums=('38c1fb790541c01427e9cb7314e05929a25dc5d5') build() { mkdir build diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD index c5ef52b67..5e5fbccb6 100644 --- a/extra/kdegames-kdiamond/PKGBUILD +++ b/extra/kdegames-kdiamond/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187996 2013-06-08 08:00:33Z andrea $ +# $Id: PKGBUILD 189559 2013-07-03 17:02:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kdiamond -pkgver=4.10.4 +pkgver=4.10.5 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=('acb1b7cdfdc30025a4686321ab0ef226c8adb1e0') +sha1sums=('eba0692af37410bd1005d0cbb8759420169d2e7b') build() { mkdir build diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD index 6eeff0f0a..0e395f7aa 100644 --- a/extra/kdegames-kfourinline/PKGBUILD +++ b/extra/kdegames-kfourinline/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187997 2013-06-08 08:00:35Z andrea $ +# $Id: PKGBUILD 189560 2013-07-03 17:02:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kfourinline -pkgver=4.10.4 +pkgver=4.10.5 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=('263a7a641c3f48f078aebbc179ec2475558605e8') +sha1sums=('d923b3477cd7ac2e693a69cf5dcc4f0667b72670') build() { mkdir build diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD index 7a8d4adbd..3226073e4 100644 --- a/extra/kdegames-kgoldrunner/PKGBUILD +++ b/extra/kdegames-kgoldrunner/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187998 2013-06-08 08:00:36Z andrea $ +# $Id: PKGBUILD 189561 2013-07-03 17:02:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kgoldrunner -pkgver=4.10.4 +pkgver=4.10.5 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=('95fc29d606d5b491920c612e1887b1699aad4481') +sha1sums=('ade056258864f670d0e9932c07b4bec6c96589cb') build() { mkdir build diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD index 825c1c938..3bac16137 100644 --- a/extra/kdegames-kigo/PKGBUILD +++ b/extra/kdegames-kigo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187999 2013-06-08 08:00:39Z andrea $ +# $Id: PKGBUILD 189562 2013-07-03 17:02:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kigo -pkgver=4.10.4 +pkgver=4.10.5 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=('caad098497bdd71184983cc22cfd23fe71bb243a') +sha1sums=('458ceb98d8704d7810539e24be708de089814b28') build() { mkdir build diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD index 4ec19ff9c..e721516a3 100644 --- a/extra/kdegames-killbots/PKGBUILD +++ b/extra/kdegames-killbots/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188000 2013-06-08 08:00:40Z andrea $ +# $Id: PKGBUILD 189563 2013-07-03 17:02:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-killbots -pkgver=4.10.4 +pkgver=4.10.5 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=('5fef75ba6d3c849ce271164a532eaddde1c41cd4') +sha1sums=('fedcdb56a0daa244ded949433b591f783f9fe03b') build() { mkdir build diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD index c26f2f174..08c5dd2ec 100644 --- a/extra/kdegames-kiriki/PKGBUILD +++ b/extra/kdegames-kiriki/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188001 2013-06-08 08:00:41Z andrea $ +# $Id: PKGBUILD 189564 2013-07-03 17:02:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kiriki -pkgver=4.10.4 +pkgver=4.10.5 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=('a724586705a9bb66d4a9af684a0b56239d395e5e') +sha1sums=('459ad2ae8ed5d23f0fa49a512afe5c9100457e0c') build() { mkdir build diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD index 49b7addda..2f042989f 100644 --- a/extra/kdegames-kjumpingcube/PKGBUILD +++ b/extra/kdegames-kjumpingcube/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188002 2013-06-08 08:00:43Z andrea $ +# $Id: PKGBUILD 189565 2013-07-03 17:02:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kjumpingcube -pkgver=4.10.4 +pkgver=4.10.5 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=('012a89130cb95f8ae223f1dfb8380e1316ac91be') +sha1sums=('82c175cef97149ba079c8b1520d48c60f1785903') build() { mkdir build diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD index 4e17debf7..182be6147 100644 --- a/extra/kdegames-klickety/PKGBUILD +++ b/extra/kdegames-klickety/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188003 2013-06-08 08:00:44Z andrea $ +# $Id: PKGBUILD 189566 2013-07-03 17:02:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klickety -pkgver=4.10.4 +pkgver=4.10.5 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=('e7540d663a36a580e68d8ac69ba229c42db724f6') +sha1sums=('4630f3f31d9ab439475420ccd54707f097630371') build() { mkdir build diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD index 66fed7127..1dbb9ecfd 100644 --- a/extra/kdegames-klines/PKGBUILD +++ b/extra/kdegames-klines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188004 2013-06-08 08:00:46Z andrea $ +# $Id: PKGBUILD 189567 2013-07-03 17:02:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klines -pkgver=4.10.4 +pkgver=4.10.5 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=('6cbd46188030e3f495812a5d50e34be9936cdb08') +sha1sums=('adb8c1c1709b4dbdb733602ef29bcab6a177d494') build() { mkdir build diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD index 6d7c80f1e..b0b8905f0 100644 --- a/extra/kdegames-kmahjongg/PKGBUILD +++ b/extra/kdegames-kmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188005 2013-06-08 08:00:47Z andrea $ +# $Id: PKGBUILD 189568 2013-07-03 17:02:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmahjongg -pkgver=4.10.4 +pkgver=4.10.5 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=('ebecd24f0da87165d0b8859444d035019a7bcd5a') +sha1sums=('e020846d2252402cf51ae8bd63539774aeb775e9') build() { mkdir build diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD index 4158ddc30..f246cb653 100644 --- a/extra/kdegames-kmines/PKGBUILD +++ b/extra/kdegames-kmines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188006 2013-06-08 08:00:48Z andrea $ +# $Id: PKGBUILD 189569 2013-07-03 17:02:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmines -pkgver=4.10.4 +pkgver=4.10.5 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=('950f28e722db36daee4ee187f696eaa51415b752') +sha1sums=('c896f86b96f4fb380c695c0491db6d5fff0836fe') build() { mkdir build diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD index 973c9f00a..9ad03e271 100644 --- a/extra/kdegames-knavalbattle/PKGBUILD +++ b/extra/kdegames-knavalbattle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188007 2013-06-08 08:00:50Z andrea $ +# $Id: PKGBUILD 189570 2013-07-03 17:02:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knavalbattle -pkgver=4.10.4 +pkgver=4.10.5 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=('cf55f549029647b59b082bc2ab9383a5375a416c') +sha1sums=('e939a5b5d409bf89da3ffa8cd6e4af0d0e7798a0') build() { mkdir build diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD index 9f801cec5..6c5c748ca 100644 --- a/extra/kdegames-knetwalk/PKGBUILD +++ b/extra/kdegames-knetwalk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188008 2013-06-08 08:00:51Z andrea $ +# $Id: PKGBUILD 189571 2013-07-03 17:02:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knetwalk -pkgver=4.10.4 +pkgver=4.10.5 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=('482d4ba187a55ba32841e141ce3717ad94306377') +sha1sums=('61fb05ab580785362b1204c8b64badc160284d02') build() { mkdir build diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD index 528a232ab..7aabde091 100644 --- a/extra/kdegames-kolf/PKGBUILD +++ b/extra/kdegames-kolf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188009 2013-06-08 08:00:52Z andrea $ +# $Id: PKGBUILD 189572 2013-07-03 17:02:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kolf -pkgver=4.10.4 +pkgver=4.10.5 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=('ec61e9d436c59cc738f340b7ca27e8ccef017b2f') +sha1sums=('ae1af46f6144adf912b3b9bf99666a178a6f78ac') build() { mkdir build diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD index bbc850b5c..4c2084ae7 100644 --- a/extra/kdegames-kollision/PKGBUILD +++ b/extra/kdegames-kollision/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188010 2013-06-08 08:00:56Z andrea $ +# $Id: PKGBUILD 189573 2013-07-03 17:02:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kollision -pkgver=4.10.4 +pkgver=4.10.5 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=('bd7839e85789894010a2df0171e417a008afd753') +sha1sums=('d7850701d8817dac21457ebeef78c18d0f37001f') build() { mkdir build diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD index 0ec218ceb..792c926a8 100644 --- a/extra/kdegames-konquest/PKGBUILD +++ b/extra/kdegames-konquest/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188011 2013-06-08 08:00:57Z andrea $ +# $Id: PKGBUILD 189574 2013-07-03 17:02:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-konquest -pkgver=4.10.4 +pkgver=4.10.5 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=('a238dee4a52ad6a051d53843112f85a7a912355f') +sha1sums=('5e5c61bc3823be1dd45c87a77f404f51f5ed9b6e') build() { mkdir build diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD index 44d6e7211..6ea963369 100644 --- a/extra/kdegames-kpatience/PKGBUILD +++ b/extra/kdegames-kpatience/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188012 2013-06-08 08:01:00Z andrea $ +# $Id: PKGBUILD 189575 2013-07-03 17:02:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kpatience -pkgver=4.10.4 +pkgver=4.10.5 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=('c5ab4a1a27c4fe2f88e456af08aca3a4d2d1340e') +sha1sums=('65be653b7fa41054e3f446441365fbad65b841b0') build() { mkdir build diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD index f9cbf9bff..33a0647bf 100644 --- a/extra/kdegames-kreversi/PKGBUILD +++ b/extra/kdegames-kreversi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188013 2013-06-08 08:01:01Z andrea $ +# $Id: PKGBUILD 189576 2013-07-03 17:02:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kreversi -pkgver=4.10.4 +pkgver=4.10.5 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=('b30a93287348fd2394b9abf4e60b07f29bdccbfb') +sha1sums=('f3ea6c3c37367ca112146c4b85cb521064f1187c') build() { mkdir build diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD index 28532127a..1235fd275 100644 --- a/extra/kdegames-kshisen/PKGBUILD +++ b/extra/kdegames-kshisen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188014 2013-06-08 08:01:02Z andrea $ +# $Id: PKGBUILD 189577 2013-07-03 17:02:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kshisen -pkgver=4.10.4 +pkgver=4.10.5 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=('c09157433df05f409046606d890b0935c167b877') +sha1sums=('28cfe402f4a39d0902a85e8e316f40d26af17e1b') build() { mkdir build diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD index 34f4d08ff..bf17ffde6 100644 --- a/extra/kdegames-ksirk/PKGBUILD +++ b/extra/kdegames-ksirk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188015 2013-06-08 08:01:04Z andrea $ +# $Id: PKGBUILD 189578 2013-07-03 17:02:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksirk -pkgver=4.10.4 +pkgver=4.10.5 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=('f0145f13d8ead33d37855298f8732ac82ea7dbe1') +sha1sums=('dc43176fc71a7ca45976f79eb383aa1922a8adf8') build() { mkdir build diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD index de3357ee0..272318de8 100644 --- a/extra/kdegames-ksnakeduel/PKGBUILD +++ b/extra/kdegames-ksnakeduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188016 2013-06-08 08:01:05Z andrea $ +# $Id: PKGBUILD 189579 2013-07-03 17:02:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksnakeduel -pkgver=4.10.4 +pkgver=4.10.5 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=('21fec5a9e979065958ccb670a7198ecd82a334fb') +sha1sums=('a7c5416dadf66a4148e4e30c12a6dc1528793524') build() { mkdir build diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD index 6197885c6..b57dd2cd4 100644 --- a/extra/kdegames-kspaceduel/PKGBUILD +++ b/extra/kdegames-kspaceduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188017 2013-06-08 08:01:06Z andrea $ +# $Id: PKGBUILD 189580 2013-07-03 17:02:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kspaceduel -pkgver=4.10.4 +pkgver=4.10.5 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=('e4e8667c2961bae7a96143ccc7dc342d3c959799') +sha1sums=('1b4146c55498e1223d0cf9209c1cec45d5cb5720') build() { mkdir build diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD index 573eed219..7a41a708c 100644 --- a/extra/kdegames-ksquares/PKGBUILD +++ b/extra/kdegames-ksquares/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188018 2013-06-08 08:01:08Z andrea $ +# $Id: PKGBUILD 189581 2013-07-03 17:02:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksquares -pkgver=4.10.4 +pkgver=4.10.5 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=('6553d30c4f983fd3346ad85e551afbbdb590442c') +sha1sums=('ca68405a5344481c1ed81bda0a7e37d78d0300f4') build() { mkdir build diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD index 15d22736f..0941002cf 100644 --- a/extra/kdegames-ksudoku/PKGBUILD +++ b/extra/kdegames-ksudoku/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188019 2013-06-08 08:01:09Z andrea $ +# $Id: PKGBUILD 189582 2013-07-03 17:02:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksudoku -pkgver=4.10.4 +pkgver=4.10.5 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=('563d086f2b8fe844c7ae5b3fcecef496cb851d20') +sha1sums=('65da23cf971d77c563803f8f35794f4ff1ad4d15') build() { mkdir build diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD index 440498402..167069b4c 100644 --- a/extra/kdegames-ktuberling/PKGBUILD +++ b/extra/kdegames-ktuberling/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188020 2013-06-08 08:01:11Z andrea $ +# $Id: PKGBUILD 189583 2013-07-03 17:02:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ktuberling -pkgver=4.10.4 +pkgver=4.10.5 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=('209f64812e1aa9a6bd4f5ae87a83e6cb096d42f7') +sha1sums=('59128492d7f7ecb1dcde1b88f40ddc186590914d') build() { mkdir build diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD index 10b923e99..744e93344 100644 --- a/extra/kdegames-kubrick/PKGBUILD +++ b/extra/kdegames-kubrick/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188021 2013-06-08 08:01:13Z andrea $ +# $Id: PKGBUILD 189584 2013-07-03 17:03:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kubrick -pkgver=4.10.4 +pkgver=4.10.5 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=('4b40f130930594908b0764744947c9a2deb1954e') +sha1sums=('e1bc6911e549ca39725b2b093b0d33868c6cea52') build() { mkdir build diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD index bb83e6700..8904c0738 100644 --- a/extra/kdegames-lskat/PKGBUILD +++ b/extra/kdegames-lskat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188022 2013-06-08 08:01:15Z andrea $ +# $Id: PKGBUILD 189585 2013-07-03 17:03:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-lskat -pkgver=4.10.4 +pkgver=4.10.5 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=('060cdb3f02655a82442b8eff9ef3d3b2be12fd9c') +sha1sums=('48465c69208786a1e642968e5097b4acedb4aba1') build() { mkdir build diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD index d9d5a7e00..8256821c8 100644 --- a/extra/kdegames-palapeli/PKGBUILD +++ b/extra/kdegames-palapeli/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188023 2013-06-08 08:01:17Z andrea $ +# $Id: PKGBUILD 189586 2013-07-03 17:03:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-palapeli -pkgver=4.10.4 +pkgver=4.10.5 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=('595572e46a0dbd31fe3bb8cb623602dadf3d8753') +sha1sums=('08dfbb9619197597094d1e543825217a9c79c4fd') build() { mkdir build diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD index ab0817b38..816003aed 100644 --- a/extra/kdegames-picmi/PKGBUILD +++ b/extra/kdegames-picmi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188024 2013-06-08 08:01:18Z andrea $ +# $Id: PKGBUILD 189587 2013-07-03 17:03:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-picmi -pkgver=4.10.4 +pkgver=4.10.5 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=('ef1a3c217432e44f4f3f146a54513b9ea56b4c96') +sha1sums=('fd2f95d39f4aeeea694a3b74949a3472783a3719') build() { mkdir build diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index b620ba2f7..59323a01a 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188025 2013-06-08 08:01:19Z andrea $ +# $Id: PKGBUILD 189588 2013-07-03 17:03:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.10.4 +pkgver=4.10.5 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=('0cd301a65f800a201a57295984374612db7d6377') +sha1sums=('14e8b214ad2aa17a3ce586ca481502a120061912') build() { mkdir build diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index a04834fc3..af1fcb9fd 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188026 2013-06-08 08:01:21Z andrea $ +# $Id: PKGBUILD 189589 2013-07-03 17:03:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.10.4 +pkgver=4.10.5 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=('022c0ab35f4a57e6bbf200caff0a8f2688f47b2a') +sha1sums=('1ff61bd5f4bc78b947451306aec899c845d0e178') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index 1c099ce00..7fc3f3a98 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188027 2013-06-08 08:01:22Z andrea $ +# $Id: PKGBUILD 189590 2013-07-03 17:03:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.10.4 +pkgver=4.10.5 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=('baa625095edbee3b943a0e09287a7c2bff7c20af') +sha1sums=('0e601ca75d6d237c23a83b10b2597b1ff905ea97') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index 6f1b36ca2..5d7513cdb 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188028 2013-06-08 08:01:24Z andrea $ +# $Id: PKGBUILD 189591 2013-07-03 17:03:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.10.4 +pkgver=4.10.5 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=('e9441c3358e2be76912a5879decedfa911809247') +sha1sums=('31d4f0e2da3475f423a8c9aa77db569d7ea698d6') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index 471cd21ad..d7f40bb1f 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188029 2013-06-08 08:01:25Z andrea $ +# $Id: PKGBUILD 189592 2013-07-03 17:03:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.10.4 +pkgver=4.10.5 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=('8578d6e50f60955392ac7c9e6aff93696126247f') +sha1sums=('976a2093dda115b16f13603c35959b163cc4169e') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 9b6857ffc..7d788d371 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188030 2013-06-08 08:01:27Z andrea $ +# $Id: PKGBUILD 189593 2013-07-03 17:03:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.10.4 +pkgver=4.10.5 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=('f762162c9fcb276c6c52508c70eea95ba135e4be') +sha1sums=('c76fcd0f5fedcfd0017b3f27349e5fab8dd7bb74') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index 6dcde696c..1135a400b 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188031 2013-06-08 08:01:28Z andrea $ +# $Id: PKGBUILD 189594 2013-07-03 17:03:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.10.4 +pkgver=4.10.5 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=('34a8f6c379aa2defca2441c7f2583f1d75f99441') +sha1sums=('4bae1e43e55f0aad7626c9a2fe10bca46cba1bd8') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index 25fa594d6..8025affe1 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188032 2013-06-08 08:01:30Z andrea $ +# $Id: PKGBUILD 189595 2013-07-03 17:03:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.10.4 +pkgver=4.10.5 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=('6550523e0270447a00b7c498fbe03f67b425626b') +sha1sums=('2a5dcb4cc7ed0f290a857d4b7a1418f31c39a25f') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index 0cea57133..481ba502e 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188033 2013-06-08 08:01:31Z andrea $ +# $Id: PKGBUILD 189596 2013-07-03 17:03:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.10.4 +pkgver=4.10.5 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=('f4b58972ce05a4bdfcb94c972b023f168d3172e9') +sha1sums=('80a5878f2c9f4fa490f22a22fde03003c883c8cb') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index ca290f5a5..736b0b87e 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187932 2013-06-08 07:59:10Z andrea $ +# $Id: PKGBUILD 189495 2013-07-03 17:00:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.10.4 +pkgver=4.10.5 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=('7659ac1e1d9832f541f605abbfc47da9d3ab2356') +sha1sums=('8009cd23f844691c18001dbfe98a8e2f5a9f30b9') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index 0f81b4a15..1de32d595 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188034 2013-06-08 08:01:33Z andrea $ +# $Id: PKGBUILD 189597 2013-07-03 17:03:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.10.4 +pkgver=4.10.5 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=('70feca363d1a5d5aa9d784d62819a34eb701054f') +sha1sums=('b7db0edf8113faa4796cd585e41e514a7218a720') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index f7c1e3e11..71cf62db3 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188035 2013-06-08 08:01:34Z andrea $ +# $Id: PKGBUILD 189598 2013-07-03 17:03:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.10.4 +pkgver=4.10.5 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=('356f0bb93514b240a67b0a02edad15ac5e107fdb') +sha1sums=('fcd7759b4a92217c93188ed82e4cff7817013bb5') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index f24d37a01..6928b875f 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188036 2013-06-08 08:01:37Z andrea $ +# $Id: PKGBUILD 189599 2013-07-03 17:03:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.10.4 +pkgver=4.10.5 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=('e9c939d22a4dd6c17cdda9da964434e014d6b771') +sha1sums=('88631de08af153d1c745ba2cd0468e8cb7474217') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD index 9a24d7cf5..31a8f3c18 100644 --- a/extra/kdemultimedia-audiocd-kio/PKGBUILD +++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188037 2013-06-08 08:01:38Z andrea $ +# $Id: PKGBUILD 189600 2013-07-03 17:03:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-audiocd-kio -pkgver=4.10.4 +pkgver=4.10.5 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=('7dbd0c6b08fe0b4223012f7332e661c9cd046697') +sha1sums=('d215fe1ec68cee0b833ed82ad34c4850400cc081') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD index 8d5cdc6f4..711fb5d39 100644 --- a/extra/kdemultimedia-dragonplayer/PKGBUILD +++ b/extra/kdemultimedia-dragonplayer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188038 2013-06-08 08:01:40Z andrea $ +# $Id: PKGBUILD 189601 2013-07-03 17:03:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-dragonplayer -pkgver=4.10.4 +pkgver=4.10.5 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=('c7ff43b01890318ed0c629eed64fe36cc2e15db6') +sha1sums=('58cf5d6fa420257665032c70cf8a70485af45a97') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index 57c08ecc1..85b1bc1d6 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188039 2013-06-08 08:01:41Z andrea $ +# $Id: PKGBUILD 189602 2013-07-03 17:03:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.10.4 +pkgver=4.10.5 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=('6c1e4fcb3fe8ecabca3a49718b815eda0f20c5cc') +sha1sums=('68fb56a2cb51672f250566baeb36e489cc15909c') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD index 042db5183..d12f82761 100644 --- a/extra/kdemultimedia-juk/PKGBUILD +++ b/extra/kdemultimedia-juk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188040 2013-06-08 08:01:42Z andrea $ +# $Id: PKGBUILD 189603 2013-07-03 17:03:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-juk -pkgver=4.10.4 +pkgver=4.10.5 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=('92af1645405b88aef85505649e68e3fcab4a7841') +sha1sums=('9f3aec6a41e3089c0a97feb48d94cd5d206c252a') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD index 5fdf38288..2abc84f93 100644 --- a/extra/kdemultimedia-kmix/PKGBUILD +++ b/extra/kdemultimedia-kmix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188041 2013-06-08 08:01:44Z andrea $ +# $Id: PKGBUILD 189604 2013-07-03 17:03:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kmix -pkgver=4.10.4 +pkgver=4.10.5 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=('d392101358196e0b99bc15846b895dff9c88cafc') +sha1sums=('80b29d1c360dbebf1516c92de144f823012491ee') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD index d3d9ad7a5..bdabd514f 100644 --- a/extra/kdemultimedia-kscd/PKGBUILD +++ b/extra/kdemultimedia-kscd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188042 2013-06-08 08:01:45Z andrea $ +# $Id: PKGBUILD 189605 2013-07-03 17:03:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kscd -pkgver=4.10.4 +pkgver=4.10.5 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=('e3e3c0b60897559ce3f5ff8a0f5dfe7bcd10ae98') +sha1sums=('8573e185d1e3ca05eda2f7a37ff7500859e3d0e3') build() { mkdir build diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD index cb09a4512..c8b43845d 100644 --- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188043 2013-06-08 08:01:46Z andrea $ +# $Id: PKGBUILD 189606 2013-07-03 17:03:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-mplayerthumbs -pkgver=4.10.4 +pkgver=4.10.5 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=('3b82041ae4a297c448971bb3faeb9e5492654310') +sha1sums=('dc72e06f6298647635b7490e8acff75a14aa0682') build() { cd "${srcdir}" diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index d85b87a86..4daeb8141 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188553 2013-06-15 11:11:29Z andrea $ +# $Id: PKGBUILD 189607 2013-07-03 17:03:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -9,8 +9,8 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -21,7 +21,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a' +sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') prepare() { @@ -48,7 +48,7 @@ package_kdenetwork-filesharing() { pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' depends=('kdelibs' 'smbclient') install='kdenetwork.install' - cd $srcdir/build/filesharing + cd $srcdir/build/kdenetwork-filesharing make DESTDIR=$pkgdir install } @@ -66,8 +66,6 @@ package_kdenetwork-kget() { install='kdenetwork-kget.install' cd $srcdir/build/kget make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kget - make DESTDIR=$pkgdir install } package_kdenetwork-kppp() { @@ -77,7 +75,7 @@ package_kdenetwork-kppp() { install='kdenetwork-kppp.install' cd $srcdir/build/kppp make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kppp + cd $srcdir/build/kppp/doc make DESTDIR=$pkgdir install } @@ -90,7 +88,7 @@ package_kdenetwork-krdc() { url="http://kde.org/applications/internet/krdc/" cd $srcdir/build/krdc make DESTDIR=$pkgdir install - cd $srcdir/build/doc/krdc + cd $srcdir/build/krdc/doc make DESTDIR=$pkgdir install } @@ -102,6 +100,6 @@ package_kdenetwork-krfb() { depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt') cd $srcdir/build/krfb make DESTDIR=$pkgdir install - cd $srcdir/build/doc/krfb + cd $srcdir/build/krfb/doc make DESTDIR=$pkgdir install } diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index fd6e82a1f..194ac9b6f 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187929 2013-06-08 07:59:07Z andrea $ +# $Id: PKGBUILD 189492 2013-07-03 17:00:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64' 'mips64el') @@ -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=('1ef9a4b6224363db2c3b50199dd302cea57c3a27') +sha1sums=('f0b18cd320973c02d9b52cce9f4f424cb868d7fb') build() { mkdir build diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 7d4aad653..bf30a69c4 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187925 2013-06-08 07:59:03Z andrea $ +# $Id: PKGBUILD 189488 2013-07-03 17:00:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -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=('58f785dbc07932aad01bd7beeeceacc8fefac0bd') +sha1sums=('3e5ab28312cf1f194d8b3c1999102a4de8029146') build() { mkdir build diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index dabd76d63..96e235cbc 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188046 2013-06-08 08:01:54Z andrea $ +# $Id: PKGBUILD 189609 2013-07-03 17:03:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,6 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-applets-fuzzy-clock' 'kdeplasma-addons-applets-icontasks' 'kdeplasma-addons-applets-incomingmsg' - 'kdeplasma-addons-applets-kdeobservatory' 'kdeplasma-addons-applets-kimpanel' 'kdeplasma-addons-applets-knowledgebase' 'kdeplasma-addons-applets-kolourpicker' @@ -77,7 +76,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-qmlwallpapers' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -86,7 +85,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=('bdc8f5db0253132f8007d52fc79d8aa2ea2f9e0a') +sha1sums=('d2198e25bdde0f9b4ce6ce0024c4662dc97e5fa4') build() { mkdir build @@ -224,14 +223,6 @@ package_kdeplasma-addons-applets-incomingmsg() { make DESTDIR=$pkgdir install } -package_kdeplasma-addons-applets-kdeobservatory() { - pkgdesc='Visualize the KDE ecosystem' - depends=('kdeplasma-addons-libs' 'qwt') - install='kdeplasma-addons.install' - cd $srcdir/build/applets/kdeobservatory - make DESTDIR=$pkgdir install -} - package_kdeplasma-addons-applets-kimpanel() { pkgdesc='A generic input method panel for Oriental languages' depends=('kdeplasma-addons-libs') diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 6fb1ea26a..f12dadca6 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 188716 2013-06-18 14:20:59Z andrea $ +# $Id: PKGBUILD 189497 2013-07-03 17:00:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 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=('167c7bc7f9f83f4017f006e2b4c2a3ec24eb6c9d' +sha1sums=('39cca1dad490ba9ec36b43967afc0159d7343185' 'dc70306c507083cf9b4bb1c536858742292fa1bf') prepare() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 6d615223f..c0e4d4663 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188047 2013-06-08 08:01:57Z andrea $ +# $Id: PKGBUILD 189610 2013-07-03 17:03:51Z 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.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -26,7 +26,7 @@ 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=('da886df4ddebb12e760db7469de1350feed2b338' +sha1sums=('e14780cfd63f14cc4b5ec2f769af6a5e9b416940' '07db42bbcae402c292eebf002e549b04162621c5') prepare() { diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index 6eac7a25e..08b5c89eb 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188048 2013-06-08 08:01:58Z andrea $ +# $Id: PKGBUILD 189611 2013-07-03 17:03:53Z 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.4 +pkgver=4.10.5 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=('ad148c0b8acdcc8062d832ca21bb84284bcab841') +sha1sums=('acecc68284addf327b70a72c787befd2cc0f28d2') build() { cd $srcdir diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index 64a1eb1f0..52a405b26 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188050 2013-06-08 08:02:01Z andrea $ +# $Id: PKGBUILD 189613 2013-07-03 17:03:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.10.4 +pkgver=4.10.5 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=('acc3004826ae3afd3f87463b6c36661c566a8c7b') +sha1sums=('0028141091901b08b133d338e6c4ce44448b680c') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index 92475c793..4796e58e2 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188051 2013-06-08 08:02:03Z andrea $ +# $Id: PKGBUILD 189614 2013-07-03 17:03:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.10.4 +pkgver=4.10.5 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=('8c8aa571a6e3541e276128503358c6de6bf8e20a') +sha1sums=('9c9f3219482d5a90e8c90d5fc0a3fa53c947d150') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index 9a2e544ea..bbfa1af77 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188052 2013-06-08 08:02:07Z andrea $ +# $Id: PKGBUILD 189615 2013-07-03 17:03:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.10.4 +pkgver=4.10.5 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=('bd3525ffc4fbd2e0f8fbbdd377b00ac21ae9241d') +sha1sums=('0d3ff509cd38ba290160575d7456ec17bfe00628') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index 3cd9bc54b..a15c4b171 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188053 2013-06-08 08:02:10Z andrea $ +# $Id: PKGBUILD 189616 2013-07-03 17:03:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.10.4 +pkgver=4.10.5 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=('9d0c6f9a476610670cc7775b6bb5cc5f014f8536') +sha1sums=('23c17847fa52849c90920f4a4717d578aedc0cdc') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index bf389fc13..9087b06f0 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188054 2013-06-08 08:02:11Z andrea $ +# $Id: PKGBUILD 189617 2013-07-03 17:04:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.10.4 +pkgver=4.10.5 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=('12160f2b5e7bb94cd72d090627f39b4eaa2ae03e') +sha1sums=('9758ded1ad5a664d4f22f4de16e3809549495ee5') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index cef8c9182..e0741d5fc 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188055 2013-06-08 08:02:12Z andrea $ +# $Id: PKGBUILD 189618 2013-07-03 17:04:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.10.4 +pkgver=4.10.5 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=('b4d9773326dfe16f3b50b6f16b52c906b7c3180e') +sha1sums=('4875e0940e4e18d4be9c428c66aaaf204950ae3c') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index 85f9325fc..72ef08458 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.4 +pkgver=4.10.5 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=('9e8ee623f83a7d909b1e4385430c9716807bfa2e') +sha1sums=('c87ff44502352ae63120991866c239544d28d3ca') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index 6c5b89040..2b5e684c9 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188057 2013-06-08 08:02:15Z andrea $ +# $Id: PKGBUILD 189620 2013-07-03 17:04:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.10.4 +pkgver=4.10.5 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=('f98109823013dd6ee7cff81e55f338dbd8695eab') +sha1sums=('f34c6b40a9cc581ab03bd79839276fdd9885b356') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index 7aa80414e..5484f5e52 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188058 2013-06-08 08:02:17Z andrea $ +# $Id: PKGBUILD 189621 2013-07-03 17:04:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.10.4 +pkgver=4.10.5 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=('47198c116fab656279090e9461daf334381554b2') +sha1sums=('ff945ff2cee1a0e9bcccd3d526dd077028c21308') build() { cd "${srcdir}" diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD index 7106e1082..13c27b5b2 100644 --- a/extra/kdeutils-print-manager/PKGBUILD +++ b/extra/kdeutils-print-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188059 2013-06-08 08:02:19Z andrea $ +# $Id: PKGBUILD 189622 2013-07-03 17:04:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-print-manager -pkgver=4.10.4 +pkgver=4.10.5 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=('a2adfbb31a78f1f7978997844c1d758fac53098a') +sha1sums=('fb8df7bf5f9bd6da2099e9dadf3cdf20f20a9083') build() { mkdir build diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index 28f62fd27..76f05035f 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188060 2013-06-08 08:02:21Z andrea $ +# $Id: PKGBUILD 189623 2013-07-03 17:04:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.10.4 +pkgver=4.10.5 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=('0c5addd5093d676ba2733c7132d4a231f0e6955e') +sha1sums=('7e41f314431432b1d5b7b51432f6c80b910b3e55') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index 75890f0c0..5ddc89b6d 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188061 2013-06-08 08:02:22Z andrea $ +# $Id: PKGBUILD 189624 2013-07-03 17:04:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.10.4 +pkgver=4.10.5 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=('646e60691f68bfbff9b5ecc57cf0e198a6229a53') +sha1sums=('e88a8782c33ba5ca8893c8df4826dc699de1cccb') build() { cd "${srcdir}" diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index 0cca96ed0..ee0b1dfe4 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188062 2013-06-08 08:02:24Z andrea $ +# $Id: PKGBUILD 189625 2013-07-03 17:04:16Z 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.4 +pkgver=4.10.5 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=('d54b8a154350795613080a5f28f56bbf80c10ed2') +sha1sums=('6d81be773a08fe41cbd34ac178107e3ba3a96181') build() { cd $srcdir diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD index cfeec5209..2521472b1 100644 --- a/extra/lcms2/PKGBUILD +++ b/extra/lcms2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166698 2012-09-15 23:58:57Z eric $ +# $Id: PKGBUILD 189259 2013-07-01 18:54:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=lcms2 -pkgver=2.4 -pkgrel=1.1 +pkgver=2.5 +pkgrel=1 pkgdesc="Small-footprint color management engine, version 2" arch=('i686' 'x86_64' 'mips64el') license=('MIT') @@ -12,21 +12,21 @@ depends=('libtiff') url="http://www.littlecms.com" options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz) -sha1sums=('9944902864283af49e4e21a1ca456db4e04ea7c2') +sha1sums=('bab3470471fc7756c5fbe71be9a3c7d677d2ee7b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD index 1fbc25589..40409218e 100644 --- a/extra/leveldb/PKGBUILD +++ b/extra/leveldb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188250 2013-06-13 13:52:03Z dreisner $ +# $Id: PKGBUILD 189268 2013-07-02 02:41:15Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: feydaykyn <feydaykyn@yahoo.fr> pkgname=leveldb -pkgver=1.10.0 +pkgver=1.12.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=('d5b234658138d07f6edc2de24e01d9b0585c03cb') +sha1sums=('e7b84f239949920bfc2d7d1074ec6a6fa8869e23') build() { make -C "$pkgname-$pkgver" diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index d7da69d70..93312bb7e 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185754 2013-05-18 10:51:46Z andyrtr $ +# $Id: PKGBUILD 189301 2013-07-02 19:57:06Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.45 +pkgver=2.4.46 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch COPYING) -sha256sums=('3ef0a70c16080fb90c50e807b660b7353d82509c03647f6ecc00bbfa1caee208' +sha256sums=('33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1' 'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD index b58503776..26f5cf8b0 100644 --- a/extra/libkcddb/PKGBUILD +++ b/extra/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187950 2013-06-08 07:59:30Z andrea $ +# $Id: PKGBUILD 189513 2013-07-03 17:01:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcddb -pkgver=4.10.4 +pkgver=4.10.5 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=('a9017c1922ee56f51c16c617e9046ccb6149ccd5') +sha1sums=('125568df9a1f8e1f78f29d6e85ac7681100ed9ff') build() { cd "${srcdir}" diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD index 68225a978..01ecddac6 100644 --- a/extra/libkcompactdisc/PKGBUILD +++ b/extra/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187951 2013-06-08 07:59:31Z andrea $ +# $Id: PKGBUILD 189514 2013-07-03 17:01:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcompactdisc -pkgver=4.10.4 +pkgver=4.10.5 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=('d442e7d4257b68f182815f3a4330982a026b7dc3') +sha1sums=('69c63adeaa2d449a36f7cb7b9735321e7f8e3fc2') build() { cd "${srcdir}" diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 819d7d53c..cc3dec567 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187945 2013-06-08 07:59:25Z andrea $ +# $Id: PKGBUILD 189508 2013-07-03 17:00:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.10.4 +pkgver=4.10.5 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=('3390eb344d62f7e44fe5db65eb171d397142fa96') +sha1sums=('fc124bb21db24dea02233e26f852628e10dd11d4') build() { mkdir build diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index 8c3ea236d..a8dc805f1 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187943 2013-06-08 07:59:23Z andrea $ +# $Id: PKGBUILD 189506 2013-07-03 17:00:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.10.4 +pkgver=4.10.5 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=('78b56f1388be8fcbfc0d9f4f9e395a6ae5f25d7f') +sha1sums=('40c7aa6d23f31389bb72ae9f2c25bbdfe54d34f5') build() { cd "${srcdir}" diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD index 4f9ffb501..37bfeb96c 100644 --- a/extra/libkdegames/PKGBUILD +++ b/extra/libkdegames/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187952 2013-06-08 07:59:32Z andrea $ +# $Id: PKGBUILD 189515 2013-07-03 17:01:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdegames -pkgver=4.10.4 +pkgver=4.10.5 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=('5c3ff5f9ac6c7f4c80044e67cad1863631c0a7e6') +sha1sums=('d4f343d27fbc83e8b31b6bf2cb626e893b9ac515') build() { mkdir build diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index bc614dfea..b2b49c2bc 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187946 2013-06-08 07:59:26Z andrea $ +# $Id: PKGBUILD 189509 2013-07-03 17:01:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.10.4 +pkgver=4.10.5 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=('88db6d3eae13ac1dd0113e456cb1f6ad8f31c7b3') +sha1sums=('9521acdb66893006143bffdba81d2dbf140ce27f') build() { cd "${srcdir}" diff --git a/extra/libkfbapi/PKGBUILD b/extra/libkfbapi/PKGBUILD new file mode 100644 index 000000000..6182653fd --- /dev/null +++ b/extra/libkfbapi/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 188957 2013-06-27 06:08:07Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: birdflesh <antkoul at gmail dot com> + +pkgname=libkfbapi +pkgver=1.0 +pkgrel=1 +pkgdesc="KDE library for accessing Facebook services" +arch=('i686' 'x86_64') +url='https://projects.kde.org/libkfbapi' +license=('GPL') +depends=('kdepimlibs') +makedepends=('cmake' 'automoc4' 'boost') +source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2") +md5sums=('05ce3213a1383796a02115705c2bf829') + +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/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 805629acf..52ab216c4 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.10.4 +pkgver=4.10.5 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=('f4d96eddaad6e160c3ca579420117ed2deec74f6') +sha1sums=('a9ead1c184938ea17b3bc0162dabb4df7ae4673b') build() { cd "${srcdir}" diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD index c3fc14617..ae74de3ea 100644 --- a/extra/libkmahjongg/PKGBUILD +++ b/extra/libkmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187953 2013-06-08 07:59:33Z andrea $ +# $Id: PKGBUILD 189516 2013-07-03 17:01:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkmahjongg -pkgver=4.10.4 +pkgver=4.10.5 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=('5bb8fbcc696702489fb12dde5f8a098aecdd9a3a') +sha1sums=('5dbed099eea3338088b61173c512dda4c92747a4') build() { mkdir build diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index d72ffc11f..5190eb293 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187948 2013-06-08 07:59:28Z andrea $ +# $Id: PKGBUILD 189511 2013-07-03 17:01:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.10.4 +pkgver=4.10.5 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=('6bb65bd85a9e65dfc20448a359df77c11e6aca55') +sha1sums=('5142d582390b031751dc410bdef80253dd596dfb') build() { cd "${srcdir}" diff --git a/extra/libmspack/PKGBUILD b/extra/libmspack/PKGBUILD index cdf016760..f180b2a97 100644 --- a/extra/libmspack/PKGBUILD +++ b/extra/libmspack/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136796 2011-09-01 15:19:12Z andyrtr $ +# $Id: PKGBUILD 189640 2013-07-03 19:24:42Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libmspack -pkgver=0.3alpha -pkgrel=1.1 +pkgver=0.4alpha +pkgrel=1 pkgdesc="A library for Microsoft compression formats" arch=('i686' 'x86_64' 'mips64el') url="http://www.cabextract.org.uk/libmspack/" @@ -12,7 +12,7 @@ depends=('glibc') makedepends=() options=('!libtool') source=(http://www.cabextract.org.uk/libmspack/$pkgname-$pkgver.tar.gz) -md5sums=('08d08455b6d58ea649b35febd23f6386') +md5sums=('1ab10b507259993c74b4c41a88103b59') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD index 0d1a717b1..2c6086d5c 100644 --- a/extra/libsecret/PKGBUILD +++ b/extra/libsecret/PKGBUILD @@ -3,13 +3,14 @@ pkgname=libsecret pkgver=0.15 -pkgrel=1 +pkgrel=2 pkgdesc='library for storing and retrieving passwords and other secrets.' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="https://live.gnome.org/Libsecret" depends=('glib2' 'libgcrypt') makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'vala') +optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) sha256sums=('33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8') diff --git a/extra/libtheora/PKGBUILD b/extra/libtheora/PKGBUILD index 7871d1c24..8280477cf 100644 --- a/extra/libtheora/PKGBUILD +++ b/extra/libtheora/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137894 2011-09-12 09:56:42Z pierre $ +# $Id: PKGBUILD 189280 2013-07-02 08:08:13Z jgc $ # Maintainer: Tom Killian <tom@archlinux.org> # Committer: dorphell <dorphell@archlinux.org> pkgname=libtheora pkgver=1.1.1 -pkgrel=2.1 +pkgrel=3 pkgdesc="An open video codec developed by the Xiph.org" arch=('i686' 'x86_64' 'mips64el') url="http://www.xiph.org" @@ -12,18 +12,26 @@ license=('BSD') depends=('libogg') makedepends=('libvorbis') options=('!libtool') -source=("http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2") -md5sums=('292ab65cedd5021d6b7ddd117e07cd8e') -sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262') +source=(http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2 + libtheora-1.1.1-libpng16.patch) +md5sums=('292ab65cedd5021d6b7ddd117e07cd8e' + '08edd81c7a1be2c4edfd2cd3c112a8c6') +sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262' + 'c3f03dbaa5c6459846ce79ea904db1b66971878d') + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np0 -i ../libtheora-1.1.1-libpng16.patch +} build() { - cd "${srcdir}/libtheora-${pkgver}" - ./configure --prefix=/usr --enable-shared --disable-static --build=$CHOST --target=$CHOST --host=$CHOST + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --enable-shared --disable-static make } package() { - cd "${srcdir}/libtheora-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/libtheora/libtheora-1.1.1-libpng16.patch b/extra/libtheora/libtheora-1.1.1-libpng16.patch new file mode 100644 index 000000000..93da700c4 --- /dev/null +++ b/extra/libtheora/libtheora-1.1.1-libpng16.patch @@ -0,0 +1,17 @@ +http://bugs.gentoo.org/465450 +http://trac.xiph.org/ticket/1947 + +--- examples/png2theora.c ++++ examples/png2theora.c +@@ -462,9 +462,9 @@ + png_set_strip_alpha(png_ptr); + + row_data = (png_bytep)png_malloc(png_ptr, +- 3*height*width*png_sizeof(*row_data)); ++ 3*height*width*sizeof(*row_data)); + row_pointers = (png_bytep *)png_malloc(png_ptr, +- height*png_sizeof(*row_pointers)); ++ height*sizeof(*row_pointers)); + for(y = 0; y < height; y++) { + row_pointers[y] = row_data + y*(3*width); + } diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD index e822af1bc..1bf94b42b 100644 --- a/extra/libva-intel-driver/PKGBUILD +++ b/extra/libva-intel-driver/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182376 2013-04-09 18:36:11Z ioni $ +# $Id: PKGBUILD 188964 2013-06-27 12:37:13Z heftig $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva-intel-driver -pkgver=1.0.20 +pkgver=1.2.0 pkgrel=1 pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family." arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('libva') options=('!libtool') replaces=('libva-driver-intel') source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('0aeba2d78f02c4f2c13b519c468e04fa88b2ae3e') +sha1sums=('580c8dc5d2323b1e7dd9506512695001f845c2f1') build() { cd $pkgname-$pkgver diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD index 5542ce890..bcf5de286 100644 --- a/extra/libva/PKGBUILD +++ b/extra/libva/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182375 2013-04-09 18:35:29Z ioni $ +# $Id: PKGBUILD 188963 2013-06-27 12:36:37Z heftig $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva -pkgver=1.1.1 +pkgver=1.2.1 pkgrel=1 pkgdesc="Video Acceleration (VA) API for Linux" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('libva-vdpau-driver: vdpau back-end for nvidia' 'libva-intel-driver: back-end for intel cards') options=('!libtool') source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('755e488677a196c9ac18b8c0d11aa2a56e050306') +sha1sums=('f716a4cadd670b14f44a2e833f96a2c509956339') build() { cd "$pkgname-$pkgver" diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD index f62047d91..ec4e40325 100644 --- a/extra/libvdpau/PKGBUILD +++ b/extra/libvdpau/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 176895 2013-02-02 07:01:31Z andyrtr $ +# $Id: PKGBUILD 189278 2013-07-02 07:41:51Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libvdpau pkgver=0.6 -pkgrel=1 +pkgrel=2 pkgdesc="Nvidia VDPAU library" arch=(i686 x86_64 mips64el) url='http://cgit.freedesktop.org/~aplattner/libvdpau' -depends=('gcc-libs') +depends=('gcc-libs' 'libxext') conflicts=('nvidia-utils<190.42-2') options=('!libtool') license=('custom') source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz) -makedepends=('libx11') +makedepends=('dri2proto') sha256sums=('9b55beec9d8b01bbf89229b7d075ceee870f4e1830523c11f29a46c07fe72d75') build() { diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD index ae57ce964..ac72fa01e 100644 --- a/extra/libwebp/PKGBUILD +++ b/extra/libwebp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184409 2013-05-06 19:38:39Z foutrelis $ +# $Id: PKGBUILD 188992 2013-06-27 23:02:01Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=libwebp -pkgver=0.3.0 -pkgrel=3 +pkgver=0.3.1 +pkgrel=1 pkgdesc="WebP library and conversion tools" arch=('x86_64' 'i686' 'mips64el') url="https://developers.google.com/speed/webp/" @@ -13,7 +13,7 @@ license=(BSD) depends=(libpng libjpeg libtiff giflib) options=('!libtool') source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha256sums=('8903fca40ece603b9cb20d32105168da7e2a33bebbd4d89001a3c8741ef03ddb') +sha256sums=('b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD index 38e2623e2..8d7b13e69 100644 --- a/extra/libxi/PKGBUILD +++ b/extra/libxi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188904 2013-06-24 21:48:21Z lcarlier $ +# $Id: PKGBUILD 189335 2013-07-03 08:11:31Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxi -pkgver=1.7.1 -pkgrel=3 +pkgver=1.7.2 +pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org" @@ -12,20 +12,8 @@ depends=('libxext' 'inputproto') makedepends=('pkgconfig' 'xorg-util-macros' 'libxfixes' 'automake') options=(!libtool) license=('custom') -source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2 - git-fixes.diff) -sha256sums=('e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5' - 'faa2f76f68e65f537062829ad45977561079ac8747bd8e24a82055e70a5bf0cc') - -prepare() { - cd "${srcdir}/libXi-${pkgver}" - - # fix CVE-2013-1998 CVE-2013-1984 CVE-2013-1995 merged upstream - patch -Np1 -i ${srcdir}/git-fixes.diff - - # a patch change configure.ac - autoreconf -fiv -} +source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) +sha256sums=('df24781dc63645e2b561cd0b20bd8a0e7aff02e426a8d2a7641159004d4cb20e') build() { cd "${srcdir}/libXi-${pkgver}" diff --git a/extra/libxi/git-fixes.diff b/extra/libxi/git-fixes.diff deleted file mode 100644 index b1b4f40d9..000000000 --- a/extra/libxi/git-fixes.diff +++ /dev/null @@ -1,1386 +0,0 @@ -From bb82c72a1d69eaf60b7586570faf797df967f661 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Mon, 29 Apr 2013 18:39:34 -0700 -Subject: [PATCH 01/16] Expand comment on the memory vs. reply ordering in - XIGetSelectedEvents() - -Unpacking from the wire involves un-interleaving the structs & masks, -which wasn't obvious to me the first time I read it, so make notes -before I forget again. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XISelEv.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/XISelEv.c b/src/XISelEv.c -index fa7eb54..f871222 100644 ---- a/src/XISelEv.c -+++ b/src/XISelEv.c -@@ -135,8 +135,14 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - - _XRead(dpy, (char*)mask_in, reply.length * 4); - -- /* Memory layout of the XIEventMask for a 3 mask reply: -- * [struct a][struct b][struct c][masks a][masks b][masks c] -+ /* -+ * This function takes interleaved xXIEventMask structs & masks off -+ * the wire, such as this 3 mask reply: -+ * [struct a][masks a][struct b][masks b][struct c][masks c] -+ * And generates a memory buffer to be returned to callers in which -+ * they are not interleaved, so that callers can treat the returned -+ * pointer as a simple array of XIEventMask structs, such as: -+ * [struct a][struct b][struct c][masks a][masks b][masks c] - */ - len = reply.num_masks * sizeof(XIEventMask); - --- -1.8.3.1 - - -From 5d43d4914dcabb6de69859567061e99300e56ef4 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri, 17 May 2013 09:07:44 +1000 -Subject: [PATCH 02/16] Copy the sequence number into the target event too - (#64687) - -X.Org Bug 64687 <http://bugs.freedesktop.org/show_bug.cgi?id=64687> - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> ---- - src/XExtInt.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/XExtInt.c b/src/XExtInt.c -index 507573b..8e19b97 100644 ---- a/src/XExtInt.c -+++ b/src/XExtInt.c -@@ -915,6 +915,7 @@ static void xge_copy_to_cookie(xGenericEvent* ev, - cookie->type = ev->type; - cookie->evtype = ev->evtype; - cookie->extension = ev->extension; -+ cookie->serial = ev->sequenceNumber; - } - - static Bool -@@ -1521,6 +1522,7 @@ wireToDeviceEvent(xXIDeviceEvent *in, XGenericEventCookie* cookie) - out = next_block(&ptr_lib, sizeof(XIDeviceEvent)); - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1793,6 +1795,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie) - cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len); - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1825,6 +1828,7 @@ wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XGenericEventCookie *cookie) - out->info = (XIHierarchyInfo*)&out[1]; - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1865,6 +1869,7 @@ wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cook - - out = next_block(&ptr, sizeof(XIRawEvent)); - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1915,6 +1920,7 @@ wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie *cookie) - out->buttons.mask = (unsigned char*)&out[1]; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1957,6 +1963,7 @@ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie) - cookie->data = out; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1977,6 +1984,7 @@ wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in, - cookie->data = out; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -2004,6 +2012,7 @@ wireToBarrierEvent(xXIBarrierEvent *in, XGenericEventCookie *cookie) - - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); --- -1.8.3.1 - - -From 59b8e1388a687f871831ac5a9e0ac11de75e2516 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Wed, 1 May 2013 23:58:39 -0700 -Subject: [PATCH 03/16] Use _XEatDataWords to avoid overflow of rep.length bit - shifting - -rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - configure.ac | 6 ++++++ - src/XGMotion.c | 2 +- - src/XGetDCtl.c | 2 +- - src/XGetDProp.c | 5 ++--- - src/XGetFCtl.c | 2 +- - src/XGetKMap.c | 2 +- - src/XGetMMap.c | 2 +- - src/XGetProp.c | 4 +--- - src/XGtSelect.c | 2 +- - src/XIProperties.c | 7 +++---- - src/XIint.h | 14 ++++++++++++++ - src/XListDProp.c | 2 +- - src/XListDev.c | 2 +- - src/XOpenDev.c | 2 +- - src/XQueryDv.c | 2 +- - 15 files changed, 36 insertions(+), 20 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8dbca38..f5ef1e2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,6 +31,12 @@ PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] - # CFLAGS only for PointerBarrier typedef - PKG_CHECK_MODULES(XFIXES, [xfixes >= 5]) - -+# Check for _XEatDataWords function that may be patched into older Xlib releases -+SAVE_LIBS="$LIBS" -+LIBS="$XI_LIBS" -+AC_CHECK_FUNCS([_XEatDataWords]) -+LIBS="$SAVE_LIBS" -+ - # Check for xmlto and asciidoc for man page conversion - # (only needed by people building tarballs) - if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then -diff --git a/src/XGMotion.c b/src/XGMotion.c -index 99b1c44..5feac85 100644 ---- a/src/XGMotion.c -+++ b/src/XGMotion.c -@@ -112,7 +112,7 @@ XGetDeviceMotionEvents( - Xfree(bufp); - Xfree(savp); - *nEvents = 0; -- _XEatData(dpy, (unsigned long)size); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return (NULL); -diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c -index c66212d..f73a4e8 100644 ---- a/src/XGetDCtl.c -+++ b/src/XGetDCtl.c -@@ -95,7 +95,7 @@ XGetDeviceControl( - nbytes = (long)rep.length << 2; - d = (xDeviceState *) Xmalloc((unsigned)nbytes); - if (!d) { -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - goto out; - } - sav = d; -diff --git a/src/XGetDProp.c b/src/XGetDProp.c -index 5d44f91..f9e8f0c 100644 ---- a/src/XGetDProp.c -+++ b/src/XGetDProp.c -@@ -112,14 +112,13 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - * This part of the code should never be reached. If it is, - * the server sent back a property with an invalid format. - */ -- nbytes = rep.length << 2; -- _XEatData(dpy, (unsigned long) nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadImplementation); - } - if (! *prop) { -- _XEatData(dpy, (unsigned long) nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadAlloc); -diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c -index 43afa00..28fab4d 100644 ---- a/src/XGetFCtl.c -+++ b/src/XGetFCtl.c -@@ -95,7 +95,7 @@ XGetFeedbackControl( - nbytes = (long)rep.length << 2; - f = (xFeedbackState *) Xmalloc((unsigned)nbytes); - if (!f) { -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - goto out; - } - sav = f; -diff --git a/src/XGetKMap.c b/src/XGetKMap.c -index 9431fbb..00dde06 100644 ---- a/src/XGetKMap.c -+++ b/src/XGetKMap.c -@@ -99,7 +99,7 @@ XGetDeviceKeyMapping(register Display * dpy, XDevice * dev, - if (mapping) - _XRead(dpy, (char *)mapping, nbytes); - else -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - } - - UnlockDisplay(dpy); -diff --git a/src/XGetMMap.c b/src/XGetMMap.c -index 8a1cdb2..ce10c2d 100644 ---- a/src/XGetMMap.c -+++ b/src/XGetMMap.c -@@ -92,7 +92,7 @@ XGetDeviceModifierMapping( - if (res->modifiermap) - _XReadPad(dpy, (char *)res->modifiermap, nbytes); - else -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - res->max_keypermod = rep.numKeyPerModifier; - } - -diff --git a/src/XGetProp.c b/src/XGetProp.c -index c5d088b..34bc581 100644 ---- a/src/XGetProp.c -+++ b/src/XGetProp.c -@@ -68,7 +68,6 @@ XGetDeviceDontPropagateList( - int *count) - { - XEventClass *list = NULL; -- int rlen; - xGetDeviceDontPropagateListReq *req; - xGetDeviceDontPropagateListReply rep; - XExtDisplayInfo *info = XInput_find_display(dpy); -@@ -90,7 +89,6 @@ XGetDeviceDontPropagateList( - *count = rep.count; - - if (*count) { -- rlen = rep.length << 2; - list = (XEventClass *) Xmalloc(rep.length * sizeof(XEventClass)); - if (list) { - int i; -@@ -105,7 +103,7 @@ XGetDeviceDontPropagateList( - list[i] = (XEventClass) ec; - } - } else -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - } - - UnlockDisplay(dpy); -diff --git a/src/XGtSelect.c b/src/XGtSelect.c -index f890db7..5c0f812 100644 ---- a/src/XGtSelect.c -+++ b/src/XGtSelect.c -@@ -104,7 +104,7 @@ XGetSelectedExtensionEvents( - (XEventClass *) Xmalloc(*this_client_count * - sizeof(XEventClass)); - if (!*this_client_list) { -- _XEatData(dpy, (unsigned long)tlen + alen); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return (Success); -diff --git a/src/XIProperties.c b/src/XIProperties.c -index 83a7a68..5e58fb6 100644 ---- a/src/XIProperties.c -+++ b/src/XIProperties.c -@@ -64,7 +64,7 @@ XIListProperties(Display* dpy, int deviceid, int *num_props_return) - props = (Atom*)Xmalloc(rep.num_properties * sizeof(Atom)); - if (!props) - { -- _XEatData(dpy, rep.num_properties << 2); -+ _XEatDataWords(dpy, rep.length); - goto cleanup; - } - -@@ -203,8 +203,7 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - * This part of the code should never be reached. If it is, - * the server sent back a property with an invalid format. - */ -- nbytes = rep.length << 2; -- _XEatData(dpy, nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadImplementation); -@@ -222,7 +221,7 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - *data = Xmalloc(rbytes); - - if (!(*data)) { -- _XEatData(dpy, nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadAlloc); -diff --git a/src/XIint.h b/src/XIint.h -index 571bb23..3ddc3c5 100644 ---- a/src/XIint.h -+++ b/src/XIint.h -@@ -83,4 +83,18 @@ next_block(void **ptr, int size) { - return ret; - } - -+#ifndef HAVE__XEATDATAWORDS -+#include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */ -+#include <limits.h> -+ -+static inline void _XEatDataWords(Display *dpy, unsigned long n) -+{ -+# ifndef LONG64 -+ if (n >= (ULONG_MAX >> 2)) -+ _XIOError(dpy); -+# endif -+ _XEatData (dpy, n << 2); -+} -+#endif -+ - #endif -diff --git a/src/XListDProp.c b/src/XListDProp.c -index 8667350..bde6cb5 100644 ---- a/src/XListDProp.c -+++ b/src/XListDProp.c -@@ -65,7 +65,7 @@ XListDeviceProperties(Display* dpy, XDevice* dev, int *nprops_return) - props = (Atom*)Xmalloc(rep.nAtoms * sizeof(Atom)); - if (!props) - { -- _XEatData(dpy, rep.nAtoms << 2); -+ _XEatDataWords(dpy, rep.length); - goto cleanup; - } - -diff --git a/src/XListDev.c b/src/XListDev.c -index bd6e70a..1fa4747 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -202,7 +202,7 @@ XListInputDevices( - list = (xDeviceInfo *) Xmalloc(rlen); - slist = list; - if (!slist) { -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return (XDeviceInfo *) NULL; -diff --git a/src/XOpenDev.c b/src/XOpenDev.c -index 74f18ac..e784f8b 100644 ---- a/src/XOpenDev.c -+++ b/src/XOpenDev.c -@@ -101,7 +101,7 @@ XOpenDevice( - if (rlen - dlen > 0) - _XEatData(dpy, (unsigned long)rlen - dlen); - } else -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - - UnlockDisplay(dpy); - SyncHandle(); -diff --git a/src/XQueryDv.c b/src/XQueryDv.c -index 24d4e4e..69c285b 100644 ---- a/src/XQueryDv.c -+++ b/src/XQueryDv.c -@@ -91,7 +91,7 @@ XQueryDeviceState( - if (rlen > 0) { - data = Xmalloc(rlen); - if (!data) { -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - goto out; - } - _XRead(dpy, data, rlen); --- -1.8.3.1 - - -From f3e08e4fbe40016484ba795feecf1a742170ffc1 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:26:52 -0800 -Subject: [PATCH 04/16] Stack buffer overflow in XGetDeviceButtonMapping() - [CVE-2013-1998 1/3] - -We copy the entire reply sent by the server into the fixed size -mapping[] array on the stack, even if the server says it's a larger -size than the mapping array can hold. HULK SMASH STACK! - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetBMap.c | 21 +++++++++++++-------- - 1 file changed, 13 insertions(+), 8 deletions(-) - -diff --git a/src/XGetBMap.c b/src/XGetBMap.c -index 211c9ca..002daba 100644 ---- a/src/XGetBMap.c -+++ b/src/XGetBMap.c -@@ -60,6 +60,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - #ifdef MIN /* some systems define this in <sys/param.h> */ - #undef MIN -@@ -75,7 +76,6 @@ XGetDeviceButtonMapping( - { - int status = 0; - unsigned char mapping[256]; /* known fixed size */ -- long nbytes; - XExtDisplayInfo *info = XInput_find_display(dpy); - - register xGetDeviceButtonMappingReq *req; -@@ -92,13 +92,18 @@ XGetDeviceButtonMapping( - - status = _XReply(dpy, (xReply *) & rep, 0, xFalse); - if (status == 1) { -- nbytes = (long)rep.length << 2; -- _XRead(dpy, (char *)mapping, nbytes); -- -- /* don't return more data than the user asked for. */ -- if (rep.nElts) -- memcpy((char *)map, (char *)mapping, MIN((int)rep.nElts, nmap)); -- status = rep.nElts; -+ if (rep.length <= (sizeof(mapping) >> 2)) { -+ unsigned long nbytes = rep.length << 2; -+ _XRead(dpy, (char *)mapping, nbytes); -+ -+ /* don't return more data than the user asked for. */ -+ if (rep.nElts) -+ memcpy(map, mapping, MIN((int)rep.nElts, nmap)); -+ status = rep.nElts; -+ } else { -+ _XEatDataWords(dpy, rep.length); -+ status = 0; -+ } - } else - status = 0; - UnlockDisplay(dpy); --- -1.8.3.1 - - -From 91434737f592e8f5cc1762383882a582b55fc03a Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 23:37:23 -0800 -Subject: [PATCH 05/16] memory corruption in _XIPassiveGrabDevice() - [CVE-2013-1998 2/3] - -If the server returned more modifiers than the caller asked for, -we'd just keep copying past the end of the array provided by the -caller, writing over who-knows-what happened to be there. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XIPassiveGrab.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/XIPassiveGrab.c b/src/XIPassiveGrab.c -index ac17c01..53b4084 100644 ---- a/src/XIPassiveGrab.c -+++ b/src/XIPassiveGrab.c -@@ -88,7 +88,7 @@ _XIPassiveGrabDevice(Display* dpy, int deviceid, int grabtype, int detail, - return -1; - _XRead(dpy, (char*)failed_mods, reply.num_modifiers * sizeof(xXIGrabModifierInfo)); - -- for (i = 0; i < reply.num_modifiers; i++) -+ for (i = 0; i < reply.num_modifiers && i < num_modifiers; i++) - { - modifiers_inout[i].status = failed_mods[i].status; - modifiers_inout[i].modifiers = failed_mods[i].modifiers; --- -1.8.3.1 - - -From 5398ac0797f7516f2c9b8f2869a6c6d071437352 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Fri, 26 Apr 2013 22:48:36 -0700 -Subject: [PATCH 06/16] unvalidated lengths in XQueryDeviceState() - [CVE-2013-1998 3/3] - -If the lengths given for each class state in the reply add up to more -than the rep.length, we could read past the end of the buffer allocated -to hold the data read from the server. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XQueryDv.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/src/XQueryDv.c b/src/XQueryDv.c -index 69c285b..3836777 100644 ---- a/src/XQueryDv.c -+++ b/src/XQueryDv.c -@@ -59,6 +59,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XDeviceState * - XQueryDeviceState( -@@ -66,8 +67,8 @@ XQueryDeviceState( - XDevice *dev) - { - int i, j; -- int rlen; -- int size = 0; -+ unsigned long rlen; -+ size_t size = 0; - xQueryDeviceStateReq *req; - xQueryDeviceStateReply rep; - XDeviceState *state = NULL; -@@ -87,9 +88,11 @@ XQueryDeviceState( - if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) - goto out; - -- rlen = rep.length << 2; -- if (rlen > 0) { -- data = Xmalloc(rlen); -+ if (rep.length > 0) { -+ if (rep.length < (INT_MAX >> 2)) { -+ rlen = (unsigned long) rep.length << 2; -+ data = Xmalloc(rlen); -+ } - if (!data) { - _XEatDataWords(dpy, rep.length); - goto out; -@@ -97,6 +100,10 @@ XQueryDeviceState( - _XRead(dpy, data, rlen); - - for (i = 0, any = (XInputClass *) data; i < (int)rep.num_classes; i++) { -+ if (any->length > rlen) -+ goto out; -+ rlen -= any->length; -+ - switch (any->class) { - case KeyClass: - size += sizeof(XKeyState); --- -1.8.3.1 - - -From b0b13c12a8079a5a0e7f43b2b8983699057b2cec Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 07/16] integer overflow in XGetDeviceControl() [CVE-2013-1984 - 1/8] - -If the number of valuators reported by the server is large enough that -it overflows when multiplied by the size of the appropriate struct, then -memory corruption can occur when more bytes are copied from the X server -reply than the size of the buffer we allocated to hold them. - -v2: check that reply size fits inside the data read from the server, so -we don't read out of bounds either - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetDCtl.c | 31 ++++++++++++++++++++++++------- - 1 file changed, 24 insertions(+), 7 deletions(-) - -diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c -index f73a4e8..51ed0ae 100644 ---- a/src/XGetDCtl.c -+++ b/src/XGetDCtl.c -@@ -61,6 +61,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XDeviceControl * - XGetDeviceControl( -@@ -68,8 +69,6 @@ XGetDeviceControl( - XDevice *dev, - int control) - { -- int size = 0; -- int nbytes, i; - XDeviceControl *Device = NULL; - XDeviceControl *Sav = NULL; - xDeviceState *d = NULL; -@@ -92,8 +91,12 @@ XGetDeviceControl( - goto out; - - if (rep.length > 0) { -- nbytes = (long)rep.length << 2; -- d = (xDeviceState *) Xmalloc((unsigned)nbytes); -+ unsigned long nbytes; -+ size_t size = 0; -+ if (rep.length < (INT_MAX >> 2)) { -+ nbytes = (unsigned long) rep.length << 2; -+ d = Xmalloc(nbytes); -+ } - if (!d) { - _XEatDataWords(dpy, rep.length); - goto out; -@@ -111,33 +114,46 @@ XGetDeviceControl( - case DEVICE_RESOLUTION: - { - xDeviceResolutionState *r; -+ size_t val_size; - - r = (xDeviceResolutionState *) d; -- size += sizeof(XDeviceResolutionState) + -- (3 * sizeof(int) * r->num_valuators); -+ if (r->num_valuators >= (INT_MAX / (3 * sizeof(int)))) -+ goto out; -+ val_size = 3 * sizeof(int) * r->num_valuators; -+ if ((sizeof(xDeviceResolutionState) + val_size) > nbytes) -+ goto out; -+ size += sizeof(XDeviceResolutionState) + val_size; - break; - } - case DEVICE_ABS_CALIB: - { -+ if (sizeof(xDeviceAbsCalibState) > nbytes) -+ goto out; - size += sizeof(XDeviceAbsCalibState); - break; - } - case DEVICE_ABS_AREA: - { -+ if (sizeof(xDeviceAbsAreaState) > nbytes) -+ goto out; - size += sizeof(XDeviceAbsAreaState); - break; - } - case DEVICE_CORE: - { -+ if (sizeof(xDeviceCoreState) > nbytes) -+ goto out; - size += sizeof(XDeviceCoreState); - break; - } - default: -+ if (d->length > nbytes) -+ goto out; - size += d->length; - break; - } - -- Device = (XDeviceControl *) Xmalloc((unsigned)size); -+ Device = Xmalloc(size); - if (!Device) - goto out; - -@@ -150,6 +166,7 @@ XGetDeviceControl( - int *iptr, *iptr2; - xDeviceResolutionState *r; - XDeviceResolutionState *R; -+ unsigned int i; - - r = (xDeviceResolutionState *) d; - R = (XDeviceResolutionState *) Device; --- -1.8.3.1 - - -From 322ee3576789380222d4403366e4fd12fb24cb6a Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 08/16] integer overflow in XGetFeedbackControl() - [CVE-2013-1984 2/8] - -If the number of feedbacks reported by the server is large enough that -it overflows when multiplied by the size of the appropriate struct, or -if the total size of all the feedback structures overflows when added -together, then memory corruption can occur when more bytes are copied from -the X server reply than the size of the buffer we allocated to hold them. - -v2: check that reply size fits inside the data read from the server, so - we don't read out of bounds either - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetFCtl.c | 24 +++++++++++++++++++----- - 1 file changed, 19 insertions(+), 5 deletions(-) - -diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c -index 28fab4d..bb50bf3 100644 ---- a/src/XGetFCtl.c -+++ b/src/XGetFCtl.c -@@ -61,6 +61,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XFeedbackState * - XGetFeedbackControl( -@@ -68,8 +69,6 @@ XGetFeedbackControl( - XDevice *dev, - int *num_feedbacks) - { -- int size = 0; -- int nbytes, i; - XFeedbackState *Feedback = NULL; - XFeedbackState *Sav = NULL; - xFeedbackState *f = NULL; -@@ -91,9 +90,16 @@ XGetFeedbackControl( - goto out; - - if (rep.length > 0) { -+ unsigned long nbytes; -+ size_t size = 0; -+ int i; -+ - *num_feedbacks = rep.num_feedbacks; -- nbytes = (long)rep.length << 2; -- f = (xFeedbackState *) Xmalloc((unsigned)nbytes); -+ -+ if (rep.length < (INT_MAX >> 2)) { -+ nbytes = rep.length << 2; -+ f = Xmalloc(nbytes); -+ } - if (!f) { - _XEatDataWords(dpy, rep.length); - goto out; -@@ -102,6 +108,10 @@ XGetFeedbackControl( - _XRead(dpy, (char *)f, nbytes); - - for (i = 0; i < *num_feedbacks; i++) { -+ if (f->length > nbytes) -+ goto out; -+ nbytes -= f->length; -+ - switch (f->class) { - case KbdFeedbackClass: - size += sizeof(XKbdFeedbackState); -@@ -116,6 +126,8 @@ XGetFeedbackControl( - { - xStringFeedbackState *strf = (xStringFeedbackState *) f; - -+ if (strf->num_syms_supported >= (INT_MAX / sizeof(KeySym))) -+ goto out; - size += sizeof(XStringFeedbackState) + - (strf->num_syms_supported * sizeof(KeySym)); - } -@@ -130,10 +142,12 @@ XGetFeedbackControl( - size += f->length; - break; - } -+ if (size > INT_MAX) -+ goto out; - f = (xFeedbackState *) ((char *)f + f->length); - } - -- Feedback = (XFeedbackState *) Xmalloc((unsigned)size); -+ Feedback = Xmalloc(size); - if (!Feedback) - goto out; - --- -1.8.3.1 - - -From 6dd6dc51a2935c72774be81e5cc2ba2c30e9feff Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 09/16] integer overflow in XGetDeviceDontPropagateList() - [CVE-2013-1984 3/8] - -If the number of event classes reported by the server is large enough -that it overflows when multiplied by the size of the appropriate struct, -then memory corruption can occur when more bytes are copied from the -X server reply than the size of the buffer we allocated to hold them. - -V2: EatData if count is 0 but length is > 0 to avoid XIOErrors - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetProp.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/XGetProp.c b/src/XGetProp.c -index 34bc581..b49328c 100644 ---- a/src/XGetProp.c -+++ b/src/XGetProp.c -@@ -60,6 +60,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XEventClass * - XGetDeviceDontPropagateList( -@@ -88,10 +89,11 @@ XGetDeviceDontPropagateList( - } - *count = rep.count; - -- if (*count) { -- list = (XEventClass *) Xmalloc(rep.length * sizeof(XEventClass)); -+ if (rep.length != 0) { -+ if ((rep.count != 0) && (rep.length < (INT_MAX / sizeof(XEventClass)))) -+ list = Xmalloc(rep.length * sizeof(XEventClass)); - if (list) { -- int i; -+ unsigned int i; - CARD32 ec; - - /* read and assign each XEventClass separately because --- -1.8.3.1 - - -From bb922ed4253b35590f0369f32a917ff89ade0830 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 10/16] integer overflow in XGetDeviceMotionEvents() - [CVE-2013-1984 4/8] - -If the number of events or axes reported by the server is large enough -that it overflows when multiplied by the size of the appropriate struct, -then memory corruption can occur when more bytes are copied from the -X server reply than the size of the buffer we allocated to hold them. - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGMotion.c | 22 +++++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) - -diff --git a/src/XGMotion.c b/src/XGMotion.c -index 5feac85..a4c75b6 100644 ---- a/src/XGMotion.c -+++ b/src/XGMotion.c -@@ -59,6 +59,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XDeviceTimeCoord * - XGetDeviceMotionEvents( -@@ -74,7 +75,7 @@ XGetDeviceMotionEvents( - xGetDeviceMotionEventsReply rep; - XDeviceTimeCoord *tc; - int *data, *bufp, *readp, *savp; -- long size, size2; -+ unsigned long size; - int i, j; - XExtDisplayInfo *info = XInput_find_display(dpy); - -@@ -104,10 +105,21 @@ XGetDeviceMotionEvents( - SyncHandle(); - return (NULL); - } -- size = rep.length << 2; -- size2 = rep.nEvents * (sizeof(XDeviceTimeCoord) + (rep.axes * sizeof(int))); -- savp = readp = (int *)Xmalloc(size); -- bufp = (int *)Xmalloc(size2); -+ if (rep.length < (INT_MAX >> 2)) { -+ size = rep.length << 2; -+ savp = readp = Xmalloc(size); -+ } else { -+ size = 0; -+ savp = readp = NULL; -+ } -+ /* rep.axes is a CARD8, so assume max number of axes for bounds check */ -+ if (rep.nEvents < -+ (INT_MAX / (sizeof(XDeviceTimeCoord) + (UCHAR_MAX * sizeof(int))))) { -+ size_t bsize = rep.nEvents * -+ (sizeof(XDeviceTimeCoord) + (rep.axes * sizeof(int))); -+ bufp = Xmalloc(bsize); -+ } else -+ bufp = NULL; - if (!bufp || !savp) { - Xfree(bufp); - Xfree(savp); --- -1.8.3.1 - - -From 242f92b490a695fbab244af5bad11b71f897c732 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 11/16] integer overflow in XIGetProperty() [CVE-2013-1984 5/8] - -If the number of items reported by the server is large enough that -it overflows when multiplied by the size of the appropriate item type, -then memory corruption can occur when more bytes are copied from the -X server reply than the size of the buffer we allocated to hold them. - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XIProperties.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/src/XIProperties.c b/src/XIProperties.c -index 5e58fb6..32436d1 100644 ---- a/src/XIProperties.c -+++ b/src/XIProperties.c -@@ -38,6 +38,7 @@ - #include <X11/extensions/XInput2.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - Atom* - XIListProperties(Display* dpy, int deviceid, int *num_props_return) -@@ -170,7 +171,7 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - { - xXIGetPropertyReq *req; - xXIGetPropertyReply rep; -- long nbytes, rbytes; -+ unsigned long nbytes, rbytes; - - XExtDisplayInfo *info = XInput_find_display(dpy); - -@@ -216,9 +217,11 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - * recopy the string to make it null terminated. - */ - -- nbytes = rep.num_items * rep.format/8; -- rbytes = nbytes + 1; -- *data = Xmalloc(rbytes); -+ if (rep.num_items < (INT_MAX / (rep.format/8))) { -+ nbytes = rep.num_items * rep.format/8; -+ rbytes = nbytes + 1; -+ *data = Xmalloc(rbytes); -+ } - - if (!(*data)) { - _XEatDataWords(dpy, rep.length); --- -1.8.3.1 - - -From 528419b9ef437e7eeafb41bf45e8ff7d818bd845 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 12/16] integer overflow in XIGetSelectedEvents() - [CVE-2013-1984 6/8] - -If the number of events or masks reported by the server is large enough -that it overflows when multiplied by the size of the appropriate struct, -or the sizes overflow as they are totaled up, then memory corruption can -occur when more bytes are copied from the X server reply than the size -of the buffer we allocated to hold them. - -v2: check that reply size fits inside the data read from the server, - so that we don't read out of bounds either - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XISelEv.c | 25 +++++++++++++++++++------ - 1 file changed, 19 insertions(+), 6 deletions(-) - -diff --git a/src/XISelEv.c b/src/XISelEv.c -index f871222..0471bef 100644 ---- a/src/XISelEv.c -+++ b/src/XISelEv.c -@@ -42,6 +42,7 @@ in this Software without prior written authorization from the author. - #include <X11/extensions/ge.h> - #include <X11/extensions/geproto.h> - #include "XIint.h" -+#include <limits.h> - - int - XISelectEvents(Display* dpy, Window win, XIEventMask* masks, int num_masks) -@@ -101,13 +102,14 @@ out: - XIEventMask* - XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - { -- int i, len = 0; -+ unsigned int i, len = 0; - unsigned char *mask; - XIEventMask *mask_out = NULL; - xXIEventMask *mask_in = NULL, *mi; - xXIGetSelectedEventsReq *req; - xXIGetSelectedEventsReply reply; - XExtDisplayInfo *info = XInput_find_display(dpy); -+ size_t rbytes; - - *num_masks_return = -1; - LockDisplay(dpy); -@@ -129,11 +131,16 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - goto out; - } - -- mask_in = Xmalloc(reply.length * 4); -- if (!mask_in) -+ if (reply.length < (INT_MAX >> 2)) { -+ rbytes = (unsigned long) reply.length << 2; -+ mask_in = Xmalloc(rbytes); -+ } -+ if (!mask_in) { -+ _XEatDataWords(dpy, reply.length); - goto out; -+ } - -- _XRead(dpy, (char*)mask_in, reply.length * 4); -+ _XRead(dpy, (char*)mask_in, rbytes); - - /* - * This function takes interleaved xXIEventMask structs & masks off -@@ -148,8 +155,14 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - - for (i = 0, mi = mask_in; i < reply.num_masks; i++) - { -- len += mi->mask_len * 4; -- mi = (xXIEventMask*)((char*)mi + mi->mask_len * 4); -+ unsigned int mask_bytes = mi->mask_len * 4; -+ len += mask_bytes; -+ if (len > INT_MAX) -+ goto out; -+ if ((sizeof(xXIEventMask) + mask_bytes) > rbytes) -+ goto out; -+ rbytes -= (sizeof(xXIEventMask) + mask_bytes); -+ mi = (xXIEventMask*)((char*)mi + mask_bytes); - mi++; - } - --- -1.8.3.1 - - -From 17071c1c608247800b2ca03a35b1fcc9c4cabe6c Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun, 10 Mar 2013 13:30:55 -0700 -Subject: [PATCH 13/16] Avoid integer overflow in XGetDeviceProperties() - [CVE-2013-1984 7/8] - -If the number of items as reported by the Xserver is too large, it -could overflow the calculation for the size of the buffer to copy the -reply into, causing memory corruption. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetDProp.c | 61 ++++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 37 insertions(+), 24 deletions(-) - -diff --git a/src/XGetDProp.c b/src/XGetDProp.c -index f9e8f0c..3691122 100644 ---- a/src/XGetDProp.c -+++ b/src/XGetDProp.c -@@ -38,6 +38,7 @@ in this Software without prior written authorization from the author. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - int - XGetDeviceProperty(Display* dpy, XDevice* dev, -@@ -48,7 +49,8 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - { - xGetDevicePropertyReq *req; - xGetDevicePropertyReply rep; -- long nbytes, rbytes; -+ unsigned long nbytes, rbytes; -+ int ret = Success; - - XExtDisplayInfo *info = XInput_find_display(dpy); - -@@ -81,30 +83,43 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - * data, but this last byte is null terminated and convenient for - * returning string properties, so the client doesn't then have to - * recopy the string to make it null terminated. -+ * -+ * Maximum item limits are set to both prevent integer overflow when -+ * calculating the amount of memory to malloc, and to limit how much -+ * memory will be used if a server provides an insanely high count. - */ - switch (rep.format) { - case 8: -- nbytes = rep.nItems; -- rbytes = rep.nItems + 1; -- if (rbytes > 0 && -- (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) -- _XReadPad (dpy, (char *) *prop, nbytes); -+ if (rep.nItems < INT_MAX) { -+ nbytes = rep.nItems; -+ rbytes = rep.nItems + 1; -+ if ((*prop = Xmalloc (rbytes))) -+ _XReadPad (dpy, (char *) *prop, nbytes); -+ else -+ ret = BadAlloc; -+ } - break; - - case 16: -- nbytes = rep.nItems << 1; -- rbytes = rep.nItems * sizeof (short) + 1; -- if (rbytes > 0 && -- (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) -- _XRead16Pad (dpy, (short *) *prop, nbytes); -+ if (rep.nItems < (INT_MAX / sizeof (short))) { -+ nbytes = rep.nItems << 1; -+ rbytes = rep.nItems * sizeof (short) + 1; -+ if ((*prop = Xmalloc (rbytes))) -+ _XRead16Pad (dpy, (short *) *prop, nbytes); -+ else -+ ret = BadAlloc; -+ } - break; - - case 32: -- nbytes = rep.nItems << 2; -- rbytes = rep.nItems * sizeof (long) + 1; -- if (rbytes > 0 && -- (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) -- _XRead32 (dpy, (long *) *prop, nbytes); -+ if (rep.nItems < (INT_MAX / sizeof (long))) { -+ nbytes = rep.nItems << 2; -+ rbytes = rep.nItems * sizeof (long) + 1; -+ if ((*prop = Xmalloc (rbytes))) -+ _XRead32 (dpy, (long *) *prop, nbytes); -+ else -+ ret = BadAlloc; -+ } - break; - - default: -@@ -112,16 +127,13 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - * This part of the code should never be reached. If it is, - * the server sent back a property with an invalid format. - */ -- _XEatDataWords(dpy, rep.length); -- UnlockDisplay(dpy); -- SyncHandle(); -- return(BadImplementation); -+ ret = BadImplementation; - } - if (! *prop) { - _XEatDataWords(dpy, rep.length); -- UnlockDisplay(dpy); -- SyncHandle(); -- return(BadAlloc); -+ if (ret == Success) -+ ret = BadAlloc; -+ goto out; - } - (*prop)[rbytes - 1] = '\0'; - } -@@ -130,9 +142,10 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - *actual_format = rep.format; - *nitems = rep.nItems; - *bytes_after = rep.bytesAfter; -+ out: - UnlockDisplay (dpy); - SyncHandle (); - -- return Success; -+ return ret; - } - --- -1.8.3.1 - - -From ef82512288d8ca36ac0beeb289f158195b0a8cae Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun, 10 Mar 2013 00:22:14 -0800 -Subject: [PATCH 14/16] Avoid integer overflow in XListInputDevices() - [CVE-2013-1984 8/8] - -If the length of the reply as reported by the Xserver is too long, it -could overflow the calculation for the size of the buffer to copy the -reply into, causing memory corruption. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XListDev.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/XListDev.c b/src/XListDev.c -index 1fa4747..1c14b96 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -60,6 +60,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - /* Calculate length field to a multiples of sizeof(XID). XIDs are typedefs - * to ulong and thus may be 8 bytes on some platforms. This can trigger a -@@ -179,7 +180,7 @@ XListInputDevices( - XAnyClassPtr Any; - char *nptr, *Nptr; - int i; -- long rlen; -+ unsigned long rlen; - XExtDisplayInfo *info = XInput_find_display(dpy); - - LockDisplay(dpy); -@@ -198,9 +199,10 @@ XListInputDevices( - - if ((*ndevices = rep.ndevices)) { /* at least 1 input device */ - size = *ndevices * sizeof(XDeviceInfo); -- rlen = rep.length << 2; /* multiply length by 4 */ -- list = (xDeviceInfo *) Xmalloc(rlen); -- slist = list; -+ if (rep.length < (INT_MAX >> 2)) { -+ rlen = rep.length << 2; /* multiply length by 4 */ -+ slist = list = Xmalloc(rlen); -+ } - if (!slist) { - _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); --- -1.8.3.1 - - -From 81b4df8ac6aa1520c41c3526961014a6f115cc46 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun, 10 Mar 2013 00:16:22 -0800 -Subject: [PATCH 15/16] sign extension issue in XListInputDevices() - [CVE-2013-1995] - -nptr is (signed) char, which can be negative, and will sign extend -when added to the int size, which means size can be subtracted from, -leading to allocating too small a buffer to hold the data being copied -from the X server's reply. - -v2: check that string size fits inside the data read from the server, - so that we don't read out of bounds either - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XListDev.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/src/XListDev.c b/src/XListDev.c -index 1c14b96..b85ff3c 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -73,7 +73,7 @@ static int pad_to_xid(int base_size) - return ((base_size + padsize - 1)/padsize) * padsize; - } - --static int -+static size_t - SizeClassInfo(xAnyClassPtr *any, int num_classes) - { - int size = 0; -@@ -170,7 +170,7 @@ XListInputDevices( - register Display *dpy, - int *ndevices) - { -- int size; -+ size_t size; - xListInputDevicesReq *req; - xListInputDevicesReply rep; - xDeviceInfo *list, *slist = NULL; -@@ -178,7 +178,7 @@ XListInputDevices( - XDeviceInfo *clist = NULL; - xAnyClassPtr any, sav_any; - XAnyClassPtr Any; -- char *nptr, *Nptr; -+ unsigned char *nptr, *Nptr; - int i; - unsigned long rlen; - XExtDisplayInfo *info = XInput_find_display(dpy); -@@ -217,9 +217,12 @@ XListInputDevices( - size += SizeClassInfo(&any, (int)list->num_classes); - } - -- for (i = 0, nptr = (char *)any; i < *ndevices; i++) { -+ Nptr = ((unsigned char *)list) + rlen + 1; -+ for (i = 0, nptr = (unsigned char *)any; i < *ndevices; i++) { - size += *nptr + 1; - nptr += (*nptr + 1); -+ if (nptr > Nptr) -+ goto out; - } - - clist = (XDeviceInfoPtr) Xmalloc(size); -@@ -245,8 +248,8 @@ XListInputDevices( - } - - clist = sclist; -- nptr = (char *)any; -- Nptr = (char *)Any; -+ nptr = (unsigned char *)any; -+ Nptr = (unsigned char *)Any; - for (i = 0; i < *ndevices; i++, clist++) { - clist->name = (char *)Nptr; - memcpy(Nptr, nptr + 1, *nptr); -@@ -256,6 +259,7 @@ XListInputDevices( - } - } - -+ out: - XFree((char *)slist); - UnlockDisplay(dpy); - SyncHandle(); --- -1.8.3.1 - - -From 661c45ca17c434dbd342a46fd3fb813852ae0ca9 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Tue, 21 May 2013 12:23:05 +1000 -Subject: [PATCH 16/16] Don't overwrite the cookies serial number - -serial != sequenceNumber, see _XSetLastRequestRead() - -cookie->serial is already set at this point, setting it again directly from -the sequenceNumber of the event causes a bunch of weird issues such as -scrollbars and text drag-n-drop breaking. - -https://bugzilla.redhat.com/show_bug.cgi?id=965347 - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XExtInt.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/XExtInt.c b/src/XExtInt.c -index 8e19b97..d3c6b7c 100644 ---- a/src/XExtInt.c -+++ b/src/XExtInt.c -@@ -915,7 +915,6 @@ static void xge_copy_to_cookie(xGenericEvent* ev, - cookie->type = ev->type; - cookie->evtype = ev->evtype; - cookie->extension = ev->extension; -- cookie->serial = ev->sequenceNumber; - } - - static Bool --- -1.8.3.1 - diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index 99ad5a40a..ce3a26ac5 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188255 2013-06-13 15:52:39Z giovanni $ +# $Id: PKGBUILD 189484 2013-07-03 16:37:06Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=link-grammar -pkgver=4.7.12 +pkgver=4.7.14 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=('f4f0b731dc0bbd1c7adfe9a8ef7ab116') +md5sums=('2d7771d8063aec6efb27a35663d67e9f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index fcf5d170a..c10b39419 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187158 2013-06-04 16:22:02Z giovanni $ +# $Id: PKGBUILD 189482 2013-07-03 16:31:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.6.2 +pkgver=2.6.3 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=('55f6ea5982cf87836113376174826e8c' +md5sums=('99e311b2202057a259899f67b425e087' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa/CVE-2013-1993.patch b/extra/mesa/CVE-2013-1993.patch deleted file mode 100644 index 00f723d35..000000000 --- a/extra/mesa/CVE-2013-1993.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 80ac3b279e776b3d9f45a209e52c5bd34ba7e7df Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Fri, 26 Apr 2013 23:31:58 +0000 -Subject: integer overflow in XF86DRIOpenConnection() [CVE-2013-1993 1/2] - -busIdStringLength is a CARD32 and needs to be bounds checked before adding -one to it to come up with the total size to allocate, to avoid integer -overflow leading to underallocation and writing data from the network past -the end of the allocated buffer. - -NOTE: This is a candidate for stable release branches. - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Brian Paul <brianp@vmware.com> -(cherry picked from commit 2e5a268f18be30df15aed0b44b01a18a37fb5df4) ---- -diff --git a/src/glx/XF86dri.c b/src/glx/XF86dri.c -index b1cdc9b..8f53bd7 100644 ---- a/src/glx/XF86dri.c -+++ b/src/glx/XF86dri.c -@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #include <X11/extensions/Xext.h> - #include <X11/extensions/extutil.h> - #include "xf86dristr.h" -+#include <limits.h> - - static XExtensionInfo _xf86dri_info_data; - static XExtensionInfo *xf86dri_info = &_xf86dri_info_data; -@@ -201,7 +202,11 @@ XF86DRIOpenConnection(Display * dpy, int screen, drm_handle_t * hSAREA, - } - - if (rep.length) { -- if (!(*busIdString = calloc(rep.busIdStringLength + 1, 1))) { -+ if (rep.busIdStringLength < INT_MAX) -+ *busIdString = calloc(rep.busIdStringLength + 1, 1); -+ else -+ *busIdString = NULL; -+ if (*busIdString == NULL) { - _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); --- -cgit v0.9.0.2-2-gbebe -From 6de60ddf9ccac6f185d8f4e88ddfc63a94bd670f Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Fri, 26 Apr 2013 23:33:03 +0000 -Subject: integer overflow in XF86DRIGetClientDriverName() [CVE-2013-1993 2/2] - -clientDriverNameLength is a CARD32 and needs to be bounds checked before -adding one to it to come up with the total size to allocate, to avoid -integer overflow leading to underallocation and writing data from the -network past the end of the allocated buffer. - -NOTE: This is a candidate for stable release branches. - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Brian Paul <brianp@vmware.com> -(cherry picked from commit 306f630e676eb901789dd09a0f30d7e7fa941ebe) ---- -diff --git a/src/glx/XF86dri.c b/src/glx/XF86dri.c -index 8f53bd7..56e3557 100644 ---- a/src/glx/XF86dri.c -+++ b/src/glx/XF86dri.c -@@ -305,9 +305,11 @@ XF86DRIGetClientDriverName(Display * dpy, int screen, - *ddxDriverPatchVersion = rep.ddxDriverPatchVersion; - - if (rep.length) { -- if (! -- (*clientDriverName = -- calloc(rep.clientDriverNameLength + 1, 1))) { -+ if (rep.clientDriverNameLength < INT_MAX) -+ *clientDriverName = calloc(rep.clientDriverNameLength + 1, 1); -+ else -+ *clientDriverName = NULL; -+ if (*clientDriverName == NULL) { - _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 4fa536edd..5f8d193eb 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 188839 2013-06-22 10:51:37Z lcarlier $ +# $Id: PKGBUILD 189266 2013-07-01 22:29:39Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'mesa-libgl') -pkgver=9.1.3 -pkgrel=2 +pkgver=9.1.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' 'wayland' 'systemd') @@ -17,18 +17,9 @@ url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 - LICENSE - CVE-2013-1993.patch) -md5sums=('952ccd03547ed72333b64e1746cf8ada' - '5c65a0fe315dd347e09b1f2826a1df5a' - 'dc8dad7c9bc6a92bd9c33b27b9da825e') - -prepare() { - cd ${srcdir}/?esa-* - - # fix CVE-2013-1993 merged upstream - patch -Np1 -i ${srcdir}/CVE-2013-1993.patch -} + LICENSE) +md5sums=('a2c4e25d0e27918bc67f61bae04d0cb8' + '5c65a0fe315dd347e09b1f2826a1df5a') build() { cd ${srcdir}/?esa-* diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index b34f0297a..ea2db4660 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184009 2013-04-30 20:08:12Z giovanni $ +# $Id: PKGBUILD 189221 2013-06-30 05:10:45Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: xduugu <xduugu@gmx.com> pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=6.2.0 +pkgver=6.3.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz") -md5sums=('a09b69f7e17677f1b5bfd15720dd004c') +md5sums=('3d64652b1aa3ce3faaa468b11dcbd82c') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index cedf8841f..58f51c2f3 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187924 2013-06-08 07:59:02Z andrea $ +# $Id: PKGBUILD 189487 2013-07-03 17:00:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core -pkgver=4.10.4 +pkgver=4.10.5 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=('28d9641ffc1b877f0cd0d27343b56563ed2bc74d') +sha1sums=('416dbcc9e20d463ed8dc009a4cd7d26be6ffa6cc') build() { mkdir build diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD index 5a5d121d3..da65212de 100644 --- a/extra/nepomuk-widgets/PKGBUILD +++ b/extra/nepomuk-widgets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187941 2013-06-08 07:59:20Z andrea $ +# $Id: PKGBUILD 189504 2013-07-03 17:00:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-widgets -pkgver=4.10.4 +pkgver=4.10.5 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=('fb7379a3b324b2660f220094c8273860722fe3f1') +sha1sums=('f796178217f69e211786f08ed7c40c39b96d25c9') build() { mkdir build diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD index aaa1795b7..96d9a654a 100644 --- a/extra/ntfs-3g_ntfsprogs/PKGBUILD +++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185299 2013-05-13 04:23:22Z eric $ +# $Id: PKGBUILD 188990 2013-06-27 19:50:33Z bpiotrowski $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Bächler <thomas.archlinux.org> @@ -6,7 +6,7 @@ pkgbase=ntfs-3g_ntfsprogs pkgname=ntfs-3g pkgver=2013.1.13 -pkgrel=3 +pkgrel=4 pkgdesc="NTFS filesystem utilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.tuxera.com/community/ntfs-3g-download/" @@ -29,7 +29,8 @@ build() { ./configure --prefix=/usr \ --with-fuse=external --disable-static \ --enable-posix-acls --disable-ldconfig \ - --mandir=/usr/share/man --sbin=/usr/bin + --mandir=/usr/share/man --sbin=/usr/bin \ + --enable-extras make } diff --git a/extra/nx-common/NXproto.h.64bit.diff b/extra/nx-common/NXproto.h.64bit.diff deleted file mode 100644 index ac326ebcd..000000000 --- a/extra/nx-common/NXproto.h.64bit.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 -+++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 -@@ -26,6 +26,30 @@ - #include <X11/Xmd.h> - #include <X11/Xproto.h> - -+/* -+ Copied from Xproto.h -+ */ -+ -+/* For the purpose of the structure definitions in this file, -+we must redefine the following types in terms of Xmd.h's types, which may -+include bit fields. All of these are #undef'd at the end of this file, -+restoring the definitions in X.h. */ -+ -+#define Window CARD32 -+#define Drawable CARD32 -+#define Font CARD32 -+#define Pixmap CARD32 -+#define Cursor CARD32 -+#define Colormap CARD32 -+#define GContext CARD32 -+#define Atom CARD32 -+#define VisualID CARD32 -+#define Time CARD32 -+#define KeyCode CARD8 -+#define KeySym CARD32 -+ -+/* End copied from Xproto.h */ -+ - #define sz_xNXGetControlParametersReq 4 - #define sz_xNXGetCleanupParametersReq 4 - #define sz_xNXGetImageParametersReq 4 -@@ -343,9 +367,9 @@ - CARD8 dstDepth; - CARD32 srcLength B32; - CARD32 dstLength B32; -- INT16 srcX B16, srcY B16; -+ CARD16 srcX B16, srcY B16; - CARD16 srcWidth B16, srcHeight B16; -- INT16 dstX B16, dstY B16; -+ CARD16 dstX B16, dstY B16; - CARD16 dstWidth B16, dstHeight B16; - } xNXPutPackedImageReq; - -@@ -463,4 +487,20 @@ - } - #endif - -+/* Copied from Xproto.h */ -+ -+/* restore these definitions back to the typedefs in X.h */ -+#undef Window -+#undef Drawable -+#undef Font -+#undef Pixmap -+#undef Cursor -+#undef Colormap -+#undef GContext -+#undef Atom -+#undef VisualID -+#undef Time -+#undef KeyCode -+#undef KeySym -+ - #endif /* NXproto_H */ diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD deleted file mode 100644 index ee36eb8f2..000000000 --- a/extra/nx-common/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 157435 2012-04-28 09:58:39Z andyrtr $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=nx-common -pkgver=3.5.0 -pkgrel=5 -pkgdesc="NoMachine NX common package for client and server" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://nomachine.com/" -depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash' -makedepends=('xorg-server-devel' 'nx-headers') -source=(http://64.34.173.142/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz - http://64.34.173.142/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz - nxcompsh-gcc43.patch) -options=('!libtool') -md5sums=('84ade443b79ea079380b754aba9d392e' - 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' - 'b6c279654dac421fc3dd1a27d66ff53c') - -build() { - # nxcompsh - cd ${srcdir}/nxcompsh - patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch - ./configure --prefix=/usr/lib/nx - make - - # nxssh - cd ${srcdir}/nxssh - sed -i "s:NX.h:nx/NX.h:g" clientloop.c packet.c proxy.c - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib - make -} - -package() { - install -dm755 ${pkgdir}/usr/{bin,lib/nx} - - # nxcompsh - cd ${srcdir}/nxcompsh - cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx - cd ${pkgdir}/usr/lib/ - ln -sv /usr/lib/nx/libXcompsh.so{,.3,.3.5.0} . - # ^ really needed? - - # nxssh - cd ${srcdir}/nxssh - install -D -m755 nxssh ${pkgdir}/usr/lib/nx/bin/nxssh - cd ${pkgdir}/usr/bin - ln -sv /usr/lib/nx/bin/nxssh . -} diff --git a/extra/nx-common/nx-3.5.0-libpng15.patch b/extra/nx-common/nx-3.5.0-libpng15.patch deleted file mode 100644 index c8f2a9559..000000000 --- a/extra/nx-common/nx-3.5.0-libpng15.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp ---- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 -+++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 -@@ -414,7 +414,7 @@ - - png_read_info(pngPtr, infoPtr); - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -565,7 +565,7 @@ - - png_read_info( pngPtr, infoPtr ) ; - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -709,7 +709,7 @@ - png_read_info(pngPtr, infoPtr) ; - - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } diff --git a/extra/nx-common/nxcompsh-gcc43.patch b/extra/nx-common/nxcompsh-gcc43.patch deleted file mode 100644 index 681a0dab5..000000000 --- a/extra/nx-common/nxcompsh-gcc43.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 -+++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 -@@ -18,10 +18,12 @@ - #ifndef Misc_H - #define Misc_H - --#include <iostream.h> -+#include <iostream> - --#include <errno.h> --#include <string.h> -+#include <cerrno> -+#include <cstring> -+ -+using namespace std; - - // - // Error handling macros. - diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index 330cb5a14..06fac5810 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181255 2013-04-02 18:31:27Z stephane $ +# $Id: PKGBUILD 189231 2013-06-30 23:32:16Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi -pkgver=1.6.4 -pkgrel=2 +pkgver=1.6.5 +pkgrel=1 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mpi.org" @@ -10,12 +10,12 @@ license=('custom') depends=('gcc-fortran' 'openssh' 'libltdl' 'hwloc') [ "$CARCH" = "mips64el" ] || depends+=('valgrind') makedepends=('inetutils') -options=(!libtool) +options=('!libtool') source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('38095d3453519177272f488d5058a98f7ebdbf10') +sha1sums=('93859d515b33dd9a0ee6081db285a2d1dffe21ce') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} if [ "$CARCH" = "mips64el" ]; then valgrind="--without-valgrind --disable-memchecker" @@ -45,7 +45,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install # FS#28583 @@ -57,8 +57,9 @@ package() { # Openmpi's otfinfo conflicts with the one from texlive mv "${pkgdir}"/usr/bin/otfinfo{,mpi} - # Remove dangling symlink + # Remove dangling symlink and useless file rm "${pkgdir}"/usr/share/man/man1/orteCC.1 + rm "${pkgdir}"/usr/share/vampirtrace/config.log install -d -m 755 "${pkgdir}"/etc/ld.so.conf.d echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf diff --git a/extra/opennx/PKGBUILD b/extra/opennx/PKGBUILD deleted file mode 100644 index e7abfa9ee..000000000 --- a/extra/opennx/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 175949 2013-01-25 09:52:43Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: Armin Luntzer -# Original opennx PKGBUILD: Tomas Groth tomasgroth.at.yahoo.dk - -pkgname=opennx -pkgver=0.16.0.725 -pkgrel=1 -pkgdesc="A GPL replacement for the NoMachine client, patched to always show the session chooser" -url="http://opennx.sf.net/" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('wxgtk' 'libcups' 'libxext' 'libxft' 'xorg-xauth' 'curl' 'nx-common') -makedepends=('zip' 'opensc' 'libpulse' 'smbclient' 'libusb-compat') -#optdepends=('cups: for full local printing support') -source=(http://downloads.sourceforge.net/project/opennx/opennx/CI-source/opennx-$pkgver.tar.gz) -md5sums=('6bfe389638ac9c14fa89ca56b0c671b6') - -build() { - cd $srcdir/opennx* - ./configure --prefix=/usr \ - --enable-usbip - make -} - -package() { - cd $srcdir/opennx* - make DESTDIR=${pkgdir} install - make DESTDIR=${pkgdir} install-man - - # fix some file locations - install -dm755 ${pkgdir}/usr/share/applications - cp -aR ${pkgdir}/usr/share/applnk/xdg/* ${pkgdir}/usr/share/applications - rm -rf ${pkgdir}/usr/share/applnk - - sed -i -e "s:Exec=/usr/NX/bin/opennx:Exec=/usr/bin/opennx:" ${pkgdir}/usr/share/applications/*.desktop -} diff --git a/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch deleted file mode 100644 index 5b65557c1..000000000 --- a/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8eb3ec51a58dd02334118d8f0aa1bebb5704d15c Mon Sep 17 00:00:00 2001 -From: Father Chrysostomos via RT <bug-Tk@rt.cpan.org> -Date: Mon, 6 Aug 2012 17:42:14 -0400 -Subject: [PATCH] Fix compilation under threaded bleadperl - - Ticket <URL: https://rt.cpan.org/Ticket/Display.html?id=78824 > - -CopSTASHPV is no longer an lvalue under threads. (It never was under non-threaded builds.) ---- - tkGlue.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/tkGlue.c b/tkGlue.c -index 1b7c025..9079302 100644 ---- a/tkGlue.c -+++ b/tkGlue.c -@@ -4154,11 +4154,7 @@ int type; - SV *x = NULL; - int prefix = '?'; - name = SvPV(sv,na); --#ifdef USE_ITHREADS -- CopSTASHPV(PL_curcop) = NULL; --#else -- CopSTASH(PL_curcop) = NULL; --#endif -+ CopSTASH_set(PL_curcop, NULL); - switch (type) - { - case TK_CONFIG_SCALARVAR: --- -1.8.2.3 - diff --git a/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch deleted file mode 100644 index 95067501f..000000000 --- a/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2333fa35c99aae1db1cb8d3ebce31fc21bc66e0a Mon Sep 17 00:00:00 2001 -From: Slaven Rezic <slaven@rezic.de> -Date: Sat, 23 Mar 2013 14:00:58 +0100 -Subject: [PATCH] * fix for 5.17.7 and newer: SvUPGRADE() is no longer an - expression - ---- - IO/IO.xs | 6 +----- - tkGlue.c | 5 +---- - 2 files changed, 2 insertions(+), 9 deletions(-) - -diff --git a/IO/IO.xs b/IO/IO.xs -index 8ae2a57..42f7515 100644 ---- a/IO/IO.xs -+++ b/IO/IO.xs -@@ -207,11 +207,7 @@ int offset - info.count = 0; - info.error = 0; - info.eof = 0; -- if (!SvUPGRADE(buf, SVt_PV)) -- { -- RETVAL = &PL_sv_undef; -- return; -- } -+ (void)SvUPGRADE(buf, SVt_PV); - SvPOK_only(buf); /* validate pointer */ - Tcl_CreateFileHandler(fd, TCL_READABLE, read_handler, (ClientData) &info); - do -diff --git a/tkGlue.c b/tkGlue.c -index dd3d283..cdc53ad 100644 ---- a/tkGlue.c -+++ b/tkGlue.c -@@ -3830,10 +3830,7 @@ ClientData clientData; - return EXPIRE((interp, "Cannot trace readonly variable")); - } - } -- if (!SvUPGRADE(sv, SVt_PVMG)) -- { -- return EXPIRE((interp, "Trace SvUPGRADE failed")); -- } -+ (void)SvUPGRADE(sv, SVt_PVMG); - - if (SvTYPE(sv) == SVt_PVAV) - { --- -1.8.2.3 - diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index 41ac2a372..32e1d58b6 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,51 +1,36 @@ -# $Id: PKGBUILD 186419 2013-05-26 09:25:47Z bluewind $ +# $Id: PKGBUILD 189257 2013-07-01 18:23:51Z eric $ # Maintainer: # Contributor: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=perl-tk -_cpanname=Tk -pkgver=804.030 -pkgrel=5 +pkgver=804.031 +pkgrel=1 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64' 'mips64el') -url="http://search.cpan.org/dist/${_cpanname}" +url="http://search.cpan.org/dist/Tk" license=('PerlArtistic' 'GPL' 'custom') depends=('libpng' 'libjpeg' 'tk' 'perl') options=('!emptydirs') replaces=('perltk') provides=('perltk') -source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz - 0001-Fix-compilation-under-threaded-bleadperl.patch - 0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch) -md5sums=('13275e85f99ee467a86d9598a437abff' - '361c34978746310e5c31b7a47c016b22' - '46448cdac9d7159f15f2d4b2719d171b') - -prepare() { - cd "$srcdir/${_cpanname}-$pkgver" - - # https://rt.cpan.org/Public/Bug/Display.html?id=78824 - patch -Np1 -i "$srcdir/0001-Fix-compilation-under-threaded-bleadperl.patch" - - # https://rt.cpan.org/Public/Bug/Display.html?id=82677 - patch -Np1 -i "$srcdir/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch" -} +source=(http://www.cpan.org/authors/id/S/SR/SREZIC/Tk-${pkgver}.tar.gz) +md5sums=('57a8afd0563184c17a6470d1ee957f35') build() { - cd "$srcdir/${_cpanname}-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + cd Tk-$pkgver + perl Makefile.PL INSTALLDIRS=vendor make } #check() { -# cd "$srcdir/${_cpanname}-$pkgver" +# cd Tk-$pkgver # make test #} package() { - cd "$srcdir/${_cpanname}-$pkgver" + cd Tk-$pkgver make install DESTDIR="$pkgdir" # license diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 65e20e86f..63eca9541 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188729 2013-06-18 15:46:36Z andyrtr $ +# $Id: PKGBUILD 188927 2013-06-25 16:51:15Z 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.3 +_dcpkgver=2.2.4 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.4.0 -pkgrel=4 +pkgrel=5 pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 430e0d077..c46a82e66 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185057 2013-05-10 18:09:28Z andrea $ +# $Id: PKGBUILD 189290 2013-07-02 11:12:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 -pkgver=4.8.4 -pkgrel=18 +pkgver=4.8.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -14,7 +14,8 @@ depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus' 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'mesa-libgl') -optdepends=('postgresql-libs: PostgreSQL driver' +optdepends=('qtchooser: set the default Qt toolkit' + 'postgresql-libs: PostgreSQL driver' 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver' 'libxinerama: Xinerama support' @@ -30,12 +31,12 @@ options=('!libtool') replaces=('qt<=4.8.4') conflicts=('qt') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz" +source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz" 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop' 'improve-cups-support.patch' 'declarative-fix-sigbus.patch') -md5sums=('89c5ecba180cae74c66260ac732dc5cb' +md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'a16638f4781e56e7887ff8212a322ecc' '8a28b3f52dbeb685d4b69440b520a3e1' '9727c406c240990870c905696a8c5bd1' @@ -44,7 +45,7 @@ md5sums=('89c5ecba180cae74c66260ac732dc5cb' 'c439c7731c25387352d8453ca7574971' 'aac963d05a9d5733e2bfce9e26607f51') -build() { +prepare() { cd ${_pkgfqn} # (FS#28381) (KDEBUG#180051) @@ -53,16 +54,26 @@ build() { # MIPS N32-specific fix, shouldn't affect correctness on other platforms. patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch" - export QT4DIR="${srcdir}"/${_pkgfqn} - export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - - [ "${CARCH}" = "mips64el" ] && export CXXFLAGS="${CXXFLAGS} -fpermissive" - sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf - [ "$CARCH" != "mips64el" ] && extra="-plugin-sql-ibase" + cp mkspecs/common/linux{,32}.conf + sed -i "/^QMAKE_LIBDIR\s/s|=|= /usr/lib32|g" mkspecs/common/linux32.conf + sed -i "s|common/linux.conf|common/linux32.conf|" mkspecs/linux-g++-32/qmake.conf +} + +build() { + export QT4DIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + + if [ "${CARCH}" = "mips64el" ]; then + export CXXFLAGS="${CXXFLAGS} -fpermissive" + else + extra="-plugin-sql-ibase" + fi + + cd ${_pkgfqn} ./configure -confirm-license -opensource \ -prefix /usr \ @@ -117,7 +128,7 @@ package() { install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer.png \ "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt4.png install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \ - "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdusviewer-qt4.png + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt4.png install -d "${pkgdir}"/usr/share/applications install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig,qdbusviewer}-qt4.desktop \ diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD index 028af2afd..c201d7bf1 100644 --- a/extra/refind-efi/PKGBUILD +++ b/extra/refind-efi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188814 2013-06-21 19:48:54Z tpowa $ +# $Id: PKGBUILD 189205 2013-06-29 11:28:10Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -16,8 +16,8 @@ _COMPILER="GCC46" ####### pkgname="refind-efi" -pkgver="0.6.12" -pkgrel="2" +pkgver="0.7.0" +pkgrel="1" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html" arch=('x86_64' 'i686') @@ -41,15 +41,6 @@ for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModul source+=("${_TIANO_DIR_}/${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}") done -sha1sums=('aabac34b2a30e16c5fd105777b9245c2ed0496e4' - '4d1992699f9b48dd2b7e6bd6c0b25fc065f75894' - '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP') - [[ "${CARCH}" == "x86_64" ]] && _TIANO_ARCH="X64" [[ "${CARCH}" == "i686" ]] && _TIANO_ARCH="IA32" @@ -209,3 +200,11 @@ package() { install -D -m0644 "${srcdir}/refind-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/refind/LICENSE" } +sha1sums=('f71f00dbbe8c068c9ef80f468835c998832d364f' + '4d1992699f9b48dd2b7e6bd6c0b25fc065f75894' + '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP') diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 1f8a9b70a..3c78759bd 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186426 2013-05-26 09:26:05Z bluewind $ +# $Id: PKGBUILD 188995 2013-06-28 01:52:37Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool -pkgver=1.4.7 -pkgrel=7 +pkgver=1.4.8 +pkgrel=1 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64' 'mips64el') url="http://www.rrdtool.org" @@ -15,24 +15,28 @@ optdepends=('tcl: to use corresponding binding' \ 'ruby: to use corresponding binding' \ 'lua51: to use corresponding binding') options=('!libtool' '!emptydirs' '!makeflags') -source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) -sha1sums=('faab7df7696b69f85d6f89dd9708d7cf0c9a273b') +source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz + rrdtool-pangofont.patch) +sha1sums=('56d68857f39e70bfa32360947614d8220702ed02' + '8c600285bdab7776c1d5301df7cf486d69eae048') prepare() { cd ${pkgname}-${pkgver} # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in + patch -p1 -i ../rrdtool-pangofont.patch } build() { cd ${pkgname}-${pkgver} + autoconf PYTHON=python2 LUA=/usr/bin/lua5.1 \ LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \ ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ --enable-ruby --enable-ruby-site-install --enable-python \ --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap - make + make LIBS+="-lglib-2.0" } package() { diff --git a/extra/rrdtool/rrdtool-pangofont.patch b/extra/rrdtool/rrdtool-pangofont.patch new file mode 100644 index 000000000..60936d8b5 --- /dev/null +++ b/extra/rrdtool/rrdtool-pangofont.patch @@ -0,0 +1,39 @@ +From ba76d4915eb3d379d69205957e48edea4aee27b6 Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker <tobi@oetiker.ch> +Date: Wed, 24 Apr 2013 23:49:28 +0200 +Subject: [PATCH] move to non-deprecated pango_font_map_create_context + +--- + configure.ac | 2 +- + src/rrd_graph.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2f9e395..d6b2722 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -535,7 +535,7 @@ EX_CHECK_ALL(cairo, cairo_font_options_create, cairo.h, + EX_CHECK_ALL(cairo, cairo_svg_surface_create, cairo-svg.h, cairo-svg, 1.10.2, http://cairographics.org/releases/, "") + EX_CHECK_ALL(cairo, cairo_pdf_surface_create, cairo-pdf.h, cairo-pdf, 1.10.2, http://cairographics.org/releases/, "") + EX_CHECK_ALL(cairo, cairo_ps_surface_create, cairo-ps.h, cairo-ps, 1.10.2, http://cairographics.org/releases/, "") +-EX_CHECK_ALL(pangocairo-1.0, pango_cairo_context_set_font_options, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "") ++EX_CHECK_ALL(pangocairo-1.0, pango_font_map_create_context, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "") + + fi + EX_CHECK_ALL(glib-2.0, glib_check_version, glib.h, glib-2.0, 2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "") +diff --git a/src/rrd_graph.c b/src/rrd_graph.c +index 5547aa6..25ae485 100644 +--- a/src/rrd_graph.c ++++ b/src/rrd_graph.c +@@ -4282,7 +4282,7 @@ void rrd_graph_init( + fontmap = pango_cairo_font_map_get_default(); + } + +- context = pango_cairo_font_map_create_context((PangoCairoFontMap*)fontmap); ++ context = pango_font_map_create_context(fontmap); + + pango_cairo_context_set_resolution(context, 100); + +-- +1.8.1.6 + diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 048fa5b79..e28535354 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Jeramy Rutley <jrutley@gmail.com> pkgname=('ruby' 'ruby-docs') -pkgver=2.0.0_p195 +pkgver=2.0.0_p247 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.ruby-lang.org/en/' @@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') -md5sums=('2f54faea6ee1ca500632ec3c0cb59cb6' +md5sums=('60913f3eec0c4071f44df42600be2604' '6fb8e7a09955e0f64be3158fb4a27e7a') build() { diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD index 894ad7771..ce5dea5d9 100644 --- a/extra/snd/PKGBUILD +++ b/extra/snd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186867 2013-05-31 11:57:47Z schiv $ +# $Id: PKGBUILD 189298 2013-07-02 15:47:31Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: see .contrib pkgname=snd -pkgver=13.7 +pkgver=13.8 pkgrel=1 pkgdesc="An advanced sound editor" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123' 'timidity++' 'vorbis-tools') install=$pkgname.install source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz") -md5sums=('220b0155bace73d4442374a837c2f5fd') +md5sums=('d70148dc06073b49a854ada504e8a2d4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index c78ff1934..6c4bbacbe 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 185050 2013-05-10 17:29:50Z andrea $ +# $Id: PKGBUILD 189254 2013-07-01 16:34:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=soprano pkgver=2.9.2 -pkgrel=1 +pkgrel=2 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64' 'mips64el') url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') -depends=('qt4' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base') +depends=('qt4' 'libiodbc' 'virtuoso-base' 'redland') makedepends=('cmake' 'doxygen') [ "$CARCH" != "mips64el" ] && makedepends+=('java-environment') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('60ce910cf3c8e4655c614b45d73f2b2a') -build() { +prepare() { mkdir build +} + +build() { cd build # we need the rpath cmake ../${pkgname}-${pkgver} \ diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index eb16cf181..dc1da967f 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181132 2013-03-31 23:20:08Z bisson $ +# $Id: PKGBUILD 189234 2013-07-01 01:03:08Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=uim -pkgver=1.8.5 +pkgver=1.8.6 pkgrel=1 pkgdesc='Multilingual input method library' url='http://code.google.com/p/uim/' @@ -16,8 +16,8 @@ optdepends=('qt4: immodule and helper applications' 'gtk3: immodules and helper applications' 'gnome-panel: gnome applet indicator') options=('!libtool') -source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -sha1sums=('13178e0ad9e9196e3fdb0bb9806e4add8fe3a8e5') +source=("https://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('409c30b31b9e58e3c18cb7862933487b0585cd1d') install=install diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 3db3d41be..be063f430 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188206 2013-06-12 20:04:04Z guillaume $ +# $Id: PKGBUILD 189196 2013-06-29 09:29:34Z 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.10.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' @@ -59,7 +59,7 @@ package_wireshark-cli() { # Headers install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil} - install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}" + install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}" for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d} done diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index c936481fc..013ddac45 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187885 2013-06-07 20:50:17Z lcarlier $ +# $Id: PKGBUILD 189300 2013-07-02 19:56:50Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.9 +pkgver=2.21.11 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,18 +19,22 @@ 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=('1359cbc9e494a284faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189') +sha256sums=('523aa13f2ba65f0be871de338956a5acccb0d3a3d9c195ed3cd47abc2c025e22') build() { cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ --enable-dri + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/xmlsec/PKGBUILD b/extra/xmlsec/PKGBUILD index ec82fd47f..12ada7f9f 100644 --- a/extra/xmlsec/PKGBUILD +++ b/extra/xmlsec/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 135818 2011-08-18 15:05:00Z andyrtr $ +# $Id: PKGBUILD 189642 2013-07-03 19:47:13Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Hussam Al-Tayeb <ht990332@gmail.com> pkgname=xmlsec -pkgver=1.2.18 -pkgrel=2.1 +pkgver=1.2.19 +pkgrel=1 pkgdesc="XML Security Library is a C library based on LibXML2" license=('custom') arch=(i686 x86_64 'mips64el') url="http://www.aleksey.com/xmlsec/index.html" -depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls' 'nss>=3.12.10' 'libtool') -makedepends=('pkgconfig') +depends=('libxslt' 'openssl' 'gnutls' 'nss' 'libltdl') options=('!libtool') source=(http://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz) -md5sums=('8694b4609aab647186607f79e1da7f1a') +md5sums=('fe664ba5f01ebfaeb0ab5deeb0b2249e') build() { cd ${srcdir}/${pkgname}1-${pkgver} diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 398e39971..3a5d78c56 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183085 2013-04-17 12:51:32Z andyrtr $ +# $Id: PKGBUILD 189247 2013-07-01 10:57:37Z jgc $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.14.1 -pkgrel=1 +pkgver=1.14.2 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -19,43 +19,49 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-sis.patch xserver-1.6.0-less-acpi-brokenness.patch bug59825.patch + xephyr-glx.patch xvfb-run xvfb-run.1 10-quirks.conf loongson.patch - git-fixes.patch) -sha256sums=('a5adb02571efb7d7459dde83286a3adb77dfd1a52a7348e75d2dc72d6f8d28aa' + fb-rename-wfbDestroyGlyphCache.patch) +sha256sums=('f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588' + 'bb63658d250c21bbfaf94c5417f2920ce5963ee1f7db6cac2b163a54f2e9b619' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' 'c1081681093cd56003f77e1bf4febc3e6bb84a1bde95292fbe19e8c461a7d207' 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1') -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - +prepare() { + cd "${pkgbase}-${pkgver}" # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" + patch -Np1 -i ../autoconfig-nvidia.patch # Use unofficial imedia SiS driver for supported SiS devices - patch -Np0 -i "${srcdir}/autoconfig-sis.patch" + patch -Np0 -i ../autoconfig-sis.patch # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html patch -Np1 -i "${srcdir}/loongson.patch" # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo - patch -Np1 -i "${srcdir}/bug59825.patch" + patch -Np1 -i ../bug59825.patch # From Fedora. Do not build acpid code, it is buggy and we do not need it - patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch" + patch -Np1 -i ../xserver-1.6.0-less-acpi-brokenness.patch - # post release git fixes - patch -Np1 -i "${srcdir}/git-fixes.patch" + # Add GLX support for Xephyr - https://bugs.freedesktop.org/show_bug.cgi?id=62346 + patch -Np0 -i ../xephyr-glx.patch + # http://cgit.freedesktop.org/xorg/xserver/commit/fb/wfbrename.h?id=5047810a4c20fab444b8c6eb146c55dcdb0d4219 + patch -Np1 -i ../fb-rename-wfbDestroyGlyphCache.patch +} +build() { + cd "${pkgbase}-${pkgver}" autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ @@ -98,7 +104,7 @@ package_xorg-server-common() { pkgdesc="Xorg server common files" depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${pkgbase}-${pkgver}" install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" @@ -120,7 +126,7 @@ package_xorg-server() { groups=('xorg') conflicts=('nvidia-utils<=290.10') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/etc/X11" @@ -150,7 +156,7 @@ package_xorg-server-xephyr() { pkgdesc="A nested X server that runs as an X application" depends=(libxfont libgl libgcrypt libxv 'pixman>=0.28.0' xorg-server-common) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" + cd "${pkgbase}-${pkgver}/hw/kdrive" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" @@ -159,9 +165,9 @@ package_xorg-server-xephyr() { package_xorg-server-xvfb() { pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt 'pixman>=0.28.0' xorg-server-common) + depends=(libxfont libxdmcp libxau libgcrypt 'pixman>=0.28.0' xorg-server-common xorg-xauth) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" + cd "${pkgbase}-${pkgver}/hw/vfb" make DESTDIR="${pkgdir}" install install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" @@ -175,7 +181,7 @@ package_xorg-server-xnest() { pkgdesc="A nested X server that runs as an X application" depends=(libxfont libxext libgcrypt 'pixman>=0.28.0' xorg-server-common) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" + cd "${pkgbase}-${pkgver}/hw/xnest" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" @@ -186,7 +192,7 @@ package_xorg-server-xdmx() { pkgdesc="Distributed Multihead X Server and utilities" depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes 'pixman>=0.28.0' xorg-server-common) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" + cd "${pkgbase}-${pkgver}/hw/dmx" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" @@ -204,7 +210,7 @@ package_xorg-server-devel() { # not technically required but almost every Xorg pkg needs it to build xorg-util-macros) - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install rm -rf "${pkgdir}/usr/bin" diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch index 177f908ef..177f908ef 100644 --- a/extra/xorg-server/git-fixes.patch +++ b/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch diff --git a/extra/xorg-server/xephyr-glx.patch b/extra/xorg-server/xephyr-glx.patch new file mode 100644 index 000000000..3011e2497 --- /dev/null +++ b/extra/xorg-server/xephyr-glx.patch @@ -0,0 +1,39 @@ +--- hw/kdrive/ephyr/ephyrinit.c 2013-03-14 19:07:41.904335711 +0100 ++++ hw/kdrive/ephyr/ephyrinit.c.new 2013-03-14 19:07:33.024335444 +0100 +@@ -28,6 +28,7 @@ + #endif + #include "ephyr.h" + #include "ephyrlog.h" ++#include "glx_extinit.h" + + extern Window EphyrPreExistingHostWin; + extern Bool EphyrWantGrayScale; +@@ -53,9 +54,28 @@ + KdCardInfoAdd(&ephyrFuncs, 0); + } + ++static const ExtensionModule ephyrExtensions[] = { ++#ifdef GLXEXT ++ { GlxExtensionInit, "GLX", &noGlxExtension }, ++#endif ++}; ++ ++static ++void ephyrExtensionInit(void) ++{ ++ int i; ++ ++ for (i = 0; i < ARRAY_SIZE(ephyrExtensions); i++) ++ LoadExtension(&ephyrExtensions[i], TRUE); ++} ++ ++ + void + InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) + { ++ if (serverGeneration == 1) ++ ephyrExtensionInit(); ++ + KdInitOutput(pScreenInfo, argc, argv); + } + diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 8045f9ab8..1553ddcc3 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 185530 2013-05-14 19:12:24Z foutrelis $ +# $Id: PKGBUILD 188951 2013-06-27 01:33:26Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=xulrunner -pkgver=21.0 +pkgver=22.0 pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') @@ -16,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/ shared-libs.patch) options=('!emptydirs') replaces=('xulrunner-oss') -sha256sums=('c3623bc243bd57c7267eacac658993f5f635f639235bea9ed8fce9b52e59be64' +sha256sums=('f806adf3f1c5b4c8d26322401ef876c73a549f93911be921044f508d698ac589' '3fba82b327f8825ebe93ceaeaea4968d57cf7d700f40bf4457b06d263bcc2e8f' '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1') |