[arch-commits] Commit in cmake/repos (10 files)

Antonio Rojas arojas at archlinux.org
Thu Aug 20 14:47:00 UTC 2015


    Date: Thursday, August 20, 2015 @ 16:47:00
  Author: arojas
Revision: 244439

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cmake/repos/testing-i686/
  cmake/repos/testing-i686/PKGBUILD
    (from rev 244438, cmake/trunk/PKGBUILD)
  cmake/repos/testing-i686/cmake.install
    (from rev 244438, cmake/trunk/cmake.install)
  cmake/repos/testing-i686/kdelibs-4.14.11.patch
    (from rev 244438, cmake/trunk/kdelibs-4.14.11.patch)
  cmake/repos/testing-i686/rebuild.list
    (from rev 244438, cmake/trunk/rebuild.list)
  cmake/repos/testing-x86_64/
  cmake/repos/testing-x86_64/PKGBUILD
    (from rev 244438, cmake/trunk/PKGBUILD)
  cmake/repos/testing-x86_64/cmake.install
    (from rev 244438, cmake/trunk/cmake.install)
  cmake/repos/testing-x86_64/kdelibs-4.14.11.patch
    (from rev 244438, cmake/trunk/kdelibs-4.14.11.patch)
  cmake/repos/testing-x86_64/rebuild.list
    (from rev 244438, cmake/trunk/rebuild.list)

--------------------------------------+
 testing-i686/PKGBUILD                |   63 +++++++++++++++++++++++++++++++++
 testing-i686/cmake.install           |   12 ++++++
 testing-i686/kdelibs-4.14.11.patch   |   40 ++++++++++++++++++++
 testing-i686/rebuild.list            |    5 ++
 testing-x86_64/PKGBUILD              |   63 +++++++++++++++++++++++++++++++++
 testing-x86_64/cmake.install         |   12 ++++++
 testing-x86_64/kdelibs-4.14.11.patch |   40 ++++++++++++++++++++
 testing-x86_64/rebuild.list          |    5 ++
 8 files changed, 240 insertions(+)

Copied: cmake/repos/testing-i686/PKGBUILD (from rev 244438, cmake/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2015-08-20 14:47:00 UTC (rev 244439)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=cmake
+pkgver=3.3.1
+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' 'jsoncpp')
+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" 'kdelibs-4.14.11.patch')
+md5sums=('52638576f4e1e621fed6c3410d3a1b12'
+         '1eeec67ab4bff6d92430d52acdbde142')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+# fix build of KDE4 applications with kdelibs 4.14.11 http://www.cmake.org/gitweb?p=cmake.git;a=commit;h=b9ec9392da21a3421e48c6961976060d872faffb
+  patch -p1 -i ../kdelibs-4.14.11.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/testing-i686/cmake.install (from rev 244438, cmake/trunk/cmake.install)
===================================================================
--- testing-i686/cmake.install	                        (rev 0)
+++ testing-i686/cmake.install	2015-08-20 14:47:00 UTC (rev 244439)
@@ -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
+}

Copied: cmake/repos/testing-i686/kdelibs-4.14.11.patch (from rev 244438, cmake/trunk/kdelibs-4.14.11.patch)
===================================================================
--- testing-i686/kdelibs-4.14.11.patch	                        (rev 0)
+++ testing-i686/kdelibs-4.14.11.patch	2015-08-20 14:47:00 UTC (rev 244439)
@@ -0,0 +1,40 @@
+From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike at sf-mail.de>
+Date: Tue, 18 Aug 2015 12:14:43 +0200
+Subject: [PATCH 1/1] FindPkgConfig: remove variable dereference
+
+If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no
+cmake_minimum_required() call is present this line can lead to an error as that
+string is empty so too few arguments are passed to if():
+
+See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log".
+See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log".
+CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif):
+  given arguments:
+
+    "VERSION_LESS" "3.1"
+
+  Unknown arguments specified
+Call Stack (most recent call first):
+  /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options)
+  /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
+---
+ Modules/FindPkgConfig.cmake |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index 526a62e..ae6903e 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cma
+       set(${_no_cmake_path} 1)
+       set(${_no_cmake_environment_path} 1)
+     endif()
+-  elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1)
++  elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
+     set(${_no_cmake_path} 1)
+     set(${_no_cmake_environment_path} 1)
+   endif()
+-- 
+1.7.10.4
+

Copied: cmake/repos/testing-i686/rebuild.list (from rev 244438, cmake/trunk/rebuild.list)
===================================================================
--- testing-i686/rebuild.list	                        (rev 0)
+++ testing-i686/rebuild.list	2015-08-20 14:47:00 UTC (rev 244439)
@@ -0,0 +1,5 @@
+quazip
+glm
+gluon
+sfml
+wt

Copied: cmake/repos/testing-x86_64/PKGBUILD (from rev 244438, cmake/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2015-08-20 14:47:00 UTC (rev 244439)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=cmake
+pkgver=3.3.1
+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' 'jsoncpp')
+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" 'kdelibs-4.14.11.patch')
+md5sums=('52638576f4e1e621fed6c3410d3a1b12'
+         '1eeec67ab4bff6d92430d52acdbde142')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+# fix build of KDE4 applications with kdelibs 4.14.11 http://www.cmake.org/gitweb?p=cmake.git;a=commit;h=b9ec9392da21a3421e48c6961976060d872faffb
+  patch -p1 -i ../kdelibs-4.14.11.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/testing-x86_64/cmake.install (from rev 244438, cmake/trunk/cmake.install)
===================================================================
--- testing-x86_64/cmake.install	                        (rev 0)
+++ testing-x86_64/cmake.install	2015-08-20 14:47:00 UTC (rev 244439)
@@ -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
+}

Copied: cmake/repos/testing-x86_64/kdelibs-4.14.11.patch (from rev 244438, cmake/trunk/kdelibs-4.14.11.patch)
===================================================================
--- testing-x86_64/kdelibs-4.14.11.patch	                        (rev 0)
+++ testing-x86_64/kdelibs-4.14.11.patch	2015-08-20 14:47:00 UTC (rev 244439)
@@ -0,0 +1,40 @@
+From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike at sf-mail.de>
+Date: Tue, 18 Aug 2015 12:14:43 +0200
+Subject: [PATCH 1/1] FindPkgConfig: remove variable dereference
+
+If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no
+cmake_minimum_required() call is present this line can lead to an error as that
+string is empty so too few arguments are passed to if():
+
+See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log".
+See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log".
+CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif):
+  given arguments:
+
+    "VERSION_LESS" "3.1"
+
+  Unknown arguments specified
+Call Stack (most recent call first):
+  /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options)
+  /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
+---
+ Modules/FindPkgConfig.cmake |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index 526a62e..ae6903e 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cma
+       set(${_no_cmake_path} 1)
+       set(${_no_cmake_environment_path} 1)
+     endif()
+-  elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1)
++  elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
+     set(${_no_cmake_path} 1)
+     set(${_no_cmake_environment_path} 1)
+   endif()
+-- 
+1.7.10.4
+

Copied: cmake/repos/testing-x86_64/rebuild.list (from rev 244438, cmake/trunk/rebuild.list)
===================================================================
--- testing-x86_64/rebuild.list	                        (rev 0)
+++ testing-x86_64/rebuild.list	2015-08-20 14:47:00 UTC (rev 244439)
@@ -0,0 +1,5 @@
+quazip
+glm
+gluon
+sfml
+wt



More information about the arch-commits mailing list