From f60de6664a098734dc7962a6105c175268706e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Tue, 15 Jul 2014 03:56:51 +0000 Subject: Tue Jul 15 03:46:22 UTC 2014 --- community/aria2/PKGBUILD | 6 +- community/fcitx-mozc/PKGBUILD | 21 ++--- community/gnuradio-iqbal/PKGBUILD | 12 ++- community/gnuradio-osmosdr/PKGBUILD | 8 +- community/linuxconsole/PKGBUILD | 6 +- community/noise/PKGBUILD | 11 ++- community/noise/mesa-demos-conflict.patch | 24 +++++ community/parcellite/PKGBUILD | 8 +- community/redis/PKGBUILD | 6 +- community/xcircuit/PKGBUILD | 6 +- extra/allegro4/PKGBUILD | 6 +- extra/ddd/PKGBUILD | 8 +- extra/evolution-data-server/PKGBUILD | 6 +- extra/evolution-ews/PKGBUILD | 6 +- extra/evolution/PKGBUILD | 6 +- extra/gtkhtml4/PKGBUILD | 6 +- ...vent-structures-with-64-bit-extended-fiel.patch | 102 +++++++++++++++++++++ extra/libxcb/PKGBUILD | 14 ++- extra/licq/PKGBUILD | 8 +- extra/mesa/PKGBUILD | 4 +- extra/ncmpc/PKGBUILD | 6 +- 21 files changed, 208 insertions(+), 72 deletions(-) create mode 100644 community/noise/mesa-demos-conflict.patch create mode 100644 extra/libxcb/Force-XCB-event-structures-with-64-bit-extended-fiel.patch diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 75f68b666..efe523715 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108617 2014-03-30 14:15:46Z fyan $ +# $Id: PKGBUILD 115671 2014-07-14 06:09:49Z fyan $ # Maintainer: Felix Yan # Contributor: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ # Contributor: Daniel J Griffiths pkgname=aria2 -pkgver=1.18.5 +pkgver=1.18.6 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ license=('GPL') depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') source=(http://downloads.sourceforge.net/aria2/aria2-$pkgver.tar.xz) -sha256sums=('90a15959498673ebe6a964f8f9fe840f4adbb0a1904a9810cd7da6743c0b619b') +sha256sums=('b9890e1d353e76a87bf94dc8a810586f4b7899130603599dd1227ed0c19e0d74') build() { cd $pkgname-$pkgver diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD index a41948875..f45eeb116 100644 --- a/community/fcitx-mozc/PKGBUILD +++ b/community/fcitx-mozc/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 111402 2014-05-18 04:53:46Z fyan $ +# $Id: PKGBUILD 115667 2014-07-14 05:32:06Z fyan $ # Maintainer: Felix Yan # Contributor: ponsfoot ## Mozc compile option _bldtype=Release -_zipcoderel=201404 +_zipcoderel=201406 _protobuf_ver=2.5.0 -_gyp_rev=1920 +_gyp_rev=1950 _japanese_usage_dictionary_rev=10 -_revision=192 +_revision=271 _pkgbase=mozc pkgname=fcitx-mozc pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" -pkgver=1.15.1785.102 +pkgver=1.15.1834.102 _patchver=${pkgver}.1 pkgrel=1 arch=('i686' 'x86_64') url="http://code.google.com/p/mozc/" license=('custom') depends=('qt4' 'fcitx' 'zinnia') -makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa' 'svn') +makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa' 'svn' 'ninja') replaces=('mozc-fcitx') conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx') source=(mozc::svn+http://mozc.googlecode.com/svn/trunk/src#revision=$_revision @@ -79,7 +79,6 @@ build() { _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc" QTDIR=/usr GYP_DEFINES="document_dir=/usr/share/licenses/$pkgname" python2 build_mozc.py gyp - python2 build_mozc.py build_tools -c $_bldtype python2 build_mozc.py build -c $_bldtype $_targets # Extract license part of mozc @@ -94,7 +93,7 @@ package() { install -d "${pkgdir}/usr/share/licenses/$pkgname/" install -m 644 LICENSE data/installer/*.html "${pkgdir}/usr/share/licenses/${pkgname}/" - for mofile in out_linux/${_bldtype}/obj/gen/unix/fcitx/po/*.mo + for mofile in out_linux/${_bldtype}/gen/unix/fcitx/po/*.mo do filename=`basename $mofile` lang=${filename/.mo/} @@ -121,8 +120,8 @@ package() { sha512sums=('SKIP' 'SKIP' 'SKIP' - '3a868b8f34c6651221db585f3338c9d5ac5c832781fa23f299d6dbe24c8ec1b506e8284c113256330d340fd63e770458ff9212953a290c588ca2f3dab1a706ec' - '84c4c05b0a54df6cd3dbee1f7194779cdac90c3bff46bc34f4e0bb7edbcbd030fced03766f3e93a76f3c23905666d90fa80e1c69d1cc7f4a3b526fad44a42f7a' + 'bdfebfd2a72ea1e8bd5e29c7e065b4ed45c1e5bc6f43e8fbdbf454f24fdf7d44b4f10f8a8f0ca5b6e433bb87877e77a3998a6b25ad9f904f2529d0d2e0ae4b76' + 'bbfd5a48426bfa4a1d438d6d640ceb76174aac4d503dc9de64e6cd1d72c5e081588a2893ba7a558444a38c0f6a132acb0e5a3aed61ad79744efb3aa9dbb6c523' '5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee' - '04d695e06f895d737cf161ac00ddc774ffbf0c91c0e8a827a14f23dbe83f4a609becd6b834557befb83b923ee1a72ba237b688ee46e6b17d953f41955d985301' + '7a5bcedc8c3174fb65bdfd2126abae0f7432bc5b10dfdce7cd9703bdeac4a5652cc3be59b2a6829184a1b4e0199bf9606db79c2cef7858c2ccc6a5a367b229c6' '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a') diff --git a/community/gnuradio-iqbal/PKGBUILD b/community/gnuradio-iqbal/PKGBUILD index d5b7293f3..5c0081106 100644 --- a/community/gnuradio-iqbal/PKGBUILD +++ b/community/gnuradio-iqbal/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 115611 2014-07-12 17:17:29Z kkeen $ +# $Id: PKGBUILD 115693 2014-07-14 09:30:04Z kkeen $ # Maintainer: Kyle Keen # Contributor: Dominik Heidler pkgname=gnuradio-iqbal _pkgname=gr-iqbal pkgver=0.37.1 -pkgrel=2 -pkgdesc="gnuradio I/Q balancing" +pkgrel=3 +pkgdesc="Gnuradio I/Q balancing" arch=('i686' 'x86_64') url="http://cgit.osmocom.org/gr-iqbal/" license=('GPL') -depends=('gnuradio') +depends=('gnuradio' 'fftw') replaces=('gr-iqbal') makedepends=('git' 'cmake' 'boost' 'swig') source=("git://git.osmocom.org/gr-iqbal/#tag=v$pkgver" @@ -21,8 +21,9 @@ build() { cd "$srcdir/$_pkgname" git submodule init git submodule update - # patch is already in git, only applies to 0.37.1 + # patches are already in git, only applies to 0.37.1 patch -p1 -i "$srcdir/float-complex.patch" + sed -i 's/LIBOSMODSP_LIBRARIES ""/LIBOSMODSP_LIBRARIES ${FFTW3F_LIBRARIES}/' CMakeLists.txt mkdir build cd build cmake \ @@ -31,6 +32,7 @@ build() { -DPYTHON_EXECUTABLE=$(which python2) \ -DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \ -DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \ + -DCMAKE_LIBRARY_PATH=/usr/lib \ -DCMAKE_INSTALL_PREFIX=/usr ../ make } diff --git a/community/gnuradio-osmosdr/PKGBUILD b/community/gnuradio-osmosdr/PKGBUILD index 91d791062..c6bf99419 100644 --- a/community/gnuradio-osmosdr/PKGBUILD +++ b/community/gnuradio-osmosdr/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 115631 2014-07-12 20:27:39Z kkeen $ +# $Id: PKGBUILD 115685 2014-07-14 08:50:36Z kkeen $ # Maintainer: Kyle Keen # Contributor: Dominik Heidler pkgname=gnuradio-osmosdr _pkgname=gr-osmosdr pkgver=0.1.1 -pkgrel=8 -pkgdesc="GNU Radio source block for Funcube Dongle, RTL-SDR, USRP and OsmoSDR devices" +pkgrel=9 +#_commit=c65d205d3b +pkgdesc="Source block for Funcube Dongle, RTL-SDR, USRP, OsmoSDR, BladeRF and HackRF devices" url="http://sdr.osmocom.org/trac/" arch=('i686' 'x86_64') license=('GPL') @@ -14,6 +15,7 @@ makedepends=('git' 'cmake' 'boost' 'python2-cheetah' 'swig') conflicts=('gr-osmosdr-git') replaces=('gr-osmosdr') source=("git://git.osmocom.org/gr-osmosdr#tag=v$pkgver") +#source=("git://git.osmocom.org/gr-osmosdr#commit=$_commit") md5sums=('SKIP') # add airspy support? diff --git a/community/linuxconsole/PKGBUILD b/community/linuxconsole/PKGBUILD index b7e9de300..0ef80f29a 100644 --- a/community/linuxconsole/PKGBUILD +++ b/community/linuxconsole/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100995 2013-11-14 11:37:01Z spupykin $ +# $Id: PKGBUILD 115722 2014-07-14 15:12:54Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Andrzej Giniewicz pkgname=linuxconsole -pkgver=1.4.6 +pkgver=1.4.7 pkgrel=1 pkgdesc="Set of utilities for joysticks and serial devices" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ source=(http://prdownloads.sourceforge.net/linuxconsole/linuxconsoletools-$pkgve 'inputattach.conf.d' 'inputattach.service' 'inputattachctl') -md5sums=('9115e08e3a2193b62da46d0e02852787' +md5sums=('fc839ab0dd04718244e17eab9d137ecd' '7ca903e54829764c8241233af5069216' 'c19b9ed38b243191cf5378b87a42a4cc' '7dd0690a9d2fe5e1052900650906e273') diff --git a/community/noise/PKGBUILD b/community/noise/PKGBUILD index d5b7cf128..0b3fe6dc6 100644 --- a/community/noise/PKGBUILD +++ b/community/noise/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111905 2014-05-26 14:37:08Z alucryd $ +# $Id: PKGBUILD 115712 2014-07-14 13:49:09Z alucryd $ # Maintainer: Maxime Gauduin pkgname=noise pkgver=0.3.0 -pkgrel=1 +pkgrel=2 pkgdesc='The Pantheon Music Player' arch=('i686' 'x86_64') url='https://launchpad.net/noise' @@ -15,12 +15,15 @@ optdepends=('gst-plugins-base: "Base" plugin libraries' 'gst-plugins-bad: "Bad" plugin libraries' 'gst-plugins-ugly: "Ugly" plugin libraries') install="${pkgname}.install" -source=("https://launchpad.net/${pkgname}/${pkgver%.?}.x/${pkgver}/+download/${pkgname}-${pkgver}.tgz") -sha256sums=('56d9dc11e376f0727748e5f60ad35555626314ecead6d62139a56ab487fdf7cf') +source=("https://launchpad.net/${pkgname}/${pkgver%.?}.x/${pkgver}/+download/${pkgname}-${pkgver}.tgz" + 'mesa-demos-conflict.patch') +sha256sums=('56d9dc11e376f0727748e5f60ad35555626314ecead6d62139a56ab487fdf7cf' + 'df2c77d7da40126b8957e40924f8d07f8e722cfae27d7f59eb3fa307768a3620') prepare() { cd ${pkgname}-${pkgver} + patch -Np1 -i ../mesa-demos-conflict.patch sed 's|${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR_UNPREFIXED}|${PLUGIN_DIR_UNPREFIXED}|' -i CMakeLists.txt } diff --git a/community/noise/mesa-demos-conflict.patch b/community/noise/mesa-demos-conflict.patch new file mode 100644 index 000000000..9704c14db --- /dev/null +++ b/community/noise/mesa-demos-conflict.patch @@ -0,0 +1,24 @@ +diff -rupN noise-0.3.0.orig/data/noise.desktop noise-0.3.0/data/noise.desktop +--- noise-0.3.0.orig/data/noise.desktop 2014-07-14 15:32:41.859039779 +0200 ++++ noise-0.3.0/data/noise.desktop 2014-07-14 15:33:18.950708937 +0200 +@@ -3,7 +3,7 @@ Type=Application + Name=Noise + GenericName=Music Player + Comment=Listen to music +-Exec=noise %U ++Exec=noise-player %U + Icon=multimedia-audio-player + Terminal=false + Categories=Audio;Music;Player;AudioVideo;GNOME;GTK; +diff -rupN noise-0.3.0.orig/src/CMakeLists.txt noise-0.3.0/src/CMakeLists.txt +--- noise-0.3.0.orig/src/CMakeLists.txt 2014-07-14 15:32:41.852369815 +0200 ++++ noise-0.3.0/src/CMakeLists.txt 2014-07-14 15:38:21.230137167 +0200 +@@ -107,7 +107,7 @@ vala_precompile (CLIENT_VALA_C ${SRC_TAR + ${CLIENT_VAPI} + ) + +-set (EXEC_NAME ../${SRC_TARGET}) ++set (EXEC_NAME ../${SRC_TARGET}-player) + + add_definitions (${DEPS_CFLAGS}) + link_directories (${DEPS_LIBRARY_DIRS}) diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD index ab156dbab..cbf153e0f 100644 --- a/community/parcellite/PKGBUILD +++ b/community/parcellite/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100807 2013-11-11 10:58:12Z spupykin $ +# $Id: PKGBUILD 115724 2014-07-14 15:13:08Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Alexander Fehr pkgname=parcellite -pkgver=1.1.7 -pkgrel=2 +pkgver=1.1.8 +pkgrel=1 pkgdesc="Lightweight GTK+ clipboard manager" arch=('i686' 'x86_64') url="http://parcellite.sourceforge.net/" @@ -13,7 +13,7 @@ depends=('gtk2') makedepends=('intltool') source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz fix-crash.patch) -md5sums=('a542aab0df50ac7a7de6501957e78fb3' +md5sums=('473d4d9e937c7de3502d21abac891cd3' 'f2cc1986e573d49c92ea3d81efd5d574') prepare() { diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 93a0e95d4..3843937b6 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 113502 2014-06-24 11:02:44Z spupykin $ +# $Id: PKGBUILD 115726 2014-07-14 16:54:39Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan-Erik Rediger # Contributor: nofxx .com> pkgname=redis -pkgver=2.8.12 +pkgver=2.8.13 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ source=("http://download.redis.io/releases/redis-$pkgver.tar.gz" "redis.service" "redis.logrotate" "redis.tmpfiles.d") -md5sums=('27645ca17ac1c269e67862fcc0f1d2e3' +md5sums=('ea92053cbb6f4eb8a4347dbaac7d7dff' '5320aa6d0f31aadc1d6202ca40425aea' '9e2d75b7a9dc421122d673fe520ef17f' 'dd9ab8022b4d963b2e5899170dfff490') diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD index 3d5e843cd..3d298359f 100644 --- a/community/xcircuit/PKGBUILD +++ b/community/xcircuit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 115273 2014-07-07 09:30:48Z spupykin $ +# $Id: PKGBUILD 115684 2014-07-14 08:50:20Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Giovanni Scafora # Contributor: simo pkgname=xcircuit -pkgver=3.8.69 +pkgver=3.8.70 pkgrel=1 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('tk' 'libxpm' 'zlib') makedepends=('chrpath' 'gendesk') _categories='Application;Electronics;Engineering' source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz) -md5sums=('dbdcf28e8af273bc2d1e97f5f843e833') +md5sums=('5abb5c81272f8a5a2f8ccca6eb3e27e8') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/allegro4/PKGBUILD b/extra/allegro4/PKGBUILD index e15282e73..4be6e7622 100644 --- a/extra/allegro4/PKGBUILD +++ b/extra/allegro4/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 197590 2013-10-27 03:29:02Z eric $ +# $Id: PKGBUILD 216867 2014-07-14 01:06:58Z eric $ # Maintainer: Ionut Biru # Contributor: Tom Newsom # Contributor: arjan pkgname=allegro4 pkgver=4.4.2 -pkgrel=2 +pkgrel=3 pkgdesc="Portable library mainly aimed at video game and multimedia programming (legacy version)" arch=('i686' 'x86_64') url="http://alleg.sourceforge.net/" license=('custom') depends=('sh' 'jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor') -makedepends=('cmake' 'libpng' 'mesa') +makedepends=('cmake' 'libpng' 'mesa' 'glu') options=('staticlibs') source=(http://downloads.sourceforge.net/alleg/allegro-${pkgver}.tar.gz LICENSE) diff --git a/extra/ddd/PKGBUILD b/extra/ddd/PKGBUILD index 16f83e679..41f54e1a0 100644 --- a/extra/ddd/PKGBUILD +++ b/extra/ddd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 216297 2014-07-03 00:52:50Z eric $ +# $Id: PKGBUILD 216895 2014-07-14 19:11:05Z eric $ # Maintainer: Eric Bélanger pkgname=ddd pkgver=3.3.12 -pkgrel=4 +pkgrel=5 pkgdesc="A graphical front-end for command-line debuggers such as GDB, JDB, pydb, perl debugger..." arch=('i686' 'x86_64') url="http://www.gnu.org/software/ddd/" @@ -21,12 +21,12 @@ sha1sums=('b91d2dfb1145af409138bd34517a898341724e56' prepare() { cd ${pkgname}-${pkgver} - patch -p1 < ../ddd-3.3.12-gcc44.patch + patch -p1 -i "${srcdir}/ddd-3.3.12-gcc44.patch" } build() { cd ${pkgname}-${pkgver} - ./configure --prefix=/usr + LIBS+="-pthread" ./configure --prefix=/usr make } diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 5755f0bb9..b4f49ff75 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 214776 2014-06-10 13:56:37Z jgc $ +# $Id: PKGBUILD 216888 2014-07-14 17:24:03Z heftig $ # Maintainer: Jan de Groot pkgname=evolution-data-server -pkgver=3.12.3 +pkgver=3.12.4 pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=(i686 x86_64) @@ -12,7 +12,7 @@ install=$pkgname.install url="https://wiki.gnome.org/Apps/Evolution" license=(GPL) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('342d96446a9d6bf95bb649f14738a032c1454069201b4743c806ce0d8ad9dd7b') +sha256sums=('5e424ec560e46e0b26d290d04ad5146d9b313a956abcf99ef46ac3d8633060c7') build() { cd "$pkgname-$pkgver" diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index fa52bc5d7..b3abeaceb 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 215041 2014-06-11 21:18:24Z heftig $ +# $Id: PKGBUILD 216890 2014-07-14 17:25:23Z heftig $ # Maintainer: Ionut Biru pkgname=evolution-ews -pkgver=3.12.3 +pkgver=3.12.4 pkgrel=1 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'libmspack') makedepends=('intltool' 'evolution') options=('!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('6d06f303343cc56efcd19ea632209d7fd3ee57bf099b54603ad015d6590df47c') +sha256sums=('a7c6bc77dfc9049e5d92f2fbc52725023868fb8a68e1a6e3efaa6f2c5404a8b7') build() { cd $pkgname-$pkgver diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index f29863599..13d3719d3 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 214778 2014-06-10 14:17:49Z jgc $ +# $Id: PKGBUILD 216889 2014-07-14 17:24:52Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=evolution -pkgver=3.12.3 +pkgver=3.12.4 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=(i686 x86_64) @@ -19,7 +19,7 @@ options=('!emptydirs') install=evolution.install url=https://wiki.gnome.org/Apps/Evolution source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('980988cf3d1f537102f4a3143a2c251ac812666b8f0936afd6bdde0fe5a96fea') +sha256sums=('4e52f46038a859179a2a20c13d2bf9ad6ea240f03ec9e54661f813b0582905a2') build() { cd $pkgname-$pkgver diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index 5b59934e3..502c14019 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 215378 2014-06-23 19:29:00Z heftig $ +# $Id: PKGBUILD 216887 2014-07-14 17:23:26Z heftig $ # Maintainer: Ionut Biru pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('gtk3' 'enchant' 'iso-codes' 'libsoup') makedepends=('intltool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver:0:3}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('58d2d6bafd221fdc07982ad0455fd168afc7fb642465d53b66b07328eab32868') +sha256sums=('e72a6e9b180217aefb1d9dbd8a2fd41f00419cd1f268e1a7e1e2aef2b54a8341') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/libxcb/Force-XCB-event-structures-with-64-bit-extended-fiel.patch b/extra/libxcb/Force-XCB-event-structures-with-64-bit-extended-fiel.patch new file mode 100644 index 000000000..90575c70d --- /dev/null +++ b/extra/libxcb/Force-XCB-event-structures-with-64-bit-extended-fiel.patch @@ -0,0 +1,102 @@ +From 3b72a2c9d1d656c74c691a45689e1d637f669e3a Mon Sep 17 00:00:00 2001 +From: Kenneth Graunke +Date: Fri, 03 Jan 2014 23:08:33 +0000 +Subject: Force XCB event structures with 64-bit extended fields to be packed. + +With the advent of the Present extension, some events (such as +PresentCompleteNotify) now use native 64-bit types on the wire. + +For XGE events, we insert an extra "uint32_t full_sequence" field +immediately after the first 32 bytes of data. Normally, this causes +the subsequent fields to be shifted over by 4 bytes, and the structure +to grow in size by 4 bytes. Everything works fine. + +However, if event contains 64-bit extended fields, this may result in +the compiler adding an extra 4 bytes of padding so that those fields +remain aligned on 64-bit boundaries. This causes the structure to grow +by 8 bytes, not 4. Unfortunately, XCB doesn't realize this, and +always believes that the length only increased by 4. read_packet() +then fails to malloc enough memory to hold the event, and the event +processing code uses the wrong offsets. + +To fix this, mark any event structures containing 64-bit extended +fields with __attribute__((__packed__)). + +v2: Use any(...) instead of True in (...), as suggested by + Daniel Martin. + +v3 (Alan Coopersmith): Fix build with Solaris Studio 12.3 by moving the +attribute to after the structure definition. + +Signed-off-by: Kenneth Graunke +Reviewed-by: Keith Packard [v1] +Reviewed-by: Josh Triplett [v1] +Reviewed-by: Daniel Martin +Signed-off-by: Alan Coopersmith +--- +diff --git a/src/c_client.py b/src/c_client.py +index 99fd307..45de544 100644 +--- a/src/c_client.py ++++ b/src/c_client.py +@@ -1762,7 +1762,7 @@ def c_simple(self, name): + # Iterator + _c_iterator(self, name) + +-def _c_complex(self): ++def _c_complex(self, force_packed = False): + ''' + Helper function for handling all structure types. + Called for all structs, requests, replies, events, errors. +@@ -1817,7 +1817,7 @@ def _c_complex(self): + if b.type.has_name: + _h(' } %s;', b.c_field_name) + +- _h('} %s;', self.c_type) ++ _h('} %s%s;', 'XCB_PACKED ' if force_packed else '', self.c_type) + + def c_struct(self, name): + ''' +@@ -2902,6 +2902,7 @@ def c_event(self, name): + # events while generating the structure for them. Otherwise we would read + # garbage (the internal full_sequence) when accessing normal event fields + # there. ++ force_packed = False + if hasattr(self, 'is_ge_event') and self.is_ge_event and self.name == name: + event_size = 0 + for field in self.fields: +@@ -2911,6 +2912,11 @@ def c_event(self, name): + full_sequence = Field(tcard32, tcard32.name, 'full_sequence', False, True, True) + idx = self.fields.index(field) + self.fields.insert(idx + 1, full_sequence) ++ ++ # If the event contains any 64-bit extended fields, they need ++ # to remain aligned on a 64-bit boundary. Adding full_sequence ++ # would normally break that; force the struct to be packed. ++ force_packed = any(f.type.size == 8 and f.type.is_simple for f in self.fields[(idx+1):]) + break + + _c_type_setup(self, name, ('event',)) +@@ -2920,7 +2926,7 @@ def c_event(self, name): + + if self.name == name: + # Structure definition +- _c_complex(self) ++ _c_complex(self, force_packed) + else: + # Typedef + _h('') +diff --git a/src/xcb.h b/src/xcb.h +index e62c985..73c77a3 100644 +--- a/src/xcb.h ++++ b/src/xcb.h +@@ -51,6 +51,8 @@ extern "C" { + * @file xcb.h + */ + ++#define XCB_PACKED __attribute__((__packed__)) ++ + /** + * @defgroup XCB_Core_API XCB Core API + * @brief Core API of the XCB library. +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index a52a31b5c..125fa09a9 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 212300 2014-05-12 07:59:16Z lcarlier $ +# $Id: PKGBUILD 216891 2014-07-14 18:06:24Z lcarlier $ # Maintainer: Andreas Radke # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=libxcb pkgver=1.10 -pkgrel=2 +pkgrel=3 pkgdesc="X11 client-side library" arch=('i686' 'x86_64') url="http://xcb.freedesktop.org/" @@ -14,10 +14,12 @@ makedepends=('pkgconfig' 'libxslt' 'python') license=('custom') source=($url/dist/$pkgname-$pkgver.tar.bz2 libxcb-1.1-no-pthread-stubs.patch - Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch) + Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch + Force-XCB-event-structures-with-64-bit-extended-fiel.patch) sha256sums=('98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5' '748ed83af60468a0eb6785222e4a5ca589d28f20b9bfc60d5936ec93b8eef356' - '47de1025bb16446b9e69ff7b6b262a0a1af957d350afe897421b9105c89befeb') + '47de1025bb16446b9e69ff7b6b262a0a1af957d350afe897421b9105c89befeb' + '7dd84c631da541e2dc708323071c3306ceaf79ee807aa457c1cdc7e069b7ccb9') prepare() { cd "$pkgname-$pkgver" @@ -25,7 +27,9 @@ prepare() { autoreconf -vfi # fix FS#40289 merged upstream - patch -Np1 -i ../Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch + patch -Np1 -i ../Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch + # fix FS#41172 merged upstream + patch -Np1 -i ../Force-XCB-event-structures-with-64-bit-extended-fiel.patch } build() { diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD index 4bf7f1dc6..b110a3650 100644 --- a/extra/licq/PKGBUILD +++ b/extra/licq/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 201263 2013-12-07 10:35:02Z bpiotrowski $ +# $Id: PKGBUILD 216875 2014-07-14 06:25:36Z fyan $ # Maintainer: Juergen Hoetzel pkgname=licq -pkgver=1.7.1 -pkgrel=6 +pkgver=1.8.2 +pkgrel=1 pkgdesc="Advanced graphical ICQ clone and more for Unix" arch=('i686' 'x86_64') url="http://www.licq.org" @@ -11,7 +11,7 @@ license=('GPL') depends=('boost-libs' 'gpgme' 'libxss' 'qt4') makedepends=('cmake' 'boost' 'optipng') source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2) -md5sums=('701e57efedc2b7ece64c3d2d2e9f9e16') +md5sums=('46af2bc95865ee61a103d27812fe6e6a') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 577185504..691e846ca 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 216627 2014-07-08 05:35:17Z lcarlier $ +# $Id: PKGBUILD 216892 2014-07-14 18:06:25Z lcarlier $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgbase=mesa pkgname=('opencl-mesa' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') pkgver=10.2.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd' diff --git a/extra/ncmpc/PKGBUILD b/extra/ncmpc/PKGBUILD index 0af09f347..8c16b0180 100644 --- a/extra/ncmpc/PKGBUILD +++ b/extra/ncmpc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 216764 2014-07-10 16:20:56Z bisson $ +# $Id: PKGBUILD 216883 2014-07-14 17:09:13Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Angel Velasquez # Contributor: Andrea Scarpino @@ -6,7 +6,7 @@ # Contributor: Daniel Bainton pkgname=ncmpc -pkgver=0.23 +pkgver=0.24 pkgrel=1 pkgdesc='Fully featured MPD client using ncurses' url='http://www.musicpd.org/clients/ncmpc/' @@ -16,7 +16,7 @@ depends=('ncurses' 'glib2' 'libmpdclient') optdepends=('python2: to enable lyrics plugin' 'ruby: to enable lyrics plugin') source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz") -sha1sums=('571ba50a252d9a7c69ae089b576560ef9de2f423') +sha1sums=('4fe581299aa1b2efdce3018b734f6cfc283bea07') build() { cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v1.2.3