[arch-commits] Commit in gmic/trunk (PKGBUILD gmic-fix-cmake.patch)

Antonio Rojas arojas at archlinux.org
Fri May 15 18:11:00 UTC 2020


    Date: Friday, May 15, 2020 @ 18:11:00
  Author: arojas
Revision: 628056

Install gmic_cluts.gmz (FS#66663), fix man page and bash completion installation

Added:
  gmic/trunk/gmic-fix-cmake.patch
Modified:
  gmic/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   15 +++++++++++----
 gmic-fix-cmake.patch |   25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-15 18:08:18 UTC (rev 628055)
+++ PKGBUILD	2020-05-15 18:11:00 UTC (rev 628056)
@@ -7,21 +7,26 @@
 pkgbase=gmic
 pkgname=(gmic zart gimp-plugin-gmic krita-plugin-gmic)
 pkgver=2.9.0
-pkgrel=7
+pkgrel=8
 arch=(x86_64)
 url="https://gmic.eu/"
 license=(custom:CeCILL)
 makedepends=(cmake gimp qt5-base fftw openexr opencv eigen graphicsmagick qt5-tools)
-source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz zart-opencv4.patch)
+source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz zart-opencv4.patch gmic-fix-cmake.patch)
 sha256sums=('6233695f9b27999dcc7cc3aa7480b0f192bd44de85209091a3b4b8a65ae8c4b5'
-            'f4295a2b9a6730060e1dd763c602bd5156570d623bc69c2214dfd11e94943296')
+            'f4295a2b9a6730060e1dd763c602bd5156570d623bc69c2214dfd11e94943296'
+            'ef26ddb0d6c7df5ceed9aa5414aab6e2ad219a1a739f24b44d414852bcb50dde')
 
 prepare() {
   mkdir -p build{,-qt,-krita,-gimp,-zart}
 
   sed -e 's|pkg_check_modules(OPENCV opencv)|pkg_check_modules(OPENCV opencv4)|' -i gmic-$pkgver/CMakeLists.txt
+
+  cd gmic-$pkgver
+  patch -p1 -i "$srcdir"/gmic-fix-cmake.patch
+
 # fix build with openCV 4.0
-  cd gmic-$pkgver/zart
+  cd zart
   patch -p1 -i ../../zart-opencv4.patch
   sed -e 's|opencv|opencv4|' -i zart.pro
 }
@@ -76,6 +81,8 @@
 
   cd ../build-qt
   make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir"/gmic-$pkgver/resources/gmic_cluts.gmz -t "$pkgdir"/usr/share/gmic
 }
 
 package_zart() {

Added: gmic-fix-cmake.patch
===================================================================
--- gmic-fix-cmake.patch	                        (rev 0)
+++ gmic-fix-cmake.patch	2020-05-15 18:11:00 UTC (rev 628056)
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c7c63f22..e07d15ab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -377,7 +377,7 @@ if(BUILD_MAN)
+   add_custom_command(
+     OUTPUT ${CMAKE_BINARY_DIR}/man/gmic.1
+     DEPENDS gmic
+-    COMMAND LD_LIBRARY_PATH=${GMIC_BINARIES_PATH} ${GMIC_BINARIES_PATH}/gmic -v - ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic raw:${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic,uchar -__help man 2> ${CMAKE_BINARY_DIR}/man/gmic.1
++    COMMAND LD_LIBRARY_PATH=${GMIC_BINARIES_PATH} ${GMIC_BINARIES_PATH}/gmic -v - ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic raw:${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic,uchar -__help man > ${CMAKE_BINARY_DIR}/man/gmic.1
+   )
+   add_custom_target(man ALL DEPENDS ${CMAKE_BINARY_DIR}/man/gmic.1)
+   install(FILES ${CMAKE_BINARY_DIR}/man/gmic.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
+@@ -388,9 +388,10 @@ if(BUILD_BASH_COMPLETION)
+   add_custom_command(
+     OUTPUT ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh
+     DEPENDS gmic
+-    COMMAND LD_LIBRARY_PATH=${GMIC_BINARIES_PATH} ${GMIC_BINARIES_PATH}/gmic -v - ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic raw:${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic,uchar -document_gmic bash 2> ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh
++    COMMAND LD_LIBRARY_PATH=${GMIC_BINARIES_PATH} ${GMIC_BINARIES_PATH}/gmic -v - ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic raw:${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic,uchar -document_gmic bash > ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh
+   )
+   add_custom_target(bashcompletion ALL DEPENDS ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh)
++  install(FILES ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh RENAME gmic DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completion)
+ endif()
+ 
+ include(CMakePackageConfigHelpers)



More information about the arch-commits mailing list