[arch-commits] Commit in cmake/repos (10 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Sun Feb 24 14:48:06 UTC 2013
Date: Sunday, February 24, 2013 @ 15:48:06
Author: andrea
Revision: 178501
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
cmake/repos/staging-i686/PKGBUILD
(from rev 178500, cmake/trunk/PKGBUILD)
cmake/repos/staging-i686/cmake.install
(from rev 178500, cmake/trunk/cmake.install)
cmake/repos/staging-i686/use-qmake4-for-qt4.patch
(from rev 178500, cmake/trunk/use-qmake4-for-qt4.patch)
cmake/repos/staging-x86_64/PKGBUILD
(from rev 178500, cmake/trunk/PKGBUILD)
cmake/repos/staging-x86_64/cmake.install
(from rev 178500, cmake/trunk/cmake.install)
cmake/repos/staging-x86_64/use-qmake4-for-qt4.patch
(from rev 178500, cmake/trunk/use-qmake4-for-qt4.patch)
Deleted:
cmake/repos/staging-i686/PKGBUILD
cmake/repos/staging-i686/cmake.install
cmake/repos/staging-x86_64/PKGBUILD
cmake/repos/staging-x86_64/cmake.install
-----------------------------------------+
staging-i686/PKGBUILD | 103 +++++++++++++++---------------
staging-i686/cmake.install | 24 +++---
staging-i686/use-qmake4-for-qt4.patch | 11 +++
staging-x86_64/PKGBUILD | 103 +++++++++++++++---------------
staging-x86_64/cmake.install | 24 +++---
staging-x86_64/use-qmake4-for-qt4.patch | 11 +++
6 files changed, 154 insertions(+), 122 deletions(-)
Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD 2013-02-24 14:47:31 UTC (rev 178500)
+++ staging-i686/PKGBUILD 2013-02-24 14:48:06 UTC (rev 178501)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=cmake
-pkgver=2.8.10.2
-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=('qtbase' 'emacs')
-optdepends=('qtbase: cmake-gui')
-install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('097278785da7182ec0aea8769d06860c')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- # Qt is built with reduce-relocations
- export CFLAGS="${CFLAGS} -fPIC"
- export CXXFLAGS="${CXXFLAGS} -fPIC"
-
- ./bootstrap --prefix=/usr \
- --mandir=/share/man \
- --docdir=/share/doc/cmake \
- --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 -Dm644 Docs/cmake-indent.vim "${vimpath}"/indent/cmake-indent.vim
- install -Dm644 Docs/cmake-syntax.vim "${vimpath}"/syntax/cmake-syntax.vim
-
- install -Dm644 Docs/cmake-mode.el \
- "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
- emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
-
- install -Dm644 Copyright.txt \
- "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: cmake/repos/staging-i686/PKGBUILD (from rev 178500, cmake/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-02-24 14:48:06 UTC (rev 178501)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=cmake
+pkgver=2.8.10.2
+pkgrel=3
+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' 'emacs')
+optdepends=('qt5-base: cmake-gui')
+install="${pkgname}.install"
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
+ 'use-qmake4-for-qt4.patch')
+md5sums=('097278785da7182ec0aea8769d06860c'
+ '3136ec7953f2e01cc099f38dbd2655e2')
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ # Qt is built with reduce-relocations
+ export CFLAGS="${CFLAGS} -fPIC"
+ export CXXFLAGS="${CXXFLAGS} -fPIC"
+
+ # Do not look for 'qmake' as this could referer to the qt5 version
+ patch -p1 -i "${srcdir}"/use-qmake4-for-qt4.patch
+
+ ./bootstrap --prefix=/usr \
+ --mandir=/share/man \
+ --docdir=/share/doc/cmake \
+ --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 -Dm644 Docs/cmake-indent.vim "${vimpath}"/indent/cmake-indent.vim
+ install -Dm644 Docs/cmake-syntax.vim "${vimpath}"/syntax/cmake-syntax.vim
+
+ install -Dm644 Docs/cmake-mode.el \
+ "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
+ emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
+
+ install -Dm644 Copyright.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: staging-i686/cmake.install
===================================================================
--- staging-i686/cmake.install 2013-02-24 14:47:31 UTC (rev 178500)
+++ staging-i686/cmake.install 2013-02-24 14:48:06 UTC (rev 178501)
@@ -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/staging-i686/cmake.install (from rev 178500, cmake/trunk/cmake.install)
===================================================================
--- staging-i686/cmake.install (rev 0)
+++ staging-i686/cmake.install 2013-02-24 14:48:06 UTC (rev 178501)
@@ -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/staging-i686/use-qmake4-for-qt4.patch (from rev 178500, cmake/trunk/use-qmake4-for-qt4.patch)
===================================================================
--- staging-i686/use-qmake4-for-qt4.patch (rev 0)
+++ staging-i686/use-qmake4-for-qt4.patch 2013-02-24 14:48:06 UTC (rev 178501)
@@ -0,0 +1,11 @@
+--- cmake-2.8.10.2/Modules/FindQt4.cmake~ 2013-02-24 12:13:41.172266220 +0000
++++ cmake-2.8.10.2/Modules/FindQt4.cmake 2013-02-24 12:20:11.229349625 +0000
+@@ -497,7 +497,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
++find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac
+ PATHS
+ ENV QTDIR
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
Deleted: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD 2013-02-24 14:47:31 UTC (rev 178500)
+++ staging-x86_64/PKGBUILD 2013-02-24 14:48:06 UTC (rev 178501)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=cmake
-pkgver=2.8.10.2
-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=('qtbase' 'emacs')
-optdepends=('qtbase: cmake-gui')
-install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('097278785da7182ec0aea8769d06860c')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- # Qt is built with reduce-relocations
- export CFLAGS="${CFLAGS} -fPIC"
- export CXXFLAGS="${CXXFLAGS} -fPIC"
-
- ./bootstrap --prefix=/usr \
- --mandir=/share/man \
- --docdir=/share/doc/cmake \
- --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 -Dm644 Docs/cmake-indent.vim "${vimpath}"/indent/cmake-indent.vim
- install -Dm644 Docs/cmake-syntax.vim "${vimpath}"/syntax/cmake-syntax.vim
-
- install -Dm644 Docs/cmake-mode.el \
- "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
- emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
-
- install -Dm644 Copyright.txt \
- "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: cmake/repos/staging-x86_64/PKGBUILD (from rev 178500, cmake/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-02-24 14:48:06 UTC (rev 178501)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=cmake
+pkgver=2.8.10.2
+pkgrel=3
+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' 'emacs')
+optdepends=('qt5-base: cmake-gui')
+install="${pkgname}.install"
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
+ 'use-qmake4-for-qt4.patch')
+md5sums=('097278785da7182ec0aea8769d06860c'
+ '3136ec7953f2e01cc099f38dbd2655e2')
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ # Qt is built with reduce-relocations
+ export CFLAGS="${CFLAGS} -fPIC"
+ export CXXFLAGS="${CXXFLAGS} -fPIC"
+
+ # Do not look for 'qmake' as this could referer to the qt5 version
+ patch -p1 -i "${srcdir}"/use-qmake4-for-qt4.patch
+
+ ./bootstrap --prefix=/usr \
+ --mandir=/share/man \
+ --docdir=/share/doc/cmake \
+ --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 -Dm644 Docs/cmake-indent.vim "${vimpath}"/indent/cmake-indent.vim
+ install -Dm644 Docs/cmake-syntax.vim "${vimpath}"/syntax/cmake-syntax.vim
+
+ install -Dm644 Docs/cmake-mode.el \
+ "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
+ emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
+
+ install -Dm644 Copyright.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: staging-x86_64/cmake.install
===================================================================
--- staging-x86_64/cmake.install 2013-02-24 14:47:31 UTC (rev 178500)
+++ staging-x86_64/cmake.install 2013-02-24 14:48:06 UTC (rev 178501)
@@ -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/staging-x86_64/cmake.install (from rev 178500, cmake/trunk/cmake.install)
===================================================================
--- staging-x86_64/cmake.install (rev 0)
+++ staging-x86_64/cmake.install 2013-02-24 14:48:06 UTC (rev 178501)
@@ -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/staging-x86_64/use-qmake4-for-qt4.patch (from rev 178500, cmake/trunk/use-qmake4-for-qt4.patch)
===================================================================
--- staging-x86_64/use-qmake4-for-qt4.patch (rev 0)
+++ staging-x86_64/use-qmake4-for-qt4.patch 2013-02-24 14:48:06 UTC (rev 178501)
@@ -0,0 +1,11 @@
+--- cmake-2.8.10.2/Modules/FindQt4.cmake~ 2013-02-24 12:13:41.172266220 +0000
++++ cmake-2.8.10.2/Modules/FindQt4.cmake 2013-02-24 12:20:11.229349625 +0000
+@@ -497,7 +497,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
++find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac
+ PATHS
+ ENV QTDIR
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
More information about the arch-commits
mailing list