[arch-commits] Commit in qca/trunk (PKGBUILD qca-fix-build-qt-prefix.patch)
Antonio Rojas
arojas at archlinux.org
Thu Apr 25 06:34:20 UTC 2019
Date: Thursday, April 25, 2019 @ 06:34:19
Author: arojas
Revision: 352107
Update to 2.2.1
Modified:
qca/trunk/PKGBUILD
Deleted:
qca/trunk/qca-fix-build-qt-prefix.patch
-------------------------------+
PKGBUILD | 15 +++-------
qca-fix-build-qt-prefix.patch | 55 ----------------------------------------
2 files changed, 5 insertions(+), 65 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-04-25 01:13:26 UTC (rev 352106)
+++ PKGBUILD 2019-04-25 06:34:19 UTC (rev 352107)
@@ -3,8 +3,8 @@
# Contributor: Pierre Schmitz <pierre at archlinux.de>
pkgname=qca
-pkgver=2.2.0
-pkgrel=2
+pkgver=2.2.1
+pkgrel=1
pkgdesc="Qt Cryptographic Architecture"
arch=(x86_64)
url="https://userbase.kde.org/QCA"
@@ -15,18 +15,13 @@
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')
+source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('d716d2d8e3ed8d95bbdb061f03081d7d032206f746a30a4d29d72196f50e7b02'
+ 'SKIP')
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() {
Deleted: qca-fix-build-qt-prefix.patch
===================================================================
--- qca-fix-build-qt-prefix.patch 2019-04-25 01:13:26 UTC (rev 352106)
+++ qca-fix-build-qt-prefix.patch 2019-04-25 06:34:19 UTC (rev 352107)
@@ -1,55 +0,0 @@
-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)
-
-
More information about the arch-commits
mailing list