Date: Friday, January 23, 2015 @ 09:04:19 Author: andrea Revision: 229676
archrelease: copy trunk to extra-i686, extra-x86_64 Added: cmake/repos/extra-i686/PKGBUILD (from rev 229675, cmake/trunk/PKGBUILD) cmake/repos/extra-i686/cmake.install (from rev 229675, cmake/trunk/cmake.install) cmake/repos/extra-x86_64/PKGBUILD (from rev 229675, cmake/trunk/PKGBUILD) cmake/repos/extra-x86_64/cmake.install (from rev 229675, cmake/trunk/cmake.install) Deleted: cmake/repos/extra-i686/0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch cmake/repos/extra-i686/PKGBUILD cmake/repos/extra-i686/cmake.install cmake/repos/extra-x86_64/0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch cmake/repos/extra-x86_64/PKGBUILD cmake/repos/extra-x86_64/cmake.install -----------------------------------------------------------------------+ /PKGBUILD | 108 ++++++++++ /cmake.install | 24 ++ extra-i686/0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch | 41 --- extra-i686/PKGBUILD | 63 ----- extra-i686/cmake.install | 12 - extra-x86_64/0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch | 41 --- extra-x86_64/PKGBUILD | 63 ----- extra-x86_64/cmake.install | 12 - 8 files changed, 132 insertions(+), 232 deletions(-) Deleted: extra-i686/0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch =================================================================== --- extra-i686/0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch 2015-01-23 08:04:11 UTC (rev 229675) +++ extra-i686/0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch 2015-01-23 08:04:19 UTC (rev 229676) @@ -1,41 +0,0 @@ -From 339fc9de27d54edec3c0b71e9e1aba858c408399 Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras <evange...@foutrelis.com> -Date: Mon, 29 Dec 2014 18:19:08 +0200 -Subject: [PATCH] FindRuby: Fix output check in _RUBY_CONFIG_VAR - -Since commit 854e762 (FindRuby: clean up querying variables from Ruby) -we query RbConfig::CONFIG first and, if the command fails or its output -equates to a false constant, then fall back to querying Config::CONFIG. - -Due to the above, an error condition exists with Ruby 2.2.0; when querying -RbConfig::CONFIG['TEENY'], the output of '0' will be discarded since it -matches the false constant '0'. - -In previous versions this wasn't a problem, but Ruby 2.2 has completely -removed Config::CONFIG. This causes RUBY_VERSION_PATCH to be set to an -empty string and the Ruby version to be detected as '2.2.' (instead of -'2.2.0'). - -This patch fixes the output check to explicitly look for an empty string -before using the fallback query method. (Someone more familiar with Ruby -might be able to deem the fallback as unnecessary and fully remove it.) ---- - Modules/FindRuby.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake -index b5ac703..0950d15 100644 ---- a/Modules/FindRuby.cmake -+++ b/Modules/FindRuby.cmake -@@ -90,7 +90,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR) - RESULT_VARIABLE _RUBY_SUCCESS - OUTPUT_VARIABLE _RUBY_OUTPUT - ERROR_QUIET) -- if(_RUBY_SUCCESS OR NOT _RUBY_OUTPUT) -+ if(_RUBY_SUCCESS OR _RUBY_OUTPUT STREQUAL "") - execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['${RBVAR}']" - RESULT_VARIABLE _RUBY_SUCCESS - OUTPUT_VARIABLE _RUBY_OUTPUT --- -2.2.1 - Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-01-23 08:04:11 UTC (rev 229675) +++ extra-i686/PKGBUILD 2015-01-23 08:04:19 UTC (rev 229676) @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgname=cmake -pkgver=3.1.0 -pkgrel=2 -pkgdesc='A cross-platform open-source make system' -arch=('i686' 'x86_64') -url="http://www.cmake.org/" -license=('custom') -depends=('curl' 'libarchive' 'shared-mime-info') -makedepends=('qt5-base' 'python-sphinx' 'emacs') -optdepends=('qt5-base: cmake-gui' - 'libxkbcommon-x11: cmake-gui') -install="${pkgname}.install" -source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz" - 0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch) -md5sums=('188eb7dc9b1b82b363bc51c0d3f1d461' - 'c21e3e63501e1ee7aa6092851089f8ad') - -prepare() { - cd ${pkgname}-${pkgver} - - # http://public.kitware.com/pipermail/cmake-developers/2014-December/024044.html - patch -Np1 -i ../0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch -} - -build() { - cd ${pkgname}-${pkgver} - - ./bootstrap --prefix=/usr \ - --mandir=/share/man \ - --docdir=/share/doc/cmake \ - --sphinx-man \ - --system-libs \ - --qt-gui \ - --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - vimpath="${pkgdir}/usr/share/vim/vimfiles" - install -d "${vimpath}"/{help,indent,syntax} - ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-help.vim \ - "${vimpath}"/help/ - ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-indent.vim \ - "${vimpath}"/indent/ - ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-syntax.vim \ - "${vimpath}"/syntax/ - - install -d "${pkgdir}"/usr/share/emacs/site-lisp/ - emacs -batch -f batch-byte-compile \ - "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el - ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \ - "${pkgdir}"/usr/share/emacs/site-lisp/ - - install -Dm644 Copyright.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} Copied: cmake/repos/extra-i686/PKGBUILD (from rev 229675, cmake/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-01-23 08:04:19 UTC (rev 229676) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=cmake +pkgver=3.1.1 +pkgrel=1 +pkgdesc='A cross-platform open-source make system' +arch=('i686' 'x86_64') +url="http://www.cmake.org/" +license=('custom') +depends=('curl' 'libarchive' 'shared-mime-info') +makedepends=('qt5-base' 'python-sphinx' 'emacs') +optdepends=('qt5-base: cmake-gui' + 'libxkbcommon-x11: cmake-gui') +install="${pkgname}.install" +source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz") +md5sums=('0ae4f25dbec66697c0c3cec1b9e885ae') + +build() { + cd ${pkgname}-${pkgver} + + ./bootstrap --prefix=/usr \ + --mandir=/share/man \ + --docdir=/share/doc/cmake \ + --sphinx-man \ + --system-libs \ + --qt-gui \ + --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + vimpath="${pkgdir}/usr/share/vim/vimfiles" + install -d "${vimpath}"/{help,indent,syntax} + ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-help.vim \ + "${vimpath}"/help/ + ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-indent.vim \ + "${vimpath}"/indent/ + ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-syntax.vim \ + "${vimpath}"/syntax/ + + install -d "${pkgdir}"/usr/share/emacs/site-lisp/ + emacs -batch -f batch-byte-compile \ + "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el + ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \ + "${pkgdir}"/usr/share/emacs/site-lisp/ + + install -Dm644 Copyright.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} Deleted: extra-i686/cmake.install =================================================================== --- extra-i686/cmake.install 2015-01-23 08:04:11 UTC (rev 229675) +++ extra-i686/cmake.install 2015-01-23 08:04:19 UTC (rev 229676) @@ -1,12 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null - [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: cmake/repos/extra-i686/cmake.install (from rev 229675, cmake/trunk/cmake.install) =================================================================== --- extra-i686/cmake.install (rev 0) +++ extra-i686/cmake.install 2015-01-23 08:04:19 UTC (rev 229676) @@ -0,0 +1,12 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null + [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch =================================================================== --- extra-x86_64/0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch 2015-01-23 08:04:11 UTC (rev 229675) +++ extra-x86_64/0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch 2015-01-23 08:04:19 UTC (rev 229676) @@ -1,41 +0,0 @@ -From 339fc9de27d54edec3c0b71e9e1aba858c408399 Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras <evange...@foutrelis.com> -Date: Mon, 29 Dec 2014 18:19:08 +0200 -Subject: [PATCH] FindRuby: Fix output check in _RUBY_CONFIG_VAR - -Since commit 854e762 (FindRuby: clean up querying variables from Ruby) -we query RbConfig::CONFIG first and, if the command fails or its output -equates to a false constant, then fall back to querying Config::CONFIG. - -Due to the above, an error condition exists with Ruby 2.2.0; when querying -RbConfig::CONFIG['TEENY'], the output of '0' will be discarded since it -matches the false constant '0'. - -In previous versions this wasn't a problem, but Ruby 2.2 has completely -removed Config::CONFIG. This causes RUBY_VERSION_PATCH to be set to an -empty string and the Ruby version to be detected as '2.2.' (instead of -'2.2.0'). - -This patch fixes the output check to explicitly look for an empty string -before using the fallback query method. (Someone more familiar with Ruby -might be able to deem the fallback as unnecessary and fully remove it.) ---- - Modules/FindRuby.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake -index b5ac703..0950d15 100644 ---- a/Modules/FindRuby.cmake -+++ b/Modules/FindRuby.cmake -@@ -90,7 +90,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR) - RESULT_VARIABLE _RUBY_SUCCESS - OUTPUT_VARIABLE _RUBY_OUTPUT - ERROR_QUIET) -- if(_RUBY_SUCCESS OR NOT _RUBY_OUTPUT) -+ if(_RUBY_SUCCESS OR _RUBY_OUTPUT STREQUAL "") - execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['${RBVAR}']" - RESULT_VARIABLE _RUBY_SUCCESS - OUTPUT_VARIABLE _RUBY_OUTPUT --- -2.2.1 - Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-01-23 08:04:11 UTC (rev 229675) +++ extra-x86_64/PKGBUILD 2015-01-23 08:04:19 UTC (rev 229676) @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgname=cmake -pkgver=3.1.0 -pkgrel=2 -pkgdesc='A cross-platform open-source make system' -arch=('i686' 'x86_64') -url="http://www.cmake.org/" -license=('custom') -depends=('curl' 'libarchive' 'shared-mime-info') -makedepends=('qt5-base' 'python-sphinx' 'emacs') -optdepends=('qt5-base: cmake-gui' - 'libxkbcommon-x11: cmake-gui') -install="${pkgname}.install" -source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz" - 0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch) -md5sums=('188eb7dc9b1b82b363bc51c0d3f1d461' - 'c21e3e63501e1ee7aa6092851089f8ad') - -prepare() { - cd ${pkgname}-${pkgver} - - # http://public.kitware.com/pipermail/cmake-developers/2014-December/024044.html - patch -Np1 -i ../0001-FindRuby-Fix-output-check-in-_RUBY_CONFIG_VAR.patch -} - -build() { - cd ${pkgname}-${pkgver} - - ./bootstrap --prefix=/usr \ - --mandir=/share/man \ - --docdir=/share/doc/cmake \ - --sphinx-man \ - --system-libs \ - --qt-gui \ - --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - vimpath="${pkgdir}/usr/share/vim/vimfiles" - install -d "${vimpath}"/{help,indent,syntax} - ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-help.vim \ - "${vimpath}"/help/ - ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-indent.vim \ - "${vimpath}"/indent/ - ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-syntax.vim \ - "${vimpath}"/syntax/ - - install -d "${pkgdir}"/usr/share/emacs/site-lisp/ - emacs -batch -f batch-byte-compile \ - "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el - ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \ - "${pkgdir}"/usr/share/emacs/site-lisp/ - - install -Dm644 Copyright.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} Copied: cmake/repos/extra-x86_64/PKGBUILD (from rev 229675, cmake/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-01-23 08:04:19 UTC (rev 229676) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=cmake +pkgver=3.1.1 +pkgrel=1 +pkgdesc='A cross-platform open-source make system' +arch=('i686' 'x86_64') +url="http://www.cmake.org/" +license=('custom') +depends=('curl' 'libarchive' 'shared-mime-info') +makedepends=('qt5-base' 'python-sphinx' 'emacs') +optdepends=('qt5-base: cmake-gui' + 'libxkbcommon-x11: cmake-gui') +install="${pkgname}.install" +source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz") +md5sums=('0ae4f25dbec66697c0c3cec1b9e885ae') + +build() { + cd ${pkgname}-${pkgver} + + ./bootstrap --prefix=/usr \ + --mandir=/share/man \ + --docdir=/share/doc/cmake \ + --sphinx-man \ + --system-libs \ + --qt-gui \ + --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + vimpath="${pkgdir}/usr/share/vim/vimfiles" + install -d "${vimpath}"/{help,indent,syntax} + ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-help.vim \ + "${vimpath}"/help/ + ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-indent.vim \ + "${vimpath}"/indent/ + ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-syntax.vim \ + "${vimpath}"/syntax/ + + install -d "${pkgdir}"/usr/share/emacs/site-lisp/ + emacs -batch -f batch-byte-compile \ + "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el + ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \ + "${pkgdir}"/usr/share/emacs/site-lisp/ + + install -Dm644 Copyright.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} Deleted: extra-x86_64/cmake.install =================================================================== --- extra-x86_64/cmake.install 2015-01-23 08:04:11 UTC (rev 229675) +++ extra-x86_64/cmake.install 2015-01-23 08:04:19 UTC (rev 229676) @@ -1,12 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null - [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: cmake/repos/extra-x86_64/cmake.install (from rev 229675, cmake/trunk/cmake.install) =================================================================== --- extra-x86_64/cmake.install (rev 0) +++ extra-x86_64/cmake.install 2015-01-23 08:04:19 UTC (rev 229676) @@ -0,0 +1,12 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null + [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}