zint: update to 2.15.0.
This commit is contained in:
parent
21fb9fa19a
commit
adf3039c1b
@ -4444,7 +4444,7 @@ libabsl_throw_delegate.so.2401.0.0 abseil-cpp-20240116.1_1
|
|||||||
libabsl_time.so.2401.0.0 abseil-cpp-20240116.1_1
|
libabsl_time.so.2401.0.0 abseil-cpp-20240116.1_1
|
||||||
libabsl_time_zone.so.2401.0.0 abseil-cpp-20240116.1_1
|
libabsl_time_zone.so.2401.0.0 abseil-cpp-20240116.1_1
|
||||||
libabsl_vlog_config_internal.so.2401.0.0 abseil-cpp-20240116.1_1
|
libabsl_vlog_config_internal.so.2401.0.0 abseil-cpp-20240116.1_1
|
||||||
libzint.so.2.13 libzint-2.13.0_1
|
libzint.so.2.15 libzint-2.15.0_1
|
||||||
libairspyhf.so.0 libairspyhf-1.6.8_1
|
libairspyhf.so.0 libairspyhf-1.6.8_1
|
||||||
libtraceevent.so.1 libtraceevent-1.6.2_1
|
libtraceevent.so.1 libtraceevent-1.6.2_1
|
||||||
libtracefs.so.1 libtracefs-1.4.2_1
|
libtracefs.so.1 libtracefs-1.4.2_1
|
||||||
|
@ -0,0 +1,42 @@
|
|||||||
|
From 9265abd9e1aaa6ab2be14835c14d70864e3f1dd0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
|
||||||
|
Date: Fri, 11 Apr 2025 03:24:38 +0200
|
||||||
|
Subject: [PATCH] Fix installation of cmake files
|
||||||
|
|
||||||
|
When binaries, libs and development files like include or cmake files
|
||||||
|
are installed to different target directories then those where before
|
||||||
|
relatively installed to the binary and not in the correct directory
|
||||||
|
where other development related files where installed.
|
||||||
|
|
||||||
|
Tested inside of nixpkgs with zxing using the system library of zint.
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 2 +-
|
||||||
|
backend/CMakeLists.txt | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 6f7cf220..ecfe53c3 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -201,4 +201,4 @@ if(ZINT_UNINSTALL)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
configure_file("zint-config.cmake.in" "zint-config.cmake" @ONLY)
|
||||||
|
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zint-config.cmake" DESTINATION "${CMAKE_INSTALL_DATADIR}/zint")
|
||||||
|
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zint-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/zint")
|
||||||
|
diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
|
||||||
|
index 45538515..1e7e40b3 100644
|
||||||
|
--- a/backend/CMakeLists.txt
|
||||||
|
+++ b/backend/CMakeLists.txt
|
||||||
|
@@ -131,7 +131,7 @@ endif()
|
||||||
|
if(ZINT_STATIC)
|
||||||
|
install(TARGETS zint-static EXPORT zint-targets ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||||
|
endif()
|
||||||
|
-install(EXPORT zint-targets NAMESPACE zint:: DESTINATION "${CMAKE_INSTALL_DATADIR}/zint")
|
||||||
|
+install(EXPORT zint-targets NAMESPACE zint:: DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/zint")
|
||||||
|
install(FILES zint.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT Devel)
|
||||||
|
|
||||||
|
if(ZINT_TEST)
|
||||||
|
--
|
||||||
|
2.49.0
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
# Template file for 'zint'
|
# Template file for 'zint'
|
||||||
pkgname=zint
|
pkgname=zint
|
||||||
version=2.13.0
|
version=2.15.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DZINT_USE_QT=ON -DZINT_USE_PNG=ON -DZINT_QT6=ON"
|
configure_args="-DZINT_USE_QT=ON -DZINT_USE_PNG=ON -DZINT_QT6=ON"
|
||||||
@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
|
|||||||
homepage="https://www.zint.org.uk/"
|
homepage="https://www.zint.org.uk/"
|
||||||
changelog="https://raw.githubusercontent.com/zint/zint/master/ChangeLog"
|
changelog="https://raw.githubusercontent.com/zint/zint/master/ChangeLog"
|
||||||
distfiles="https://github.com/zint/zint/archive/refs/tags/${version}.tar.gz"
|
distfiles="https://github.com/zint/zint/archive/refs/tags/${version}.tar.gz"
|
||||||
checksum=480d95e46d2a2dae204c0f2b6433f185aba50786a0f00d1420752a6e287311ec
|
checksum=529ce50566f8421f1707333c201097c490273f93b5de45f4d21231a11d3722cf
|
||||||
|
|
||||||
if [ "$XBPS_CHECK_PKGS" ]; then
|
if [ "$XBPS_CHECK_PKGS" ]; then
|
||||||
configure_args+=" -DZINT_TEST=ON"
|
configure_args+=" -DZINT_TEST=ON"
|
||||||
@ -25,12 +25,6 @@ pre_check() {
|
|||||||
export LD_LIBRARY_PATH="$wrksrc/build/backend"
|
export LD_LIBRARY_PATH="$wrksrc/build/backend"
|
||||||
}
|
}
|
||||||
|
|
||||||
post_install() {
|
|
||||||
vmkdir "usr/lib/cmake/zint"
|
|
||||||
mv "${DESTDIR}/usr/share/apps/cmake/modules/"Find*cmake "${DESTDIR}/usr/lib/cmake/zint"
|
|
||||||
mv "${DESTDIR}/usr/share/zint/zint-"*.cmake "${DESTDIR}/usr/lib/cmake/zint"
|
|
||||||
}
|
|
||||||
|
|
||||||
zint-devel_package() {
|
zint-devel_package() {
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
depends="${sourcepkg}>=${version}_${revision}"
|
depends="${sourcepkg}>=${version}_${revision}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user