Sync with Arch

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

3 files changed, 42 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b32dbf3e7257..298a0319ae0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cmake-git
 	pkgdesc = A cross-platform open-source make system
-	pkgver = 3.17.0.659.gff4388e90b
+	pkgver = 3.17.3.1287.g04b9b2b5f3
 	pkgrel = 1
 	url = http://www.cmake.org/
 	arch = x86_64
@@ -14,14 +14,17 @@ pkgbase = cmake-git
 	depends = libarchive
 	depends = shared-mime-info
 	depends = jsoncpp
-	depends = rhash
+	depends = libjsoncpp.so
 	depends = libuv
+	depends = rhash
 	optdepends = qt5-base: cmake-gui
 	optdepends = libxkbcommon-x11: cmake-gui
 	provides = cmake
 	conflicts = cmake
 	source = git+https://gitlab.kitware.com/cmake/cmake.git
+	source = cmake-cppflags.patch
 	md5sums = SKIP
+	md5sums = d7316e540d07e0a7ebce75951a7b2697
 
 pkgname = cmake-git
 
diff --git a/PKGBUILD b/PKGBUILD
index bac0b1bfa673..37d47dbbdd50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 # This PKGBUILD is based on the official Arch cmake package.
 
 pkgname=cmake-git
-pkgver=3.17.0.659.gff4388e90b
+pkgver=3.17.3.1287.g04b9b2b5f3
 pkgrel=1
 pkgdesc='A cross-platform open-source make system'
 arch=('x86_64')
@@ -17,12 +17,14 @@ url="http://www.cmake.org/"
 license=('custom')
 conflicts=('cmake')
 provides=('cmake')
-depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp' 'rhash' 'libuv')
+depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp' 'libjsoncpp.so' 'libuv' 'rhash')
 makedepends=('qt5-base' 'python-sphinx' 'git' 'ncurses' 'emacs')
 optdepends=('qt5-base: cmake-gui'
             'libxkbcommon-x11: cmake-gui')
-source=('git+https://gitlab.kitware.com/cmake/cmake.git')
-md5sums=('SKIP')
+source=('git+https://gitlab.kitware.com/cmake/cmake.git'
+        'cmake-cppflags.patch')
+md5sums=('SKIP'
+         'd7316e540d07e0a7ebce75951a7b2697')
 shortver=$(printf "${pkgver}" | sed 's/\([0-9]\+\.[0-9]\+\)\..*/\1/')
 
 pkgver() {
@@ -32,6 +34,7 @@ pkgver() {
 
 prepare() {
     cd "$srcdir/cmake"
+    patch -p1 -i ../cmake-cppflags.patch # Honor CPPFLAGS https://gitlab.kitware.com/cmake/cmake/issues/12928
 }
 
 build() {
@@ -69,4 +72,8 @@ package() {
 
   install -Dm644 Copyright.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  # install bash completions
+  mkdir -p "$pkgdir"/usr/share/bash-completion/completions
+  ln -s /usr/share/cmake-${shortver}/completions/{cmake,cpack,ctest} "$pkgdir"/usr/share/bash-completion/completions
 }
diff --git a/cmake-cppflags.patch b/cmake-cppflags.patch
new file mode 100644
index 000000000000..ffac66c76ed2
--- /dev/null
+++ b/cmake-cppflags.patch
@@ -0,0 +1,26 @@
+diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake
+index f6d620f40e..325b11f25e 100644
+--- a/Modules/CMakeCInformation.cmake
++++ b/Modules/CMakeCInformation.cmake
+@@ -100,7 +100,7 @@ if(NOT CMAKE_MODULE_EXISTS)
+   set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
+ endif()
+ 
+-set(CMAKE_C_FLAGS_INIT "$ENV{CFLAGS} ${CMAKE_C_FLAGS_INIT}")
++set(CMAKE_C_FLAGS_INIT "$ENV{CPPFLAGS} $ENV{CFLAGS} ${CMAKE_C_FLAGS_INIT}")
+ 
+ cmake_initialize_per_config_variable(CMAKE_C_FLAGS "Flags used by the C compiler")
+ 
+diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake
+index dbb4366757..8a0ee288c6 100644
+--- a/Modules/CMakeCXXInformation.cmake
++++ b/Modules/CMakeCXXInformation.cmake
+@@ -197,7 +197,7 @@ endforeach()
+ # on the initial values computed in the platform/*.cmake files
+ # use _INIT variables so that this only happens the first time
+ # and you can set these flags in the cmake cache
+-set(CMAKE_CXX_FLAGS_INIT "$ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS_INIT}")
++set(CMAKE_CXX_FLAGS_INIT "$ENV{CPPFLAGS} $ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS_INIT}")
+ 
+ cmake_initialize_per_config_variable(CMAKE_CXX_FLAGS "Flags used by the CXX compiler")
+