[arch-commits] Commit in cmake/repos (12 files)
Felix Yan
fyan at archlinux.org
Sat Feb 7 13:36:31 UTC 2015
Date: Saturday, February 7, 2015 @ 14:36:31
Author: fyan
Revision: 231107
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cmake/repos/extra-i686/PKGBUILD
(from rev 231106, cmake/trunk/PKGBUILD)
cmake/repos/extra-i686/cmake.install
(from rev 231106, cmake/trunk/cmake.install)
cmake/repos/extra-i686/fix-openssl.patch
(from rev 231106, cmake/trunk/fix-openssl.patch)
cmake/repos/extra-x86_64/PKGBUILD
(from rev 231106, cmake/trunk/PKGBUILD)
cmake/repos/extra-x86_64/cmake.install
(from rev 231106, cmake/trunk/cmake.install)
cmake/repos/extra-x86_64/fix-openssl.patch
(from rev 231106, cmake/trunk/fix-openssl.patch)
Deleted:
cmake/repos/extra-i686/PKGBUILD
cmake/repos/extra-i686/cmake.install
cmake/repos/extra-i686/fix-openssl.patch
cmake/repos/extra-x86_64/PKGBUILD
cmake/repos/extra-x86_64/cmake.install
cmake/repos/extra-x86_64/fix-openssl.patch
--------------------------------+
/PKGBUILD | 118 ++++++++++++++++++++++++++++++
/cmake.install | 24 ++++++
/fix-openssl.patch | 152 +++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 61 ---------------
extra-i686/cmake.install | 12 ---
extra-i686/fix-openssl.patch | 76 -------------------
extra-x86_64/PKGBUILD | 61 ---------------
extra-x86_64/cmake.install | 12 ---
extra-x86_64/fix-openssl.patch | 76 -------------------
9 files changed, 294 insertions(+), 298 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-02-07 13:35:42 UTC (rev 231106)
+++ extra-i686/PKGBUILD 2015-02-07 13:36:31 UTC (rev 231107)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=cmake
-pkgver=3.1.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')
-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"
- 'fix-openssl.patch')
-md5sums=('0ae4f25dbec66697c0c3cec1b9e885ae'
- '6e7853ca9d495a06615cb8049d4434ee')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/fix-openssl.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 231106, cmake/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-02-07 13:36:31 UTC (rev 231107)
@@ -0,0 +1,59 @@
+# $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.1.2
+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=('75f61184aa70664bc7b3158293950f04')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+}
+
+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-02-07 13:35:42 UTC (rev 231106)
+++ extra-i686/cmake.install 2015-02-07 13:36:31 UTC (rev 231107)
@@ -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 231106, cmake/trunk/cmake.install)
===================================================================
--- extra-i686/cmake.install (rev 0)
+++ extra-i686/cmake.install 2015-02-07 13:36:31 UTC (rev 231107)
@@ -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-i686/fix-openssl.patch
===================================================================
--- extra-i686/fix-openssl.patch 2015-02-07 13:35:42 UTC (rev 231106)
+++ extra-i686/fix-openssl.patch 2015-02-07 13:36:31 UTC (rev 231107)
@@ -1,76 +0,0 @@
-X-Git-Url: http://www.cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindOpenSSL.cmake;h=3adc2692622e459a175f31d5b2a54619ec8164f2;hp=bfbe01f59090ed096ba81e95f2d125d2d53b2179;hb=27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38;hpb=081c724ccb82ed1bae3f629f4b6f0b3afc79fdfc
-
-diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
-index bfbe01f..3adc269 100644
---- a/Modules/FindOpenSSL.cmake
-+++ b/Modules/FindOpenSSL.cmake
-@@ -285,7 +285,7 @@ endfunction()
- if (OPENSSL_INCLUDE_DIR)
- if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
- file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
-- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
-+ REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
-
- # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
- # The status gives if this is a developer or prerelease and is ignored here.
-X-Git-Url: http://www.cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindOpenSSL.cmake;h=3adc2692622e459a175f31d5b2a54619ec8164f2;hp=6b4f9853c01f64b94bfec3ff51da8789af63a07e;hb=27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38;hpb=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505
-
-diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
-index 6b4f985..3adc269 100644
---- a/Modules/FindOpenSSL.cmake
-+++ b/Modules/FindOpenSSL.cmake
-@@ -16,10 +16,12 @@
- #
- # ::
- #
--# OPENSSL_FOUND - system has the OpenSSL library
--# OPENSSL_INCLUDE_DIR - the OpenSSL include directory
--# OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
--# OPENSSL_VERSION - This is set to $major.$minor.$revision$path (eg. 0.9.8s)
-+# OPENSSL_FOUND - System has the OpenSSL library
-+# OPENSSL_INCLUDE_DIR - The OpenSSL include directory
-+# OPENSSL_CRYPTO_LIBRARY - The OpenSSL crypto library
-+# OPENSSL_SSL_LIBRARY - The OpenSSL SSL library
-+# OPENSSL_LIBRARIES - All OpenSSL libraries
-+# OPENSSL_VERSION - This is set to $major.$minor.$revision$patch (eg. 0.9.8s)
-
- #=============================================================================
- # Copyright 2006-2009 Kitware, Inc.
-@@ -153,6 +155,8 @@ if(WIN32 AND NOT CYGWIN)
-
- mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE
- SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
-+ set( OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
-+ set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
- set( OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
- elseif(MINGW)
- # same player, for MinGW
-@@ -181,6 +185,8 @@ if(WIN32 AND NOT CYGWIN)
- )
-
- mark_as_advanced(SSL_EAY LIB_EAY)
-+ set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
-+ set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
- set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
- unset(LIB_EAY_NAMES)
- unset(SSL_EAY_NAMES)
-@@ -207,6 +213,8 @@ if(WIN32 AND NOT CYGWIN)
- )
-
- mark_as_advanced(SSL_EAY LIB_EAY)
-+ set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
-+ set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
- set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
- endif()
- else()
-@@ -275,9 +283,7 @@ function(from_hex HEX DEC)
- endfunction()
-
- if (OPENSSL_INCLUDE_DIR)
-- if (_OPENSSL_VERSION)
-- set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
-- elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
-+ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
- file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
- REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
-
Copied: cmake/repos/extra-i686/fix-openssl.patch (from rev 231106, cmake/trunk/fix-openssl.patch)
===================================================================
--- extra-i686/fix-openssl.patch (rev 0)
+++ extra-i686/fix-openssl.patch 2015-02-07 13:36:31 UTC (rev 231107)
@@ -0,0 +1,76 @@
+X-Git-Url: http://www.cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindOpenSSL.cmake;h=3adc2692622e459a175f31d5b2a54619ec8164f2;hp=bfbe01f59090ed096ba81e95f2d125d2d53b2179;hb=27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38;hpb=081c724ccb82ed1bae3f629f4b6f0b3afc79fdfc
+
+diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
+index bfbe01f..3adc269 100644
+--- a/Modules/FindOpenSSL.cmake
++++ b/Modules/FindOpenSSL.cmake
+@@ -285,7 +285,7 @@ endfunction()
+ if (OPENSSL_INCLUDE_DIR)
+ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+ file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
++ REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+
+ # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
+ # The status gives if this is a developer or prerelease and is ignored here.
+X-Git-Url: http://www.cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindOpenSSL.cmake;h=3adc2692622e459a175f31d5b2a54619ec8164f2;hp=6b4f9853c01f64b94bfec3ff51da8789af63a07e;hb=27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38;hpb=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505
+
+diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
+index 6b4f985..3adc269 100644
+--- a/Modules/FindOpenSSL.cmake
++++ b/Modules/FindOpenSSL.cmake
+@@ -16,10 +16,12 @@
+ #
+ # ::
+ #
+-# OPENSSL_FOUND - system has the OpenSSL library
+-# OPENSSL_INCLUDE_DIR - the OpenSSL include directory
+-# OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
+-# OPENSSL_VERSION - This is set to $major.$minor.$revision$path (eg. 0.9.8s)
++# OPENSSL_FOUND - System has the OpenSSL library
++# OPENSSL_INCLUDE_DIR - The OpenSSL include directory
++# OPENSSL_CRYPTO_LIBRARY - The OpenSSL crypto library
++# OPENSSL_SSL_LIBRARY - The OpenSSL SSL library
++# OPENSSL_LIBRARIES - All OpenSSL libraries
++# OPENSSL_VERSION - This is set to $major.$minor.$revision$patch (eg. 0.9.8s)
+
+ #=============================================================================
+ # Copyright 2006-2009 Kitware, Inc.
+@@ -153,6 +155,8 @@ if(WIN32 AND NOT CYGWIN)
+
+ mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE
+ SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
++ set( OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
++ set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
+ set( OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
+ elseif(MINGW)
+ # same player, for MinGW
+@@ -181,6 +185,8 @@ if(WIN32 AND NOT CYGWIN)
+ )
+
+ mark_as_advanced(SSL_EAY LIB_EAY)
++ set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
++ set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
+ set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+ unset(LIB_EAY_NAMES)
+ unset(SSL_EAY_NAMES)
+@@ -207,6 +213,8 @@ if(WIN32 AND NOT CYGWIN)
+ )
+
+ mark_as_advanced(SSL_EAY LIB_EAY)
++ set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
++ set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
+ set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+ endif()
+ else()
+@@ -275,9 +283,7 @@ function(from_hex HEX DEC)
+ endfunction()
+
+ if (OPENSSL_INCLUDE_DIR)
+- if (_OPENSSL_VERSION)
+- set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
+- elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
++ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+ file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+ REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-02-07 13:35:42 UTC (rev 231106)
+++ extra-x86_64/PKGBUILD 2015-02-07 13:36:31 UTC (rev 231107)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=cmake
-pkgver=3.1.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')
-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"
- 'fix-openssl.patch')
-md5sums=('0ae4f25dbec66697c0c3cec1b9e885ae'
- '6e7853ca9d495a06615cb8049d4434ee')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/fix-openssl.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 231106, cmake/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-02-07 13:36:31 UTC (rev 231107)
@@ -0,0 +1,59 @@
+# $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.1.2
+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=('75f61184aa70664bc7b3158293950f04')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+}
+
+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-02-07 13:35:42 UTC (rev 231106)
+++ extra-x86_64/cmake.install 2015-02-07 13:36:31 UTC (rev 231107)
@@ -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 231106, cmake/trunk/cmake.install)
===================================================================
--- extra-x86_64/cmake.install (rev 0)
+++ extra-x86_64/cmake.install 2015-02-07 13:36:31 UTC (rev 231107)
@@ -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/fix-openssl.patch
===================================================================
--- extra-x86_64/fix-openssl.patch 2015-02-07 13:35:42 UTC (rev 231106)
+++ extra-x86_64/fix-openssl.patch 2015-02-07 13:36:31 UTC (rev 231107)
@@ -1,76 +0,0 @@
-X-Git-Url: http://www.cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindOpenSSL.cmake;h=3adc2692622e459a175f31d5b2a54619ec8164f2;hp=bfbe01f59090ed096ba81e95f2d125d2d53b2179;hb=27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38;hpb=081c724ccb82ed1bae3f629f4b6f0b3afc79fdfc
-
-diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
-index bfbe01f..3adc269 100644
---- a/Modules/FindOpenSSL.cmake
-+++ b/Modules/FindOpenSSL.cmake
-@@ -285,7 +285,7 @@ endfunction()
- if (OPENSSL_INCLUDE_DIR)
- if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
- file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
-- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
-+ REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
-
- # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
- # The status gives if this is a developer or prerelease and is ignored here.
-X-Git-Url: http://www.cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindOpenSSL.cmake;h=3adc2692622e459a175f31d5b2a54619ec8164f2;hp=6b4f9853c01f64b94bfec3ff51da8789af63a07e;hb=27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38;hpb=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505
-
-diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
-index 6b4f985..3adc269 100644
---- a/Modules/FindOpenSSL.cmake
-+++ b/Modules/FindOpenSSL.cmake
-@@ -16,10 +16,12 @@
- #
- # ::
- #
--# OPENSSL_FOUND - system has the OpenSSL library
--# OPENSSL_INCLUDE_DIR - the OpenSSL include directory
--# OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
--# OPENSSL_VERSION - This is set to $major.$minor.$revision$path (eg. 0.9.8s)
-+# OPENSSL_FOUND - System has the OpenSSL library
-+# OPENSSL_INCLUDE_DIR - The OpenSSL include directory
-+# OPENSSL_CRYPTO_LIBRARY - The OpenSSL crypto library
-+# OPENSSL_SSL_LIBRARY - The OpenSSL SSL library
-+# OPENSSL_LIBRARIES - All OpenSSL libraries
-+# OPENSSL_VERSION - This is set to $major.$minor.$revision$patch (eg. 0.9.8s)
-
- #=============================================================================
- # Copyright 2006-2009 Kitware, Inc.
-@@ -153,6 +155,8 @@ if(WIN32 AND NOT CYGWIN)
-
- mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE
- SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
-+ set( OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
-+ set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
- set( OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
- elseif(MINGW)
- # same player, for MinGW
-@@ -181,6 +185,8 @@ if(WIN32 AND NOT CYGWIN)
- )
-
- mark_as_advanced(SSL_EAY LIB_EAY)
-+ set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
-+ set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
- set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
- unset(LIB_EAY_NAMES)
- unset(SSL_EAY_NAMES)
-@@ -207,6 +213,8 @@ if(WIN32 AND NOT CYGWIN)
- )
-
- mark_as_advanced(SSL_EAY LIB_EAY)
-+ set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
-+ set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
- set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
- endif()
- else()
-@@ -275,9 +283,7 @@ function(from_hex HEX DEC)
- endfunction()
-
- if (OPENSSL_INCLUDE_DIR)
-- if (_OPENSSL_VERSION)
-- set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
-- elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
-+ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
- file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
- REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
-
Copied: cmake/repos/extra-x86_64/fix-openssl.patch (from rev 231106, cmake/trunk/fix-openssl.patch)
===================================================================
--- extra-x86_64/fix-openssl.patch (rev 0)
+++ extra-x86_64/fix-openssl.patch 2015-02-07 13:36:31 UTC (rev 231107)
@@ -0,0 +1,76 @@
+X-Git-Url: http://www.cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindOpenSSL.cmake;h=3adc2692622e459a175f31d5b2a54619ec8164f2;hp=bfbe01f59090ed096ba81e95f2d125d2d53b2179;hb=27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38;hpb=081c724ccb82ed1bae3f629f4b6f0b3afc79fdfc
+
+diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
+index bfbe01f..3adc269 100644
+--- a/Modules/FindOpenSSL.cmake
++++ b/Modules/FindOpenSSL.cmake
+@@ -285,7 +285,7 @@ endfunction()
+ if (OPENSSL_INCLUDE_DIR)
+ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+ file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
++ REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+
+ # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
+ # The status gives if this is a developer or prerelease and is ignored here.
+X-Git-Url: http://www.cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindOpenSSL.cmake;h=3adc2692622e459a175f31d5b2a54619ec8164f2;hp=6b4f9853c01f64b94bfec3ff51da8789af63a07e;hb=27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38;hpb=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505
+
+diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
+index 6b4f985..3adc269 100644
+--- a/Modules/FindOpenSSL.cmake
++++ b/Modules/FindOpenSSL.cmake
+@@ -16,10 +16,12 @@
+ #
+ # ::
+ #
+-# OPENSSL_FOUND - system has the OpenSSL library
+-# OPENSSL_INCLUDE_DIR - the OpenSSL include directory
+-# OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
+-# OPENSSL_VERSION - This is set to $major.$minor.$revision$path (eg. 0.9.8s)
++# OPENSSL_FOUND - System has the OpenSSL library
++# OPENSSL_INCLUDE_DIR - The OpenSSL include directory
++# OPENSSL_CRYPTO_LIBRARY - The OpenSSL crypto library
++# OPENSSL_SSL_LIBRARY - The OpenSSL SSL library
++# OPENSSL_LIBRARIES - All OpenSSL libraries
++# OPENSSL_VERSION - This is set to $major.$minor.$revision$patch (eg. 0.9.8s)
+
+ #=============================================================================
+ # Copyright 2006-2009 Kitware, Inc.
+@@ -153,6 +155,8 @@ if(WIN32 AND NOT CYGWIN)
+
+ mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE
+ SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
++ set( OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
++ set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
+ set( OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
+ elseif(MINGW)
+ # same player, for MinGW
+@@ -181,6 +185,8 @@ if(WIN32 AND NOT CYGWIN)
+ )
+
+ mark_as_advanced(SSL_EAY LIB_EAY)
++ set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
++ set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
+ set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+ unset(LIB_EAY_NAMES)
+ unset(SSL_EAY_NAMES)
+@@ -207,6 +213,8 @@ if(WIN32 AND NOT CYGWIN)
+ )
+
+ mark_as_advanced(SSL_EAY LIB_EAY)
++ set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
++ set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
+ set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+ endif()
+ else()
+@@ -275,9 +283,7 @@ function(from_hex HEX DEC)
+ endfunction()
+
+ if (OPENSSL_INCLUDE_DIR)
+- if (_OPENSSL_VERSION)
+- set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
+- elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
++ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+ file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+ REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+
More information about the arch-commits
mailing list