From cbcf42aba84733e1b9072f5320519c99bf8c0ac7 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 10 Oct 2011 23:14:36 +0000 Subject: Mon Oct 10 23:14:36 UTC 2011 --- extra/empathy/PKGBUILD | 6 +-- extra/gtksourceview3/PKGBUILD | 6 +-- extra/kdelibs/PKGBUILD | 12 ++++-- extra/kdelibs/kdelibs-nepomuk-unicode.diff | 65 ++++++++++++++++++++++++++++++ extra/libtorrent-rasterbar/PKGBUILD | 6 +-- extra/lsof/PKGBUILD | 8 ++-- extra/mkvtoolnix/PKGBUILD | 6 +-- extra/python-geoip/PKGBUILD | 9 +++-- extra/python-m2crypto/PKGBUILD | 15 +++---- extra/transmission/PKGBUILD | 19 +++++---- 10 files changed, 109 insertions(+), 43 deletions(-) create mode 100644 extra/kdelibs/kdelibs-nepomuk-unicode.diff (limited to 'extra') diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index a3388e231..66e51cd45 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139245 2011-10-01 18:56:30Z ibiru $ +# $Id: PKGBUILD 140214 2011-10-09 19:40:31Z ibiru $ # Maintainer: Ionut Biru pkgname=empathy -pkgver=3.2.0 +pkgver=3.2.0.1 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ options=('!libtool') groups=('gnome-extra') install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0c55d8603ab2f1a4e998dc06bf8a6e48bdb6b02e373ac0d009b3f218fdec9633') +sha256sums=('b11f6f980ce7ae75ddcdbe14bded86c0cc5970181e2257026610a025b75f5512') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index e939d8e3b..eb13f87ee 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139352 2011-10-01 18:59:14Z ibiru $ +# $Id: PKGBUILD 140208 2011-10-09 15:35:36Z ibiru $ # Maintainer: Ionut Biru pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.xz) -sha256sums=('63582fbb25eb756865bfdcc38b2839c80a6bd2388bba8c7edce09aef791c360e') +sha256sums=('979e967a3e8d64512db5f7466ce71431e0fa8a77958275369fd9061e068585a4') build() { cd "${srcdir}/$_pkgbasename-${pkgver}" diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 24ac8c85c..99360d885 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139893 2011-10-05 19:09:04Z andrea $ +# $Id: PKGBUILD 140212 2011-10-09 17:04:53Z ronald $ # Maintainer: Andrea Scarpino pkgname=kdelibs pkgver=4.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -19,10 +19,12 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' replaces=('kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' 'archlinux-menu.patch') + 'kde-applications-menu.patch' 'archlinux-menu.patch' + 'kdelibs-nepomuk-unicode.diff') sha1sums=('4b074633cbf69752fda96018514ee771efe8f18b' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67') + '63a850ab4196b9d06934f2b4a13acd9f7739bc67' + 'e24aae17ef0d83085199ad7c7623afef9919b8ff') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -31,6 +33,8 @@ build() { patch -p1 -i "${srcdir}"/kde-applications-menu.patch # add Archlinux menu entry patch -p1 -i "${srcdir}"/archlinux-menu.patch + # nepomuk unicode character fix + patch -p1 -i "${srcdir}"/kdelibs-nepomuk-unicode.diff cd "${srcdir}" mkdir build diff --git a/extra/kdelibs/kdelibs-nepomuk-unicode.diff b/extra/kdelibs/kdelibs-nepomuk-unicode.diff new file mode 100644 index 000000000..1c85d6fc9 --- /dev/null +++ b/extra/kdelibs/kdelibs-nepomuk-unicode.diff @@ -0,0 +1,65 @@ +diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h +index 055482e..3880e13 100644 +--- a/nepomuk/query/querybuilderdata_p.h ++++ b/nepomuk/query/querybuilderdata_p.h +@@ -32,6 +32,28 @@ + #include "query_p.h" + #include "groupterm_p.h" + ++namespace { ++/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle ++/// utf8 chars which use more than one char, ie. wide chars. ++/// Thus, we simply truncate each term at the first wide char. ++QStringList stripExtendedCharsHack(const QStringList& terms) { ++ QStringList newTerms; ++ foreach(const QString& term, terms) { ++ int i = 0; ++ while(i < term.length()) { ++ if(term[i].unicode() > 0x7f) { ++ break; ++ } ++ ++i; ++ } ++ if(i > 0) { ++ newTerms.append(term.left(i)); ++ } ++ } ++ return newTerms; ++} ++} ++ + namespace Nepomuk { + namespace Query { + class QueryBuilderData +@@ -246,16 +268,23 @@ namespace Nepomuk { + for( QHash::const_iterator it = m_fullTextSearchTerms.constBegin(); + it != m_fullTextSearchTerms.constEnd(); ++it ) { + const QString& varName = it.key(); +- const QStringList& terms = it.value(); +- // bif:search_excerpt wants a vector of all search terms +- excerptParts +- << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)") +- .arg( terms.join(QLatin1String("','")), +- varName ); ++ const QStringList terms = stripExtendedCharsHack(it.value()); ++ if(terms.count()) { ++ // bif:search_excerpt wants a vector of all search terms ++ excerptParts ++ << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)") ++ .arg( terms.join(QLatin1String("','")), ++ varName ); ++ } + } + +- return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_") +- .arg(excerptParts.join(QLatin1String(","))); ++ if(excerptParts.count()) { ++ return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_") ++ .arg(excerptParts.join(QLatin1String(","))); ++ } ++ else { ++ return QString(); ++ } + } + else { + return QString(); \ No newline at end of file diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index b18f3442e..122798148 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134299 2011-08-02 19:50:28Z ibiru $ +# $Id: PKGBUILD 140204 2011-10-09 10:15:48Z ibiru $ # Maintainer : Ionut Biru # Contributor: Hugo Doria pkgname=libtorrent-rasterbar -pkgver=0.15.7 +pkgver=0.15.8 pkgrel=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" @@ -12,7 +12,7 @@ license=('custom') depends=('boost-libs' 'python2') makedepends=('boost') source=(http://libtorrent.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('5ddc5966436f98c146b6aba8595dfe86cecb6724') +sha1sums=('9e21ebfa6fba19b237754a10ae9b8007781c48f0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/lsof/PKGBUILD b/extra/lsof/PKGBUILD index a5e4c8089..a8687fff1 100644 --- a/extra/lsof/PKGBUILD +++ b/extra/lsof/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 115676 2011-03-19 06:54:43Z angvp $ +# $Id: PKGBUILD 140198 2011-10-09 08:36:54Z angvp $ # Maintainer: Angel Velasquez # Contributor: Daniel J Griffiths # Contributor: Aaron Griffin # Contributor: Jochem Kossen pkgname=lsof -pkgver=4.84 -pkgrel=3 +pkgver=4.85 +pkgrel=1 pkgdesc="Lists open files for running Unix processes" arch=('i686' 'x86_64') url="http://people.freebsd.org/~abe/" license=('custom') depends=('glibc') source=(ftp://sunsite.ualberta.ca/pub/Mirror/lsof/${pkgname}_${pkgver}.tar.bz2 license.txt) -md5sums=('a09326df500ef7e4550af546868338d6' +md5sums=('102ee2081172bbe76dccaa6cceda8573' '1b63c76bd10437cabf890508c8e58d36') build() { diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 9388dc481..f7854fc66 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 138691 2011-09-27 16:36:38Z giovanni $ +# $Id: PKGBUILD 140216 2011-10-09 20:54:01Z giovanni $ # Maintainer: Giovanni Scafora pkgname=mkvtoolnix -pkgver=5.0.0 +pkgver=5.0.1 pkgrel=1 pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" depends=('file' 'boost-libs' 'libmatroska' 'lzo2' 'expat' 'flac' 'libvorbis') makedepends=('boost' 'ruby') source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8a8d29c3b0eb202bb32ea44c54aeb83b') +md5sums=('93fbbe946de6013eca699c0c2a93a4e9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD index 0e535d169..2a5fe156e 100644 --- a/extra/python-geoip/PKGBUILD +++ b/extra/python-geoip/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 89623 2010-09-02 16:32:29Z remy $ +# $Id: PKGBUILD 140200 2011-10-09 08:54:48Z angvp $ +# Maintainer: Angel Velasquez # Maintainer: Jan de Groot pkgname=python-geoip -pkgver=1.2.4 -pkgrel=2 +pkgver=1.2.7 +pkgrel=1 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library." arch=(i686 x86_64) url="http://www.maxmind.com/app/python" @@ -12,9 +13,9 @@ depends=('python2' 'geoip') source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-${pkgver}.tar.gz) replaces=('geoip-python') provides=('geoip-python') +md5sums=('df71f5ae7a5c77bbdf726d512b7d67cf') build() { cd ${startdir}/src/GeoIP-Python-${pkgver} python2 setup.py build install --root=${startdir}/pkg } -md5sums=('50f820d854476efaf3b7af733ffe4236') diff --git a/extra/python-m2crypto/PKGBUILD b/extra/python-m2crypto/PKGBUILD index 4e8a1aafb..010da5c82 100644 --- a/extra/python-m2crypto/PKGBUILD +++ b/extra/python-m2crypto/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 87898 2010-08-18 16:12:44Z ibiru $ -# Maintainer: +# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ +# Maintainer: Angel Velasquez # Contributor: Sergej Pupykin # Contributor: William Rea pkgname=python-m2crypto -pkgver=0.20.2 -pkgrel=3 +pkgver=0.21.1 +pkgrel=1 pkgdesc="A crypto and SSL toolkit for Python" arch=('i686' 'x86_64') url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" license=('BSD') depends=('python2' 'openssl') makedepends=('swig') -source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz" - 'openssl1.patch') -md5sums=('6c24410410d6eb1920ea43f77a93613a' - '80a707ad6610f2871efdf40658e30364') +source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz") +md5sums=('f93d8462ff7646397a9f77a2fe602d17') build() { cd "${srcdir}/M2Crypto-${pkgver}" - patch -Np0 -i ${srcdir}/openssl1.patch python2 setup.py build } diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 5b91d09be..5d41168be 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 132249 2011-07-22 09:01:42Z ibiru $ +# $Id: PKGBUILD 140202 2011-10-09 09:38:10Z ibiru $ # Maintainer : Ionut Biru pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.33 +pkgver=2.41 pkgrel=1 arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" license=('MIT') -makedepends=('gtk2' 'intltool' 'curl' 'libnotify' 'qt' 'libevent' 'libcanberra' 'dbus-glib') +makedepends=('gtk2' 'intltool' 'curl' 'qt' 'libevent') source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.bz2 transmissiond transmissiond.conf) -md5sums=('082217a65713ac879410c622cbe6eb26' +md5sums=('71a7ccf74019283bd4998fa2c57b2fc1' '08875299e3fbb68fc546c1f350ac1f06' 'be39806c35b7544856fa4070b00fc960') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgbase}-2.40" ./configure --prefix=/usr make @@ -29,7 +29,7 @@ package_transmission-cli() { backup=('etc/conf.d/transmissiond') install=transmission-cli.install - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgbase}-2.40" for dir in daemon cli web utils do @@ -43,13 +43,12 @@ package_transmission-cli() { package_transmission-gtk() { pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)" - depends=('curl' 'libevent' 'libnotify' 'desktop-file-utils' 'hicolor-icon-theme' - 'gtk2' 'dbus-glib' 'libcanberra') + depends=('curl' 'libevent' 'gtk2' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('notification-daemon: Desktop notification support' 'transmission-cli: daemon and web support') install=transmission-gtk.install - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgbase}-2.40" make -C gtk DESTDIR="${pkgdir}" install make -C po DESTDIR="${pkgdir}" install @@ -62,7 +61,7 @@ package_transmission-qt() { optdepends=('transmission-cli: daemon and web support') install=transmission-qt.install - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgbase}-2.40" make -C qt INSTALL_ROOT="${pkgdir}"/usr install -- cgit v1.2.3-54-g00ecf