Merge branch 'testing' of gitorious.org:chakra-packages/core into testing

This commit is contained in:
Fabian 2013-10-09 09:23:11 +00:00
commit 011fcec5a0
2 changed files with 20 additions and 3 deletions

View File

@ -2,7 +2,7 @@
pkgname=cmake
pkgver=2.8.10.2
pkgrel=2
pkgrel=3
pkgdesc="A cross-platform open-source make system"
arch=('x86_64')
license=('custom')
@ -10,12 +10,17 @@ url="http://www.cmake.org"
depends=('curl' 'libarchive>=2.3.1' 'shared-mime-info')
makedepends=('qt')
install=${pkgname}.install
source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
md5sums=('097278785da7182ec0aea8769d06860c')
source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
"add_extra_prefix_to_find_paths.patch")
md5sums=('097278785da7182ec0aea8769d06860c'
'1e6575c3c54ecbbbccd64dd94a4192df')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
# add /extra prefix to find paths
patch -Np1 -i ../add_extra_prefix_to_find_paths.patch
./bootstrap --prefix=/usr \
--mandir=/share/man \
--docdir=/share/doc/cmake \

View File

@ -0,0 +1,12 @@
diff -Naur cmake-2.8.10.2-orig/Modules/FindGTK2.cmake cmake-2.8.10.2/Modules/FindGTK2.cmake
--- cmake-2.8.10.2-orig/Modules/FindGTK2.cmake 2012-11-27 14:26:32.000000000 +0100
+++ cmake-2.8.10.2/Modules/FindGTK2.cmake 2013-10-06 10:38:08.368594779 +0200
@@ -218,6 +218,8 @@
/usr/pkg/include/glib
$ENV{GTKMM_BASEPATH}/include
$ENV{GTKMM_BASEPATH}/lib
+ /extra/usr/include
+ /extra/usr/lib
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/include