diff options
-rw-r--r-- | community-testing/percona-server/PKGBUILD | 6 | ||||
-rw-r--r-- | community/bibletime/PKGBUILD | 14 | ||||
-rw-r--r-- | community/calibre/PKGBUILD | 6 | ||||
-rw-r--r-- | community/freedroidrpg/PKGBUILD | 6 | ||||
-rw-r--r-- | community/libdnet/PKGBUILD | 17 | ||||
-rw-r--r-- | community/libdnet/libdnet.install | 2 | ||||
-rw-r--r-- | community/linphone/PKGBUILD | 19 | ||||
-rw-r--r-- | community/stow/PKGBUILD | 4 | ||||
-rw-r--r-- | community/vtk/PKGBUILD | 15 | ||||
-rw-r--r-- | community/vtk/fix-boost-graph-api-changes.diff | 42 | ||||
-rw-r--r-- | extra/kdebindings-python/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/libmtp/PKGBUILD | 11 | ||||
-rw-r--r-- | extra/libxfce4ui/PKGBUILD | 42 | ||||
-rw-r--r-- | extra/pyqt/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/pyqt/fix-qthelp-build.patch | 11 | ||||
-rw-r--r-- | extra/qscintilla/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/sip/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/xfconf/PKGBUILD | 57 | ||||
-rw-r--r-- | kde-unstable/kdebindings-python/PKGBUILD | 6 | ||||
-rw-r--r-- | kde-unstable/kdelibs/PKGBUILD | 6 | ||||
-rw-r--r-- | kde-unstable/kdeutils-ksecrets/PKGBUILD | 31 | ||||
-rw-r--r-- | kde-unstable/kdeutils-ksecrets/kdeutils-ksecrets.install | 12 |
22 files changed, 228 insertions, 114 deletions
diff --git a/community-testing/percona-server/PKGBUILD b/community-testing/percona-server/PKGBUILD index d3bcd65b3..4a03ded15 100644 --- a/community-testing/percona-server/PKGBUILD +++ b/community-testing/percona-server/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.17_rel22.1 +pkgver=5.5.18_rel23.0 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ url="http://www.percona.com/software/percona-server/" options=('!libtool' 'emptydirs') backup=('etc/mysql/my.cnf') install=percona.install -source=("http://www.percona.com/redir/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/source/Percona-Server-${pkgver/_/-}.tar.gz" +source=("http://www.percona.com/redir/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/Percona-Server-${pkgver/_/-}.tar.gz" 'mysqld' 'my.cnf') @@ -98,6 +98,6 @@ package() { install -dm700 "${pkgdir}"/var/lib/mysql } -md5sums=('77e2ff68ff3ffa60a48a1ee045056f15' +md5sums=('17b266f5c10d01838522188f313a1ead' '243864805611764a7e5883c1dba7afd8' '1c949c0dbea5206af0db14942d9927b6') diff --git a/community/bibletime/PKGBUILD b/community/bibletime/PKGBUILD index 069524e3e..057c61125 100644 --- a/community/bibletime/PKGBUILD +++ b/community/bibletime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61103 2011-12-21 20:53:10Z andrea $ +# $Id: PKGBUILD 61169 2011-12-23 14:46:29Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de> pkgname=bibletime -pkgver=2.9.0 -pkgrel=2 +pkgver=2.9.1 +pkgrel=1 pkgdesc="Bible study tool for KDE4" arch=('x86_64' 'i686') url="http://www.bibletime.info/" @@ -12,13 +12,15 @@ depends=('qt' 'sword' 'openssl' 'clucene' 'qtwebkit') makedepends=('cmake' 'boost-libs') install=$pkgname.install source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") -md5sums=('0190b64de5892fc5f45e9a3d46bb29d6') +sha256sums=('308a86d4a1f63203e01438e75be8306377927498b5d0ae8769a4df3c828013b5') build() { cd "$srcdir/$pkgname-$pkgver" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release "$srcdir/$pkgname-$pkgver" + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + "$srcdir/$pkgname-$pkgver" make } diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index ad7ea8e30..a1d0f4102 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60656 2011-12-16 15:19:32Z giovanni $ +# $Id: PKGBUILD 61189 2011-12-24 00:16:51Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.31 +pkgver=0.8.32 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('c2373e34d83b81a321cebea043d5f160' +md5sums=('ee973514615fc104be7cc41adf0862a6' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD index 19eb799c2..2f3a97380 100644 --- a/community/freedroidrpg/PKGBUILD +++ b/community/freedroidrpg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 60343 2011-12-11 19:59:55Z spupykin $ +# $Id: PKGBUILD 61165 2011-12-23 11:47:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: nut543 <kfs1@online.no> #pkgbase=freedroidrpg #pkgname=('freedroidrpg' 'freedroidrpg-data') pkgname='freedroidrpg' -pkgver=0.15rc2 +pkgver=0.15 pkgrel=1 arch=('i686' 'x86_64') # depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data') @@ -17,7 +17,7 @@ license=("GPL") source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidrpg-$pkgver.tar.gz freedroidrpg.jpg freedroidrpg.desktop) -md5sums=('0e098aae0b16b6f87ffe5f7932580491' +md5sums=('003a3f34619cfaa87add2030fea5d120' 'b73d9dac44c7e83a6c80fbe4eb96ba79' '9a10c2a2064439cdcff5b945dfb1c3ac') diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD index 0e9854553..3c4c0f057 100644 --- a/community/libdnet/PKGBUILD +++ b/community/libdnet/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 58611 2011-11-16 15:32:03Z spupykin $ +# $Id: PKGBUILD 61173 2011-12-23 18:40:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: James Fryman <jfryman@gmail.com> pkgname=libdnet pkgver=1.12 -pkgrel=5 +pkgrel=6 pkgdesc="A simplified, portable interface to several low-level networking routines" arch=(i686 x86_64) makedepends=(python2) optdepends=(python2) -install=libdnet.install license=("BSD") url="http://code.google.com/p/libdnet/" options=('!libtool') @@ -17,17 +16,19 @@ source=(http://libdnet.googlecode.com/files/libdnet-$pkgver.tgz) md5sums=('9253ef6de1b5e28e9c9a62b882e44cc9') build() { - mkdir -p $pkgdir/usr/bin + cd $srcdir/$pkgname-$pkgver - [ $CARCH == "x86_64" ] && export CFLAGS=-fPIC + autoreconf -I config --force --install + ./configure --prefix=/usr + make +} +package() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make && make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir/" install cd python && \ python2 setup.py install --root=$pkgdir install -D -m0644 ../LICENSE $pkgdir/usr/share/licenses/libdnet/license - mv $pkgdir/usr/man $startdir/pkg/usr/share/ } diff --git a/community/libdnet/libdnet.install b/community/libdnet/libdnet.install index cb8146f24..3264378fd 100644 --- a/community/libdnet/libdnet.install +++ b/community/libdnet/libdnet.install @@ -1,3 +1,3 @@ post_install() { - /sbin/ldconfig + /sbin/ldconfig } diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD index a4712826d..66da29a14 100644 --- a/community/linphone/PKGBUILD +++ b/community/linphone/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 49813 2011-06-21 09:18:21Z spupykin $ +# $Id: PKGBUILD 61187 2011-12-23 22:08:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=linphone -pkgver=3.4.3 -pkgrel=4 +pkgver=3.5.0 +pkgrel=1 pkgdesc="A Voice-over-IP phone" arch=('i686' 'x86_64') url="http://www.linphone.org/index.php/eng" license=('GPL') depends=('alsa-lib' 'ffmpeg' 'gtk2' 'libexosip2' 'speex' 'libv4l' 'libglade' 'v4l-utils' - 'libpulse' 'libxv' 'mediastreamer' 'ortp') + 'libpulse' 'libxv') +# 'mediastreamer' 'ortp') makedepends=('pkgconfig' 'perlxml' 'intltool' 'sgmltools-lite') optdepends=('pulseaudio') options=('!libtool' '!emptydirs') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/3.4.x/sources/linphone-$pkgver.tar.gz" - "disable-v4l1.patch") -md5sums=('66e21f36d62c2094f7b4360262c46f20' - '7ee15689eed1adbdcf0ddab8fadca34a') +conflicts=('ortp' 'mediastreamer') +source=("http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/linphone-$pkgver.tar.gz") +md5sums=('ad89cd6030a131f2b17ea50eb6f4c6f2') build() { cd "$srcdir/$pkgname-$pkgver" export PKG_CONFIG=/usr/bin/pkg-config unset SGML_CATALOG_FILES -# patch -p1 <$srcdir/disable-v4l1.patch ./configure --prefix=/usr --disable-static --enable-ipv6 --enable-video \ --enable-alsa --enable-pulseaudio --disable-artsc --disable-strict \ --libexecdir=/usr/lib/$pkgname \ - --enable-external-mediastreamer --enable-external-ortp + --disable-external-mediastreamer --disable-external-ortp make } diff --git a/community/stow/PKGBUILD b/community/stow/PKGBUILD index c362a08d0..d52341b39 100644 --- a/community/stow/PKGBUILD +++ b/community/stow/PKGBUILD @@ -5,14 +5,14 @@ # Contributor: Chris Brannon <cmbrannon79@gmail.com> pkgname=stow -pkgver=2.1.0 +pkgver=2.1.2 pkgrel=1 pkgdesc='GNU Stow is a program for managing the installation of software packages' url='http://www.gnu.org/software/stow/' arch=('i686' 'x86_64') source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz") license=('GPL2') -md5sums=('5526fdb8c76d0aee35eb304d7f55d2f6') +md5sums=('82857e43531cf6936aed99ef3b86b446') build() { cd $pkgname-$pkgver diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 4dadb8d58..78af11f86 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58425 2011-11-12 17:19:02Z ibiru $ +# $Id: PKGBUILD 61185 2011-12-23 22:04:01Z tdziedzic $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> # Contributor: leepesjee <lpeschier at xs4all dot nl> @@ -9,7 +9,7 @@ pkgname=vtk pkgver=5.8.0 -pkgrel=6 +pkgrel=7 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' arch=('i686' 'x86_64') url='http://www.vtk.org' @@ -24,11 +24,13 @@ optdepends=('python2: python bindings' source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" 'fixkernelversioncheck.diff' - 'ffmpeg-0.8.diff') + 'ffmpeg-0.8.diff' + 'fix-boost-graph-api-changes.diff') md5sums=('37b7297d02d647cc6ca95b38174cb41f' 'a05295b81930e894fc0e31866f399151' '9e137af23701f76fc727222ebac23389' - 'e992321c9d1def6034d0fa6607b40c5a') + 'e992321c9d1def6034d0fa6607b40c5a' + 'e715aef2aea26fc05f904efb5d0d5627') build() { cd VTK @@ -41,6 +43,10 @@ build() { # remove next pkgver bump patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff + # fix compilation error: http://vtk.org/Bug/view.php?id=12772 + # remove next pkgver bump + patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff + cd ${srcdir} rm -rf build @@ -82,6 +88,7 @@ build() { -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ ${srcdir}/VTK make diff --git a/community/vtk/fix-boost-graph-api-changes.diff b/community/vtk/fix-boost-graph-api-changes.diff new file mode 100644 index 000000000..2162e7a28 --- /dev/null +++ b/community/vtk/fix-boost-graph-api-changes.diff @@ -0,0 +1,42 @@ +commit d3ecc2c459dd1df937fc97887581ace1036da533 +Author: Marcus D. Hanwell <marcus.hanwell@kitware.com> +Date: Tue Dec 13 15:36:06 2011 -0500 + + BUG: 12772 fixes for change in Boost graph API + + This fixes bug 12772, where an API change in Boost was causing + compilation failures using Boost 1.38. Thanks to Orion Poplawski for + reporting the issue and posting the patch. + + Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06 + +diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +index c789f6b..cf7cd47 100644 +--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx ++++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +@@ -47,6 +47,15 @@ using namespace boost; + vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); + + ++namespace { ++ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { ++ return e.Id; ++ } ++ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { ++ return e.underlying_desc.Id; ++ } ++} ++ + // Redefine the bfs visitor, the only visitor we + // are using is the tree_edge visitor. + template <typename IdMap> +@@ -95,7 +104,8 @@ public: + + // Copy the vertex and edge data from the graph to the tree. + tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); +- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); ++ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), ++ unwrap_edge_id(e), tree_e.Id); + } + + private: diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 42a4f02ea..09339c550 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 144629 2011-12-08 09:18:34Z andrea $ +# $Id: PKGBUILD 145595 2011-12-23 10:46:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-python pkgver=4.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="KDE bindings for Python" url="http://kde.org/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') +depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2") sha1sums=('cac4b94098dba73d58fb4f7d73d7c65c306517d1') diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index 9632630d0..811b29c8f 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 127351 2011-06-13 11:09:19Z stephane $ +# $Id: PKGBUILD 145614 2011-12-24 03:54:58Z dreisner $ # Contributor: damir <damir@archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libmtp -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="library implementation of the Media Transfer Protocol" arch=("i686" "x86_64") url="http://libmtp.sourceforge.net" license=('LGPL') depends=('libusb-compat') -makedepends=('doxygen') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('fd7b293436528f4c780a9da6e5cc5398') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('073e1c2a00ba377f68dce47727e185ae') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-udev-rules=52-libmtp.rules + ./configure --prefix=/usr make } diff --git a/extra/libxfce4ui/PKGBUILD b/extra/libxfce4ui/PKGBUILD index 5a528e5e2..be1939c7b 100644 --- a/extra/libxfce4ui/PKGBUILD +++ b/extra/libxfce4ui/PKGBUILD @@ -1,35 +1,39 @@ -# $Id: PKGBUILD 124354 2011-05-20 06:47:50Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 145607 2011-12-23 17:37:26Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> pkgname=libxfce4ui -pkgver=4.8.0 -pkgrel=3 -pkgdesc="share commonly used Xfce widgets among the Xfce applications" +pkgver=4.8.1 +pkgrel=1 +pkgdesc="Commonly used Xfce widgets among Xfce applications" arch=('i686' 'x86_64') -license=('GPL2') url="http://www.xfce.org/" -depends=('libxfce4util>=4.8.0' 'gtk2' "xfconf>=4.8.0" 'libsm' 'startup-notification') +license=('GPL2') +depends=('libxfce4util' 'gtk2' 'xfconf' 'libsm' 'startup-notification') makedepends=('intltool' 'gtk-doc' 'glade') optdepends=('glade: for using the included glade module') #replaces=('libxfcegui4') - later when all is ported options=('!libtool') -source=(http://archive.xfce.org/src/xfce/libxfce4ui/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('df9acb3328dff905bd0777b84532b69f') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) +sha256sums=('39cbed29da06960074014b74abc2ba57db49dc81ab8995fb2160579c51669956') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --enable-gtk-doc \ - --disable-debug + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --enable-gtk-doc \ + --disable-debug make } 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/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index e6a2ab294..a0510e30d 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145329 2011-12-21 20:47:08Z andrea $ +# $Id: PKGBUILD 145605 2011-12-23 14:48:45Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> @@ -6,18 +6,23 @@ pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') -pkgver=4.8.6 +pkgver=4.9 pkgrel=2 arch=('i686' 'x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' 'python-opengl' 'qt-assistant-compat' 'qtwebkit') -source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('9bfd7b08b8e438b83cc50d5c58191f97') +source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz" + 'fix-qthelp-build.patch') +md5sums=('61619500d09d87b6c2a25bd3ea994504' + '356a453331a33c507b1baba4a9771764') build() { cd "${srcdir}" + + patch -p0 -i "${srcdir}"/fix-qthelp-build.patch + cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} cd "${srcdir}/PyQt-x11-gpl-${pkgver}" diff --git a/extra/pyqt/fix-qthelp-build.patch b/extra/pyqt/fix-qthelp-build.patch new file mode 100644 index 000000000..cd565e646 --- /dev/null +++ b/extra/pyqt/fix-qthelp-build.patch @@ -0,0 +1,11 @@ +--- PyQt-x11-gpl-4.9/configure.py~ 2011-12-23 14:53:07.981490550 +0100 ++++ PyQt-x11-gpl-4.9/configure.py 2011-12-23 14:52:38.384984221 +0100 +@@ -1264,7 +1264,7 @@ + opengl = (mname == "QtOpenGL") + + qt = [mname] +- if mname in ("QtOpenGL", "QtWebKit"): ++ if mname in ("QtHelp", "QtOpenGL", "QtWebKit"): + qt.append("QtCore") + + makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0, diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 5572ae8fa..c7c37e755 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142563 2011-11-12 08:13:52Z andrea $ +# $Id: PKGBUILD 145611 2011-12-23 20:54:15Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') pkgver=2.6 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" @@ -58,9 +58,6 @@ package_python-qscintilla() { cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" install -Dm755 Qsci.so \ "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so" - - # Fix RPATH - chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python3.2/site-packages/PyQt4/Qsci.so } package_python2-qscintilla() { @@ -69,7 +66,4 @@ package_python2-qscintilla() { cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - # Fix RPATH - chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so } diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 405823d2a..fd047dc72 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141389 2011-10-30 11:14:14Z andrea $ +# $Id: PKGBUILD 145600 2011-12-23 10:58:52Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> @@ -6,14 +6,14 @@ pkgbase=sip pkgname=('sip' 'python2-sip') -pkgver=4.13 +pkgver=4.13.1 pkgrel=1 arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") -md5sums=('21b4e2cad56e4156df2220143264b8ff') +md5sums=('3f61fd39d5b0c8fa9e43b59af04de924') build() { cd "${srcdir}" diff --git a/extra/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD index 0c5496af8..f677e21d8 100644 --- a/extra/xfconf/PKGBUILD +++ b/extra/xfconf/PKGBUILD @@ -1,42 +1,49 @@ -# $Id: PKGBUILD 130064 2011-07-01 20:39:13Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 145609 2011-12-23 17:39:17Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfconf -pkgver=4.8.0 -pkgrel=2 -pkgdesc="a simple client-server configuration storage and query system" +pkgver=4.8.1 +pkgrel=1 +pkgdesc="A simple client-server configuration storage and query system" arch=('i686' 'x86_64') -license=('GPL2') url="http://www.xfce.org/" +license=('GPL2') groups=('xfce4') # http://www.xfce.org/documentation/requirements -# keep dbus and gtk2, see also http://bugs.archlinux.org/task/14536 -depends=( "libxfce4util>=4.8.0" "dbus-glib" 'dbus' 'gtk2') -makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig' 'glib-perl' 'intltool' 'gtk-doc' 'chrpath') +# keep dbus, see also http://bugs.archlinux.org/task/14536 +depends=('libxfce4util' 'dbus-glib' 'dbus') +makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig' + 'glib-perl' 'intltool' 'gtk-doc' 'chrpath') options=('!libtool' '!emptydirs') -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0f11ed1ec7789c5c4c3fcc7cdb3c2940') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) +sha256sums=('9860737539fab2b852e8c07c50c205a5fbe894b08bcb4488a70e3fd6c75993cb') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --enable-gtk-doc \ - --with-perl-options=INSTALLDIRS="vendor" \ - --disable-debug + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --enable-gtk-doc \ + --with-perl-options=INSTALLDIRS="vendor" \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + # remove unneeded dynloader bootstrap file - rm ${pkgdir}/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.bs - + rm "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.bs" + # fix insecure rpath, http://bugs.archlinux.org/task/19980 - chrpath -d ${pkgdir}/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.so + chrpath -d "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.so" } + +# vim:set ts=2 sw=2 et: diff --git a/kde-unstable/kdebindings-python/PKGBUILD b/kde-unstable/kdebindings-python/PKGBUILD index dc67315a6..5cb72a876 100644 --- a/kde-unstable/kdebindings-python/PKGBUILD +++ b/kde-unstable/kdebindings-python/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 145484 2011-12-22 22:36:59Z andrea $ +# $Id: PKGBUILD 145602 2011-12-23 11:12:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-python pkgver=4.7.95 -pkgrel=1 +pkgrel=2 pkgdesc="KDE bindings for Python" url="http://kde.org/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') +depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.bz2") sha1sums=('7c1d3c590e80b871ab21be45d4a57ab8aa420e22') diff --git a/kde-unstable/kdelibs/PKGBUILD b/kde-unstable/kdelibs/PKGBUILD index dae3e165a..e231b2882 100644 --- a/kde-unstable/kdelibs/PKGBUILD +++ b/kde-unstable/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145473 2011-12-22 22:28:08Z andrea $ +# $Id: PKGBUILD 145566 2011-12-23 08:37:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs pkgver=4.7.95 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee' 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl' - 'upower' 'udisks' 'libxcursor' 'qtwebkit') + 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit') makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell') replaces=('kdelibs-experimental') install=${pkgname}.install diff --git a/kde-unstable/kdeutils-ksecrets/PKGBUILD b/kde-unstable/kdeutils-ksecrets/PKGBUILD new file mode 100644 index 000000000..f2ab76b15 --- /dev/null +++ b/kde-unstable/kdeutils-ksecrets/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 145567 2011-12-23 08:38:53Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-ksecrets +pkgver=4.7.95 +pkgrel=1 +pkgdesc='Secrets Management Infrastructure for KDE' +url='http://techbase.kde.org/Projects/Utils/ksecretsservice' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-workspace') +makedepends=('cmake' 'automoc4') +groups=('kde' 'kdeutils') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/ksecrets-${pkgver}.tar.bz2") +sha1sums=('5c9936a62b0592efcdd9966da84572f8ba7bb71f') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ksecrets-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeutils-ksecrets/kdeutils-ksecrets.install b/kde-unstable/kdeutils-ksecrets/kdeutils-ksecrets.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/kdeutils-ksecrets/kdeutils-ksecrets.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} |