From 34e6c976d28892a7bd3f7578f10fcfa57865472f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 22 Dec 2011 23:15:05 +0000 Subject: Thu Dec 22 23:15:04 UTC 2011 --- community/bibletime/PKGBUILD | 8 +- community/fatrat/PKGBUILD | 11 +- community/freeradius/PKGBUILD | 5 +- community/gambas2/PKGBUILD | 4 +- community/gambas3/PKGBUILD | 8 +- community/goldendict/PKGBUILD | 7 +- community/goldendict/goldendict.changelog | 3 + community/google-gadgets/PKGBUILD | 8 +- community/gpsbabel/PKGBUILD | 8 +- community/kadu/PKGBUILD | 21 +- community/kvirc/PKGBUILD | 6 +- community/libgda3/PKGBUILD | 4 +- community/luarocks/PKGBUILD | 16 +- community/luminancehdr/PKGBUILD | 6 +- community/myodbc/PKGBUILD | 4 +- community/mythtv/PKGBUILD | 6 +- community/opensips/PKGBUILD | 4 +- community/paraview/PKGBUILD | 7 +- community/perl-dbd-odbc/PKGBUILD | 4 +- community/psqlodbc/PKGBUILD | 4 +- community/python-pyzmq/PKGBUILD | 17 + community/python2-pyzmq/PKGBUILD | 17 + community/qbittorrent/PKGBUILD | 3 +- community/qlandkartegt/PKGBUILD | 7 +- community/qmc2/PKGBUILD | 8 +- community/qtcreator/PKGBUILD | 24 +- community/qtractor/PKGBUILD | 10 +- community/rapidsvn/PKGBUILD | 13 +- community/root/PKGBUILD | 2 +- community/sigil/PKGBUILD | 6 +- community/swi-prolog/PKGBUILD | 2 +- community/texmaker/PKGBUILD | 6 +- community/wine/PKGBUILD | 8 +- community/wkhtmltopdf/PKGBUILD | 6 +- extra/apr-util/PKGBUILD | 4 +- extra/arora/PKGBUILD | 31 +- extra/arora/install | 12 + extra/dhcp/PKGBUILD | 14 +- extra/dhcp/dhclient-script-pathFixes.patch | 28 +- extra/erlang/PKGBUILD | 23 +- extra/freetds/PKGBUILD | 8 +- extra/git/PKGBUILD | 8 +- extra/gnome-keyring/PKGBUILD | 17 +- .../silence_no_socket_to_connect.patch | 717 ++++++++++++++++ extra/gtk-xfce-engine/PKGBUILD | 39 +- extra/kdelibs/PKGBUILD | 6 +- extra/kwebkitpart/PKGBUILD | 13 +- extra/libreoffice/PKGBUILD | 18 +- extra/libreoffice/PKGBUILD.next_stable | 924 +++++++++++++++++++++ extra/libreoffice/gcc462_buildfix.diff | 138 +++ extra/mono-tools/PKGBUILD | 28 +- extra/mono-tools/mono-tools.install | 11 +- extra/monodevelop-debugger-gdb/PKGBUILD | 6 +- extra/monodevelop/PKGBUILD | 6 +- extra/opencv/PKGBUILD | 4 +- extra/php/PKGBUILD | 4 +- extra/pyqt/PKGBUILD | 15 +- extra/qt/PKGBUILD | 175 ++-- extra/qt/qt.install | 6 +- extra/qt3/PKGBUILD | 84 +- extra/qtwebkit/PKGBUILD | 38 + extra/qtwebkit/python2-path.patch | 29 + extra/redland/PKGBUILD | 13 +- extra/unixodbc/PKGBUILD | 8 +- extra/xulrunner/PKGBUILD | 27 +- extra/xulrunner/mozilla-pkgconfig.patch | 46 +- multilib/wine/PKGBUILD | 8 +- testing/nilfs-utils/PKGBUILD | 8 +- 68 files changed, 2345 insertions(+), 444 deletions(-) create mode 100644 community/python-pyzmq/PKGBUILD create mode 100644 community/python2-pyzmq/PKGBUILD create mode 100644 extra/arora/install create mode 100644 extra/gnome-keyring/silence_no_socket_to_connect.patch create mode 100644 extra/libreoffice/PKGBUILD.next_stable create mode 100644 extra/libreoffice/gcc462_buildfix.diff create mode 100644 extra/qtwebkit/PKGBUILD create mode 100644 extra/qtwebkit/python2-path.patch diff --git a/community/bibletime/PKGBUILD b/community/bibletime/PKGBUILD index f5b061581..069524e3e 100644 --- a/community/bibletime/PKGBUILD +++ b/community/bibletime/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 60250 2011-12-08 17:32:00Z arodseth $ +# $Id: PKGBUILD 61103 2011-12-21 20:53:10Z andrea $ # Maintainer: Alexander Rødseth # Contributor: Tobias T. pkgname=bibletime pkgver=2.9.0 -pkgrel=1 -pkgdesc="Bible software that uses the Sword Engine for KDE4" +pkgrel=2 +pkgdesc="Bible study tool for KDE4" arch=('x86_64' 'i686') url="http://www.bibletime.info/" license=('GPL2') -depends=('qt' 'sword' 'openssl' 'clucene') +depends=('qt' 'sword' 'openssl' 'clucene' 'qtwebkit') makedepends=('cmake' 'boost-libs') install=$pkgname.install source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index 4a1075411..60743f17b 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 59930 2011-12-02 20:58:17Z ibiru $ +# $Id: PKGBUILD 61071 2011-12-21 20:50:30Z andrea $ # Maintainer: Lukas Jirkovsky pkgname=fatrat pkgver=1.2.0_beta1 -pkgrel=2 +pkgrel=3 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64') url="http://fatrat.dolezel.info/" license=('GPL') -depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net') +depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net' 'qtwebkit') optdepends=('geoip: GeoIP support') makedepends=('boost' 'cmake' 'java-environment') source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz) @@ -17,10 +17,13 @@ md5sums=('7ce4d5e6318361f36ba5ac86a5755da9') build() { cd $pkgname-$pkgver - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + . /etc/profile.d/jre.sh + . /etc/profile.d/jdk.sh cmake \ -DWITH_EVERYTHING=ON \ + -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS="-lpthread" \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" \ -DCMAKE_INSTALL_PREFIX=/usr \ . diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 908f47ca5..745c604da 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 59708 2011-11-29 13:34:54Z stephane $ +# $Id: PKGBUILD 61107 2011-12-21 20:57:04Z andrea $ # Maintainer: Sergej Pupykin # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.1.12 -pkgrel=2 +pkgrel=3 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" license=("GPL") depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam' 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow') +makedepends=('libpcap' 'unixodbc' 'python2') optdepends=('libpcap' 'unixodbc' 'python2') options=('!libtool' 'emptydirs' '!makeflags') install=$pkgname.install diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index debefafd2..946e8a1af 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58354 2011-11-12 10:52:35Z ibiru $ +# $Id: PKGBUILD 61109 2011-12-21 20:57:20Z andrea $ # Maintainer : Laurent Carlier # Contributor: Biru Ionut # Contributor: Andrea Scarpino @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.23.1 -pkgrel=5 +pkgrel=6 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index eb5599e8f..1f27e0911 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58437 2011-11-12 17:24:37Z ibiru $ +# $Id: PKGBUILD 61105 2011-12-21 20:56:54Z andrea $ # Maintainer: Laurent Carlier pkgbase=gambas3 @@ -13,7 +13,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=2.99.6 -pkgrel=4 +pkgrel=5 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -22,7 +22,7 @@ groups=('gambas3') makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' - 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' + 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" @@ -860,7 +860,7 @@ package_gambas3-gb-qt4-opengl() { } package_gambas3-gb-qt4-webkit() { - depends=('gambas3-gb-qt4') + depends=('gambas3-gb-qt4' 'qtwebkit') pkgdesc="Qt4 toolkit webkit component" ## workaround for splitting diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD index 8cd682302..0d3796329 100644 --- a/community/goldendict/PKGBUILD +++ b/community/goldendict/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 58521 2011-11-13 15:39:18Z andrea $ +# $Id: PKGBUILD 61073 2011-12-21 20:50:41Z andrea $ # Maintainer: Jaroslav Lichtblau # Contributor: m0rph pkgname=goldendict pkgver=1.0.1 -pkgrel=4 +pkgrel=5 pkgdesc="Feature-rich dictionary lookup program" arch=('i686' 'x86_64') url="http://goldendict.berlios.de/" license=('GPL3') -depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qt' 'phonon') +depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qt' 'qtwebkit' 'phonon') +makedepds=('patch') provides=('stardict') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 diff --git a/community/goldendict/goldendict.changelog b/community/goldendict/goldendict.changelog index 8ec311fe1..a42c630d3 100644 --- a/community/goldendict/goldendict.changelog +++ b/community/goldendict/goldendict.changelog @@ -1,3 +1,6 @@ +2011-12-17 Jaroslav Lichtblau + * goldendict 1.0.1-5 libQtWebKit.so.4 now in new qtwebkit package + 2010-12-27 Jaroslav Lichtblau * Update to major release 1.0.1 diff --git a/community/google-gadgets/PKGBUILD b/community/google-gadgets/PKGBUILD index c56d9f808..ad1ce8ab6 100644 --- a/community/google-gadgets/PKGBUILD +++ b/community/google-gadgets/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58523 2011-11-13 15:42:30Z andrea $ +# $Id: PKGBUILD 61075 2011-12-21 20:50:53Z andrea $ # Maintainer: Ray Rashif pkgbase=google-gadgets @@ -8,14 +8,14 @@ _basedir="$startdir/pkg/base" pkgver=0.11.2 _sover=1.0 _sobump=0.0.0 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url="http://code.google.com/p/google-gadgets-for-linux/" license=('APACHE') makedepends=('gstreamer0.10-base-plugins' 'libwebkit' 'desktop-file-utils' 'xdg-utils' 'librsvg' 'curl' 'libsoup-gnome' - 'qt' + 'qt' 'qtwebkit' 'networkmanager' 'zip' 'flex') options=('!libtool') @@ -124,7 +124,7 @@ package_google-gadgets-qt() { pkgdesc="Desktop widgets from Google (partial Qt front-end)" groups=('google-gadgets') install=$pkgbase.install - depends=('google-gadgets-common' 'qt' + depends=('google-gadgets-common' 'qt' 'qtwebkit' 'desktop-file-utils' 'xdg-utils' 'gstreamer0.10-base-plugins' 'libwebkit') optdepends=('networkmanager: desktop integration') diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD index fd72e1403..4a03c8930 100644 --- a/community/gpsbabel/PKGBUILD +++ b/community/gpsbabel/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 58522 2011-11-13 15:40:29Z andrea $ +# $Id: PKGBUILD 61077 2011-12-21 20:51:01Z andrea $ # Maintainer: Sergej Pupykin # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea pkgname=gpsbabel pkgver=1.4.2 -pkgrel=3 +pkgrel=4 pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats" arch=('i686' 'x86_64') url="http://www.gpsbabel.org" license=('GPL') depends=('libusb-compat' 'expat') -makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2') -optdepends=('qt') +makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit') +optdepends=('qt' 'qtwebkit') options=('docs') source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz" "gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD") diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index dabc9abfa..d575a5d51 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 58524 2011-11-13 15:44:01Z andrea $ -# Maintainer: Mateusz Herych +# $Id: PKGBUILD 61079 2011-12-21 20:51:06Z andrea $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Mateusz Herych # Contributor: Jaroslaw Swierczynski pkgname=kadu pkgver=0.10.1 -pkgrel=1 +pkgrel=3 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" arch=('i686' 'x86_64') url="http://www.kadu.net/" license=('GPL') -depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient') +depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') -source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) +source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) md5sums=('6211a9a9e02d645268cbf055892601a0') build() { - cd $srcdir + cd "$srcdir" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -24,8 +25,8 @@ build() { } package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} - rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} + cd "$srcdir/build" + make DESTDIR="$pkgdir" install + rm -rf "$pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}" + rm -rf "$pkgdir/usr/share/kadu/{HISTORY,README}" } diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index bd83293b7..1566792fb 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 58785 2011-11-18 14:18:17Z andrea $ +# $Id: PKGBUILD 61081 2011-12-21 20:51:13Z andrea $ # Maintainer: Sergej Pupykin pkgname=kvirc pkgver=4.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="Qt-based IRC client" url="http://www.kvirc.net" -depends=('python2' 'qt' 'libxss') +depends=('python2' 'qt' 'libxss' 'qtwebkit') arch=(i686 x86_64) makedepends=('cmake') license=('GPL') diff --git a/community/libgda3/PKGBUILD b/community/libgda3/PKGBUILD index 07313f713..6118698ad 100644 --- a/community/libgda3/PKGBUILD +++ b/community/libgda3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49363 2011-06-15 09:20:21Z spupykin $ +# $Id: PKGBUILD 61111 2011-12-21 20:57:25Z andrea $ # Maintainer: Sergej Pupykin pkgname=libgda3 pkgver=3.1.5 -pkgrel=9 +pkgrel=10 pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers" arch=('i686' 'x86_64') url="http://www.gnome-db.org/Download" diff --git a/community/luarocks/PKGBUILD b/community/luarocks/PKGBUILD index 2b29ab5c8..bd6ae2be6 100644 --- a/community/luarocks/PKGBUILD +++ b/community/luarocks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56921 2011-10-16 23:25:18Z cbrannon $ +# $Id: PKGBUILD 61062 2011-12-21 13:24:55Z cbrannon $ # Maintainer: Chris Brannon # Contributor: Geoffroy Carrier pkgname=luarocks -pkgver=2.0.6 +pkgver=2.0.7 pkgrel=1 pkgdesc='Deployment and management system for Lua modules' arch=('i686' 'x86_64') @@ -15,17 +15,12 @@ optdepends=('cvs: for fetching sources from CVS repositories' 'luasec: HTTPS support' 'cmake: for building rocks that use the cmake build system') license=('custom') -source=(http://luarocks.org/releases/$pkgname-$pkgver.tar.gz - packbinary.patch) +options=('!makeflags') +source=(http://luarocks.org/releases/$pkgname-$pkgver.tar.gz) build() { cd "$srcdir/$pkgname-$pkgver" - ## The --pack-binary option to the "build" command is broken in the release, - # but it was fixed in upstream's git repo. The following patch goes - # away with the next release: - patch -p1 < "$srcdir/packbinary.patch" - # I added --with-downloader=curl, because luarocks already uses curl # for uploading. May as well use curl for downloading. ./configure --prefix=/usr --sysconfdir=/etc/luarocks --with-downloader=curl @@ -38,5 +33,4 @@ package() { install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -md5sums=('ad3eed4d579552aa91ea49c2bdbc2bb1' - 'f364b5a092a54559408df7431bc14746') +md5sums=('3a9f80418025e2c43ac369ee6837b659') diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index c2107abc2..f29d49477 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 58474 2011-11-12 22:05:38Z lcarlier $ +# $Id: PKGBUILD 61083 2011-12-21 20:51:24Z andrea $ # Maintainer: Jaroslav Lichtblau # Contributor: Lukas Jirkovsky # Contributor: Dmitry N. Shilov pkgname=luminancehdr pkgver=2.1.0 -pkgrel=5 +pkgrel=6 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64') url='http://qtpfsgui.sourceforge.net/' license=('GPL') -depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt') +depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit') optdepends=('hugin: align image stack functionality') install=$pkgname.install changelog=$pkgname.changelog diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index ab516ed39..d12814082 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56720 2011-10-11 09:17:30Z spupykin $ +# $Id: PKGBUILD 61113 2011-12-21 20:57:39Z andrea $ # Maintainer: Sergej Pupykin pkgname=myodbc pkgver=5.1.9 -pkgrel=1 +pkgrel=2 pkgdesc="ODBC driver/connector for MySQL" arch=(i686 x86_64) url="http://dev.mysql.com/downloads/connector/odbc/" diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index f7f4fa734..1c8404d90 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59400 2011-11-24 09:36:19Z jconder $ +# $Id: PKGBUILD 61085 2011-12-21 20:51:44Z andrea $ # Maintainer: Jonathan Conder # Contributor: Giovanni Scafora # Contributor: Juergen Hoetzel @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.24.1 -pkgrel=3 +pkgrel=4 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ license=('GPL') depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama' 'libxvmc' 'libxxf86vm' 'lirc-utils' 'mesa' 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' - 'python-lxml' 'qt' 'wget') + 'python-lxml' 'wget' 'qtwebkit') makedepends=('yasm') optdepends=('xmltv: to download tv listings') backup=('etc/conf.d/mythbackend') diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index e57168aba..d35668224 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43142 2011-03-24 09:42:53Z spupykin $ +# $Id: PKGBUILD 61115 2011-12-21 20:57:48Z andrea $ # Maintainer: Sergej Pupykin pkgname=opensips pkgver=1.6.4 -pkgrel=1 +pkgrel=2 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org" depends=('gcc-libs' 'openssl' 'db' 'attr' 'kernel-headers' 'libxml2') diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index e6e2fae3c..97a294e2d 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 58527 2011-11-13 15:58:19Z andrea $ +# $Id: PKGBUILD 61087 2011-12-21 20:51:56Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Michele Mocciola # Contributor: Simon Zilliken pkgname=paraview pkgver=3.10.1 -pkgrel=4 +pkgrel=5 pkgdesc='Parallel Visualization Application using VTK' arch=('i686' 'x86_64') url='http://www.paraview.org' license=('custom') -depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5' +depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' + 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5' makedepends=('cmake' 'desktop-file-utils') source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" 'paraview.png' diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD index f7e75f8f1..a9ff23703 100644 --- a/community/perl-dbd-odbc/PKGBUILD +++ b/community/perl-dbd-odbc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60400 2011-12-13 10:29:34Z spupykin $ +# $Id: PKGBUILD 61117 2011-12-21 20:57:54Z andrea $ # Maintainer: Sergej Pupykin # Contributor: François Charette pkgname=perl-dbd-odbc pkgver=1.33 -pkgrel=1 +pkgrel=2 pkgdesc="ODBC Driver for DBI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DBD-ODBC/" diff --git a/community/psqlodbc/PKGBUILD b/community/psqlodbc/PKGBUILD index e2163921f..70b493bd0 100644 --- a/community/psqlodbc/PKGBUILD +++ b/community/psqlodbc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 60404 2011-12-13 10:30:42Z spupykin $ +# $Id: PKGBUILD 61119 2011-12-21 20:58:01Z andrea $ # Maintainer: # Contributor: Douglas Soares de Andrade # Contributor: Rick Rein pkgname=psqlodbc pkgver=09.00.0310 -pkgrel=1 +pkgrel=2 pkgdesc="PostgreSQL ODBC driver" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD new file mode 100644 index 000000000..d957ed58f --- /dev/null +++ b/community/python-pyzmq/PKGBUILD @@ -0,0 +1,17 @@ +# $Id: PKGBUILD 61127 2011-12-22 03:57:10Z kkeen $ +# Maintainer: Kyle Keen +pkgname=python-pyzmq +pkgver=2.1.11 +pkgrel=1 +pkgdesc="Python3 bindings for zeromq, written in Cython" +arch=(i686 x86_64) +url="http://www.zeromq.org/bindings:python" +license=('LGPL') +depends=(zeromq python) +source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) +md5sums=('8ce303d022a1043669d4f239cddca746') + +build() { + cd "$srcdir/pyzmq-$pkgver" + python3 setup.py install --root="$pkgdir" --optimize=1 +} diff --git a/community/python2-pyzmq/PKGBUILD b/community/python2-pyzmq/PKGBUILD new file mode 100644 index 000000000..8ac19b91b --- /dev/null +++ b/community/python2-pyzmq/PKGBUILD @@ -0,0 +1,17 @@ +# Maintainer: Kyle Keen +pkgname=python2-pyzmq +pkgver=2.1.11 +pkgrel=1 +pkgdesc="Python2 bindings for zeromq, written in Cython" +arch=(i686 x86_64) +url="http://www.zeromq.org/bindings:python" +license=('LGPL') +depends=(zeromq python2) +source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) +md5sums=('8ce303d022a1043669d4f239cddca746') + +build() { + cd "$srcdir/pyzmq-$pkgver" + sed -i 's|^#!/usr/bin/env python$|&2|' $(find ./ -name '*.py') + python2 setup.py install --root="$pkgdir" --optimize=1 +} diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index 8028c9802..e26f76684 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 60037 2011-12-03 17:31:58Z tdziedzic $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Daniel J Griffiths # Contributor: Geoffroy Carrier pkgname=qbittorrent pkgver=2.9.2 -pkgrel=6 +pkgrel=7 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64') url="http://www.qbittorrent.org/" diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index e3f05159e..0f783cec4 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 60267 2011-12-08 19:52:00Z jlichtblau $ +# $Id: PKGBUILD 61091 2011-12-21 20:52:19Z andrea $ # Maintainer: Jaroslav Lichtblau # Contributor: Matthias Maennich # Contributor: pkgname=qlandkartegt pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64') url="http://www.qlandkarte.org/" license=('GPL') -depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'mesa' 'postgresql-libs' 'qt' 'shared-mime-info') +depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'mesa' 'postgresql-libs' + 'qt' 'shared-mime-info' 'qtwebkit') makedepends=('cmake' 'garmindev') optdepends=('garmindev: to connect garmin devices') install=$pkgname.install diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD index 204bb88f1..0ecf20c74 100644 --- a/community/qmc2/PKGBUILD +++ b/community/qmc2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 58650 2011-11-17 09:14:35Z spupykin $ +# $Id: PKGBUILD 61093 2011-12-21 20:52:27Z andrea $ # Maintainer: Sergej Pupykin # Contributor: JJDaNiMoTh pkgname=qmc2 pkgver=0.34 -pkgrel=1 +pkgrel=2 pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME" url="http://qmc2.arcadehits.net" license=("GPL") arch=('i686' 'x86_64') -depends=('qt' 'phonon' 'sdl' 'libxmu') +depends=('qtwebkit' 'phonon' 'sdl') makedepends=('rsync' 'mesa') -source=("http://downloads.sourceforge.net/project/qmc2/qmc2/$pkgver/qmc2-$pkgver.tar.bz2") +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") md5sums=('3439fb62c95ff702e3c4194c05353169') build() { diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index b8458ee86..fb21f0f79 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 60602 2011-12-14 21:38:30Z svenstaro $ +# $Id: PKGBUILD 61095 2011-12-21 20:52:38Z andrea $ # Maintainer: Imanol Celaya # Maintainer: Sven-Hendrik Haase # Contributor: Lukas Jirkovsky @@ -9,14 +9,21 @@ pkgname="qtcreator" pkgver=2.4.0 _pkgver=2.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') url='http://qt.nokia.com/products/developer-tools' license=('LGPL') -depends=('qt>=4.7.4') -makedepends=('qt-private-headers>=4.7.4' 'git') +depends=('qt>=4.8.0') +makedepends=('qt-private-headers>=4.8.0' 'git') options=('docs') +optdepends=('qt-doc: for the integrated Qt documentation' + 'gdb: for the debugger' + 'cmake: for cmake project suppport' + 'openssh-askpass: for ssh support' + 'git: for git support' + 'mercurial: for mercurial support' + 'bzr: for bazaar support') install=qtcreator.install source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz" 'qtcreator.desktop') @@ -25,6 +32,7 @@ md5sums=('80c1a2be4c685ce147c42424ad977e1a' build() { cd ${srcdir} + [[ -d build ]] && rm -r build mkdir build && cd build @@ -33,14 +41,6 @@ build() { } package() { - optdepends=('qt-doc: for the integrated Qt documentation' - 'gdb: for the debugger' - 'cmake: for cmake project suppport' - 'openssh-askpass: for ssh support' - 'git: for git support' - 'mercurial: for mercurial support' - 'bzr: for bazaar support') - cd ${srcdir}/build make INSTALL_ROOT="${pkgdir}/usr/" install diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD index 9cd0fc150..59ff37802 100644 --- a/community/qtractor/PKGBUILD +++ b/community/qtractor/PKGBUILD @@ -1,22 +1,20 @@ -# $Id: PKGBUILD 56375 2011-10-06 21:35:18Z schiv $ +# $Id: PKGBUILD 61060 2011-12-21 12:38:09Z schiv $ # Maintainer: Ray Rashif # Contributor: Philipp Überbacher pkgname=qtractor -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=1 pkgdesc="Audio/MIDI multitrack sequencer" arch=('i686' 'x86_64') url="http://qtractor.sourceforge.net/" license=('GPL') -depends=('qt' 'jack' 'slv2>=0.6.6-6' 'libmad' 'liblo' +depends=('qt' 'jack' 'slv2' 'libmad' 'liblo' 'libsamplerate' 'rubberband') - # slv2 versioned for https://bugs.archlinux.org/task/25060 makedepends=('ladspa' 'dssi') [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support') -changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('c54adf974fd363a9f2151a802f170e6d') +md5sums=('15a75fe7164b9670961af0ce9e689fdb') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/rapidsvn/PKGBUILD b/community/rapidsvn/PKGBUILD index 75060d618..b592275ff 100644 --- a/community/rapidsvn/PKGBUILD +++ b/community/rapidsvn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59187 2011-11-21 14:15:46Z spupykin $ +# $Id: PKGBUILD 61057 2011-12-21 11:53:59Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Angel 'angvp' Velasquez # Contributor: AqD @@ -6,22 +6,25 @@ pkgname=rapidsvn pkgver=0.12.0 -pkgrel=3 +pkgrel=5 pkgdesc="A cross-platform GUI front-end for the Subversion revision system written in C++ using the wxWidgets framework." url='http://rapidsvn.tigris.org/' arch=('i686' 'x86_64') license=('GPL') options=('!libtool') depends=('subversion' 'wxgtk') -makedepends=('python2') -source=(http://www.rapidsvn.org/download/release/0.12/rapidsvn-$pkgver-1.tar.gz +makedepends=('python2' 'automake' 'libtool') +#source=(http://www.rapidsvn.org/download/release/0.12/rapidsvn-$pkgver-1.tar.gz +source=(http://arch.p5n.pp.ru/~sergej/dl/rapidsvn-$pkgver-1svn20111221.tar.bz2 $pkgname.desktop) -md5sums=('8ec54104fca32d81e396a68e25324263' +md5sums=('042173c66e980ac0773579accdcca92f' '349e6d9729f88868902611bb1172f134') build() { cd $srcdir/$pkgname-$pkgver-1 + ./autogen.sh + sed -i 's#src/tests/svncpp/Makefile##' configure [ "$NOEXTRACT" == 1 ] || ./configure --prefix=/usr --with-apu-config="`which apu-1-config`" --with-apr-config="`which apr-1-config`" diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index 32d5ad0a3..729d3377f 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -3,7 +3,7 @@ pkgname=root pkgver=5.32.00 -pkgrel=1 +pkgrel=2 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64') url='http://root.cern.ch' diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index a8ae971a9..272fa4291 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 59836 2011-11-30 22:56:23Z giovanni $ +# $Id: PKGBUILD 61097 2011-12-21 20:52:48Z andrea $ # Maintainer: Giovanni Scafora # Contributor: Larry Hajali pkgname=sigil pkgver=0.4.2 -pkgrel=2 +pkgrel=3 pkgdesc="A WYSIWYG ebook editor" arch=('i686' 'x86_64') url="http://code.google.com/p/sigil/" license=('GPL3') -depends=('qt') +depends=('qtwebkit') makedepends=('cmake') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip" diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD index 9364ecbca..5a43c9910 100644 --- a/community/swi-prolog/PKGBUILD +++ b/community/swi-prolog/PKGBUILD @@ -4,7 +4,7 @@ pkgname=swi-prolog pkgver=5.10.5 -pkgrel=2 +pkgrel=3 pkgdesc='Prolog environment' arch=('i686' 'x86_64') url='http://www.swi-prolog.org/' diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD index 4b3dab122..627bc22da 100644 --- a/community/texmaker/PKGBUILD +++ b/community/texmaker/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58537 2011-11-13 16:08:37Z andrea $ +# $Id: PKGBUILD 61099 2011-12-21 20:52:54Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Daniel J Griffiths # Contributor: furester @@ -7,12 +7,12 @@ pkgname=texmaker pkgver=3.1 -pkgrel=1 +pkgrel=2 pkgdesc='Free cross-platform latex editor' arch=('i686' 'x86_64') url="http://www.xm1math.net/texmaker/index.html" license=('GPL') -depends=('poppler-qt' 'ghostscript') +depends=('poppler-qt' 'ghostscript' 'qtwebkit') source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2") md5sums=('10a14c75abbb7234d4e5e58a7c85b110') diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD index 18f179961..9528e2edb 100644 --- a/community/wine/PKGBUILD +++ b/community/wine/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 60678 2011-12-16 21:03:03Z svenstaro $ +# $Id: PKGBUILD 61124 2011-12-21 21:17:31Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Jan "heftig" Steffens # Contributor: Eduardo Romero @@ -6,7 +6,7 @@ pkgname=wine pkgver=1.3.35 -pkgrel=1 +pkgrel=3 _pkgbasever=${pkgver/rc/-rc} @@ -89,6 +89,10 @@ build() { rm -rf $pkgname-{32,64}-build mkdir $pkgname-32-build + # These additional CFLAGS solve FS#27662 + export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" + export CXXFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" + if [[ $CARCH == x86_64 ]]; then msg2 "Building Wine-64..." diff --git a/community/wkhtmltopdf/PKGBUILD b/community/wkhtmltopdf/PKGBUILD index 8c61fd2c4..14c05a4e8 100644 --- a/community/wkhtmltopdf/PKGBUILD +++ b/community/wkhtmltopdf/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 58535 2011-11-13 16:06:48Z andrea $ +# $Id: PKGBUILD 61101 2011-12-21 20:52:58Z andrea $ # Maintainer: Evangelos Foutras pkgname=wkhtmltopdf pkgver=0.9.9 -pkgrel=1 +pkgrel=2 pkgdesc="Simple shell utility to convert html to pdf using the webkit rendering engine, and qt" arch=('i686' 'x86_64') url="http://code.google.com/p/wkhtmltopdf/" license=('GPL3') -depends=('qt') +depends=('qtwebkit') optdepends=('xorg-server: wkhtmltopdf needs X or Xvfb to operate') source=(http://wkhtmltopdf.googlecode.com/files/$pkgname-$pkgver.tar.bz2) sha1sums=('41f598c0103326e7c13101391447b0284b4ba3cb') diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD index 037dabef7..873d25cc2 100644 --- a/extra/apr-util/PKGBUILD +++ b/extra/apr-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143806 2011-11-29 13:33:24Z stephane $ +# $Id: PKGBUILD 145331 2011-12-21 20:47:10Z andrea $ # Maintainer: Jan de Groot # Maintainer: Pierre Schmitz pkgname=apr-util pkgver=1.3.12 -pkgrel=3 +pkgrel=4 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" diff --git a/extra/arora/PKGBUILD b/extra/arora/PKGBUILD index 9bcf87b01..ac4085b60 100644 --- a/extra/arora/PKGBUILD +++ b/extra/arora/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 110242 2011-02-18 07:44:40Z andrea $ -# Maintainer: +# $Id: PKGBUILD 145325 2011-12-21 20:47:00Z andrea $ +# Maintainer: Gaetan Bisson # Contributor: Pierre Schmitz # Contributor: Daniel J Griffiths pkgname=arora pkgver=0.11.0 -pkgrel=2 -pkgdesc='A cross platform web browser built using Qt and WebKit' -arch=('i686' 'x86_64') -url='http://www.arora-browser.org' +pkgrel=3 +pkgdesc='Lightweight cross-platform Web browser' +url='http://www.arora-browser.org/' license=('GPL') -depends=('qt' 'desktop-file-utils') -install='arora.install' -source=("http://arora.googlecode.com/files/arora-${pkgver}.tar.gz") -md5sums=('64334ce4198861471cad9316d841f0cb') +arch=('i686' 'x86_64') +depends=('qtwebkit' 'desktop-file-utils') +source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31') -build() { - cd ${srcdir}/${pkgname}-${pkgver} +install=install - qmake PREFIX="/usr" "CONFIG-=debug" -r +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + qmake PREFIX='/usr' 'CONFIG-=debug' -r make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make INSTALL_ROOT=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make INSTALL_ROOT="${pkgdir}" install } diff --git a/extra/arora/install b/extra/arora/install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/extra/arora/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 +} diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD index 34c3e4448..3af4f8303 100644 --- a/extra/dhcp/PKGBUILD +++ b/extra/dhcp/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 119729 2011-04-14 10:22:18Z daniel $ +# $Id: PKGBUILD 145313 2011-12-21 18:57:01Z daniel $ # Maintainer: Daniel Isenmann pkgbase=dhcp pkgname=('dhcp' 'dhclient') # separate patch levels with a period to maintain proper versioning. -pkgver=4.2.1.1 -_pkgver=4.2.1-P1 +pkgver=4.2.3.2 +_pkgver=4.2.3-P1 pkgrel=1 arch=('i686' 'x86_64') license=('custom:isc-dhcp') url="https://www.isc.org/software/dhcp" -source=(http://ftp.isc.org/isc/${pkgbase}/${pkgbase}-${_pkgver}.tar.gz +source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz dhcp4 dhcp6 dhcp dhcp-4.1.1-missing-ipv6-not-fatal.patch dhclient-script-pathFixes.patch) -md5sums=('22e6f1eff6d5cfe2621a06cc62ba5b70' +md5sums=('04599f1557a5cafd10d7745267a68c8b' 'c49b1497837ba56c54e401a66e1bab9b' '12c2f3ae47ed23eb698eb7f1bfd80f20' '8f357e46e1efcbb746f38737a3f977a2' 'fd64aeb4f399dcc41ea43089a3811094' - 'ddcc5cd576ec631ade6c4da21952b50b') + '541b415a25a169eaf64b681405f79a80') build() { cd ${srcdir}/${pkgbase}-${_pkgver} @@ -66,7 +66,7 @@ package_dhcp(){ package_dhclient(){ pkgdesc="dhclient is standalone client from the dhcp package" - depends=('bash' 'iproute2') + depends=('bash' 'iproute2' 'net-tools') cd ${srcdir}/${pkgbase}-${_pkgver} make -C client DESTDIR=${pkgdir} install diff --git a/extra/dhcp/dhclient-script-pathFixes.patch b/extra/dhcp/dhclient-script-pathFixes.patch index e19c328d2..a4143ddde 100644 --- a/extra/dhcp/dhclient-script-pathFixes.patch +++ b/extra/dhcp/dhclient-script-pathFixes.patch @@ -1,5 +1,5 @@ ---- linux 2009-04-21 16:21:09.000000000 +0200 -+++ linux_new 2010-06-30 19:06:20.000000000 +0200 +--- linux 2011-05-18 20:01:54.000000000 +0000 ++++ linux_new 2011-12-21 18:45:41.487171012 +0000 @@ -23,7 +23,7 @@ # of the $1 in its args. @@ -9,7 +9,7 @@ make_resolv_conf() { if [ x"$new_domain_name_servers" != x ]; then -@@ -112,9 +112,9 @@ +@@ -122,9 +122,9 @@ if [ x$reason = xPREINIT ]; then if [ x$alias_ip_address != x ]; then # Bring down alias interface. Its routes will disappear too. @@ -21,7 +21,7 @@ # We need to give the kernel some time to get the interface up. sleep 1 -@@ -141,32 +141,32 @@ +@@ -151,25 +151,25 @@ if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ [ x$alias_ip_address != x$old_ip_address ]; then # Possible new alias. Remove old alias. @@ -50,6 +50,24 @@ - route add default gw $router $metric_arg dev $interface + /sbin/route add default gw $router $metric_arg dev $interface done + else + # we haven't changed the address, have we changed other options +@@ -177,21 +177,21 @@ + if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then + # if we've changed routers delete the old and add the new. + for router in $old_routers; do +- route del default gw $router ++ /sbin/route del default gw $router + done + for router in $new_routers; do + if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then +- route add -host $router dev $interface ++ /sbin/route add -host $router dev $interface + fi +- route add default gw $router $metric_arg dev $interface ++ /sbin/route add default gw $router $metric_arg dev $interface + done + fi fi if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; then @@ -62,7 +80,7 @@ fi make_resolv_conf exit_with_hooks 0 -@@ -176,42 +176,42 @@ +@@ -201,42 +201,42 @@ || [ x$reason = xSTOP ]; then if [ x$alias_ip_address != x ]; then # Turn off alias interface. diff --git a/extra/erlang/PKGBUILD b/extra/erlang/PKGBUILD index 57f84c43e..62458f595 100644 --- a/extra/erlang/PKGBUILD +++ b/extra/erlang/PKGBUILD @@ -1,32 +1,43 @@ -# $Id: PKGBUILD 140857 2011-10-20 05:42:01Z ibiru $ +# $Id: PKGBUILD 145333 2011-12-21 20:47:12Z andrea $ # Maintainer: Vesa Kaihlavirta # Contributor: Sarah Hay # Contributor: Tom Burdick pkgname=erlang pkgver=R14B04 -pkgrel=1 +pkgrel=2 pkgdesc="A small concurrent functional programming language developed by Ericsson." arch=(i686 x86_64) url="http://www.erlang.org/index.html" license=('custom') depends=('ncurses' 'glibc') -makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc' 'mesa') +makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa') optdepends=('wxgtk: for wx support' 'unixodbc: database') options=('!makeflags') source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz) +md5sums=('4b469729f103f52702bfb1fb24529dc0' + 'f31e72518daae4007f595c0b224dd59f') + +# please check these deps reported by namcap when you do the next build: +#erlang E: Dependency java-environment detected and not included (found class files usr/lib/erlang/lib/jinterface-1.5.4/priv/OtpErlang.jar, usr/lib/erlang/lib/ic-4.2.27/priv/ic.jar) +#erlang E: Dependency mesa detected and not included (libraries ['usr/lib/libGLU.so.1'] needed in files ['usr/lib/erlang/lib/wx-0.99/priv/erl_gl.so']) + build() { cd "$srcdir/otp_src_${pkgver/./-}" - ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk) - ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk) + export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk) + export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk) sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs make +} + +package() { + cd "$srcdir/otp_src_${pkgver/./-}" make INSTALL_PREFIX="$pkgdir" install # fix prefix @@ -58,5 +69,3 @@ build() { install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" } -md5sums=('4b469729f103f52702bfb1fb24529dc0' - 'f31e72518daae4007f595c0b224dd59f') diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD index 1b8b9050d..c91427f2c 100644 --- a/extra/freetds/PKGBUILD +++ b/extra/freetds/PKGBUILD @@ -3,7 +3,7 @@ pkgname=freetds pkgver=0.91 -pkgrel=1 +pkgrel=2 pkgdesc='Library for accessing Sybase and MS SQL Server databases' url='http://www.freetds.org' arch=('i686' 'x86_64') @@ -17,12 +17,12 @@ source=("ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/${pkgname}-${pkgve md5sums=('b14db5823980a32f0643d1a84d3ec3ad') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc/freetds --mandir=/usr/share/man --enable-msdblib --with-tdsver=7.0 make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 0c0a90a05..9f8a2c007 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 144099 2011-12-03 18:17:43Z dan $ +# $Id: PKGBUILD 145348 2011-12-22 00:36:32Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.8 +pkgver=1.7.8.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -80,7 +80,7 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -sha1sums=('7453e737e008f7319a5eca24a9ef3c5fb1f13398' - '93315f7f51d7f27d3e421c9b0d64afa27f3d16df' +sha1sums=('198e23e6e50245331590a6159ccdbdbe1792422c' + 'b49ce0b4da4f85671693c9b2c6f6a8b8ee65c809' 'f2b41828bd912b72e2cb3e14677739c4f370de66' '149e2da1ecb48872ddb31c0945afeaad1f9653d7') diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index c72b7e7ea..542137746 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 145081 2011-12-16 15:41:26Z ibiru $ +#$Id: PKGBUILD 145317 2011-12-21 19:21:50Z ibiru $ # Maintainer: Jan De Groot pkgname=gnome-keyring pkgver=3.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) license=('GPL' 'LGPL') @@ -13,11 +13,14 @@ groups=('gnome') options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + silence_no_socket_to_connect.patch) +sha256sums=('f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3' + '4cf3965e9beea747a7916682d37f36bc481bee10247788d4dd53f6e27fe5c041') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/silence_no_socket_to_connect.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-keyring \ @@ -27,6 +30,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-keyring/silence_no_socket_to_connect.patch b/extra/gnome-keyring/silence_no_socket_to_connect.patch new file mode 100644 index 000000000..e6eba7855 --- /dev/null +++ b/extra/gnome-keyring/silence_no_socket_to_connect.patch @@ -0,0 +1,717 @@ +From 5ca7387952f99bf318d337df2d853f5bc3c0ddd2 Mon Sep 17 00:00:00 2001 +From: Stef Walter +Date: Mon, 19 Dec 2011 12:08:51 +0000 +Subject: rpc-layer: Correctly handle case where gnome-keyring-daemon not running + + * In the gnome-keyring-pkcs11.so module return stand in info + when the gnome-keyring-daemon info is not running. + * In addition no slots will be listed + +https://bugzilla.gnome.org/show_bug.cgi?id=665961 +--- +diff --git a/pkcs11/rpc-layer/gkm-rpc-module.c b/pkcs11/rpc-layer/gkm-rpc-module.c +index ea939a7..b95bee1 100644 +--- a/pkcs11/rpc-layer/gkm-rpc-module.c ++++ b/pkcs11/rpc-layer/gkm-rpc-module.c +@@ -228,10 +228,8 @@ call_connect (CallState *cs) + assert (cs->socket == -1); + assert (cs->call_status == CALL_INVALID); + +- if (!pkcs11_socket_path) { +- warning (("no socket to connect to")); ++ if (!pkcs11_socket_path) + return CKR_DEVICE_REMOVED; +- } + + debug (("connecting to: %s", pkcs11_socket_path)); + +@@ -968,13 +966,14 @@ proto_read_sesssion_info (GkmRpcMessage *msg, CK_SESSION_INFO_PTR info) + * CALL MACROS + */ + +-#define BEGIN_CALL(call_id) \ ++#define BEGIN_CALL_OR(call_id, if_no_daemon) \ + debug ((#call_id ": enter")); \ + return_val_if_fail (pkcs11_initialized, CKR_CRYPTOKI_NOT_INITIALIZED); \ + { \ + CallState *_cs; \ + CK_RV _ret = CKR_OK; \ + _ret = call_lookup (&_cs); \ ++ if (_ret == CKR_DEVICE_REMOVED) return (if_no_daemon); \ + if (_ret != CKR_OK) return _ret; \ + _ret = call_prepare (_cs, GKM_RPC_CALL_##call_id); \ + if (_ret != CKR_OK) goto _cleanup; +@@ -1198,16 +1197,18 @@ rpc_C_Initialize (CK_VOID_PTR init_args) + } + } + +- /* Call through and initialize the daemon */ +- ret = call_lookup (&cs); +- if (ret == CKR_OK) { +- ret = call_prepare (cs, GKM_RPC_CALL_C_Initialize); +- if (ret == CKR_OK) +- if (!gkm_rpc_message_write_byte_array (cs->req, GKM_RPC_HANDSHAKE, GKM_RPC_HANDSHAKE_LEN)) +- ret = CKR_HOST_MEMORY; +- if (ret == CKR_OK) +- ret = call_run (cs); +- call_done (cs, ret); ++ /* Call through and initialize the daemon if available */ ++ if (pkcs11_socket_path != NULL) { ++ ret = call_lookup (&cs); ++ if (ret == CKR_OK) { ++ ret = call_prepare (cs, GKM_RPC_CALL_C_Initialize); ++ if (ret == CKR_OK) ++ if (!gkm_rpc_message_write_byte_array (cs->req, GKM_RPC_HANDSHAKE, GKM_RPC_HANDSHAKE_LEN)) ++ ret = CKR_HOST_MEMORY; ++ if (ret == CKR_OK) ++ ret = call_run (cs); ++ call_done (cs, ret); ++ } + } + + done: +@@ -1232,7 +1233,7 @@ static CK_RV + rpc_C_Finalize (CK_VOID_PTR reserved) + { + CallState *cs; +- CK_RV ret; ++ CK_RV ret = CKR_OK; + + debug (("C_Finalize: enter")); + return_val_if_fail (pkcs11_initialized, CKR_CRYPTOKI_NOT_INITIALIZED); +@@ -1240,17 +1241,18 @@ rpc_C_Finalize (CK_VOID_PTR reserved) + + pthread_mutex_lock (&init_mutex); + +- ret = call_lookup (&cs); +- if (ret == CKR_OK) { +- ret = call_prepare (cs, GKM_RPC_CALL_C_Finalize); ++ if (pkcs11_socket_path != NULL) { ++ ret = call_lookup (&cs); + if (ret == CKR_OK) { +- ret = call_run (cs); ++ ret = call_prepare (cs, GKM_RPC_CALL_C_Finalize); ++ if (ret == CKR_OK) ++ ret = call_run (cs); ++ call_done (cs, ret); + } +- call_done (cs, ret); +- } + +- if (ret != CKR_OK) +- warning (("finalizing the daemon returned an error: %d", ret)); ++ if (ret != CKR_OK) ++ warning (("finalizing the daemon returned an error: %d", ret)); ++ } + + /* This should stop all other calls in */ + pkcs11_initialized = 0; +@@ -1265,11 +1267,26 @@ rpc_C_Finalize (CK_VOID_PTR reserved) + } + + static CK_RV ++fill_stand_in_info (CK_INFO_PTR info) ++{ ++ static CK_INFO stand_in_info = { ++ { CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR }, ++ "GNOME Keyring ", ++ 0, ++ "GNOME Keyring (without daemon) ", ++ { 1, 1 }, ++ }; ++ memcpy (info, &stand_in_info, sizeof (CK_INFO)); ++ return CKR_OK; ++ ++} ++ ++static CK_RV + rpc_C_GetInfo (CK_INFO_PTR info) + { + return_val_if_fail (info, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_GetInfo); ++ BEGIN_CALL_OR (C_GetInfo, fill_stand_in_info (info)); + PROCESS_CALL; + OUT_INFO (info); + END_CALL; +@@ -1287,7 +1304,7 @@ rpc_C_GetSlotList (CK_BBOOL token_present, CK_SLOT_ID_PTR slot_list, CK_ULONG_PT + { + return_val_if_fail (count, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_GetSlotList); ++ BEGIN_CALL_OR (C_GetSlotList, (*count = 0, CKR_OK)); + IN_BYTE (token_present); + IN_ULONG_BUFFER (slot_list, count); + PROCESS_CALL; +@@ -1300,7 +1317,7 @@ rpc_C_GetSlotInfo (CK_SLOT_ID id, CK_SLOT_INFO_PTR info) + { + return_val_if_fail (info, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_GetSlotInfo); ++ BEGIN_CALL_OR (C_GetSlotInfo, CKR_SLOT_ID_INVALID); + IN_ULONG (id); + PROCESS_CALL; + OUT_SLOT_INFO (info); +@@ -1312,7 +1329,7 @@ rpc_C_GetTokenInfo (CK_SLOT_ID id, CK_TOKEN_INFO_PTR info) + { + return_val_if_fail (info, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_GetTokenInfo); ++ BEGIN_CALL_OR (C_GetTokenInfo, CKR_SLOT_ID_INVALID); + IN_ULONG (id); + PROCESS_CALL; + OUT_TOKEN_INFO (info); +@@ -1325,7 +1342,7 @@ rpc_C_GetMechanismList (CK_SLOT_ID id, CK_MECHANISM_TYPE_PTR mechanism_list, + { + return_val_if_fail (count, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_GetMechanismList); ++ BEGIN_CALL_OR (C_GetMechanismList, CKR_SLOT_ID_INVALID); + IN_ULONG (id); + IN_ULONG_BUFFER (mechanism_list, count); + PROCESS_CALL; +@@ -1340,7 +1357,7 @@ rpc_C_GetMechanismInfo (CK_SLOT_ID id, CK_MECHANISM_TYPE type, + { + return_val_if_fail (info, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_GetMechanismInfo); ++ BEGIN_CALL_OR (C_GetMechanismInfo, CKR_SLOT_ID_INVALID); + IN_ULONG (id); + IN_MECHANISM_TYPE (type); + PROCESS_CALL; +@@ -1352,7 +1369,7 @@ static CK_RV + rpc_C_InitToken (CK_SLOT_ID id, CK_UTF8CHAR_PTR pin, CK_ULONG pin_len, + CK_UTF8CHAR_PTR label) + { +- BEGIN_CALL (C_InitToken); ++ BEGIN_CALL_OR (C_InitToken, CKR_SLOT_ID_INVALID); + IN_ULONG (id); + IN_BYTE_ARRAY (pin, pin_len); + IN_STRING (label); +@@ -1365,7 +1382,7 @@ rpc_C_WaitForSlotEvent (CK_FLAGS flags, CK_SLOT_ID_PTR slot, CK_VOID_PTR reserve + { + return_val_if_fail (slot, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_WaitForSlotEvent); ++ BEGIN_CALL_OR (C_WaitForSlotEvent, CKR_DEVICE_REMOVED); + IN_ULONG (flags); + PROCESS_CALL; + OUT_ULONG (slot); +@@ -1378,7 +1395,7 @@ rpc_C_OpenSession (CK_SLOT_ID id, CK_FLAGS flags, CK_VOID_PTR user_data, + { + return_val_if_fail (session, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_OpenSession); ++ BEGIN_CALL_OR (C_OpenSession, CKR_SLOT_ID_INVALID); + IN_ULONG (id); + IN_ULONG (flags); + PROCESS_CALL; +@@ -1389,7 +1406,7 @@ rpc_C_OpenSession (CK_SLOT_ID id, CK_FLAGS flags, CK_VOID_PTR user_data, + static CK_RV + rpc_C_CloseSession (CK_SESSION_HANDLE session) + { +- BEGIN_CALL (C_CloseSession); ++ BEGIN_CALL_OR (C_CloseSession, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + PROCESS_CALL; + END_CALL; +@@ -1398,7 +1415,7 @@ rpc_C_CloseSession (CK_SESSION_HANDLE session) + static CK_RV + rpc_C_CloseAllSessions (CK_SLOT_ID id) + { +- BEGIN_CALL (C_CloseAllSessions); ++ BEGIN_CALL_OR (C_CloseAllSessions, CKR_SLOT_ID_INVALID); + IN_ULONG (id); + PROCESS_CALL; + END_CALL; +@@ -1407,7 +1424,7 @@ rpc_C_CloseAllSessions (CK_SLOT_ID id) + static CK_RV + rpc_C_GetFunctionStatus (CK_SESSION_HANDLE session) + { +- BEGIN_CALL (C_GetFunctionStatus); ++ BEGIN_CALL_OR (C_GetFunctionStatus, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + PROCESS_CALL; + END_CALL; +@@ -1416,7 +1433,7 @@ rpc_C_GetFunctionStatus (CK_SESSION_HANDLE session) + static CK_RV + rpc_C_CancelFunction (CK_SESSION_HANDLE session) + { +- BEGIN_CALL (C_CancelFunction); ++ BEGIN_CALL_OR (C_CancelFunction, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + PROCESS_CALL; + END_CALL; +@@ -1427,7 +1444,7 @@ rpc_C_GetSessionInfo(CK_SESSION_HANDLE session, CK_SESSION_INFO_PTR info) + { + return_val_if_fail (info, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_GetSessionInfo); ++ BEGIN_CALL_OR (C_GetSessionInfo, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + PROCESS_CALL; + OUT_SESSION_INFO (info); +@@ -1438,7 +1455,7 @@ static CK_RV + rpc_C_InitPIN (CK_SESSION_HANDLE session, CK_UTF8CHAR_PTR pin, + CK_ULONG pin_len) + { +- BEGIN_CALL (C_InitPIN); ++ BEGIN_CALL_OR (C_InitPIN, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (pin, pin_len); + PROCESS_CALL; +@@ -1449,7 +1466,7 @@ static CK_RV + rpc_C_SetPIN (CK_SESSION_HANDLE session, CK_UTF8CHAR_PTR old_pin, + CK_ULONG old_pin_len, CK_UTF8CHAR_PTR new_pin, CK_ULONG new_pin_len) + { +- BEGIN_CALL (C_SetPIN); ++ BEGIN_CALL_OR (C_SetPIN, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (old_pin, old_pin_len); + IN_BYTE_ARRAY (new_pin, old_pin_len); +@@ -1463,7 +1480,7 @@ rpc_C_GetOperationState (CK_SESSION_HANDLE session, CK_BYTE_PTR operation_state, + { + return_val_if_fail (operation_state_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_GetOperationState); ++ BEGIN_CALL_OR (C_GetOperationState, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_BUFFER (operation_state, operation_state_len); + PROCESS_CALL; +@@ -1476,7 +1493,7 @@ rpc_C_SetOperationState (CK_SESSION_HANDLE session, CK_BYTE_PTR operation_state, + CK_ULONG operation_state_len, CK_OBJECT_HANDLE encryption_key, + CK_OBJECT_HANDLE authentication_key) + { +- BEGIN_CALL (C_SetOperationState); ++ BEGIN_CALL_OR (C_SetOperationState, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (operation_state, operation_state_len); + IN_ULONG (encryption_key); +@@ -1489,7 +1506,7 @@ static CK_RV + rpc_C_Login (CK_SESSION_HANDLE session, CK_USER_TYPE user_type, + CK_UTF8CHAR_PTR pin, CK_ULONG pin_len) + { +- BEGIN_CALL (C_Login); ++ BEGIN_CALL_OR (C_Login, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_ULONG (user_type); + IN_BYTE_ARRAY (pin, pin_len); +@@ -1500,7 +1517,7 @@ rpc_C_Login (CK_SESSION_HANDLE session, CK_USER_TYPE user_type, + static CK_RV + rpc_C_Logout (CK_SESSION_HANDLE session) + { +- BEGIN_CALL (C_Logout); ++ BEGIN_CALL_OR (C_Logout, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + PROCESS_CALL; + END_CALL; +@@ -1512,7 +1529,7 @@ rpc_C_CreateObject (CK_SESSION_HANDLE session, CK_ATTRIBUTE_PTR template, + { + return_val_if_fail (new_object, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_CreateObject); ++ BEGIN_CALL_OR (C_CreateObject, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_ATTRIBUTE_ARRAY (template, count); + PROCESS_CALL; +@@ -1527,7 +1544,7 @@ rpc_C_CopyObject (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object, + { + return_val_if_fail (new_object, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_CopyObject); ++ BEGIN_CALL_OR (C_CopyObject, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_ULONG (object); + IN_ATTRIBUTE_ARRAY (template, count); +@@ -1540,7 +1557,7 @@ rpc_C_CopyObject (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object, + static CK_RV + rpc_C_DestroyObject (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object) + { +- BEGIN_CALL (C_DestroyObject); ++ BEGIN_CALL_OR (C_DestroyObject, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_ULONG (object); + PROCESS_CALL; +@@ -1553,7 +1570,7 @@ rpc_C_GetObjectSize (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object, + { + return_val_if_fail (size, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_GetObjectSize); ++ BEGIN_CALL_OR (C_GetObjectSize, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_ULONG (object); + PROCESS_CALL; +@@ -1565,7 +1582,7 @@ static CK_RV + rpc_C_GetAttributeValue (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object, + CK_ATTRIBUTE_PTR template, CK_ULONG count) + { +- BEGIN_CALL (C_GetAttributeValue); ++ BEGIN_CALL_OR (C_GetAttributeValue, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_ULONG (object); + IN_ATTRIBUTE_BUFFER (template, count); +@@ -1578,7 +1595,7 @@ static CK_RV + rpc_C_SetAttributeValue (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object, + CK_ATTRIBUTE_PTR template, CK_ULONG count) + { +- BEGIN_CALL (C_SetAttributeValue); ++ BEGIN_CALL_OR (C_SetAttributeValue, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_ULONG (object); + IN_ATTRIBUTE_ARRAY (template, count); +@@ -1590,7 +1607,7 @@ static CK_RV + rpc_C_FindObjectsInit (CK_SESSION_HANDLE session, CK_ATTRIBUTE_PTR template, + CK_ULONG count) + { +- BEGIN_CALL (C_FindObjectsInit); ++ BEGIN_CALL_OR (C_FindObjectsInit, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_ATTRIBUTE_ARRAY (template, count); + PROCESS_CALL; +@@ -1606,7 +1623,7 @@ rpc_C_FindObjects (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE_PTR objects, + + return_val_if_fail (count, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_FindObjects); ++ BEGIN_CALL_OR (C_FindObjects, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_ULONG_BUFFER (objects, address_of_max_count); + PROCESS_CALL; +@@ -1618,7 +1635,7 @@ rpc_C_FindObjects (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE_PTR objects, + static CK_RV + rpc_C_FindObjectsFinal (CK_SESSION_HANDLE session) + { +- BEGIN_CALL (C_FindObjectsFinal); ++ BEGIN_CALL_OR (C_FindObjectsFinal, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + PROCESS_CALL; + END_CALL; +@@ -1628,7 +1645,7 @@ static CK_RV + rpc_C_EncryptInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, + CK_OBJECT_HANDLE key) + { +- BEGIN_CALL (C_EncryptInit); ++ BEGIN_CALL_OR (C_EncryptInit, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_MECHANISM (mechanism); + IN_ULONG (key); +@@ -1642,7 +1659,7 @@ rpc_C_Encrypt (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len, + { + return_val_if_fail (encrypted_data_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_Encrypt); ++ BEGIN_CALL_OR (C_Encrypt, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (data, data_len); + IN_BYTE_BUFFER (encrypted_data, encrypted_data_len); +@@ -1658,7 +1675,7 @@ rpc_C_EncryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, + { + return_val_if_fail (encrypted_part_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_EncryptUpdate); ++ BEGIN_CALL_OR (C_EncryptUpdate, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (part, part_len); + IN_BYTE_BUFFER (encrypted_part, encrypted_part_len); +@@ -1673,7 +1690,7 @@ rpc_C_EncryptFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR last_part, + { + return_val_if_fail (last_part_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_EncryptFinal); ++ BEGIN_CALL_OR (C_EncryptFinal, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_BUFFER (last_part, last_part_len); + PROCESS_CALL; +@@ -1685,7 +1702,7 @@ static CK_RV + rpc_C_DecryptInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, + CK_OBJECT_HANDLE key) + { +- BEGIN_CALL (C_DecryptInit); ++ BEGIN_CALL_OR (C_DecryptInit, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_MECHANISM (mechanism); + IN_ULONG (key); +@@ -1699,7 +1716,7 @@ rpc_C_Decrypt (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_data, + { + return_val_if_fail (data_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_Decrypt); ++ BEGIN_CALL_OR (C_Decrypt, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (enc_data, enc_data_len); + IN_BYTE_BUFFER (data, data_len); +@@ -1714,7 +1731,7 @@ rpc_C_DecryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_part, + { + return_val_if_fail (part_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_DecryptUpdate); ++ BEGIN_CALL_OR (C_DecryptUpdate, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (enc_part, enc_part_len); + IN_BYTE_BUFFER (part, part_len); +@@ -1729,7 +1746,7 @@ rpc_C_DecryptFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR last_part, + { + return_val_if_fail (last_part_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_DecryptFinal); ++ BEGIN_CALL_OR (C_DecryptFinal, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_BUFFER (last_part, last_part_len); + PROCESS_CALL; +@@ -1740,7 +1757,7 @@ rpc_C_DecryptFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR last_part, + static CK_RV + rpc_C_DigestInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism) + { +- BEGIN_CALL (C_DigestInit); ++ BEGIN_CALL_OR (C_DigestInit, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_MECHANISM (mechanism); + PROCESS_CALL; +@@ -1753,7 +1770,7 @@ rpc_C_Digest (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len, + { + return_val_if_fail (digest_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_Digest); ++ BEGIN_CALL_OR (C_Digest, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (data, data_len); + IN_BYTE_BUFFER (digest, digest_len); +@@ -1765,7 +1782,7 @@ rpc_C_Digest (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len, + static CK_RV + rpc_C_DigestUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_len) + { +- BEGIN_CALL (C_DigestUpdate); ++ BEGIN_CALL_OR (C_DigestUpdate, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (part, part_len); + PROCESS_CALL; +@@ -1775,7 +1792,7 @@ rpc_C_DigestUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_l + static CK_RV + rpc_C_DigestKey (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE key) + { +- BEGIN_CALL (C_DigestKey); ++ BEGIN_CALL_OR (C_DigestKey, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_ULONG (key); + PROCESS_CALL; +@@ -1788,7 +1805,7 @@ rpc_C_DigestFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR digest, + { + return_val_if_fail (digest_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_DigestFinal); ++ BEGIN_CALL_OR (C_DigestFinal, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_BUFFER (digest, digest_len); + PROCESS_CALL; +@@ -1800,7 +1817,7 @@ static CK_RV + rpc_C_SignInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, + CK_OBJECT_HANDLE key) + { +- BEGIN_CALL (C_SignInit); ++ BEGIN_CALL_OR (C_SignInit, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_MECHANISM (mechanism); + IN_ULONG (key); +@@ -1814,7 +1831,7 @@ rpc_C_Sign (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len, + { + return_val_if_fail (signature_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_Sign); ++ BEGIN_CALL_OR (C_Sign, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (data, data_len); + IN_BYTE_BUFFER (signature, signature_len); +@@ -1828,7 +1845,7 @@ rpc_C_SignUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_len + { + return_val_if_fail (part_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_SignUpdate); ++ BEGIN_CALL_OR (C_SignUpdate, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (part, part_len); + PROCESS_CALL; +@@ -1841,7 +1858,7 @@ rpc_C_SignFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR signature, + { + return_val_if_fail (signature_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_SignFinal); ++ BEGIN_CALL_OR (C_SignFinal, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_BUFFER (signature, signature_len); + PROCESS_CALL; +@@ -1853,7 +1870,7 @@ static CK_RV + rpc_C_SignRecoverInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, + CK_OBJECT_HANDLE key) + { +- BEGIN_CALL (C_SignRecoverInit); ++ BEGIN_CALL_OR (C_SignRecoverInit, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_MECHANISM (mechanism); + IN_ULONG (key); +@@ -1867,7 +1884,7 @@ rpc_C_SignRecover (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_le + { + return_val_if_fail (signature_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_SignRecover); ++ BEGIN_CALL_OR (C_SignRecover, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (data, data_len); + IN_BYTE_BUFFER (signature, signature_len); +@@ -1880,7 +1897,7 @@ static CK_RV + rpc_C_VerifyInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, + CK_OBJECT_HANDLE key) + { +- BEGIN_CALL (C_VerifyInit); ++ BEGIN_CALL_OR (C_VerifyInit, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_MECHANISM (mechanism); + IN_ULONG (key); +@@ -1892,7 +1909,7 @@ static CK_RV + rpc_C_Verify (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len, + CK_BYTE_PTR signature, CK_ULONG signature_len) + { +- BEGIN_CALL (C_Verify); ++ BEGIN_CALL_OR (C_Verify, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (data, data_len); + IN_BYTE_ARRAY (signature, signature_len); +@@ -1903,7 +1920,7 @@ rpc_C_Verify (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len, + static CK_RV + rpc_C_VerifyUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_len) + { +- BEGIN_CALL (C_VerifyUpdate); ++ BEGIN_CALL_OR (C_VerifyUpdate, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (part, part_len); + PROCESS_CALL; +@@ -1914,7 +1931,7 @@ static CK_RV + rpc_C_VerifyFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR signature, + CK_ULONG signature_len) + { +- BEGIN_CALL (C_VerifyFinal); ++ BEGIN_CALL_OR (C_VerifyFinal, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (signature, signature_len); + PROCESS_CALL; +@@ -1925,7 +1942,7 @@ static CK_RV + rpc_C_VerifyRecoverInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, + CK_OBJECT_HANDLE key) + { +- BEGIN_CALL (C_VerifyRecoverInit); ++ BEGIN_CALL_OR (C_VerifyRecoverInit, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_MECHANISM (mechanism); + IN_ULONG (key); +@@ -1939,7 +1956,7 @@ rpc_C_VerifyRecover (CK_SESSION_HANDLE session, CK_BYTE_PTR signature, + { + return_val_if_fail (data_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_VerifyRecover); ++ BEGIN_CALL_OR (C_VerifyRecover, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (signature, signature_len); + IN_BYTE_BUFFER (data, data_len); +@@ -1955,7 +1972,7 @@ rpc_C_DigestEncryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, + { + return_val_if_fail (enc_part_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_DigestEncryptUpdate); ++ BEGIN_CALL_OR (C_DigestEncryptUpdate, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (part, part_len); + IN_BYTE_BUFFER (enc_part, enc_part_len); +@@ -1971,7 +1988,7 @@ rpc_C_DecryptDigestUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_part, + { + return_val_if_fail (part_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_DecryptDigestUpdate); ++ BEGIN_CALL_OR (C_DecryptDigestUpdate, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (enc_part, enc_part_len); + IN_BYTE_BUFFER (part, part_len); +@@ -1987,7 +2004,7 @@ rpc_C_SignEncryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, + { + return_val_if_fail (enc_part_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_SignEncryptUpdate); ++ BEGIN_CALL_OR (C_SignEncryptUpdate, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (part, part_len); + IN_BYTE_BUFFER (enc_part, enc_part_len); +@@ -2003,7 +2020,7 @@ rpc_C_DecryptVerifyUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_part, + { + return_val_if_fail (part_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_DecryptVerifyUpdate); ++ BEGIN_CALL_OR (C_DecryptVerifyUpdate, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (enc_part, enc_part_len); + IN_BYTE_BUFFER (part, part_len); +@@ -2017,7 +2034,7 @@ rpc_C_GenerateKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, + CK_ATTRIBUTE_PTR template, CK_ULONG count, + CK_OBJECT_HANDLE_PTR key) + { +- BEGIN_CALL (C_GenerateKey); ++ BEGIN_CALL_OR (C_GenerateKey, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_MECHANISM (mechanism); + IN_ATTRIBUTE_ARRAY (template, count); +@@ -2032,7 +2049,7 @@ rpc_C_GenerateKeyPair (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, + CK_ATTRIBUTE_PTR priv_template, CK_ULONG priv_count, + CK_OBJECT_HANDLE_PTR pub_key, CK_OBJECT_HANDLE_PTR priv_key) + { +- BEGIN_CALL (C_GenerateKeyPair); ++ BEGIN_CALL_OR (C_GenerateKeyPair, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_MECHANISM (mechanism); + IN_ATTRIBUTE_ARRAY (pub_template, pub_count); +@@ -2050,7 +2067,7 @@ rpc_C_WrapKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, + { + return_val_if_fail (wrapped_key_len, CKR_ARGUMENTS_BAD); + +- BEGIN_CALL (C_WrapKey); ++ BEGIN_CALL_OR (C_WrapKey, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_MECHANISM (mechanism); + IN_ULONG (wrapping_key); +@@ -2067,7 +2084,7 @@ rpc_C_UnwrapKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, + CK_ULONG wrapped_key_len, CK_ATTRIBUTE_PTR template, + CK_ULONG count, CK_OBJECT_HANDLE_PTR key) + { +- BEGIN_CALL (C_UnwrapKey); ++ BEGIN_CALL_OR (C_UnwrapKey, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_MECHANISM (mechanism); + IN_ULONG (unwrapping_key); +@@ -2083,7 +2100,7 @@ rpc_C_DeriveKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, + CK_OBJECT_HANDLE base_key, CK_ATTRIBUTE_PTR template, + CK_ULONG count, CK_OBJECT_HANDLE_PTR key) + { +- BEGIN_CALL (C_DeriveKey); ++ BEGIN_CALL_OR (C_DeriveKey, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_MECHANISM (mechanism); + IN_ULONG (base_key); +@@ -2096,7 +2113,7 @@ rpc_C_DeriveKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, + static CK_RV + rpc_C_SeedRandom (CK_SESSION_HANDLE session, CK_BYTE_PTR seed, CK_ULONG seed_len) + { +- BEGIN_CALL (C_SeedRandom); ++ BEGIN_CALL_OR (C_SeedRandom, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); + IN_BYTE_ARRAY (seed, seed_len); + PROCESS_CALL; +@@ -2107,9 +2124,9 @@ static CK_RV + rpc_C_GenerateRandom (CK_SESSION_HANDLE session, CK_BYTE_PTR random_data, + CK_ULONG random_len) + { +- BEGIN_CALL (C_GenerateRandom); ++ CK_ULONG_PTR address = &random_len; ++ BEGIN_CALL_OR (C_GenerateRandom, CKR_SESSION_HANDLE_INVALID); + IN_ULONG (session); +- CK_ULONG_PTR address = &random_len; + IN_BYTE_BUFFER (random_data, address); + PROCESS_CALL; + OUT_BYTE_ARRAY (random_data, address); +-- +cgit v0.9.0.2 diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD index 293f8604a..753327495 100644 --- a/extra/gtk-xfce-engine/PKGBUILD +++ b/extra/gtk-xfce-engine/PKGBUILD @@ -1,34 +1,37 @@ -# $Id: PKGBUILD 138198 2011-09-18 14:40:18Z andyrtr $ -# Maintainer: AndyRTR +# $Id: PKGBUILD 145294 2011-12-21 11:46:17Z foutrelis $ +# Maintainer: Evangelos Foutras # Contributor: tobias pkgname=gtk-xfce-engine -pkgver=2.9.0 +pkgver=2.99.0 pkgrel=1 -pkgdesc="A port of Xfce engine to GTK+-2.0" +pkgdesc="Xfce Gtk+-2.0 and Gtk+-3.0 engines" arch=('i686' 'x86_64') -license=('GPL2') url="http://www.xfce.org/" +license=('GPL2') groups=('xfce4') -depends=("gtk2>=2.14.7") +depends=('gtk2' 'gtk3') makedepends=('pkgconfig') options=('!libtool') -source=(http://archive.xfce.org/src/xfce/$pkgname/2.9/${pkgname}-${pkgver}.tar.bz2) -md5sums=('e2bc76ab5093ff8472e728e6d6ad5da2') -sha1sums=('ce0ef1220c98dddabaf7917f8d98579dd65f5009') +source=(http://archive.xfce.org/src/xfce/$pkgname/2.99/$pkgname-$pkgver.tar.bz2) +sha256sums=('27bee5a68527d214cfda9b99d4ba68d39b6d341202bc728d0ddd170a73cde154') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --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/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 8dddc4eaa..ec5e724c2 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144610 2011-12-08 09:18:08Z andrea $ +# $Id: PKGBUILD 145327 2011-12-21 20:47:05Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdelibs pkgver=4.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -13,7 +13,7 @@ depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5' 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils' 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor' - 'docbook-xsl') + 'docbook-xsl' 'qtwebkit') makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell') replaces=('kdelibs-experimental') install='kdelibs.install' diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD index f07fa6c0e..440538661 100644 --- a/extra/kwebkitpart/PKGBUILD +++ b/extra/kwebkitpart/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 140401 2011-10-12 18:43:47Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino +# $Id: PKGBUILD 145323 2011-12-21 20:46:58Z andrea $ +# Maintainer: Andrea Scarpino pkgname=kwebkitpart pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A WebKit browser component for KDE" url="http://opendesktop.org/content/show.php?content=127960" arch=('i686' 'x86_64') @@ -12,14 +11,14 @@ license=('LGPL') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=${pkgname}.git&a=snapshot&h=d2aba2aa0664fde17f29d526226576aa6b956ee1&fmt=tbz2") -md5sums=('d87b69fc4945aa9159908f842c3f9e2e') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('e736d7b26cf6e3c0eed837837b3f032b') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname} \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 393d6716e..5492bd393 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142694 2011-11-12 21:17:53Z ibiru $ +# $Id: PKGBUILD 145337 2011-12-21 20:47:18Z andrea $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -37,14 +37,14 @@ pkgname=('libreoffice-common' 'libreoffice-extension-wiki-publisher') _LOver=3.4.4.2 pkgver=3.4.4 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') #_LO_tree="3.4" _OFFICEUPD="340" license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' 'boost' + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc>=2.3.1' 'hsqldb-java' 'boost' 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' 'mesa' 'gstreamer0.10-base' 'java-environment' @@ -59,8 +59,8 @@ makedepends=( # makedepends # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors -#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" -_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://hg.services.openoffice.org/binaries" source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -104,7 +104,8 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions vbahelper.visibility.patch scp2-more-reasonable-file-access-rights.diff oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1 - RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7) + RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7 + gcc462_buildfix.diff) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip @@ -201,7 +202,8 @@ md5sums=('be8b13f83045f0a53b69fe76d6d72e9c' '43b145db28e6c0d73578ae6fd35e510d' '37638431e7e40baf2e47966ebb9bc0e9' '3c6c62e77c30649a3dfe73512947cc9a' - 'eb35d4c715e0dfc23bbc706996033829') + 'eb35d4c715e0dfc23bbc706996033829' + '10600d04ee81014bc9b5cc04e615d799') build() { @@ -233,6 +235,8 @@ build() { patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff patch -Np1 -i ${srcdir}/oracle-recognition.diff patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff + # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=43139 + patch -Np1 -i ${srcdir}/gcc462_buildfix.diff # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 diff --git a/extra/libreoffice/PKGBUILD.next_stable b/extra/libreoffice/PKGBUILD.next_stable new file mode 100644 index 000000000..1005760ac --- /dev/null +++ b/extra/libreoffice/PKGBUILD.next_stable @@ -0,0 +1,924 @@ +# $Id: PKGBUILD 142692 2011-11-12 20:22:14Z ibiru $ +# Maintainer: AndyRTR + +pkgbase="libreoffice" +pkgname=('libreoffice-common' + 'libreoffice-base' + 'libreoffice-calc' + 'libreoffice-draw' + 'libreoffice-gnome' + 'libreoffice-impress' + 'libreoffice-kde4' + 'libreoffice-math' + 'libreoffice-sdk' + 'libreoffice-sdk-doc' + 'libreoffice-writer' + 'libreoffice-en-US' + #'libreoffice-extension-barcode' # +# 'libreoffice-extension-diagram' +# 'libreoffice-extension-google-docs' +# 'libreoffice-extension-hunart' + #'libreoffice-extension-lightproof' # no source integration + #'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity +# 'libreoffice-extension-nlpsolver' +# 'libreoffice-extension-ct2n' +# 'libreoffice-extension-numbertext' +# 'libreoffice-extension-oooblogger' + 'libreoffice-extension-pdfimport' + 'libreoffice-extension-presenter-screen' + 'libreoffice-extension-presentation-minimizer' + 'libreoffice-extension-report-builder' +# 'libreoffice-extension-scripting-beanshell' +# 'libreoffice-extension-scripting-javascript' +# 'libreoffice-extension-scripting-python' +# 'libreoffice-extension-typo' +# 'libreoffice-extension-validator' +# 'libreoffice-extension-watch-window' +# 'libreoffice-extension-wiki-publisher' +) +_LOver=3.5.0.0 +pkgver=3.5.0beta1 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL3') +url="http://www.libreoffice.org/" +makedepends=( # makedepends + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' #'xulrunner' + 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' + 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' # 'libldap' + 'mesa' 'gstreamer0.10-base' 'java-environment' 'zenity' # for build icon :D + #'saxon' - currently broken + # the depends from libreoffice main pkg + "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'librsvg' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script + 'ttf-dejavu') # to satisfy regression tests + +# http://download.documentfoundation.org/mirrors/all.html +# http://wiki.documentfoundation.org/Mirrors + +#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +_additional_source_url="http://dev-www.libreoffice.org/src" +source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.bz2 + ${_additional_source_url}/8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2 + ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz + ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip + ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + ${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz + ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip +# ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 + ${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 + ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz + http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll +# ${_additional_source_url}/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt +# http://ooo.itc.hu/oxygenoffice/download/libreoffice/4a433efb6d385264ebc1d5513782d51c-SmART_0.9.4.oxt +# http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt +# http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt +# http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt +# http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt +# http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt +# http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt +# http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt +# http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt +# http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt +# buildfix_boost.diff +# buildfix_ct2n.diff +# vbahelper.visibility.patch +# scp2-more-reasonable-file-access-rights.diff +# oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1 +# RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7 +) + +noextract=(8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2 + 185d60944ea767075d27247c3162b3bc-unowinreg.dll + 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 + ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz + e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 + 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz + eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip +# 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + #4a433efb6d385264ebc1d5513782d51c-SmART_0.9.4.oxt + #7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt + #41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt + #451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt + #bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt + #23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt + #b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt + #b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt + #9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt + #dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt + #b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt +) +md5sums=('bf6ce92d8d69f1dec4836a7249e10436' + 'a0b19441245d7627c299d7014d110b32' + 'b9dee0572120c87906ed6e2fb4696b69' + '8f107ffb3fc9d9b920b7bbd0bc79c7e8' + '1f24ab1d39f4a51faf22244c94a6203f' + '35c94d2df8893241173de1d16b6034c0' + '798b2ffdc8bcfe7bca2cf92b62caf685' + 'fdb27bfe2dbe2e7b57ae194d9bf36bab' + 'ada24d37d8d638b3d8a9985e80bc2978' + '2a177023f9ea8ec8bd00837605c5df1b' + 'a7983f859eafb2677d7ff386a023bc40' + '3c219630e4302863a9a83d0efde889db' + '2ae988b339daec234019a7066f96733e' + '2c9b0f83ed5890af02c0df1c1776f39b' + 'af3c3acf618de6108d65fcdc92b492e1' + 'eeb2c7ddf0d302fba4bfc6e97eac9624' + '39bb3fcea1514f1369fcfc87542390fd' + '3404ab6b1792ae5f16bbd603bd1e1d03' + '97b2d4dba862397f446b217e2b623e71' + 'f94d9870737518e3b597f9265f4e9803' + '8ce2fcd72becf06c41f7201d15373ed9' + 'd8bd5eed178db6e2b18eeed243f85aa8' + '3bdf40c0d199af31923e900d082ca2dd' + 'ace6ab49184e329db254e454a010f56d' + 'db60e4fde8dd6d6807523deb71ee34dc' + 'ba2930200c9f019c2d93a8c88c651a0f' + '0ff7d225d087793c8c2c680d77aac3e7' + 'e1c178b18f130b40494561f02bc1a948' + '7c2549f6b0a8bb604e6c4c729ffdcfe6' + '185d60944ea767075d27247c3162b3bc') + +build() { + + unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS + [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh + [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh + + cd ${srcdir}/libreoffice-core-$_LOver + + # move external sources into place + mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + popd + + ln -s ../libreoffice-help-$_LOver/helpcontent2 . + ln -s ../libreoffice-translations-$_LOver/translations . + +# ln -s ${srcdir}/ext_sources/*Barcode* solver/unxlngx6.pro/bin/Barcode.oxt +# ln -s ${srcdir}/ext_sources/*SmART* solver/unxlngx6.pro/bin/SmART.oxt +# ln -s ${srcdir}/ext_sources/*gdocs* solver/unxlngx6.pro/bin/gdocs.oxt +# ln -s ${srcdir}/ext_sources/*hunart* solver/unxlngx6.pro/bin/hunart.oxt +# ln -s ${srcdir}/ext_sources/*numbertext* solver/unxlngx6.pro/bin/numbertext.oxt +# ln -s ${srcdir}/ext_sources/*oooblogger* solver/unxlngx6.pro/bin/oooblogger.oxt +# ln -s ${srcdir}/ext_sources/*typo* solver/unxlngx6.pro/bin/typo.oxt +# ln -s ${srcdir}/ext_sources/*Validator* solver/unxlngx6.pro/bin/Validator.oxt +# ln -s ${srcdir}/ext_sources/*WatchWindow* solver/unxlngx6.pro/bin/WatchWindow.oxt + + # buildfixes & bugfixes + #patch -Np1 -i ${srcdir}/buildfix_boost.diff +# patch -Np1 -i ${srcdir}/buildfix_ct2n.diff +# patch -Np0 -i ${srcdir}/vbahelper.visibility.patch +# patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff +# patch -Np1 -i ${srcdir}/oracle-recognition.diff +# patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff + + # unset C(XX)FLAGS + # http://www.openoffice.org/issues/show_bug.cgi?id=103205 +# unset CFLAGS +# unset CXXFLAGS + + #use the CFLAGS but remove the LibO overridden ones + for i in $CFLAGS; do + case "$i" in + -O?|-pipe|-Wall|-g|-fexceptions) continue;; + esac + ARCH_FLAGS="$ARCH_FLAGS $i" + done + + # python2 fix + export PYTHON=python2 + + # http://wiki.documentfoundation.org/Development/How_to_build/Configure_options + +# if [ "$CARCH" = "x86_64" ]; then +# EXTRAOPTS="--without-stlport" +# else +# EXTRAOPTS="--with-stlport" # --without-system-boost" +# # # avoid problems with ixion for now +# sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1 +# fi + + # needed for 0003-distro-install-fix-en-US-only-installation.patch +# autoconf -f + + # non-SMP test build +# export MAKEFLAGS="-j1" + #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ + ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ + --with-unix-wrapper="libreoffice" \ + --enable-split-app-modules \ + --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib --mandir=/usr/share/man \ + --disable-verbose \ + --with-lang="" \ + --enable-crashdump \ + --enable-dbus \ + --enable-evolution2\ + --enable-gio\ + --disable-gnome-vfs\ + --disable-kde\ + --enable-kde4\ + --enable-gtk3 \ + --enable-lockdown\ + --enable-mergelibs \ + --enable-opengl \ + --enable-odk\ + --enable-opengl\ + --disable-ext-lightproof \ + --disable-ext-mysql-connector \ + --with-system-mysql \ + --enable-librsvg=system \ + --without-fonts\ + --without-afms\ + --without-ppds\ + --without-system-libwps\ + --without-system-mdds\ + --without-myspell-dicts \ + --without-system-libvisio \ + --without-system-libcmis \ + --without-system-sampleicc \ + --without-system-libexttextcat \ + --with-system-dicts \ + --with-external-dict-dir=/usr/share/hunspell \ + --with-external-hyph-dir=/usr/share/hyphen \ + --with-external-thes-dir=/usr/share/mythes \ + --with-system-beanshell \ + --with-system-cppunit\ + --with-system-graphite\ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --without-system-saxon\ + --disable-mozilla \ + --without-system-mozilla \ + --without-system-mozilla-headers \ + --with-ant-home="/usr/share/java/apache-ant"\ + --with-system-boost\ + --with-system-cairo\ + --with-system-libs\ + --with-system-mythes\ + --with-system-headers\ + --with-system-hsqldb \ + --with-alloc=system\ + --with-system-lucene\ + --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ + --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ + --with-java-target-version=1.5 \ + $EXTRAOPTS|| return 1 + +# --enable-ext-barcode \ +# --enable-ext-diagram \ +# --enable-ext-google-docs \ +# --enable-ext-hunart \ +# --enable-ext-nlpsolver \ +# --enable-ext-ct2n \ +# --enable-ext-numbertext \ +# --enable-ext-oooblogger \ +# --enable-ext-pdfimport \ +# --enable-ext-presenter-console \ +# --enable-ext-presenter-minimizer \ +# --enable-ext-report-builder \ +# --enable-ext-scripting-beanshell \ +# --enable-ext-scripting-javascript \ +# --enable-ext-typo \ +# --enable-ext-validator \ +# --enable-ext-watch-window \ +# --enable-ext-wiki-publisher \ + +# --disable-mozilla \ +# --enable-ldap \ +# --with-openldap\ + +# --with-system-mozilla\ + +#--with-install-dirname="${pkgbase}" +# --enable-cairo\ +# --enable-ext-scripting-python \ +# --with-system-libtextcat \ +# --with-external-libtextcat-data \ +# --with-system-xrender-headers\ + + + + + +#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool + +#--with-servlet-api-jar=JARFILE +# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 +# --with-system-saxon\ +# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ + + touch src.downloaded + #./download + unset MAKEFLAGS + ./bootstrap + make + + # fake installation to create split file lists + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall distro-pack-install +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package_libreoffice-common() { + + pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" + install=${pkgbase}.install + depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6" 'librsvg' + 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script + #'java-runtime' + #'saxon' + optdepends=('libreoffice-langpack: additional language support' + 'java-runtime: adds java support' + 'libcups: adds printing support' + 'gconf: adds additional gnome support' + 'nss: adds support for signed files/macros' + 'pstoedit: translates PostScript and PDF graphics into other vector formats' + 'poppler: for shipped pdfimport extension' + 'libmythes: for use in thesaurus' + 'hsqldb-java: default database format for OpenOffice.org' + 'beanshell: interactive java -- good for prototyping /macros' + 'vigra: C++ computer vision library, usable in Basebmp' + 'libmspack: library for Microsoft compression formats for use in FontOOo' + 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' + #'libldap: to get profiles via ldap' + 'lucene: full-text search engine library for Java needed in the help section' + 'sane: for scanner access' + 'unixodbc: adds ODBC database support' + 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') + backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf) + groups=('libreoffice') + provides=('go-openoffice') + conflicts=('go-openoffice') + replaces=('go-openoffice' 'openoffice-base' 'libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # # remove version in menu entry and make it visible +# sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop +# echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop + + # put configuration files into place + install -dm755 ${pkgdir}/etc/libreoffice + install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ + # install dummy links to make them found by LibO + cd ${pkgdir}/usr/lib/libreoffice/program/ + ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . + cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ + ln -vsf /etc/libreoffice/psprint.conf . + + #fix http://bugs.archlinux.org/task/17656 + find ${pkgdir} -perm 444 -exec ls -lh {} \; + find ${pkgdir} -perm 444 -exec chmod 644 {} \; + find ${pkgdir} -perm 555 -exec ls -lh {} \; + find ${pkgdir} -perm 555 -exec chmod 755 {} \; +} + +package_libreoffice-base() { + pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-calc() { + pkgdesc="Spreadsheet application for LibreOffice." + depends=('libreoffice-common' 'lpsolve' ) + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-draw() { + pkgdesc="Drawing Application for LibreOffice." + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-gnome() { + pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." + depends=('libreoffice-common' 'dbus-glib' 'gtk3') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-impress() { + pkgdesc="Presentation Application for LibreOffice." + depends=('libreoffice-common') + optdepends=('mesa: for the OGLTrans extension') + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-kde4() { + pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." + depends=('libreoffice-common' 'kdelibs') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-math() { + pkgdesc="Equation Editor Applicationfor LibreOffice." + depends=('libreoffice-common') + optdepends=() + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-sdk() { + pkgdesc="Software Development Kit for LibreOffice." + depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # fix ArchLinux LibreOffice installation paths + sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ + -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/sdk," \ + -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ + -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \ + -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ + -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ + -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ + -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \ + -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \ + -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \ + -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ + -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{csh,sh}.in +} + +package_libreoffice-sdk-doc() { + pkgdesc="Software Development Kit documentation for LibreOffice" + depends=('libreoffice-common' 'libreoffice-sdk') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + #fix permissions + find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; +} + +package_libreoffice-writer() { + pkgdesc="Word Processor Applicationfor LibreOffice." + depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') + optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') + backup=() + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-en-US() { + pkgdesc="English (US) language pack for LibreOffice" + #arch=('any') + provides=('openoffice-en-US' 'libreoffice-langpack') + replaces=(openoffice-en-US) + conflicts=(openoffice-en-US) + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-extension-barcode() { + + pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw " + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode + chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode +} + +package_libreoffice-extension-diagram() { + + pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram +} + +package_libreoffice-extension-google-docs() { + + pkgdesc="Google Documents extension for LibreOffice" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs +} + +package_libreoffice-extension-hunart() { + + pkgdesc="Hungarian cross-reference toolbar extension" + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart +} + +#package_libreoffice-extension-lightproof() { + +# pkgdesc="Lightproof extension for LibreOffice" + #arch=('any') +# depends=('libreoffice-common') +# groups=('libreoffice-extensions') + +# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions +# unzip -q ${srcdir}/${pkgbase}-libreoffice-core-$_LOver-${_LOver}/libreoffice-core-$_LOver/libreoffice-${_LOver}/solver/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof +#} + +#package_libreoffice-extension-mysql-connector() { + +# pkgdesc="MySQL Connector extension for LibreOffice" + #arch=('any') +# depends=('libreoffice-common') +# groups=('libreoffice-extensions') + +# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions +# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector +#} + +package_libreoffice-extension-nlpsolver() { + + pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver +} + +package_libreoffice-extension-ct2n() { + + pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates." + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n +} + +package_libreoffice-extension-numbertext() { + + pkgdesc="NUMBERTEXT/MONEYTEXT extensions" + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext +} + +package_libreoffice-extension-oooblogger() { + + pkgdesc="An extensions for blogging" + #arch=('any') + depends=('libreoffice-common' 'coreutils' 'python') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger +} + +package_libreoffice-extension-pdfimport() { + + pkgdesc="This extension allows you to import and modify PDF documents" + depends=('libreoffice-common' 'poppler') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport +} + +package_libreoffice-extension-presenter-screen() { + + pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen +} + +package_libreoffice-extension-presentation-minimizer() { + + pkgdesc="This extension reduce the file size of the current presentation" + depends=('libreoffice-common' 'gcc-libs') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer +} + +package_libreoffice-extension-report-builder() { + + pkgdesc="This extension creates smart-looking database reports" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder +} + +package_libreoffice-extension-scripting-beanshell() { + + pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell +} + +package_libreoffice-extension-scripting-javascript() { + + pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript +} + +package_libreoffice-extension-scripting-python() { + + pkgdesc="LibreOffice extension - Enables support for scripts in Python" + depends=('libreoffice-common' 'python') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python +} + +package_libreoffice-extension-typo() { + + pkgdesc="Typography toolbar extension" + #arch=('any') + depends=('libreoffice-common') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo + find ${pkgdir} -type d -exec chmod 755 {} \; + #chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo +} + +package_libreoffice-extension-validator() { + + pkgdesc="Validator extension for LibreOffice" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator +} + +package_libreoffice-extension-wiki-publisher() { + + pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher +} + +package_libreoffice-extension-watch-window() { + + pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen." + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window +} diff --git a/extra/libreoffice/gcc462_buildfix.diff b/extra/libreoffice/gcc462_buildfix.diff new file mode 100644 index 000000000..c19e520dc --- /dev/null +++ b/extra/libreoffice/gcc462_buildfix.diff @@ -0,0 +1,138 @@ +--- ./framework/source/accelerators/acceleratorcache.cxx.orig 2011-12-15 15:08:41.329168423 -0200 ++++ ./framework/source/accelerators/acceleratorcache.cxx 2011-12-15 15:17:59.473190664 -0200 +@@ -61,7 +61,7 @@ AcceleratorCache::AcceleratorCache() + AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy) + : ThreadHelpBase(&Application::GetSolarMutex()) + { +- m_lCommand2Keys = rCopy.m_lCommand2Keys; ++ m_lCommand2Keys = const_cast< framework::BaseHash >& > (rCopy.m_lCommand2Keys); + m_lKey2Commands = rCopy.m_lKey2Commands; + } + +@@ -78,7 +78,7 @@ void AcceleratorCache::takeOver(const Ac + // SAFE -> ---------------------------------- + WriteGuard aWriteLock(m_aLock); + +- m_lCommand2Keys = rCopy.m_lCommand2Keys; ++ m_lCommand2Keys = const_cast< framework::BaseHash >& > (rCopy.m_lCommand2Keys); + m_lKey2Commands = rCopy.m_lKey2Commands; + + aWriteLock.unlock(); +--- ./framework/source/loadenv/loadenv.cxx.orig 2011-12-15 15:08:15.771487938 -0200 ++++ ./framework/source/loadenv/loadenv.cxx 2011-12-15 15:19:06.038358483 -0200 +@@ -255,7 +255,8 @@ void LoadEnv::initializeLoading(const :: + // take over all new parameters. + m_xTargetFrame.clear(); + m_xBaseFrame = xBaseFrame ; +- m_lMediaDescriptor = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor); ++ ::comphelper::MediaDescriptor tmp = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor); ++ m_lMediaDescriptor = tmp; + m_sTarget = sTarget ; + m_nSearchFlags = nSearchFlags ; + m_eFeature = eFeature ; +--- ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx.orig 2011-12-15 15:08:49.033072112 -0200 ++++ ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx 2011-12-15 15:11:07.209344668 -0200 +@@ -175,6 +175,15 @@ namespace framework + sal_Int16 nElementType; + UIElementDataHashMap aElementsHashMap; + com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; ++ UIElementType& operator=(const UIElementType& rRight) { ++ bModified = rRight.bModified; ++ bLoaded = rRight.bLoaded; ++ bDefaultLayer = rRight.bDefaultLayer; ++ nElementType = rRight.nElementType; ++ aElementsHashMap = rRight.aElementsHashMap; ++ xStorage = rRight.xStorage; ++ return *this; ++ }; + }; + + typedef ::std::vector< UIElementType > UIElementTypesVector; +--- ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx.orig 2011-12-19 11:10:56.000000000 +0000 ++++ ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx 2011-12-19 11:12:06.000000000 +0000 +@@ -185,6 +185,15 @@ namespace framework + sal_Int16 nElementType; + UIElementDataHashMap aElementsHashMap; + com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; ++ UIElementType& operator=(const UIElementType& rRight) { ++ bModified = rRight.bModified; ++ bLoaded = rRight.bLoaded; ++ bDefaultLayer = rRight.bDefaultLayer; ++ nElementType = rRight.nElementType; ++ aElementsHashMap = rRight.aElementsHashMap; ++ xStorage = rRight.xStorage; ++ return *this; ++ }; + }; + + typedef ::std::vector< UIElementType > UIElementTypesVector; +--- ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx.orig 2011-12-19 11:14:17.000000000 +0000 ++++ ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx 2011-12-19 11:15:16.000000000 +0000 +@@ -171,6 +171,15 @@ namespace framework + sal_Int16 nElementType; + UIElementDataHashMap aElementsHashMap; + com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; ++ UIElementType& operator=(const UIElementType& rRight) { ++ bModified = rRight.bModified; ++ bLoaded = rRight.bLoaded; ++ bDefaultLayer = rRight.bDefaultLayer; ++ nElementType = rRight.nElementType; ++ aElementsHashMap = rRight.aElementsHashMap; ++ xStorage = rRight.xStorage; ++ return *this; ++ }; + }; + + typedef ::std::vector< UIElementType > UIElementTypesVector; + +--- ./padmin/source/prtsetup.cxx.orig 2011-12-15 15:09:05.133870823 -0200 ++++ ./padmin/source/prtsetup.cxx 2011-12-15 15:13:55.626239170 -0200 +@@ -813,7 +813,7 @@ extern "C" { + + if( aDialog.Execute() ) + { +- rJobData = aDialog.getSetup(); ++ rJobData = const_cast< ::psp::PrinterInfo & > ( aDialog.getSetup() ); + nRet = 1; + } + +--- ./sfx2/source/doc/guisaveas.cxx.orig 2011-12-15 15:08:58.332955848 -0200 ++++ ./sfx2/source/doc/guisaveas.cxx 2011-12-15 15:12:39.953185212 -0200 +@@ -731,7 +731,7 @@ sal_Int8 ModelData_Impl::CheckFilter( co + if ( aFilterName.getLength() ) + m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps; + +- aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps ); ++ aFiltPropsHM << aFilterProps; + nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 ); + } + +--- ./framework/inc/classes/filtercachedata.hxx.orig 2011-12-17 13:14:22.102898902 +0000 ++++ ./framework/inc/classes/filtercachedata.hxx 2011-12-17 13:17:51.524424012 +0000 +@@ -230,7 +230,7 @@ + { + bPreferred = rCopy.bPreferred ; + sName = rCopy.sName ; +- lUINames = rCopy.lUINames ; ++ lUINames = const_cast < framework::BaseHash& > (rCopy.lUINames); + sMediaType = rCopy.sMediaType ; + sClipboardFormat = rCopy.sClipboardFormat; + nDocumentIconID = rCopy.nDocumentIconID ; +@@ -298,7 +298,7 @@ + nOrder = rCopy.nOrder ; + sName = rCopy.sName ; + sType = rCopy.sType ; +- lUINames = rCopy.lUINames ; ++ lUINames = const_cast < framework::BaseHash& > (rCopy.lUINames); + sDocumentService = rCopy.sDocumentService ; + sFilterService = rCopy.sFilterService ; + sUIComponent = rCopy.sUIComponent ; +@@ -405,7 +405,7 @@ + inline Loader& impl_copy( const Loader& rCopy ) + { + sName = rCopy.sName ; +- lUINames = rCopy.lUINames ; ++ lUINames = const_cast < framework::BaseHash& > (rCopy.lUINames); + lTypes = rCopy.lTypes ; + return (*this); + } diff --git a/extra/mono-tools/PKGBUILD b/extra/mono-tools/PKGBUILD index fef384dfd..a7dc49bf1 100644 --- a/extra/mono-tools/PKGBUILD +++ b/extra/mono-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 111524 2011-02-27 11:44:42Z daniel $ +# $Id: PKGBUILD 145315 2011-12-21 19:09:51Z daniel $ # Maintainer: Daniel Isenmann # Contributor: Brice Carpentier @@ -11,28 +11,28 @@ pkgname=mono-tools pkgver=2.10 -pkgrel=1 +pkgrel=2 pkgdesc="collection of testing and development tools for use with mono (including monodoc browser)" arch=(i686 x86_64) license=('GPL') url="http://www.mono-project.com/" -depends=('mono>=2.10.1' 'desktop-file-utils' 'gnome-desktop-sharp>=2.26.0' 'gluezilla') -makedepends=('gecko-sharp-2.0>=0.13') +depends=('libgnome-sharp' 'gtkhtml-sharp') +makedepends=('gconf-sharp') install=$pkgname.install -source=(http://ftp.novell.com/pub/mono/sources/$pkgname/$pkgname-$pkgver.tar.bz2) +source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('da178df2c119c696c08c09dc9eb01994') build() { # get rid of that .wapi errors; thanks to brice export MONO_SHARED_DIR="${startdir}/src/weird" mkdir -p "${MONO_SHARED_DIR}" - - cd ${startdir}/src/${pkgname}-${pkgver} - aclocal || return 1 - autoconf || return 1 - automake || return 1 - #sed -i 's:^Exec=.*$:Exec=/usr/bin/monodoc:' docbrowser/monodoc.desktop.in - ./configure --prefix=/usr || return 1 - make || return 1 - make GACUTIL="/usr/bin/gacutil /root ${startdir}/pkg/usr/lib" DESTDIR=${startdir}/pkg install || return 1 + cd "$srcdir/$pkgname-$pkgver" + autoreconf -fi + ./configure --prefix=/usr + make } + +package() { + cd "$srcdir/$pkgname-$pkgver" + make GACUTIL="/usr/bin/gacutil /root $pkgdir/usr/lib" DESTDIR="$pkgdir" install + } diff --git a/extra/mono-tools/mono-tools.install b/extra/mono-tools/mono-tools.install index 03f6f2f7e..d4891227b 100644 --- a/extra/mono-tools/mono-tools.install +++ b/extra/mono-tools/mono-tools.install @@ -1,9 +1,6 @@ post_install() { - # diable for a while maybe we can implement something in pacman to make it faster - #echo "creating index ... this could take a up to several minutes ..." - #monodoc --make-search-index > /dev/null 2>&1 - echo "update desktop mime database..." - update-desktop-database -q + echo "update icon cache..." + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } @@ -23,8 +20,8 @@ post_remove() { echo "removing index..." rm -f /usr/lib/monodoc/monodoc.index rm -rf /usr/lib/monodoc/search_index - echo "update desktop mime database..." - update-desktop-database -q + echo "update icon cache..." + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } # vim: ft=sh diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index a160a6193..d72219365 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,16 +1,16 @@ # Maintainer: Daniel Isenmann pkgname=monodevelop-debugger-gdb -pkgver=2.8.4.2 +pkgver=2.8.5 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64') url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=2.8.4.2' 'gdb') +depends=('monodevelop>=2.8.5' 'gdb') makedepends=('mono') source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('4c081b6d85ffe36389a3b06da37dcbe4') +md5sums=('57e7c32ba204e69f7d0d3c56e202d0ed') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index a14ee1aab..56d0b0861 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -3,17 +3,17 @@ # Contributor: Giovanni Scafora pkgname=monodevelop -pkgver=2.8.4.2 +pkgver=2.8.5 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" arch=('i686' 'x86_64') -url="http://www.monodevelop.org" +url="http://www.monodevelop.com" license=('GPL') depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.10') options=(!makeflags) install=monodevelop.install source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('276fb75e2ffa4cf41fd609caa74dc276') +md5sums=('c1d6a32330b4c22980052009de702483') build() { export MONO_SHARED_DIR=$srcdir/src/.wabi diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 1c2d78b6d..c18cbde3b 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144087 2011-12-03 09:31:31Z schiv $ +# $Id: PKGBUILD 145287 2011-12-21 06:58:54Z schiv $ # Maintainer: Ray Rashif # Contributor: Tobias Powalowski @@ -7,7 +7,7 @@ pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.3.1_a _realver=2.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 81688e917..f8f817316 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143816 2011-11-29 13:33:39Z stephane $ +# $Id: PKGBUILD 145339 2011-12-21 20:47:24Z andrea $ # Maintainer: Pierre Schmitz pkgbase=php @@ -23,7 +23,7 @@ pkgname=('php' 'php-xsl') pkgver=5.3.8 _suhosinver=5.3.7-0.9.10 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index c66e95410..e6a2ab294 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141387 2011-10-30 11:14:12Z andrea $ +# $Id: PKGBUILD 145329 2011-12-21 20:47:08Z andrea $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Douglas Soares de Andrade @@ -7,12 +7,12 @@ pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') pkgver=4.8.6 -pkgrel=1 +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') + 'python-opengl' 'qt-assistant-compat' 'qtwebkit') source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") md5sums=('9bfd7b08b8e438b83cc50d5c58191f97') @@ -44,21 +44,21 @@ build() { } package_pyqt(){ - pkgdesc="A set of Python bindings for the Qt toolkit" - depends=('qt' 'python-sip') + pkgdesc="A set of Python 3.x bindings for the Qt toolkit" + depends=('qtwebkit' 'python-sip') optdepends=('phonon: enable audio and video in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') replaces=('python-qt') provides=('python-qt') - + cd "${srcdir}/PyQt-x11-gpl-${pkgver}" # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install } package_python2-pyqt(){ - pkgdesc="PyQt: A set of Python2 bindings for the Qt toolkit" + pkgdesc="A set of Python 2.x bindings for the Qt toolkit" depends=('pyqt' 'python2-sip' 'dbus-python') optdepends=('phonon: enable audio and video in PyQt applications' 'python-opengl: enable OpenGL 3D graphics in PyQt applications' @@ -66,6 +66,7 @@ package_python2-pyqt(){ 'qt-assistant-compat: add PyQt online help in Qt Assistant') replaces=('python2-qt') provides=('python2-qt') + options=('!emptydirs') cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 0610b2920..2edcd2cea 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,88 +1,66 @@ -# $Id: PKGBUILD 137970 2011-09-13 10:37:07Z andrea $ +# $Id: PKGBUILD 145319 2011-12-21 20:46:53Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgbase=qt pkgname=('qt' 'qt-private-headers') -pkgver=4.7.4 -pkgrel=3 +pkgver=4.8.0 +pkgrel=2 arch=('i686' 'x86_64') -url='http://qt.nokia.com/' +url='http://qt-project.org/' license=('GPL3' 'LGPL') makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2') options=('!libtool') -_pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" +_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" +source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop' - 'blacklist-diginotar-certs.diff') -md5sums=('9831cf1dfa8d0689a06c2c54c5c65aaf' + 'qtconfig.desktop') +md5sums=('e8a5fdbeba2927c948d9f477a6abe904' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' - '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'd875a2a7639de3bd63dc519c13b4d069') + '6b771c8a81dd90b45e8a79afa0e5bbfd') build() { - unset QMAKESPEC - export QT4DIR=$srcdir/$_pkgfqn - export PATH=${QT4DIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + cd "${srcdir}"/${_pkgfqn} - # FS#24601 - export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" + export QT4DIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - cd $srcdir/$_pkgfqn + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf - patch -p1 -i "${srcdir}"/blacklist-diginotar-certs.diff - - sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf - sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf - sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf - - ./configure -confirm-license -opensource \ - -prefix /usr \ - -docdir /usr/share/doc/qt \ - -plugindir /usr/lib/qt/plugins \ - -importdir /usr/lib/qt/imports \ - -datadir /usr/share/qt \ - -translationdir /usr/share/qt/translations \ - -sysconfdir /etc \ - -examplesdir /usr/share/doc/qt/examples \ - -demosdir /usr/share/doc/qt/demos \ - -largefile \ - -plugin-sql-{psql,mysql,sqlite,odbc} \ - -system-sqlite \ - -xmlpatterns \ - -no-phonon \ - -no-phonon-backend \ - -svg \ - -webkit \ - -script \ - -scripttools \ - -system-zlib \ - -system-libtiff \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ - -nomake demos \ - -nomake examples \ - -nomake docs \ - -no-rpath \ - -openssl-linked \ - -silent \ - -optimized-qmake \ - -dbus \ - -reduce-relocations \ - -no-separate-debug-info \ - -gtkstyle \ - -opengl \ - -no-openvg \ - -glib - make + ./configure -confirm-license -opensource \ + -prefix /usr \ + -docdir /usr/share/doc/qt \ + -plugindir /usr/lib/qt/plugins \ + -importdir /usr/lib/qt/imports \ + -datadir /usr/share/qt \ + -translationdir /usr/share/qt/translations \ + -sysconfdir /etc \ + -examplesdir /usr/share/doc/qt/examples \ + -demosdir /usr/share/doc/qt/demos \ + -plugin-sql-{psql,mysql,sqlite,odbc} \ + -system-sqlite \ + -no-phonon \ + -no-phonon-backend \ + -no-webkit \ + -graphicssystem raster \ + -openssl-linked \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -silent \ + -no-rpath \ + -optimized-qmake \ + -reduce-relocations \ + -dbus-linked \ + -no-openvg + make } package_qt() { @@ -91,51 +69,58 @@ package_qt() { 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' - 'unixodbc: ODBC driver' - 'libxinerama: Xinerama support' - 'libxcursor: Xcursor support' - 'libxfixes: Xfixes support') + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support') install='qt.install' - - cd $srcdir/$_pkgfqn - make INSTALL_ROOT=$pkgdir install - # install missing icons and desktop files - for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do - size=$(echo $(basename ${icon}) | cut -d- -f2) - install -p -D -m644 ${icon} ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png - done - install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png - install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png - install -p -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png - install -d ${pkgdir}/usr/share/applications - install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/ + cd "${srcdir}"/${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install + + # install missing icons and desktop files + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -D -m644 ${icon} \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" + done + install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \ + "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png" + install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" + install -p -D -m644 tools/designer/src/designer/images/designer.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" + install -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \ + "${pkgdir}/usr/share/applications/" + + # install license addition + install -D -m644 LGPL_EXCEPTION.txt \ + ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt - # install license addition - install -D -m644 LGPL_EXCEPTION.txt ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt + # Fix wrong path in pkgconfig files + find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; - # Fix wrong path in pkgconfig files - find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \ - -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; - # Fix wrong path in prl files - find ${pkgdir}/usr/lib -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; } package_qt-private-headers(){ pkgdesc="Qt private headers for development" depends=("qt=${pkgver}") - install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} - install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script} + install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} + install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script} for i in QtCore QtDeclarative QtGui QtScript; do - cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \ - ${pkgdir}/usr/include/${i}/ + cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \ + "${pkgdir}"/usr/include/${i}/ done for i in corelib declarative gui script; do - cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/ + cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/ done } diff --git a/extra/qt/qt.install b/extra/qt/qt.install index 81ce5c4b0..5495fb1b5 100644 --- a/extra/qt/qt.install +++ b/extra/qt/qt.install @@ -1,12 +1,12 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-desktop-database -q } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index c0e86f867..c0e85d265 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,55 +1,45 @@ -# $Id: PKGBUILD 123699 2011-05-12 15:47:03Z andrea $ -# Maintainer: -# Contributor: Tobias Powalowski -# Contributor: John Proctor +# $Id: PKGBUILD 145341 2011-12-21 20:47:33Z andrea $ +# Maintainer: Eric Bélanger pkgname=qt3 pkgver=3.3.8 -pkgrel=20 +pkgrel=21 pkgdesc="The QT3 gui toolkit" arch=('i686' 'x86_64') -license=('GPL') url="http://www.trolltech.com/products/qt/index.html" -pkgfqn=qt-x11-free-${pkgver} -install=qt.install +license=('GPL') depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft' 'libxrandr' 'libmng') makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3') optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') -source=("ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2" - qt3-png14.patch - qt.profile - qt-copy-kde-patches.tar.bz2 - qt-patches.tar.bz2 - utf8-bug-qt3.diff - qt-font-default-subst.diff - mysql.patch - eastern_asian_languagues.diff - qt-odbc.patch - gcc-4.6.patch) -options=(!libtool) -md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85' - '1dc671df42b9030dbdf68bb61cd3375e' - 'f72d1eb4eb49b9a9467c1f6035194266' - 'f2a2dbdbfee9422c90efc3ef3f86197c' - '2f00e5c0c1e2c2a23dddc982cd79f3e0' - 'f6b3b39040f2b8f19ba1cf1445468c28' - '9370d82e85f2c799335ed0dcc1d53189' - '7d40ed1bd40d33d8b9b27a2076a5d22a' - '616f1f3029cf8375256ad6a406de3549' - '2178ca88dfd75a230918593b30eb0dbe' - '75177de5b08e1efd437c887c6e606c5b') +options=('!libtool') +install=qt.install +source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.bz2 + qt.profile qt3-png14.patch qt-copy-kde-patches.tar.bz2 + qt-patches.tar.bz2 utf8-bug-qt3.diff qt-font-default-subst.diff + mysql.patch eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) +sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7' + 'd2e257a9011208b2cb81b9cf47915b9a2f9dab83' + 'c8ea644266f4d6d6be9adf894f03138b8eca3fc2' + '9cb2e5bec782069692ee337cfa171539d9d73753' + '116afa0e737bdf27ea27f9b3653aeb56db9ec151' + 'ca5ecb29c7f1c826d48703339a3371038e306bb7' + 'd928ff55adb52c4bab2fb268df022651551cd70c' + 'bb6aad81cce143c23ff7840b1d79f6b2007a0c04' + '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17' + '1346320614f6f86fbeb10b9fbad721dea29f5b61' + 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f') # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ # other qt-patches come from fedora and gentoo build() { unset QMAKESPEC - export QTDIR="${srcdir}"/$pkgfqn + export QTDIR="${srcdir}"/qt-x11-free-${pkgver} export PATH=${QTDIR}/bin:${PATH} export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} export QMAKESPEC=$QTDIR/mkspecs/linux-g++ - cd "${srcdir}"/$pkgfqn + cd "${srcdir}"/qt-x11-free-${pkgver} # apply qt patches from kde.org for i in ../qt-copy-kde-patches/*; do patch -Np0 -i $i @@ -105,30 +95,30 @@ build() { -plugin-sql-{mysql,psql,sqlite,odbc} # fix /opt/qt/lib path - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/src/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/designer/designer/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/designer/editor/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/assistant/lib/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/designer/uilib/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile - cd "${srcdir}"/$pkgfqn + cd "${srcdir}"/qt-x11-free-${pkgver} make -C qmake - cd "${srcdir}"/$pkgfqn/plugins/src/sqldrivers/mysql - "${srcdir}"/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro - cd "${srcdir}"/$pkgfqn/plugins/src/sqldrivers/psql - "${srcdir}"/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro + cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql + "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro + cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql + "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro - cd "${srcdir}"/$pkgfqn + cd "${srcdir}"/qt-x11-free-${pkgver} # fix the broken makefiles #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile make } package() { - cd "${srcdir}"/$pkgfqn + cd "${srcdir}"/qt-x11-free-${pkgver} make INSTALL_ROOT="${pkgdir}" install rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations} - sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl + sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config @@ -136,7 +126,7 @@ package() { # install man pages install -d -m755 "${pkgdir}"/opt/qt/man - cp -r "${srcdir}"/$pkgfqn/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/ + cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/ install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD new file mode 100644 index 000000000..6bc242b15 --- /dev/null +++ b/extra/qtwebkit/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 145321 2011-12-21 20:46:56Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=qtwebkit +pkgver=2.2.0 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://trac.webkit.org/wiki/QtWebKit' +pkgdesc='An open source web browser engine (Qt port)' +license=('LGPL2.1' 'GPL3') +depends=('qt' 'gperf' 'bison' 'phonon' 'gstreamer0.10-base') +makedepends=('python2' 'mesa' 'chrpath') +conflicts=('qt<4.8') +source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz" + 'python2-path.patch') +sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7' + 'b0ef3d5596171e3900a685df9bcfac3068ad6330') + +build() { + cd "${srcdir}"/QtWebKit-${pkgver} + + patch -p1 -i "${srcdir}"/python2-path.patch + + cd Tools/Scripts + ./build-webkit --qt \ + --prefix=/usr \ + --makeargs="${MAKEFLAGS}" \ + --release \ + --3d-canvas +} + +package() { + cd "${srcdir}"/QtWebKit-${pkgver} + make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install + + # Fix RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so +} diff --git a/extra/qtwebkit/python2-path.patch b/extra/qtwebkit/python2-path.patch new file mode 100644 index 000000000..2e270e6fc --- /dev/null +++ b/extra/qtwebkit/python2-path.patch @@ -0,0 +1,29 @@ +--- QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro~ 2011-10-20 22:39:56.044519075 +0000 ++++ QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro 2011-10-20 22:41:21.302047082 +0000 +@@ -88,5 +88,5 @@ + retgen.output = $$JSC_GENERATED_SOURCES_DIR/RegExpJitTables.h + retgen.wkScript = $$PWD/create_regex_tables + retgen.input = retgen.wkScript +-retgen.commands = python $$retgen.wkScript > ${QMAKE_FILE_OUT} ++retgen.commands = python2 $$retgen.wkScript > ${QMAKE_FILE_OUT} + addExtraCompiler(retgen) +--- QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri~ 2011-10-20 22:44:23.827225580 +0000 ++++ QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri 2011-10-20 22:44:38.550707819 +0000 +@@ -640,7 +640,7 @@ + inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl + inspectorJSON.input = INSPECTOR_JSON + inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl +-inspectorJSON.commands = python $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json ++inspectorJSON.commands = python2 $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json + inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl + inspectorJSON.wkAddOutputToSources = false + addExtraCompiler(inspectorJSON) +@@ -723,7 +723,7 @@ + entities.output = $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp + entities.input = HTML_ENTITIES + entities.wkScript = $$PWD/html/parser/create-html-entity-table +-entities.commands = python $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES ++entities.commands = python2 $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES + entities.clean = ${QMAKE_FILE_OUT} + entities.depends = $$PWD/html/parser/create-html-entity-table + addExtraCompiler(entities) diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD index 39211e051..33ceed668 100644 --- a/extra/redland/PKGBUILD +++ b/extra/redland/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144346 2011-12-04 21:50:29Z eric $ +# $Id: PKGBUILD 145343 2011-12-21 20:47:36Z andrea $ # Maintainer: AndyRTR # Contributor: Francois Charette @@ -6,16 +6,17 @@ pkgbase=redland epoch=1 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') pkgver=1.0.15 -pkgrel=1 +pkgrel=2 url="http://librdf.org/" license=("GPL") arch=('i686' 'x86_64') makedepends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') options=('!libtool') -source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz +source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc} rpath.diff) -md5sums=('b0deb87f3c7d3237a3d587c1e0f2f266' - 'acc85e784f01a656bd56777f95880787') +sha1sums=('e93d6fafaeebdf9f15a1044be6f4a88270f007af' + '3aeef38a7247ae33db6a0a19511ef4132240164b' + 'f5db05c925b6bcd6402d5abd75c648b137f069c7') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -34,7 +35,7 @@ build() { package_redland() { pkgdesc="Library that provides a high-level interface to RDF data" - depends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'libtool') + depends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'libltdl') cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/unixodbc/PKGBUILD b/extra/unixodbc/PKGBUILD index fa76fd234..36a06ccae 100644 --- a/extra/unixodbc/PKGBUILD +++ b/extra/unixodbc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137809 2011-09-11 11:42:08Z pierre $ +# $Id: PKGBUILD 145345 2011-12-21 20:47:39Z andrea $ # Maintainer: AndyRTR # Contributor: Judd Vinet # Contributor: Tom Newsom pkgname=unixodbc -pkgver=2.3.0 -pkgrel=2 +pkgver=2.3.1 +pkgrel=1 pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources" arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') @@ -14,7 +14,7 @@ backup=('etc/odbc.ini' 'etc/odbcinst.ini') depends=('readline' 'libltdl') options=('!libtool') source=("http://www.unixodbc.org/unixODBC-$pkgver.tar.gz") -md5sums=('f2ad22cbdffe836c58987ed2332c2e99') +md5sums=('86788d4006620fa1f171c13d07fdcaab') build() { cd ${srcdir}/unixODBC-${pkgver} diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index b148f188f..616bba0aa 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 142354 2011-11-08 18:38:40Z ibiru $ +# $Id: PKGBUILD 145292 2011-12-21 10:20:13Z ibiru $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xulrunner -pkgver=8.0 -_ffoxver=8.0 -pkgrel=2 +pkgver=9.0 +pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx') -makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') +depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa') url="http://wiki.mozilla.org/XUL:Xul_Runner" -source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2 +source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/firefox-$pkgver.source.tar.bz2 mozconfig mozilla-pkgconfig.patch) options=('!emptydirs') replaces=('xulrunner-oss') -md5sums=('9395a5be13da119bd8d53c3225e5d17c' +md5sums=('d8d0c8c79660752b02d9e9ab69a68f94' '8dfb78c5bd0581c8cf4753813132bf0b' - '639ea80e823543dd415b90c0ee804186') + '27271ce647a83906ef7a24605e840d61') build() { cd "$srcdir/mozilla-release" @@ -27,7 +26,8 @@ build() { #fix libdir/sdkdir - fedora patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" + export PYTHON="/usr/bin/python2" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" } @@ -36,10 +36,17 @@ package() { cd "$srcdir/mozilla-release" make -j1 -f client.mk DESTDIR="$pkgdir" install + rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" + # add xulrunner library path to ld.so.conf install -d $pkgdir/etc/ld.so.conf.d echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/header.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/typelib.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpidl.py" } diff --git a/extra/xulrunner/mozilla-pkgconfig.patch b/extra/xulrunner/mozilla-pkgconfig.patch index 2203efcde..037d4aee0 100644 --- a/extra/xulrunner/mozilla-pkgconfig.patch +++ b/extra/xulrunner/mozilla-pkgconfig.patch @@ -1,6 +1,6 @@ -diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-2.0/xulrunner/installer/libxul-embedding.pc.in ---- mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in 2011-03-03 14:12:04.000000000 -0800 -+++ mozilla-2.0/xulrunner/installer/libxul-embedding.pc.in 2011-03-13 03:25:12.350027359 -0700 +diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 ++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 @@ -6,5 +6,6 @@ Name: libxul-embedding Description: Static library for version-independent embedding of the Mozilla runtime @@ -8,9 +8,9 @@ diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-2. +Requires: %NSPR_NAME% >= %NSPR_VERSION% Libs: -L${sdkdir}/lib -lxpcomglue -ldl Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% -diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul.pc.in mozilla-2.0/xulrunner/installer/libxul.pc.in ---- mozilla-2.0.orig/xulrunner/installer/libxul.pc.in 2011-03-03 14:12:04.000000000 -0800 -+++ mozilla-2.0/xulrunner/installer/libxul.pc.in 2011-03-13 03:25:28.010027359 -0700 +diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 @@ -1,5 +1,6 @@ prefix=%prefix% sdkdir=%sdkdir% @@ -18,10 +18,10 @@ diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul.pc.in mozilla-2.0/xulrunne includedir=%includedir% idldir=%idldir% -diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner/installer/Makefile.in ---- mozilla-2.0.orig/xulrunner/installer/Makefile.in 2011-03-03 14:12:04.000000000 -0800 -+++ mozilla-2.0/xulrunner/installer/Makefile.in 2011-03-13 03:25:55.570027359 -0700 -@@ -121,6 +121,7 @@ +diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in +--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 +@@ -108,6 +108,7 @@ -e "s|%includedir%|$(includedir)|" \ -e "s|%idldir%|$(idldir)|" \ -e "s|%sdkdir%|$(sdkdir)|" \ @@ -29,29 +29,9 @@ diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ -diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in ---- mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2011-03-03 14:12:04.000000000 -0800 -+++ mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2011-03-13 03:26:18.676694023 -0700 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz -diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed.pc.in ---- mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in 2011-03-03 14:12:04.000000000 -0800 -+++ mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed.pc.in 2011-03-13 03:26:41.566694025 -0700 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz -diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-js.pc.in mozilla-2.0/xulrunner/installer/mozilla-js.pc.in ---- mozilla-2.0.orig/xulrunner/installer/mozilla-js.pc.in 2011-03-03 14:12:04.000000000 -0800 -+++ mozilla-2.0/xulrunner/installer/mozilla-js.pc.in 2011-03-13 03:27:19.680027357 -0700 +diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in +--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 @@ -7,4 +7,4 @@ Version: %MOZILLA_VERSION% Requires: %NSPR_NAME% >= %NSPR_VERSION% diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 13ca6ef04..ed7a13eec 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 60679 2011-12-16 21:33:44Z svenstaro $ +# $Id: PKGBUILD 61067 2011-12-21 20:49:25Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Jan "heftig" Steffens # Contributor: Eduardo Romero @@ -6,7 +6,7 @@ pkgname=wine pkgver=1.3.35 -pkgrel=1 +pkgrel=3 _pkgbasever=${pkgver/rc/-rc} @@ -89,6 +89,10 @@ build() { rm -rf $pkgname-{32,64}-build mkdir $pkgname-32-build + # These additional CFLAGS solve FS#27662 + export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" + export CXXFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" + if [[ $CARCH == x86_64 ]]; then msg2 "Building Wine-64..." diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD index 51022ac0f..7312415f6 100644 --- a/testing/nilfs-utils/PKGBUILD +++ b/testing/nilfs-utils/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 145060 2011-12-15 22:33:56Z ibiru $ +# $Id: PKGBUILD 145311 2011-12-21 18:00:02Z ibiru $ # Maintainer : Ionut Biru # Contributor: Geoffroy Carrier pkgname=nilfs-utils pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" arch=('i686' 'x86_64') url="http://www.nilfs.org/" license=('GPL2' 'LGPL2.1') backup=('etc/nilfs_cleanerd.conf') -depends=('util-linux-ng') +depends=('util-linux') options=(!libtool) source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) md5sums=('738f7bee062051c14dcff444bb17ada7') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --libdir=/lib + ./configure --libdir=/lib --enable-libmount make } -- cgit v1.2.3-54-g00ecf