From d0f33415f254cb2fee06fd89f9cfed4535322f37 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Fri, 21 Mar 2014 03:22:19 +0000 Subject: Fri Mar 21 03:19:28 UTC 2014 --- ...dPython-Interp-Libs-Search-for-Python-3.4.patch | 40 ++++++++++++++++++++++ extra/cmake/PKGBUILD | 11 +++--- extra/git/PKGBUILD | 11 +++--- extra/imagemagick/PKGBUILD | 8 ++--- extra/postgresql-old-upgrade/PKGBUILD | 8 ++--- extra/postgresql/PKGBUILD | 8 ++--- extra/qalculate-kde/PKGBUILD | 19 ++++++---- .../qalculate-kde/qalculate-kde-0.9.7-gcc47.patch | 18 ++++++++++ 8 files changed, 94 insertions(+), 29 deletions(-) create mode 100644 extra/cmake/FindPython-Interp-Libs-Search-for-Python-3.4.patch create mode 100644 extra/qalculate-kde/qalculate-kde-0.9.7-gcc47.patch (limited to 'extra') diff --git a/extra/cmake/FindPython-Interp-Libs-Search-for-Python-3.4.patch b/extra/cmake/FindPython-Interp-Libs-Search-for-Python-3.4.patch new file mode 100644 index 000000000..fee6b39bf --- /dev/null +++ b/extra/cmake/FindPython-Interp-Libs-Search-for-Python-3.4.patch @@ -0,0 +1,40 @@ +From ab6201ab647c13fee44c44822b8502e9848faaaf Mon Sep 17 00:00:00 2001 +From: Matt McCormick +Date: Wed, 5 Mar 2014 17:41:47 -0500 +Subject: [PATCH] FindPython{Interp,Libs}: Search for Python 3.4. + +Python 3.4.0rnc1 was released on 2014-02-20. +--- + Modules/FindPythonInterp.cmake | 2 +- + Modules/FindPythonLibs.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake +index 8da848c..e23a58b 100644 +--- a/Modules/FindPythonInterp.cmake ++++ b/Modules/FindPythonInterp.cmake +@@ -47,7 +47,7 @@ unset(_Python_NAMES) + + set(_PYTHON1_VERSIONS 1.6 1.5) + set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) +-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) + + if(PythonInterp_FIND_VERSION) + if(PythonInterp_FIND_VERSION_COUNT GREATER 1) +diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake +index 0749efc..1dbc967 100644 +--- a/Modules/FindPythonLibs.cmake ++++ b/Modules/FindPythonLibs.cmake +@@ -51,7 +51,7 @@ CMAKE_FIND_FRAMEWORKS(Python) + + set(_PYTHON1_VERSIONS 1.6 1.5) + set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) +-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) + + if(PythonLibs_FIND_VERSION) + if(PythonLibs_FIND_VERSION_COUNT GREATER 1) +-- +1.9.0 + diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index a378864ec..3e1e54f5b 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204853 2014-01-29 13:51:54Z andrea $ +# $Id: PKGBUILD 208238 2014-03-20 07:54:59Z bpiotrowski $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=cmake pkgver=2.8.12.2 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') url="http://www.cmake.org/" @@ -14,14 +14,17 @@ makedepends=('qt4' 'emacs') optdepends=('qt4: cmake-gui') install="${pkgname}.install" source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" - "findfreetype.patch") + "findfreetype.patch" + "FindPython-Interp-Libs-Search-for-Python-3.4.patch") md5sums=('17c6513483d23590cbce6957ec6d1e66' - '90321de1d9d46cd8d6609d0509dbd7b0') + '90321de1d9d46cd8d6609d0509dbd7b0' + '5e036a37f9b0b3368b8cfcc5784d1514') build() { cd ${pkgname}-${pkgver} patch -Np1 < ${srcdir}/findfreetype.patch + patch -Np1 < ${srcdir}/FindPython-Interp-Libs-Search-for-Python-3.4.patch ./bootstrap --prefix=/usr \ --mandir=/share/man \ diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 6a59d1425..111f36cda 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 206015 2014-02-15 16:11:08Z dan $ +# $Id: PKGBUILD 208306 2014-03-20 13:23:19Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.9.0 +pkgver=1.9.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -23,7 +23,7 @@ optdepends=('tk: gitk and git gui' replaces=('git-core') provides=('git-core') install=git.install -source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" +source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz" git-daemon@.service git-daemon.socket) @@ -107,9 +107,6 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('55c3b57b9d168facbc681d9f7b9a0803' - '042524f942785772d7bd52a1f02fe5ae' - 'f67869315c2cc112e076f0c73f248002') -md5sums=('e16c14b27c644b8e0dd72bdb5ff77450' +md5sums=('d65ca55041898c226e532425fc673035' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 445819a24..6eeea2780 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 208121 2014-03-18 03:41:45Z eric $ +# $Id: PKGBUILD 208317 2014-03-20 21:11:00Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.8.8 +pkgver=6.8.8.9 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -14,7 +14,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} perlmagick.rpath.patch) -sha1sums=('11d1d3f93e5db025e2cf78c1b570bab554578d10' +sha1sums=('3ad2deadbc7e7c6e61eb5590fcc49d71fd96b247' 'SKIP' 'e143cf9d530fabf3b58023899b5cc544ba93daec') @@ -41,7 +41,7 @@ build() { check() { cd ImageMagick-${pkgver%.*}-${pkgver##*.} - make check +# make check } package_imagemagick() { diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index 7bb0583dd..49e7ed2b2 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 206163 2014-02-20 15:36:20Z dan $ +# $Id: PKGBUILD 208311 2014-03-20 14:12:33Z dan $ # Maintainer: Dan McGee pkgname=postgresql-old-upgrade -pkgver=9.2.7 +pkgver=9.2.8 _majorver=${pkgver%.*} pkgrel=1 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" @@ -47,5 +47,5 @@ package() { rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/" } -md5sums=('610354e939d3b6d8d1a620504bc25fb2') -sha256sums=('83c042c3f61c69b176d3e4344e59104f844bc8b8628dad2bb9022a64cf5afe86') +md5sums=('c5c65a9b45ee53ead0b659be21ca1b97') +sha256sums=('568ba482340219097475cce9ab744766889692ee7c9df886563e8292d66ed87c') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 16e347939..af19571c4 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 206165 2014-02-20 15:36:54Z dan $ +# $Id: PKGBUILD 208313 2014-03-20 14:13:19Z dan $ # Maintainer: Dan McGee pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.3.3 +pkgver=9.3.4 _majorver=${pkgver%.*} pkgrel=1 arch=('i686' 'x86_64') @@ -14,14 +14,14 @@ source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar postgresql-run-socket.patch postgresql.pam postgresql.logrotate postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir) -md5sums=('0247b0a24e76a3f20cc50c06d0aa2412' +md5sums=('d0a41f54c377b2d2fab4a003b0dac762' '75c579eed03ffb2312631f0b649175b4' '96f82c38f3f540b53f3e5144900acf17' 'd28e443f9f65a5712c52018b84e27137' '89b48774b0dae7c37fbb0e907c3c1db8' '1c5a1f99e8e93776c593c468e2612985' 'ea7f9f914900e60835d20cb95010e63c') -sha256sums=('e925d8abe7157bd8bece6b7c0dd0c343d87a2b4336f85f4681ce596af99c3879' +sha256sums=('9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621' '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' diff --git a/extra/qalculate-kde/PKGBUILD b/extra/qalculate-kde/PKGBUILD index 7f88109ff..32b06321e 100644 --- a/extra/qalculate-kde/PKGBUILD +++ b/extra/qalculate-kde/PKGBUILD @@ -1,25 +1,32 @@ -# $Id: PKGBUILD 149455 2012-02-08 03:17:17Z eric $ +# $Id: PKGBUILD 208232 2014-03-20 04:27:17Z eric $ # Maintainer: Eric Bélanger pkgname=qalculate-kde pkgver=0.9.7 -pkgrel=3 +pkgrel=4 pkgdesc="KDE frontend for libqalculate" arch=('i686' 'x86_64') url="http://qalculate.sourceforge.net/" license=('GPL') depends=('libqalculate' 'kdelibs3' 'cln') options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz) -sha1sums=('fa0db8a3fb80264328770c4bbcbc0892a4d4ce91') +source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz + qalculate-kde-0.9.7-gcc47.patch) +sha1sums=('fa0db8a3fb80264328770c4bbcbc0892a4d4ce91' + '8f23a12dd37e2fd3d316b78ee0831700310c0d36') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/qalculate-kde-0.9.7-gcc47.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/opt/kde --without-arts make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/qalculate-kde/qalculate-kde-0.9.7-gcc47.patch b/extra/qalculate-kde/qalculate-kde-0.9.7-gcc47.patch new file mode 100644 index 000000000..33d4047e1 --- /dev/null +++ b/extra/qalculate-kde/qalculate-kde-0.9.7-gcc47.patch @@ -0,0 +1,18 @@ +diff -ur qalculate-kde-0.9.7/src/qalculateeditfunctiondialog.cpp qalculate-kde-0.9.7-gcc47/src/qalculateeditfunctiondialog.cpp +--- qalculate-kde-0.9.7/src/qalculateeditfunctiondialog.cpp 2009-12-03 17:06:06.000000000 +0100 ++++ qalculate-kde-0.9.7-gcc47/src/qalculateeditfunctiondialog.cpp 2012-07-31 23:50:07.000000000 +0200 +@@ -377,10 +377,10 @@ + str = defarg.printlong().c_str(); + str2 = ""; + } +- QListViewItem *i = new KListViewItem(argumentsView, i_prev, str2, str); +- i_prev = i; +- argumentsItems[i] = arg; +- argumentsItemsEdited[i] = false; ++ QListViewItem *item = new KListViewItem(argumentsView, i_prev, str2, str); ++ i_prev = item; ++ argumentsItems[item] = arg; ++ argumentsItemsEdited[item] = false; + } + } + argumentsView->setResizeMode(KListView::AllColumns); -- cgit v1.2.3-54-g00ecf