jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gpgme: update to 1.9.0

Browse source
This commit is contained in:
Jürgen Buchmüller 2017-08-19 19:47:40 +02:00
parent 1e0fb10e41
commit f851559044
2 changed files with 4 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
srcpkgs/gpgme/patches/cmake-crossbuild-support.patch
View file

@ -1,98 +0,0 @@
Cross-building needs that include and library paths to be computed
at this package's build time and not at runtime usage of this cmake support.
Code inspired from cmake files of KDE Framework 5 various subparts.
--- lang/cpp/src/GpgmeppConfig.cmake.in.in.ORIG
+++ lang/cpp/src/GpgmeppConfig.cmake.in.in
@@ -58,19 +58,41 @@
unset(_targetsNotDefined)
unset(_expectedTargets)
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+# Use original install prefix when loaded through a
+# cross-prefix symbolic link such as /lib -> /usr/lib.
+get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
+get_filename_component(_realOrig "/usr/lib/cmake/Gpgmepp" REALPATH)
+if(_realCurr STREQUAL _realOrig)
+ set(_IMPORT_PREFIX "/usr/lib/cmake/Gpgmepp")
+endif()
+unset(_realOrig)
+unset(_realCurr)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+ set(_IMPORT_PREFIX "")
+endif()
+
# Create imported target Gpgmepp
add_library(Gpgmepp SHARED IMPORTED)
set_target_properties(Gpgmepp PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
- IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp@libsuffix@"
+ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/gpgme++"
+ INTERFACE_LINK_LIBRARIES "pthread;${_IMPORT_PREFIX}/lib/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
+ IMPORTED_LOCATION "${_IMPORT_PREFIX}/lib/libgpgmepp@libsuffix@"
)
if(CMAKE_VERSION VERSION_LESS 2.8.12)
message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
endif()
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
# Loop over all imported files and verify that they actually exist
foreach(target ${_IMPORT_CHECK_TARGETS} )
foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
--- lang/qt/src/QGpgmeConfig.cmake.in.in.ORIG
+++ lang/qt/src/QGpgmeConfig.cmake.in.in
@@ -58,19 +58,41 @@
unset(_targetsNotDefined)
unset(_expectedTargets)
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+# Use original install prefix when loaded through a
+# cross-prefix symbolic link such as /lib -> /usr/lib.
+get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
+get_filename_component(_realOrig "/usr/lib/cmake/QGpgme" REALPATH)
+if(_realCurr STREQUAL _realOrig)
+ set(_IMPORT_PREFIX "/usr/lib/cmake/QGpgme")
+endif()
+unset(_realOrig)
+unset(_realCurr)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+ set(_IMPORT_PREFIX "")
+endif()
+
# Create imported target QGpgme
add_library(QGpgme SHARED IMPORTED)
set_target_properties(QGpgme PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/qgpgme;@resolved_includedir@"
+ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/qgpgme"
INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core"
- IMPORTED_LOCATION "@resolved_libdir@/libqgpgme@libsuffix@"
+ IMPORTED_LOCATION "${_IMPORT_PREFIX}/libqgpgme@libsuffix@"
)
if(CMAKE_VERSION VERSION_LESS 2.8.12)
message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
endif()
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
# Loop over all imported files and verify that they actually exist
foreach(target ${_IMPORT_CHECK_TARGETS} )
foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )

12
srcpkgs/gpgme/template
View file

@ -1,7 +1,7 @@
# Template file for 'gpgme'
pkgname=gpgme
version=1.7.1
revision=3
version=1.9.0
revision=1
build_style=gnu-configure
configure_args="--enable-fd-passing --disable-gpgconf-test
--disable-gpg-test --disable-gpgsm-test
@ -15,7 +15,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
homepage="http://www.gnupg.org/related_software/gpgme/"
distfiles="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-$version.tar.bz2"
checksum=d0abe1449395315eac37e4e45076bbb82732cedf94210937b37776e10cdc2bb6
checksum=1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" ac_cv_sys_file_offset_bits=no";;
@ -33,7 +33,6 @@ gpgme-devel_package() {
vmove usr/include/gpgme.h
vmove usr/share
vmove usr/lib/libgpgme.so
vmove usr/lib/libgpgme-pthread.so
}
}
@ -49,7 +48,6 @@ gpgmepp-devel_package() {
depends="gpgme-devel>=${version}_${revision} gpgmepp>=${version}_${revision}"
short_desc+=" - C++ library development files"
pkg_install() {
vmove usr/include/gpgmepp_version.h
vmove usr/include/gpgme++
vmove usr/lib/libgpgmepp.so
vmove usr/lib/cmake/Gpgmepp/GpgmeppConfig.cmake
@ -69,11 +67,9 @@ gpgmeqt-devel_package() {
depends="gpgme-devel>=${version}_${revision} gpgmeqt>=${version}_${revision}"
short_desc+=" - Qt binding development files"
pkg_install() {
vmove usr/include/qgpgme_version.h
vmove usr/include/QGpgME
vmove usr/include/qgpgme
vmove usr/lib/libqgpgme.so
vmove usr/lib/cmake/Gpgmepp/QGpgmeConfig.cmake
vmove usr/lib/cmake/Gpgmepp/QGpgmeConfigVersion.cmake
vmove usr/lib/cmake/QGpgme
}
}