[arch-commits] Commit in qca/repos (3 files)

[Antonio Rojas]

    Date: Saturday, April 20, 2019 @ 23:27:38
  Author: arojas
Revision: 351841

archrelease: copy trunk to staging-x86_64

Added:
  qca/repos/staging-x86_64/
  qca/repos/staging-x86_64/PKGBUILD
    (from rev 351840, qca/trunk/PKGBUILD)
  qca/repos/staging-x86_64/qca-fix-build-qt-prefix.patch
    (from rev 351840, qca/trunk/qca-fix-build-qt-prefix.patch)

-------------------------------+
 PKGBUILD                      |   49 +++++++++++++++++++++++++++++++++++
 qca-fix-build-qt-prefix.patch |   55 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)

Copied: qca/repos/staging-x86_64/PKGBUILD (from rev 351840, qca/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2019-04-20 23:27:38 UTC (rev 351841)
@@ -0,0 +1,49 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=qca
+pkgver=2.2.0
+pkgrel=2
+pkgdesc="Qt Cryptographic Architecture"
+arch=(x86_64)
+url="https://userbase.kde.org/QCA"
+license=(LGPL)
+depends=(qt5-base nss ca-certificates)
+optdepends=('pkcs11-helper: PKCS-11 plugin' 'botan: botan plugin')
+makedepends=(cmake doxygen pkcs11-helper botan)
+conflicts=(qca-qt5)
+provides=(qca-qt5)
+replaces=(qca-qt5)
+source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}
+        qca-fix-build-qt-prefix.patch)
+sha256sums=('3b479826858099c9ac1bd7992a0e2f1cd68d684d9a32910dbc4372bef592318a'
+            'SKIP'
+            'e480b850ab78df4fe887c1262053cc4ab8b9e458299a4944a04121b06cbdf646')
+validpgpkeys=(CB9387521E1EE0127DA804843FDBB55084CC5D84) # Harald Sitter <sitter at kde.org>
+
+prepare() {
+  mkdir -p build
+
+  cd qca-$pkgver
+  patch -p1 -i ../qca-fix-build-qt-prefix.patch # Fix build when installing under Qt prefix
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_TESTS=OFF \
+    -DQCA_INSTALL_IN_QT_PREFIX=ON \
+    -DQCA_MAN_INSTALL_DIR=/usr/share/man
+  make
+}
+
+package() {
+  depends=(qt5-base nss ca-certificates)
+  optdepends=('pkcs11-helper: PKCS-11 plugin' 'botan: botan plugin')
+
+  cd build
+  make DESTDIR="$pkgdir" install
+}
+

Copied: qca/repos/staging-x86_64/qca-fix-build-qt-prefix.patch (from rev 351840, qca/trunk/qca-fix-build-qt-prefix.patch)
===================================================================
--- staging-x86_64/qca-fix-build-qt-prefix.patch	                        (rev 0)
+++ staging-x86_64/qca-fix-build-qt-prefix.patch	2019-04-20 23:27:38 UTC (rev 351841)
@@ -0,0 +1,55 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -431,7 +431,6 @@
+     message("!! you MUST explicity define CMAKE_INSTALL_PREFIX !!")
+     message("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+     message("${ESCAPE}[0m")
+-    message(FATAL_ERROR "Aborting")
+   endif(QCA_INSTALL_IN_QT_PREFIX)
+ 
+   message("")
+diff --git a/cmake/modules/QcaMacro.cmake b/cmake/modules/QcaMacro.cmake
+--- a/cmake/modules/QcaMacro.cmake
++++ b/cmake/modules/QcaMacro.cmake
+@@ -11,14 +11,15 @@
+   ENDMACRO(QT4_GET_MOC_INC_DIRS)
+ 
+   MACRO(SETUP_QT5_DIRS)
+-    EXECUTE_PROCESS( COMMAND $<TARGET_FILE:Qt5::qmake> ARGS "-query QT_INSTALL_LIBS" OUTPUT_VARIABLE QT_LIBRARY_DIR )
+-    EXECUTE_PROCESS( COMMAND $<TARGET_FILE:Qt5::qmake> ARGS "-query QT_INSTALL_PREFIX" OUTPUT_VARIABLE QT_PREFIX_DIR )
+-    EXECUTE_PROCESS( COMMAND $<TARGET_FILE:Qt5::qmake> ARGS "-query QT_INSTALL_PLUGINS" OUTPUT_VARIABLE QT_PLUGINS_DIR )
+-    EXECUTE_PROCESS( COMMAND $<TARGET_FILE:Qt5::qmake> ARGS "-query QT_INSTALL_BINS" OUTPUT_VARIABLE QT_BINARY_DIR )
+-    EXECUTE_PROCESS( COMMAND $<TARGET_FILE:Qt5::qmake> ARGS "-query QT_INSTALL_HEADERS" OUTPUT_VARIABLE QT_HEADERS_DIR )
+-    EXECUTE_PROCESS( COMMAND $<TARGET_FILE:Qt5::qmake> ARGS "-query QT_INSTALL_DOCS" OUTPUT_VARIABLE QT_DOC_DIR )
+-    EXECUTE_PROCESS( COMMAND $<TARGET_FILE:Qt5::qmake> ARGS "-query QT_INSTALL_DATA" OUTPUT_VARIABLE QT_DATA_DIR )
+-    EXECUTE_PROCESS( COMMAND $<TARGET_FILE:Qt5::qmake> ARGS "-query QT_HOST_DATA" OUTPUT_VARIABLE QT_ARCHDATA_DIR )
++    GET_TARGET_PROPERTY(QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} LOCATION)
++    EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_LIBS" OUTPUT_VARIABLE QT_LIBRARY_DIR )
++    EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PREFIX" OUTPUT_VARIABLE QT_PREFIX_DIR )
++    EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PLUGINS" OUTPUT_VARIABLE QT_PLUGINS_DIR )
++    EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_BINS" OUTPUT_VARIABLE QT_BINARY_DIR )
++    EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_HEADERS" OUTPUT_VARIABLE QT_HEADERS_DIR )
++    EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_DOCS" OUTPUT_VARIABLE QT_DOC_DIR )
++    EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_DATA" OUTPUT_VARIABLE QT_DATA_DIR )
++    EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_HOST_DATA" OUTPUT_VARIABLE QT_ARCHDATA_DIR )
+     SET( QT_MKSPECS_DIR "${QT_ARCHDATA_DIR}/mkspecs" )
+   ENDMACRO(SETUP_QT5_DIRS)
+ ELSE (Qt5Core_FOUND)
+@@ -101,8 +102,13 @@
+ 
+ macro(install_pdb TARGET INSTALL_PATH)
+   if(MSVC)
+-    install(FILES $<TARGET_PDB_FILE:${TARGET}> DESTINATION ${INSTALL_PATH} CONFIGURATIONS Debug)
+-    install(FILES $<TARGET_PDB_FILE:${TARGET}> DESTINATION ${INSTALL_PATH} CONFIGURATIONS RelWithDebInfo)
++    get_target_property(LOCATION ${TARGET} LOCATION_DEBUG)
++    string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}")
++    install(FILES ${LOCATION} DESTINATION ${INSTALL_PATH} CONFIGURATIONS Debug)
++
++    get_target_property(LOCATION ${TARGET} LOCATION_RELWITHDEBINFO)
++    string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}")
++    install(FILES ${LOCATION} DESTINATION ${INSTALL_PATH} CONFIGURATIONS RelWithDebInfo)
+   endif(MSVC)
+ endmacro(install_pdb)
+ 
+