diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/libreoffice/PKGBUILD | 71 | ||||
| -rw-r--r-- | extra/libreoffice/PKGBUILD.36 | 83 | ||||
| -rw-r--r-- | extra/mkvtoolnix/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/swig/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/swig/pyint_fromsize_t.diff | 18 | ||||
| -rw-r--r-- | extra/swig/upstream_r13128.diff | 73 | ||||
| -rw-r--r-- | extra/telepathy-qt/PKGBUILD | 12 |
7 files changed, 205 insertions, 77 deletions
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 8e2755bfa..099f64e0c 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162357 2012-06-25 18:51:18Z foutrelis $ +# $Id: PKGBUILD 163246 2012-07-11 20:12:36Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -21,15 +21,17 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' - 'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built -_LOver=3.5.4.2 -pkgver=3.5.4 -pkgrel=2 + 'libreoffice-extension-scripting-python' + 'libreoffice-extension-wiki-publisher' + 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built +_LOver=3.5.5.3 +pkgver=3.5.5 +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' + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' # 'boost' 'apache-ant' 'gperf' 'poppler>=0.20.1' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' @@ -49,8 +51,8 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" _additional_source_url="http://dev-www.libreoffice.org/src" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - ${_additional_source_url}/2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 -# ${_additional_source_url}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 + ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + ${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.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 @@ -81,9 +83,9 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 fix_broken_hebrew_wordwrapping.diff libreoffice-common.sh libreoffice-common.csh) -noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 -# 90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 +noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip @@ -110,11 +112,12 @@ noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('61afc900785dd7d071b96d9ab0af46f3' - 'd2e7414a60eacafef45fbc4bc1a8ccb3' - '545d1608da2cc736be5c8bf941adbbfb' +md5sums=('ccb80344ae1ac546b3a6b6d85f3ae26a' + '09153713133bddc49af99bd76129e929' + 'c2e66522b8adf0b3fb5789e295129ba9' '18f577b374d60b3c760a3a3350407632' - '2fa6028324347860e684e75310818d43' + 'f02578f5218f217a9f20e9c30e119c6a' + 'a9a1db27688bad49418667b434d29c1f' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -218,6 +221,8 @@ build() { --enable-odk\ --enable-ext-scripting-beanshell \ --enable-ext-scripting-javascript \ + --enable-ext-wiki-publisher \ + --enable-ext-nlpsolver \ --disable-ext-mysql-connector \ --with-system-mysql \ --enable-librsvg=system \ @@ -246,7 +251,7 @@ build() { --without-system-mozilla \ --without-system-mozilla-headers \ --with-ant-home="/usr/share/java/apache-ant"\ - --with-system-boost\ + --without-system-boost\ --with-system-cairo\ --with-system-libs\ --with-system-mythes\ @@ -259,20 +264,8 @@ build() { --with-java-target-version=1.5 \ $EXTRAOPTS -# --disable-ext-lightproof \ - - -#--with-install-dirname="${pkgbase}" -# --enable-cairo\ -# --with-system-libtextcat \ -# --with-external-libtextcat-data \ #--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 make @@ -352,7 +345,7 @@ package_libreoffice-common() { } package_libreoffice-base() { - pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." + pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI." install=libreoffice-base.install depends=('libreoffice-common' 'hsqldb-java') optdepends=('libreoffice-postgresql-connector') @@ -701,3 +694,25 @@ package_libreoffice-extension-scripting-python() { 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-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-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 +} diff --git a/extra/libreoffice/PKGBUILD.36 b/extra/libreoffice/PKGBUILD.36 index 6a3d0fe0d..b5dc0bee1 100644 --- a/extra/libreoffice/PKGBUILD.36 +++ b/extra/libreoffice/PKGBUILD.36 @@ -21,9 +21,11 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' - 'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built -_LOver=3.6.0.0.beta2 -pkgver=3.6.0beta2 + 'libreoffice-extension-scripting-python' + 'libreoffice-extension-wiki-publisher' + 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built +_LOver=3.6.0.0.beta3 +pkgver=3.6.0beta3 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') @@ -32,7 +34,7 @@ makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' + 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' #'saxon' - currently broken # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" @@ -50,8 +52,8 @@ _additional_source_url="http://dev-www.libreoffice.org/src" _additional_source_url2="http://dev-www.libreoffice.org/extern" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - ${_additional_source_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz - ${_additional_source_url}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 + ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + ${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.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 @@ -76,14 +78,14 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 - ${_additional_source_url}/ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz + ${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz ${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll buildfix.diff libreoffice-common.sh libreoffice-common.csh) -noextract=(90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 +noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz + f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip @@ -91,7 +93,7 @@ noextract=(90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 - ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz + 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -111,12 +113,12 @@ noextract=(90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2 db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('97183afb02576d5542a1eda3f29f9517' - '3368bc1adfa9e7d6d6f3ce2cee9e164e' - '7191e46a3f48ad7a7d5a21e985790e6a' +md5sums=('2f471473f405a373e8d9ca5870d3861d' + '0db44b0cc908fe4288d40d3869137d76' + '4b2f46f015c1112f9b65f9ed8ba409b6' '18f577b374d60b3c760a3a3350407632' - '48d647fbd8ef8889e5a7f422c1bfda94' - '90010e213dd25648e70f0cc12f8fed55' + 'f02578f5218f217a9f20e9c30e119c6a' + 'a9a1db27688bad49418667b434d29c1f' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -141,7 +143,7 @@ md5sums=('97183afb02576d5542a1eda3f29f9517' 'ba2930200c9f019c2d93a8c88c651a0f' '0ff7d225d087793c8c2c680d77aac3e7' '6097739c841f671cb21332b9cc593ae7' - 'ce31ac7b92cb5e66459f67213bbb6168' + '0d2dcdfbf28d6208751b33057f5361f0' 'ce5a1def34578b75959ac31210f031f6' '185d60944ea767075d27247c3162b3bc' '234e91ac65945ce1ab1e3839780e90f7' @@ -180,12 +182,12 @@ build() { # python2 fix export PYTHON=python2 - autoconf -f + #autoconf -f # non-SMP test build - export MAKEFLAGS="-j1" + #export MAKEFLAGS="-j1" #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ -# touch autogen.lastrun + ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ --with-unix-wrapper="libreoffice" \ --enable-split-app-modules \ @@ -210,6 +212,8 @@ build() { --enable-odk\ --enable-ext-scripting-beanshell \ --enable-ext-scripting-javascript \ + --enable-ext-wiki-publisher \ + --enable-ext-nlpsolver \ --disable-ext-mysql-connector \ --with-system-mysql \ --enable-librsvg=system \ @@ -240,31 +244,20 @@ build() { --without-system-mozilla \ --without-system-mozilla-headers \ --with-ant-home="/usr/share/apache-ant"\ - --with-system-boost\ + --without-system-boost\ --with-system-cairo\ --with-system-libs\ --with-system-mythes\ --with-system-headers\ --with-system-hsqldb \ --with-alloc=system\ - --without-system-clucene\ + --with-system-clucene\ + --without-system-servlet-api \ --with-java-target-version=1.5 \ $EXTRAOPTS -# --disable-ext-lightproof \ - - -#--with-install-dirname="${pkgbase}" -# --enable-cairo\ -# --with-system-libtextcat \ -# --with-external-libtextcat-data \ #--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 make @@ -349,7 +342,7 @@ package_libreoffice-common() { } package_libreoffice-base() { - pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." + pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI." install=libreoffice-base.install depends=('libreoffice-common' 'hsqldb-java') optdepends=('libreoffice-postgresql-connector') @@ -698,3 +691,25 @@ package_libreoffice-extension-scripting-python() { 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-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-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 +} diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index a513693e7..c79db4501 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160008 2012-05-27 23:45:07Z giovanni $ +# $Id: PKGBUILD 163223 2012-07-11 09:07:08Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: xduugu <xduugu@gmx.com> pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=5.6.0 +pkgver=5.7.0 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -12,7 +12,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('53e96b613752913da800dcde7b65cf6d') +md5sums=('99ea44be570412dadafe4ccaee0cfe6e') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD index d1658694a..e7f999488 100644 --- a/extra/swig/PKGBUILD +++ b/extra/swig/PKGBUILD @@ -1,20 +1,31 @@ -# $Id: PKGBUILD 161852 2012-06-15 16:11:26Z stephane $ +# $Id: PKGBUILD 163234 2012-07-11 16:22:59Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=swig pkgver=2.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="Generate scripting interfaces to C/C++ code" arch=('i686' 'x86_64') url="http://www.swig.org/" license=('custom') depends=('zlib' 'pcre') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('307020fb6437092e32c9c1bd9af8bccb1645b529') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + pyint_fromsize_t.diff + upstream_r13128.diff) +sha1sums=('307020fb6437092e32c9c1bd9af8bccb1645b529' + '59ee179b57920d255c58afe45632b896e40b5b7d' + '8f0c5ae6a46c22606cc88c649bfd0a31f061a963') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # FS#30624 + patch -Np1 -i ../pyint_fromsize_t.diff + + # Fix call to Swig_name_decl + patch -Np1 -i ../upstream_r13128.diff + ./configure --prefix=/usr make } diff --git a/extra/swig/pyint_fromsize_t.diff b/extra/swig/pyint_fromsize_t.diff new file mode 100644 index 000000000..1c7727ae2 --- /dev/null +++ b/extra/swig/pyint_fromsize_t.diff @@ -0,0 +1,18 @@ +Description: Py3k: Map PyInt_FromSize_t to PyLong_FromSize_t + The latest SWIG version introduced a usage of PyInt_FromSize_t, but + does not define a compatibility macro for Python 3k as for the other + PyInt_... functions. This patch adds that macro. + +Author: Torsten Landschoff <torsten@debian.org> + + +--- swig2.0-2.0.7.orig/Lib/python/pyhead.swg ++++ swig2.0-2.0.7/Lib/python/pyhead.swg +@@ -5,6 +5,7 @@ + #define PyInt_Check(x) PyLong_Check(x) + #define PyInt_AsLong(x) PyLong_AsLong(x) + #define PyInt_FromLong(x) PyLong_FromLong(x) ++#define PyInt_FromSize_t(x) PyLong_FromSize_t(x) + #define PyString_Check(name) PyBytes_Check(name) + #define PyString_FromString(x) PyUnicode_FromString(x) + #define PyString_Format(fmt, args) PyUnicode_Format(fmt, args) diff --git a/extra/swig/upstream_r13128.diff b/extra/swig/upstream_r13128.diff new file mode 100644 index 000000000..d7d74d7e5 --- /dev/null +++ b/extra/swig/upstream_r13128.diff @@ -0,0 +1,73 @@ +From: Klaus Kämpf <kkaempf@suse.de> +Subject: Fix call to Swig_name_decl (upstream ID 3530078) + +Origin: upstream, http://swig.svn.sourceforge.net/viewvc/swig?view=revision&revision=13128 +Bug: http://sourceforge.net/tracker/?func=detail&aid=3530078&group_id=1645&atid=101645 +Bug-Debian: http://bugs.debian.org/675196 +--- + Examples/test-suite/errors/expected.log | 26 +++++++++++++------------- + Source/Modules/lang.cxx | 4 ++-- + 2 files changed, 15 insertions(+), 15 deletions(-) + +--- a/Source/Modules/lang.cxx ++++ b/Source/Modules/lang.cxx +@@ -2623,7 +2623,7 @@ int Language::constructorDeclaration(Nod + Delete(expected_name_resolved); + } + if (illegal_name) { +- Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(name)); ++ Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(n)); + Swig_restore(n); + return SWIG_NOWRAP; + } +@@ -2760,7 +2760,7 @@ int Language::destructorDeclaration(Node + } + + if (illegal_name) { +- Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(name)); ++ Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(n)); + Swig_restore(n); + Delete(expected_name); + return SWIG_NOWRAP; +--- a/Examples/test-suite/errors/expected.log ++++ b/Examples/test-suite/errors/expected.log +@@ -227,17 +227,17 @@ cpp_extend_destructors.i:87: Warning 302 + cpp_extend_destructors.i:85: Warning 302: previous definition of '~JStruct'. + cpp_extend_destructors.i:100: Warning 302: Identifier '~LStruct' redefined (ignored), + cpp_extend_destructors.i:98: Warning 302: previous definition of '~LStruct'. +-cpp_extend_destructors.i:24: Warning 521: Illegal destructor name ~NOT_CStruct. Ignored. +-cpp_extend_destructors.i:30: Warning 521: Illegal destructor name ~NOT_DStruct. Ignored. +-cpp_extend_destructors.i:44: Warning 521: Illegal destructor name ~NOT_EStruct. Ignored. +-cpp_extend_destructors.i:50: Warning 521: Illegal destructor name ~NOT_FStruct. Ignored. +-cpp_extend_destructors.i:65: Warning 521: Illegal destructor name ~NOT_GStruct. Ignored. +-cpp_extend_destructors.i:72: Warning 521: Illegal destructor name ~NOT_HStruct. Ignored. +-cpp_extend_destructors.i:81: Warning 521: Illegal destructor name ~NOT_IStruct. Ignored. +-cpp_extend_destructors.i:86: Warning 521: Illegal destructor name ~NOT_JStruct. Ignored. +-cpp_extend_destructors.i:92: Warning 521: Illegal destructor name ~NOT_KStruct. Ignored. +-cpp_extend_destructors.i:99: Warning 521: Illegal destructor name ~NOT_LStruct< int >. Ignored. +-cpp_extend_destructors.i:99: Warning 521: Illegal destructor name ~NOT_LStruct< short >. Ignored. ++cpp_extend_destructors.i:24: Warning 521: Illegal destructor name CStruct::~NOT_CStruct(). Ignored. ++cpp_extend_destructors.i:30: Warning 521: Illegal destructor name DStruct::~NOT_DStruct(). Ignored. ++cpp_extend_destructors.i:44: Warning 521: Illegal destructor name EStruct::~NOT_EStruct(). Ignored. ++cpp_extend_destructors.i:50: Warning 521: Illegal destructor name FStruct::~NOT_FStruct(). Ignored. ++cpp_extend_destructors.i:65: Warning 521: Illegal destructor name GStruct::~NOT_GStruct(). Ignored. ++cpp_extend_destructors.i:72: Warning 521: Illegal destructor name HStruct::~NOT_HStruct(). Ignored. ++cpp_extend_destructors.i:81: Warning 521: Illegal destructor name IStruct::~NOT_IStruct(). Ignored. ++cpp_extend_destructors.i:86: Warning 521: Illegal destructor name JStruct::~NOT_JStruct(). Ignored. ++cpp_extend_destructors.i:92: Warning 521: Illegal destructor name KStruct::~NOT_KStruct(). Ignored. ++cpp_extend_destructors.i:99: Warning 521: Illegal destructor name LStruct< int >::~NOT_LStruct(). Ignored. ++cpp_extend_destructors.i:99: Warning 521: Illegal destructor name LStruct< short >::~NOT_LStruct(). Ignored. + + :::::::::::::::::::::::::::::::: cpp_extend_redefine.i ::::::::::::::::::::::::::::::::::: + cpp_extend_redefine.i:9: Warning 302: Identifier 'bar' redefined by %extend (ignored), +@@ -312,8 +312,8 @@ cpp_nested.i:12: Warning 325: Nested cla + cpp_no_access.i:3: Warning 319: No access specifier given for base class 'foo' (ignored). + + :::::::::::::::::::::::::::::::: cpp_no_return_type.i ::::::::::::::::::::::::::::::::::: +-cpp_no_return_type.i:6: Warning 504: Function R must have a return type. Ignored. +-cpp_no_return_type.i:10: Warning 504: Function UU must have a return type. Ignored. ++cpp_no_return_type.i:6: Warning 504: Function S::R() must have a return type. Ignored. ++cpp_no_return_type.i:10: Warning 504: Function U::UU() must have a return type. Ignored. + + :::::::::::::::::::::::::::::::: cpp_nobase.i ::::::::::::::::::::::::::::::::::: + cpp_nobase.i:3: Warning 401: Nothing known about base class 'Bar'. Ignored. diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index 18ffc0fba..ab037ef5b 100644 --- a/extra/telepathy-qt/PKGBUILD +++ b/extra/telepathy-qt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156982 2012-04-23 09:10:33Z ibiru $ +# $Id: PKGBUILD 163229 2012-07-11 13:09:39Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt -pkgver=0.9.1 +pkgver=0.9.2 pkgrel=1 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64') @@ -15,15 +15,11 @@ makedepends=('libxslt' 'python2' 'cmake' 'doxygen') conflicts=('telepathy-qt4') replaces=('telepathy-qt4') provides=('telepathy-qt4') -source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gcc47.patch') -md5sums=('e0e6c1a987bbeae44c778344a2cc9d80' - '32aa8eb06c76cb03af5ced27a674ebfb') +source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('e49df0c6d19bbac622209d0f87f0d1b2') build() { cd "$srcdir" - patch -Np0 -i gcc47.patch - mkdir build cd build cmake ../${pkgname}-${pkgver} \ |