From 8e5a0a990a12a59cadb687cae22a1960fce1660b Mon Sep 17 00:00:00 2001 From: root Date: Thu, 7 Feb 2013 00:08:35 -0800 Subject: Thu Feb 7 00:08:35 PST 2013 --- community/augeas/PKGBUILD | 10 +-- community/cython/PKGBUILD | 6 +- community/geany/PKGBUILD | 8 +-- community/gigi/PKGBUILD | 39 ++++++----- community/go/PKGBUILD | 23 ++++--- community/haskell-regex-base/PKGBUILD | 6 +- community/libmicrohttpd/PKGBUILD | 6 +- community/lout/PKGBUILD | 20 ++++-- community/lout/lout.install | 2 + community/midori/PKGBUILD | 34 +++++----- community/myodbc/PKGBUILD | 6 +- community/nethogs/PKGBUILD | 8 ++- community/openttd/PKGBUILD | 11 +-- community/qtemu/PKGBUILD | 6 +- community/rogue/PKGBUILD | 8 ++- community/ruby-gtk2/PKGBUILD | 56 ++++++++-------- community/ruby-gtk3/PKGBUILD | 18 +++-- community/squid/PKGBUILD | 5 +- community/stone-soup/PKGBUILD | 8 +-- community/tea/PKGBUILD | 6 +- extra/fluxbox/PKGBUILD | 10 +-- extra/fluxbox/fluxbox-fix_timer.diff | 78 ++++++++++++++++++++++ extra/strigi/PKGBUILD | 25 +++---- extra/xf86-video-sisimedia/PKGBUILD | 9 ++- ...disable-UploadToScreen-DownloadFromScreen.patch | 64 ++++++++++++++++++ kernels/linux-libre-pae/PKGBUILD | 4 +- kernels/linux-libre-pae/config | 4 +- kernels/linux-libre-xen/PKGBUILD | 2 +- kernels/linux-libre-xen/config | 2 +- libre/abiword-libre/PKGBUILD | 29 +++++--- libre/abiword-libre/abiword-2.8.6-glib-2.31.patch | 40 +++++++++++ libre/linux-libre-lts-kmod-alx/PKGBUILD | 13 ++-- 32 files changed, 391 insertions(+), 175 deletions(-) create mode 100644 extra/fluxbox/fluxbox-fix_timer.diff create mode 100644 extra/xf86-video-sisimedia/disable-UploadToScreen-DownloadFromScreen.patch create mode 100644 libre/abiword-libre/abiword-2.8.6-glib-2.31.patch diff --git a/community/augeas/PKGBUILD b/community/augeas/PKGBUILD index 6cc5ed1d3..9c79d790e 100644 --- a/community/augeas/PKGBUILD +++ b/community/augeas/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62121 2012-01-16 09:07:06Z spupykin $ +# $Id: PKGBUILD 83877 2013-02-06 10:39:22Z spupykin $ # Contributor: Thomas S Hatch # Contributor: Jon Nordby pkgname=augeas -pkgver=0.10.0 -pkgrel=2 +pkgver=1.0.0 +pkgrel=1 pkgdesc="A configuration editing tool that parses config files and transforms them into a tree" arch=('i686' 'x86_64') url="http://augeas.net" @@ -12,8 +12,8 @@ license=('LGPL') depends=('libxml2' 'gcc-libs') options=('!libtool') source=(http://augeas.net/download/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('fe1834e90a066c3208ac0214622c7352' - 'efb3f1a90ff31320dcc4c499eba5a555') +md5sums=('82131019432ecf8102e1491610ad2dd1' + '63b2f334b030c957c98ee01ef207cfdd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index cf925db51..d90482aa5 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81958 2013-01-04 19:09:03Z spupykin $ +# $Id: PKGBUILD 83887 2013-02-06 11:39:48Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Igor Scabini pkgname=('cython' 'cython2') pkgbase=cython -pkgver=0.17.4 +pkgver=0.18 pkgrel=1 pkgdesc="C-Extensions for Python " arch=(i686 x86_64) @@ -12,7 +12,7 @@ url="http://www.cython.org" license=('APACHE') makedepends=('python-distribute' 'python2-distribute') source=("http://cython.org/release/Cython-$pkgver.tar.gz") -md5sums=('cb11463e3a0c8d063e578db64ff61dde') +md5sums=('6a72d14e72f3df597b34ac326152f8d2') build() { true diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD index f294fb7e1..90c379711 100644 --- a/community/geany/PKGBUILD +++ b/community/geany/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76751 2012-09-28 23:09:27Z arodseth $ +# $Id: PKGBUILD 83915 2013-02-06 14:27:16Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Angel Velasquez # Contributor: Ionut Biru @@ -7,7 +7,7 @@ pkgname=geany pkgver=1.22 -pkgrel=2 +pkgrel=3 pkgdesc='Fast and lightweight IDE' arch=('x86_64' 'i686') url="http://www.geany.org/" @@ -31,8 +31,8 @@ build() { sed -i '0,/on/s//on2/' data/templates/files/main.py msg2 "Fixing FS#10318..." setconf geany.desktop MimeType '' - msg2 "Enabling colors for PKGBUILD files..." - setconf data/filetype_extensions.conf Sh PKGBUILD + msg2 "Enabling syntax highlighting for PKGBUILD files..." + sed -i 's/Sh=/Sh=PKGBUILD;/' data/filetype_extensions.conf } package() { diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD index a9da47161..be9a68f2b 100644 --- a/community/gigi/PKGBUILD +++ b/community/gigi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83482 2013-02-02 01:35:10Z arodseth $ +# $Id: PKGBUILD 83897 2013-02-06 12:43:24Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Sven-Hendrik Haase # Contributor: fana-m @@ -7,10 +7,11 @@ pkgname=gigi pkgver=0.8.0 -pkgrel=16 -_fixedrevision=5407 # 5208 -pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL (freeorion fork)" -url="http://gigi.sourceforge.net/" +pkgrel=17 +_fixedrevision=5407 +pkgdesc='Small, efficient and feature rich GUI for OpenGL and C++ (freeorion fork)' +url='http://freeorion.svn.sourceforge.net/viewvc/freeorion/trunk/FreeOrion/GG/' +#url='http://gigi.sourceforge.net/' arch=('x86_64' 'i686') license=('LGPL') depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python') @@ -19,7 +20,7 @@ makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa') build() { cd "$srcdir" - msg2 "Fetching files..." + msg2 'Fetching files...' if [ -d gigi/.svn ]; then (cd gigi && svn up -r "$_fixedrevision") else @@ -32,33 +33,37 @@ build() { svn export gigi gigi-build cd gigi-build - msg2 "Configuring..." + msg2 'Configuring...' setconf cmake/GiGiOgre.pc.in prefix /usr setconf cmake/GiGi.pc.in prefix /usr setconf cmake/GiGiSDL.pc.in prefix /usr - cmake \ - -D CMAKE_INSTALL_PREFIX="$pkgdir"/usr \ + # It would be better if CMAKE_INSTALL_PREFIX or the resulting Makefiles + # could be re-configured in the package() function, but this works too. + cmake -D CMAKE_INSTALL_PREFIX="$srcdir/pkg/usr" \ -D BUILD_TUTORIALS=OFF \ -D CPACK_GENERATOR=GiGiDevel \ - -D CMAKE_C_FLAGS_RELEASE="-DNDEBUG" \ + -D CMAKE_C_FLAGS_RELEASE='-DNDEBUG' \ . - msg2 "Building documentation..." + msg2 'Building documentation...' cd doc doxygen cd .. - msg2 "Compiling..." + msg2 'Compiling...' make -j1 } package() { cd "$srcdir/gigi-build" - msg2 "Packaging files..." + msg2 'Packaging files...' make install - msg2 "Fixing documentation..." + msg2 'Moving files to the right location...' + mv -v "$srcdir/pkg/usr" "$pkgdir/" + + msg2 'Fixing documentation...' mkdir -p "$pkgdir/usr/share/doc" mv "$pkgdir/usr/doc" "$pkgdir/usr/share/doc/$pkgname" @@ -66,13 +71,13 @@ package() { sed -i "s:$srcdir:/:g" "$f" done - msg2 "Fixing python3 shebang..." + msg2 'Python 3 fix...' for f in `find "$pkgdir/usr" -name "*.py"`; do sed -i "s:/env python:/python3:g" "$f" done - msg2 "Packaging license..." - install -Dm 644 COPYING \ + msg2 'Packaging license...' + install -Dm644 COPYING \ "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 8954a068a..b874f8a2e 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82502 2013-01-19 17:36:30Z arodseth $ +# $Id: PKGBUILD 83899 2013-02-06 13:13:38Z arodseth $ # Maintainer: Vesa Kaihlavirta # Maintainer: Alexander Rødseth # Contributor: Rémy Oudompheng @@ -10,10 +10,10 @@ pkgname=go pkgver=1.0.3 -pkgrel=5 +pkgrel=6 epoch=2 pkgdesc='Google Go compiler and tools' -arch=('x86_64' 'i686' 'armv6h') +arch=('x86_64' 'i686') url='http://golang.org/' license=('custom') depends=('perl' 'gawk') @@ -22,12 +22,12 @@ options=('!strip' '!emptydirs') install=go.install backup=('usr/lib/go/bin') source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz" - $pkgname.sh) + "$pkgname.sh") sha256sums=('7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df' 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') build() { - cd $srcdir/$pkgname + cd "$srcdir/$pkgname" if [ "$CARCH" == 'x86_64' ]; then export GOARCH=amd64 @@ -52,7 +52,7 @@ build() { } check() { - cd $srcdir/$pkgname + cd "$srcdir/$pkgname" if [ "$CARCH" == 'x86_64' ]; then export GOARCH=amd64 @@ -62,15 +62,15 @@ check() { export GOARCH=arm fi - export GOROOT=$srcdir/$pkgname - export PATH=$srcdir/$pkgname/bin:$PATH + export GOROOT="$srcdir/$pkgname" + export PATH="$srcdir/$pkgname/bin:$PATH" # TestSimpleMulticastListener will fail in standard chroot. cd src && bash run.bash --no-rebuild || true } package() { - cd $srcdir/$pkgname + cd "$srcdir/$pkgname" install -Dm644 LICENSE \ $pkgdir/usr/share/licenses/go/LICENSE @@ -106,8 +106,10 @@ package() { # Remove object files from target src dir find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete + # Fix for FS#32813 find $pkgdir -type f -name sql.go -exec chmod -x {} \; + # Remove all executable source files find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete @@ -130,6 +132,9 @@ package() { rm -f $pkgdir/usr/share/go/doc/articles/wiki/get.bin install -Dm644 VERSION $pkgdir/usr/lib/go/VERSION + + # Clean up + rm -r "$pkgdir/usr/bin/linux_arm" } # vim:set ts=2 sw=2 et: diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD index a7c840762..99ece767c 100644 --- a/community/haskell-regex-base/PKGBUILD +++ b/community/haskell-regex-base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83658 2013-02-04 10:08:27Z arodseth $ +# $Id: PKGBUILD 83910 2013-02-06 14:09:22Z arodseth $ # Maintainer: Vesa Kaihlavirta # Contributor: Arch Haskell Team # Contributor: Alexander Rødseth @@ -6,12 +6,12 @@ _hkgname=regex-base pkgname=haskell-regex-base pkgver=0.93.2 -pkgrel=8 +pkgrel=10 pkgdesc='Interface API for regex-posix,pcre,parsec,tdfa,dfa' url='http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base' license=('custom:BSD3') arch=('x86_64' 'i686') -depends=('ghc=7.6.2-1' 'sh' 'haskell-mtl=2.1.2') +depends=('ghc=7.6.1-1' 'sh' 'haskell-mtl=2.1.2') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz") install=$pkgname.install sha256sums=('20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278') diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 10d90a60c..c71d2a0fb 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81709 2012-12-27 13:15:11Z spupykin $ +# $Id: PKGBUILD 83879 2013-02-06 10:39:46Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Norberto Lopes # Contributor: Kao Dome @@ -6,7 +6,7 @@ # Contributor: Mathias Rohnstock pkgname=libmicrohttpd -pkgver=0.9.24 +pkgver=0.9.25 pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('2891c82cc85a92e6944cacf9ae413f7c') +md5sums=('4f3b8ccd50e7133283f2aec5cc21620f') build() { cd ${pkgname}-${pkgver} diff --git a/community/lout/PKGBUILD b/community/lout/PKGBUILD index 71aa6f957..914062c87 100644 --- a/community/lout/PKGBUILD +++ b/community/lout/PKGBUILD @@ -1,24 +1,36 @@ -# $Id: PKGBUILD 56257 2011-10-04 00:41:28Z kkeen $ +# $Id: PKGBUILD 83917 2013-02-06 14:41:18Z kkeen $ # Maintainer: Kyle Keen # Contributor: catwell pkgname=lout pkgver=3.39 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight document formatting system." arch=('i686' 'x86_64') url="http://lout.wiki.sourceforge.net/" license=('GPL') depends=('glibc') install=lout.install -source=(http://mirrors.ctan.org/support/$pkgname/$pkgname-$pkgver.tar.gz makefile.arch lout.install) +source=(http://mirrors.ctan.org/support/$pkgname/$pkgname-$pkgver.tar.gz + makefile.arch + lout.install + http://pkgs.fedoraproject.org/repo/pkgs/lout/slides.pdf/6822c33e49a1dca0b090f297d404d7fa/slides.pdf) md5sums=('151e1fba676c7052936ccc1bcd9663a9' '088a29ca16477a9a30da9fafc9391de8' - 'bc6c8df650fe75dd3c51d0c047c56f30') + '597cd52eb87ef6253cf769bed4db3952' + '6822c33e49a1dca0b090f297d404d7fa') build() { cd "$srcdir/$pkgname-$pkgver" cp ../makefile.arch . + make -f makefile.arch +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make -f makefile.arch PKGDIR="$pkgdir" install + chmod 0775 "$pkgdir/usr/lib/lout/data/" + chgrp users "$pkgdir/usr/lib/lout/data/" + install -Dm644 "$srcdir/slides.pdf" "$pkgdir/usr/share/doc/$pkgname/introduction.pdf" } diff --git a/community/lout/lout.install b/community/lout/lout.install index f05b4b601..e3688a219 100644 --- a/community/lout/lout.install +++ b/community/lout/lout.install @@ -1,6 +1,8 @@ post_install() { /usr/bin/lout -x -s /usr/lib/lout/include/init + chmod 0775 "/usr/lib/lout/data/" + chgrp users "/usr/lib/lout/data/" } post_upgrade() diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index fd40b3e4e..72587c724 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79131 2012-10-30 23:51:10Z arodseth $ +# $Id: PKGBUILD 83885 2013-02-06 11:36:28Z arodseth $ # Maintainer: Alexander Rødseth # Maintainer: Bartłomiej Piotrowski # Contributor: Andreas Radke @@ -7,41 +7,36 @@ # Contributor: Bartłomiej Piotrowski pkgname=midori -pkgver=0.4.7 -pkgrel=3 +pkgver=0.4.8 +pkgrel=1 pkgdesc='Lightweight web browser based on Gtk WebKit' arch=('x86_64' 'i686') url='http://www.twotoasts.de/index.php?/pages/midori_summary.html' license=('LGPL2.1') install=midori.install -depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss') -makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') -optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support') +depends=('libzeitgeist' 'libwebkit' 'libnotify' 'libxss' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'gcr') +makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala') +optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support' + 'aria2: download utility') options=('!emptydirs') -source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 - 0.4.7-private-mode.patch - fix-copying.patch) -md5sums=('06db7b88a41e9b2265728960d5e98f35' - 'b2f21a853038662fd0e6c2274ed9dfb7' - '4bf3a0af4edc9ad6c4d46fc9676d9eb0') +source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" + 'fix-copying.patch') +sha256sums=('40bf23f84a3537f54d7eb45df1da40ebef54c321b1b34d0d0c8e45bb0cce5e9f' + 'd4395ac994d8d614f93ae4863bbf6289b1980e0ed84aef52ca95a678b464b959') build() { cd $srcdir/$pkgname-$pkgver - # FS#31641 - patch -s -Np1 -i ../0.4.7-private-mode.patch - # FS#32229 patch -s -Np1 -i ../fix-copying.patch > /dev/null || true - # python2 + # Python 2 export PYTHON=/usr/bin/python2 sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf ./configure --prefix=/usr \ --jobs=${MAKEFLAGS/-j/} \ --enable-addons \ - --disable-hildon \ --enable-unique \ --enable-nls \ --enable-docs \ @@ -50,8 +45,9 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index bf21eafb7..cb16bb31f 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 76626 2012-09-25 10:38:28Z spupykin $ +# $Id: PKGBUILD 83893 2013-02-06 12:11:01Z spupykin $ # Maintainer: Sergej Pupykin pkgname=myodbc -pkgver=5.2.2 +pkgver=5.2.4 pkgrel=1 pkgdesc="ODBC driver/connector for MySQL" arch=(i686 x86_64) @@ -12,7 +12,7 @@ makedepends=('cmake') license=('GPL') options=('libtool') source=("http://cdn.mysql.com/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-$pkgver-src.tar.gz") -md5sums=('bb7829c68338b99debe312839edb79ad') +md5sums=('0ace04820794ea1712b2a303ebd99dba') build() { cd $srcdir/mysql-connector-odbc-${pkgver}-src diff --git a/community/nethogs/PKGBUILD b/community/nethogs/PKGBUILD index 2c2567195..3bf9ec080 100644 --- a/community/nethogs/PKGBUILD +++ b/community/nethogs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54960 2011-08-29 07:11:32Z kkeen $ +# $Id: PKGBUILD 83919 2013-02-06 14:47:26Z kkeen $ # Maintainer: Kyle Keen # Contributor: ViNS # Contributor: Daenyth pkgname=nethogs pkgver=0.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A net top tool which displays traffic used per process instead of per IP or interface" url="http://nethogs.sourceforge.net" license=(GPL) @@ -23,6 +23,10 @@ build() { patch -Np1 -i "$srcdir/gcc44.patch" make +} + +package() { + cd "$srcdir/$pkgname" make DESTDIR="$pkgdir/usr" install } # vim:set ts=2 sw=2 et: diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index bbcfdc26d..cf01e15f4 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82688 2013-01-23 00:15:57Z eric $ +# $Id: PKGBUILD 83874 2013-02-05 23:22:09Z lcarlier $ # Maintainer: Vesa Kaihlavirta pkgname=openttd pkgver=1.2.3 -pkgrel=3 +pkgrel=4 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64') url='http://www.openttd.org' @@ -15,7 +15,7 @@ optdepends=('openttd-opengfx: free graphics' source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") sha256sums=('d228798f7d4804b7ead186ec19082f0e6c83cfc2dbf625ddab1d22048117fd08') -build() { +package() { cd ${pkgname}-${pkgver} ./configure \ @@ -29,10 +29,5 @@ build() { --personal-dir=.${pkgname} make -} - -package() { - cd ${pkgname}-${pkgver} - make install } diff --git a/community/qtemu/PKGBUILD b/community/qtemu/PKGBUILD index bab61891b..6504de035 100644 --- a/community/qtemu/PKGBUILD +++ b/community/qtemu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83821 2013-02-05 10:58:29Z spupykin $ +# $Id: PKGBUILD 83889 2013-02-06 11:40:15Z spupykin $ # Maintainer: Geoffroy Carrier # Previous Contributor: Urs Wolfer pkgname=qtemu pkgver=1.0.5 -pkgrel=6 +pkgrel=7 pkgdesc="Graphical user interface for QEMU written in Qt4" url="http://qtemu.org" license=("GPL") @@ -28,5 +28,5 @@ package() { install -d "$pkgdir/usr/bin" ln -s /opt/qtemu/bin/qtemu "$pkgdir/usr/bin/qtemu" install -Dm0644 $srcdir/qtemu.desktop $pkgdir/usr/share/applications/qtemu.desktop - install -Dm0644 images/qtemu.ico $pkgdir/usr/share/icons/qtemu.ico + install -Dm0644 images/crystal/new.png $pkgdir/usr/share/icons/qtemu.png } diff --git a/community/rogue/PKGBUILD b/community/rogue/PKGBUILD index 98de5901e..76ce5bb6a 100644 --- a/community/rogue/PKGBUILD +++ b/community/rogue/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 79577 2012-11-08 06:32:13Z kkeen $ +# $Id: PKGBUILD 83922 2013-02-06 14:55:54Z kkeen $ # Maintainer: Kyle Keen pkgname=rogue pkgver=5.4.4 -pkgrel=2 +pkgrel=3 pkgdesc="The original dungeon crawl game." arch=('i686' 'x86_64') url="http://rogue.rogueforge.net/rogue-5-4/" @@ -17,6 +17,10 @@ build() { cd "$srcdir/$pkgname$pkgver" ./configure make +} + +package() { + cd "$srcdir/$pkgname$pkgver" install -Dm755 rogue "$pkgdir/usr/bin/rogue" install -Dm644 rogue.6 "$pkgdir/usr/share/man/man6/rogue.6" install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE.TXT" diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 84bcda6a4..ca6a3f1a5 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 83415 2013-01-31 20:08:37Z arodseth $ +# $Id: PKGBUILD 83903 2013-02-06 13:56:53Z arodseth $ # Maintainer: Alexander Rødseth -# Contributor: Eric Bélanger +# Contributor: Eric Bélanger # Contributor: Brad Fanella # Contributor: Bjorn Lindeijer # Contributor: kritoke pkgbase=ruby-gtk2 -pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') +pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' + 'ruby-pango') pkgver=1.2.1 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') @@ -17,60 +18,61 @@ source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") sha256sums=('cb6e329f64042c8d24248204e11bb4652f9b2984ac2965d82dab49634deb1125') build() { - cd "$srcdir/ruby-gtk2-$pkgver" - LANG="en_US.UTF-8" ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango \ - --topdir="$pkgdir" --vendor - mkdir -p "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/site_ruby/1.9.1/i686-linux" - make + cd "$srcdir/ruby-gtk2-$pkgver" + LANG="en_US.UTF-8" \ + ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --vendor + #mkdir -p \ + # "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/site_ruby/1.9.1/i686-linux" + make -j1 } package_ruby-atk() { - pkgdesc="Ruby bindings for atk" + pkgdesc='Ruby bindings for atk' depends=("ruby-glib2=$pkgver" 'atk') - cd "$srcdir/ruby-gtk2-$pkgver/atk" - make DESTDIR="$pkgdir" install + cd "$srcdir/ruby-gtk2-$pkgver/atk" + make DESTDIR="$pkgdir/" install } package_ruby-gdkpixbuf2() { - pkgdesc="Ruby bindings for gdkpixbuf2" + pkgdesc='Ruby bindings for gdkpixbuf2' depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2') - cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2" - make DESTDIR="$pkgdir" install + cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2" + make DESTDIR="$pkgdir/" install } package_ruby-gio2() { - pkgdesc="Ruby bindings for gio2" + pkgdesc='Ruby bindings for gio2' depends=("ruby-glib2=$pkgver") - cd "$srcdir/ruby-gtk2-$pkgver/gio2" - make DESTDIR="$pkgdir" install + cd "$srcdir/ruby-gtk2-$pkgver/gio2" + make DESTDIR="$pkgdir/" install } package_ruby-glib2() { - pkgdesc="Ruby bindings for glib2" + pkgdesc='Ruby bindings for glib2' depends=('glib2' 'ruby') - cd "$srcdir/ruby-gtk2-$pkgver/glib2" - make DESTDIR="$pkgdir" install + cd "$srcdir/ruby-gtk2-$pkgver/glib2" + make DESTDIR="$pkgdir/" install } package_ruby-gtk2() { - pkgdesc="Ruby bindings for gtk2" + pkgdesc='Ruby bindings for gtk2' depends=('gtk2' "ruby-glib2=$pkgver" "ruby-pango=$pkgver" "ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver") - cd "$srcdir/ruby-gtk2-$pkgver/gtk2" - make DESTDIR="$pkgdir" install + cd "$srcdir/ruby-gtk2-$pkgver/gtk2" + make DESTDIR="$pkgdir/" install } package_ruby-pango() { - pkgdesc="Ruby bindings for pango" + pkgdesc='Ruby bindings for pango' depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango') - cd "$srcdir/ruby-gtk2-$pkgver/pango" - make DESTDIR="$pkgdir" install + cd "$srcdir/ruby-gtk2-$pkgver/pango" + make DESTDIR="$pkgdir/" install } # vim:set ts=2 sw=2 et: diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD index 447700e12..243a6c626 100644 --- a/community/ruby-gtk3/PKGBUILD +++ b/community/ruby-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83417 2013-01-31 20:22:57Z arodseth $ +# $Id: PKGBUILD 83911 2013-02-06 14:10:47Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -7,9 +7,9 @@ pkgbase=ruby-gtk3 pkgname=('ruby-gtk3' 'ruby-gdk3') -depends=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-pango') +depends=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-glib2' 'ruby-pango') pkgver=1.2.1 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') @@ -19,27 +19,25 @@ sha256sums=('78c7dbfaebabefe0f5a3d96c779cc08ea949a354e3f7cd1ff797d850ded4168a') build() { cd "$srcdir/ruby-gtk3-$pkgver" - LANG="en_US.UTF-8" ruby extconf.rb \ - atk gdk_pixbuf2 gio2 glib2 gtk3 pango gdk3 \ - --topdir="$pkgdir" --vendor + LANG="en_US.UTF-8" ruby extconf.rb gtk3 gdk3 --vendor make } package_ruby-gtk3() { - pkgdesc="Ruby bindings for gtk3" + pkgdesc='Ruby bindings for gtk3' depends=('gtk3' "ruby-glib2=$pkgver" "ruby-pango=$pkgver" "ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver") cd "$srcdir/ruby-gtk3-$pkgver/gtk3" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir/" install } package_ruby-gdk3() { - pkgdesc="Ruby bindings for gdk3" + pkgdesc='Ruby bindings for gdk3' depends=('ruby' 'gtk3') cd "$srcdir/ruby-gtk3-$pkgver/gdk3" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir/" install } # vim:set ts=2 sw=2 et: diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 0eed1e067..1a5267f9f 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83469 2013-02-01 14:43:54Z spupykin $ +# $Id: PKGBUILD 83891 2013-02-06 11:40:54Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Mark Coolen # Contributor: Tom Newsom @@ -6,7 +6,7 @@ pkgname=squid pkgver=3.2.7 -pkgrel=1 +pkgrel=2 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') url='http://www.squid-cache.org' @@ -72,7 +72,6 @@ build() { --enable-htcp \ --enable-carp \ --enable-epoll \ - --with-filedescriptors=4096 \ --with-large-files \ --enable-arp-acl \ --with-default-user=proxy \ diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index fb3ce0f59..da7225f71 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Jakob Gruber pkgname=stone-soup -pkgver=0.11.0 -pkgrel=3 +pkgver=0.11.2 +pkgrel=1 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64') url='http://crawl.develz.org/' @@ -17,7 +17,7 @@ source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkg _exec=('crawl-tiles') _name=('Dungeon Crawl Stone Soup') -build() { +package() { cd "$srcdir" gendesk -n @@ -65,4 +65,4 @@ build() { } -md5sums=('715d800410a7251499bf8efcc8675ca6') +md5sums=('84b5939d242fbaec4d9d8c64fa02156c') diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index b6e40f4ed..de4f150f1 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83208 2013-01-28 10:10:19Z spupykin $ +# $Id: PKGBUILD 83883 2013-02-06 10:40:30Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Andrea Scarpino # Contributor: Roman Kyrylych @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi pkgname=tea -pkgver=34.0.0 +pkgver=34.0.1 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('cde7d88fe01cf488455fd5940bb45a93' +md5sums=('4fcc661b7898d01f58b8734395f5bdda' '377ace3363124f4c086de0babb820761') build() { diff --git a/extra/fluxbox/PKGBUILD b/extra/fluxbox/PKGBUILD index eec6c8611..6f832a720 100644 --- a/extra/fluxbox/PKGBUILD +++ b/extra/fluxbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174300 2013-01-04 04:35:47Z eric $ +# $Id: PKGBUILD 177083 2013-02-06 03:07:57Z eric $ # Maintainer: Eric Bélanger pkgname=fluxbox pkgver=1.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight and highly-configurable window manager" arch=('i686' 'x86_64') url="http://www.fluxbox.org" @@ -12,12 +12,14 @@ depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'imlib2' 'fribid optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.lzma \ - fluxbox.desktop) + fluxbox.desktop fluxbox-fix_timer.diff) sha1sums=('6892259dd495424291194fde242230cca95abce3' - 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') + 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8' + 'bc10368d7a157f83428897e2b7aced7ce620dec3') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/fluxbox-fix_timer.diff" ./configure --prefix=/usr \ --enable-xft --enable-xinerama \ --enable-imlib2 --enable-nls diff --git a/extra/fluxbox/fluxbox-fix_timer.diff b/extra/fluxbox/fluxbox-fix_timer.diff new file mode 100644 index 000000000..dceb1043b --- /dev/null +++ b/extra/fluxbox/fluxbox-fix_timer.diff @@ -0,0 +1,78 @@ +From 4d307dcd10af9d817ff5c05fc40ae7487564cb31 Mon Sep 17 00:00:00 2001 +From: Mathias Gumz +Date: Sat, 12 Jan 2013 08:24:11 +0000 +Subject: Fix bug: handle the list of Timers not in-place + +With commit 541c8c4 we switched from an (manually) ordered list to a +std::set<> to handle the active timers. The code which checks for overdue +timers now traverses and modifies the std::set<> in place. This might +lead to an infinite loop. Examples of such bad behavior are "flickering of +the tooltip" (bug #3590078) or crashes (bug #3600143) or just insanely high +cpu load when autoraising windows or submenus. + +We now make a copy of the std::set<> traverse this instead of the original. +--- +diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc +index f63ea38..dd736dd 100644 +--- a/src/FbTk/Timer.cc ++++ b/src/FbTk/Timer.cc +@@ -52,6 +52,7 @@ + #endif + + #include ++#include + #include + + +@@ -195,32 +196,35 @@ void Timer::updateTimers(int fd) { + return; + } + ++ // stoping / restarting the timers modifies the list in an upredictable ++ // way. to avoid problems such as infinite loops we save the current ++ // (ordered) list of timers into a list and work on it. ++ ++ ssize_t i; ++ const ssize_t ts = s_timerlist.size(); ++ std::vector timers; ++ ++ timers.reserve(ts); ++ for (it = s_timerlist.begin(); it != s_timerlist.end(); ++it ) { ++ timers.push_back(*it); ++ } ++ + now = FbTime::now(); +- for (it = s_timerlist.begin(); it != s_timerlist.end(); ) { ++ for (i = 0; i < ts; ++i) { ++ ++ FbTk::Timer* t = timers[i]; + +- // t->fireTimeout() might add timers to the list +- // this invalidates 'it'. thus we store the current timer +- Timer* t = *it; + if (now < t->getEndTime()) { + break; + } + + t->fireTimeout(); +- +- // find the iterator to the timer again +- // and continue working on the list +- it = s_timerlist.find(t); +- it++; +- s_timerlist.erase(t); ++ t->stop(); + + if (! t->doOnce()) { // restart the current timer +- t->m_timing = false; + t->start(); +- } else { +- t->stop(); + } + } +- + } + + +-- +cgit v0.9.1 diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD index 44eb094e2..86ff21d01 100644 --- a/extra/strigi/PKGBUILD +++ b/extra/strigi/PKGBUILD @@ -1,34 +1,29 @@ -# $Id: PKGBUILD 164838 2012-08-06 23:07:43Z andrea $ +# $Id: PKGBUILD 177081 2013-02-05 23:18:31Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=strigi -pkgver=0.7.7 -pkgrel=2 -pkgdesc="Fast crawling desktop search engine with Qt4 GUI" +pkgver=0.7.8 +pkgrel=1 +pkgdesc="Fast crawling desktop search engine with Qt GUI" arch=('i686' 'x86_64') url='http://strigi.sourceforge.net/' license=('GPL2') -depends=('exiv2' 'libxml2' 'boost-libs') -makedepends=('qt' 'cmake' 'pkg-config' 'boost') +depends=('exiv2' 'libxml2' 'boost-libs' 'qt') +makedepends=('cmake' 'pkg-config' 'boost') optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file' 'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK') -#source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'gcc47.patch') -md5sums=('ca0a0fd5c2b99879f6330837aeede996' - '1acb9b31a4859dc427fc4d387fd8aa2f') +source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('d69443234f4286d71997db9de543331a') build() { - pushd ${pkgname}-${pkgver}/strigidaemon - patch -p1 -i "${srcdir}"/gcc47.patch - popd - mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DENABLE_INOTIFY=ON \ -DENABLE_LOG4CXX=OFF \ -DENABLE_FAM=OFF \ diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD index cc18267a8..3c7340046 100644 --- a/extra/xf86-video-sisimedia/PKGBUILD +++ b/extra/xf86-video-sisimedia/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170686 2012-11-09 14:38:32Z jgc $ +# $Id: PKGBUILD 177523 2013-02-06 18:40:48Z jgc $ # Maintainer: Jan de Groot pkgname=xf86-video-sisimedia pkgver=0.9.1 -pkgrel=5 +pkgrel=6 pkgdesc="X.org SiS 671 video driver" arch=(i686 x86_64) url="http://www.linuxconsulting.ro/xorg-drivers/" @@ -38,6 +38,7 @@ source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia- sisimedia-no-xaa.patch sisimedia-xorg-1.13.patch deprecated-sym2.patch + disable-UploadToScreen-DownloadFromScreen.patch COPYING) sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '61715bb86180decde55a56fad9a12d841c89fbb2' @@ -65,6 +66,7 @@ sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '370af234867df98206a98c8cd0a6c89323593f6b' '4ea333d659abe2b78f07511467c5356f39bf8695' '9bef0b61c0505cc64464073d73684e6933d3f84c' + 'ff95fd41be43560245caa40adc6b481f2dafca7d' 'a64e244f274bcb155f892d0488a1a4b1b2f7d70d') build() { @@ -95,11 +97,14 @@ build() { patch -Np1 -i "${srcdir}/sisimedia-xorg-1.13.patch" patch -Np1 -i "${srcdir}/deprecated-sym2.patch" + patch -Np1 -i "${srcdir}/disable-UploadToScreen-DownloadFromScreen.patch" sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am sed -i -e 's,\"sis\",\"sisimedia\",g' src/sis.h sed -i -e 's,sisModuleData,sisimediaModuleData,g' src/sis_driver.c + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + autoreconf -fi ./configure --prefix=/usr --disable-dri diff --git a/extra/xf86-video-sisimedia/disable-UploadToScreen-DownloadFromScreen.patch b/extra/xf86-video-sisimedia/disable-UploadToScreen-DownloadFromScreen.patch new file mode 100644 index 000000000..4cc75989f --- /dev/null +++ b/extra/xf86-video-sisimedia/disable-UploadToScreen-DownloadFromScreen.patch @@ -0,0 +1,64 @@ +diff -ruN xf86-video-sis-0.9.1.orig/src/sis300_accel.c xf86-video-sis-0.9.1/src/sis300_accel.c +--- xf86-video-sis-0.9.1.orig/src/sis300_accel.c 2012-11-26 12:27:14.151119857 +0100 ++++ xf86-video-sis-0.9.1/src/sis300_accel.c 2012-11-26 12:36:19.227926454 +0100 +@@ -1284,8 +1284,8 @@ + /* Composite not supported */ + + /* Upload, download to/from Screen */ +- pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen; +- pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen; ++ //pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen; ++ //pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen; + } + #else /*xorg>7.0*/ + +@@ -1332,8 +1332,8 @@ + /* Composite not supported */ + + /* Upload, download to/from Screen */ +- pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; +- pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; ++ //pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; ++ //pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; + + } + #endif +diff -ruN xf86-video-sis-0.9.1.orig/src/sis310_accel.c xf86-video-sis-0.9.1/src/sis310_accel.c +--- xf86-video-sis-0.9.1.orig/src/sis310_accel.c 2012-11-26 12:27:14.151119857 +0100 ++++ xf86-video-sis-0.9.1/src/sis310_accel.c 2012-11-26 12:35:58.597921440 +0100 +@@ -1819,8 +1819,8 @@ + #endif + + /* Upload, download to/from Screen */ +- pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen; +- pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen; ++ //pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen; ++ //pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen; + + #else /*Xorg>= 7.0*/ + +@@ -1869,8 +1869,8 @@ + #endif + + /* Upload, download to/from Screen */ +- pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; +- pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; ++ //pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; ++ //pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; + #endif /*end of Xorg>=7.0*/ + + } +diff -ruN xf86-video-sis-0.9.1.orig/src/sis_accel.c xf86-video-sis-0.9.1/src/sis_accel.c +--- xf86-video-sis-0.9.1.orig/src/sis_accel.c 2012-11-26 12:27:14.154453191 +0100 ++++ xf86-video-sis-0.9.1/src/sis_accel.c 2012-11-26 12:36:44.464598873 +0100 +@@ -862,8 +862,8 @@ + /* Composite not supported */ + + /* Upload, download to/from Screen */ +- pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; +- pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; ++ //pSiS->EXADriverPtr->UploadToScreen = SiSUploadToScreen; ++ //pSiS->EXADriverPtr->DownloadFromScreen = SiSDownloadFromScreen; + + #endif /*end of Xorg>=7.0 EXA Setting*/ + } diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 4c17141c9..f169fa92a 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -24,8 +24,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'fat-3.6.x.patch') md5sums=('06bf9601d859531e7378eb43d4ca7dd3' '90b2c4b9a05b108219bd44ac4804db84' - 'c57cd0a58ceed8e12acb5161adc257cc' - 'b7c2805bb287a644c0a303bf7721e534' + '48a1026f5d36a915b8ef68f8138a7c18' + 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '88d501404f172dac6fcb248978251560') diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index 02e820a41..fff8a9465 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -324,6 +324,7 @@ CONFIG_X86_32_IRIS=m CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y +# CONFIG_XEN is not set # CONFIG_XEN_PRIVILEGED_GUEST is not set CONFIG_KVM_GUEST=y CONFIG_LGUEST_GUEST=y @@ -1983,6 +1984,7 @@ CONFIG_FIREWIRE_NOSY=m CONFIG_I2O=m CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y CONFIG_I2O_EXT_ADAPTEC=y +# CONFIG_I2O_EXT_ADAPTEC_DMA64 is not set CONFIG_I2O_CONFIG=m CONFIG_I2O_CONFIG_OLD_IOCTL=y CONFIG_I2O_BUS=m @@ -5516,7 +5518,7 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m CONFIG_PNFS_OBJLAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 344df9cde..e8a96277f 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -24,7 +24,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'fat-3.6.x.patch') md5sums=('06bf9601d859531e7378eb43d4ca7dd3' '90b2c4b9a05b108219bd44ac4804db84' - 'c57cd0a58ceed8e12acb5161adc257cc' + '36aadecfb87577e90931025f46cd9d53' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index 8d6c5912e..4c255c68c 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -5555,7 +5555,7 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m CONFIG_PNFS_OBJLAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD index 4286d258a..9d1800989 100644 --- a/libre/abiword-libre/PKGBUILD +++ b/libre/abiword-libre/PKGBUILD @@ -1,28 +1,30 @@ -# $Id: PKGBUILD 146945 2012-01-19 14:58:28Z giovanni $ +# $Id: PKGBUILD 173824 2012-12-24 15:08:34Z jgc $ # Maintainer: Giovanni Scafora # Contributor: Maël Lavault -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva _pkgbase=abiword pkgbase=abiword-libre pkgname=('abiword-libre' 'abiword-libre-plugins') pkgver=2.8.6 -pkgrel=7.1 +pkgrel=8 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.abisource.com" -makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' - 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'ttf-liberation') +makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice0.8' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' + 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv' 'ttf-liberation') options=('!makeflags' '!libtool') -source=("http://www.abisource.com/downloads/${_pkgbase}/${pkgver}/source/${_pkgbase}-${pkgver}.tar.gz" - 'compat_libwpg_0_9.patch' - 'abiword-2.8.6-no-undefined.patch' - 'abiword-2.8.6-libpng15.patch' - 'liberation-fonts.patch') +source=(http://www.abisource.com/downloads/${_pkgbase}/${pkgver}/source/${_pkgbase}-${pkgver}.tar.gz + compat_libwpg_0_9.patch + abiword-2.8.6-no-undefined.patch + abiword-2.8.6-libpng15.patch + abiword-2.8.6-glib-2.31.patch + liberation-fonts.patch) md5sums=('f883b0a7f26229a9c66fd6a1a94381aa' '09446a2ebba8288fc611e88f7cf17298' '42e2614b6e0aad457d91f6ce20b6f225' '40e370e7e88c5437140ef18037abfbd3' + '6ec338a27a6fb590c348724ddb545849' '880b17db6f249d977d2a7cd012d9ce02') build() { @@ -32,6 +34,11 @@ build() { # fix a gcc 4.6.x build issue, patch from Fedora patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch" patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch" + + # Fix build with recent glib, patch from Gentoo + patch -Np0 -i "${srcdir}/abiword-2.8.6-glib-2.31.patch" + + # Replace non-free fonts support to liberation fonts patch -Np1 -i "${srcdir}/liberation-fonts.patch" libtoolize --force @@ -54,7 +61,7 @@ build() { package_abiword-libre() { pkgdesc="A fully-featured word processor that doesn't recommend unfree fonts" - depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils') + depends=('fribidi' 'wv' 'goffice0.8' 'librsvg' 'enchant' 'desktop-file-utils') install=$pkgname.install optdepends=('abiword-libre-plugins') conflicts=("abiword-libre-plugins<${pkgver}-${pkgrel}" 'abiword') diff --git a/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch b/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch new file mode 100644 index 000000000..8b938cc25 --- /dev/null +++ b/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch @@ -0,0 +1,40 @@ +------------------------------------------------------------------------ +r30479 | hub | 2011-11-29 00:39:09 -0500 (Tue, 29 Nov 2011) | 2 lines +Changed paths: + M /abiword/trunk/src/af/util/xp/ut_go_file.h + +Bug 13197: only import glib.h +Patch by Dominique Leuenberger. +------------------------------------------------------------------------ +r30602 | hub | 2012-01-30 02:00:38 -0500 (Mon, 30 Jan 2012) | 2 lines +Changed paths: + M /abiword/trunk/goffice-bits/goffice/app/goffice-app.h + +Bug 13247 - Fix glib headers. Patch by Funda Wang +(safe to backport) +------------------------------------------------------------------------ +Index: src/af/util/xp/ut_go_file.h +=================================================================== +--- src/af/util/xp/ut_go_file.h (revision 30478) ++++ src/af/util/xp/ut_go_file.h (revision 30479) +@@ -31,7 +31,6 @@ + + #include + #include +-#include + #include + + G_BEGIN_DECLS +Index: goffice-bits/goffice/app/goffice-app.h +=================================================================== +--- goffice-bits/goffice/app/goffice-app.h (revision 30601) ++++ goffice-bits/goffice/app/goffice-app.h (revision 30602) +@@ -22,7 +22,7 @@ + #ifndef GOFFICE_APP_H + #define GOFFICE_APP_H + +-#include ++#include + + G_BEGIN_DECLS + diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 5bea880cd..61b978fdc 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,11 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.60 +_kernver=3.0.62 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') -_pkgver=2012-12-04-1-u -pkgver=20121204 -pkgrel=2 +_version=v3.8-rc5 +_pkgver=3.8-rc5-1-u +pkgver=3.8rc5.1 +pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' @@ -16,9 +17,9 @@ install=linux-libre-lts-kmod-alx.install replaces=('alx' 'alx-driver' 'dkms-alx') provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') -source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.xz) +source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz) -md5sums=('0759f5668d20f420d6d9dc6d854a2ceb') +md5sums=('6ad873fbc6664aa4c15160e3ad7cb4c1') build() { -- cgit v1.2.3-54-g00ecf