diff options
Diffstat (limited to 'dev-libs/quazip')
| -rw-r--r-- | dev-libs/quazip/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch | 90 | ||||
| -rw-r--r-- | dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch | 40 | ||||
| -rw-r--r-- | dev-libs/quazip/quazip-0.9.1.ebuild | 34 |
4 files changed, 168 insertions, 0 deletions
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest index 737b9037d7de..e4d5daf9c5a1 100644 --- a/dev-libs/quazip/Manifest +++ b/dev-libs/quazip/Manifest @@ -1,3 +1,7 @@ +AUX quazip-0.9.1-gnuinstalldirs.patch 3853 BLAKE2B cf20bde0e7231a64756d1a05b09f7683c4b4b3e8ff0699b8bfb284cd37b05574244f7d4ec18b6b8df0eae1550fc10f6d99891e8241dfaddeac18080ce8ea11a6 SHA512 b84fdf3d79d47bb18fdafc7652df6f8f705a8bfc63628eb748ee0c94e7ad955074cfdf03c6321d58cd3ef0f04238958cfe24264e785b38f583085cf49042b321 +AUX quazip-0.9.1-no-static-lib.patch 2228 BLAKE2B 7cee7fefbca5696d3862ec475ef34bbd7ae3fca2b3463933b9750081090d0608e1eac095bba53a33a40458fbea6487fb6bde06d652a8417325b2adeb6bed6d76 SHA512 cf9c09b016c3a37158eeb840ef58e1cf65fbc7f98d083489e3dc47b09f22221822c0546341e7410a77428f07ff8d98c168d8ee09d07b8b37c47df6790beeb119 DIST quazip-0.8.1.tar.gz 150584 BLAKE2B 4a1d61b65b01eee06e1292ee88b543675c77ac922d0fb1726ac0afd447d74e8c8154db82da0ce95c2f2c303c036f2795e8938a412dc22e921ee09a0ef99278f6 SHA512 d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb +DIST quazip-0.9.1.tar.gz 155775 BLAKE2B 76710f94d055e86e1885f74b85f3e6b25f053eedbb73b4b11163e243d003ea3bad50cf1568fd2dbd37bc5db05fd0a6f8d49f48bd5df22d30b1aad3747e8ab780 SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0 EBUILD quazip-0.8.1.ebuild 1106 BLAKE2B 7ae5b0f37f840aede6f0d3310d176d5bf45d82ef1821602b3a010cecf21c77e483318a959ba9901f45e2b326c5e4481615d6115a95ceaec0a8067c0492193ac2 SHA512 d9ce0a05b55da4c1317cc380c2d19bb8107ed02cd4aab26149f07c518ed07f8a98e51de7ebb272d789b2e4432cf185f9fb19fab009e06d8208bb508645933560 +EBUILD quazip-0.9.1.ebuild 834 BLAKE2B 4c4489f2259dee61a6c45894e2f2c7be54dc0850824a1cf4d9aacff84d2dc1c7c90056105ba4fb10b1e8e040240dd0c78aa0bd40454162784ec2fe18d05d4c46 SHA512 5051d9411c278c3bdbe20c1bcf51aa6776a841048f9e3533801fe15acd7ea88f884d554d6a7a4056a7a4b746bcb3af1dcf908663871cc1861437d662e026dec8 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98 diff --git a/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch b/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch new file mode 100644 index 000000000000..c8dc5b6e3ad8 --- /dev/null +++ b/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch @@ -0,0 +1,90 @@ +From 3b1bf010e6f19908c90fdd51f01797dedb62fd53 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 9 Jul 2020 23:08:22 +0200 +Subject: [PATCH] Use GNUInstallDirs, fix pkgconfig libdir/includedir + +Dropping LIB_SUFFIX. +--- + CMakeLists.txt | 16 ++++++++-------- + quazip.pc.cmakein | 6 +++--- + quazip/CMakeLists.txt | 4 ++-- + 3 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ed96b33..c3cce42 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 2.8.5) + project(QuaZip) + + # CMP0042: Explicitly acknowledge MACOSX_RPATH +@@ -11,6 +11,8 @@ set(QUAZIP_LIB_SOVERSION 1) + + option(BUILD_WITH_QT4 "Build QuaZip with Qt4 no matter if Qt5 was found" OFF) + ++include(GNUInstallDirs) ++ + if(NOT BUILD_WITH_QT4) + # try Qt5 first, and prefer that if found + find_package(Qt5Core QUIET) +@@ -48,18 +50,16 @@ find_package(ZLIB REQUIRED) + # All build libraries are moved to this directory + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}) + +-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") +-set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE) +-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" CACHE STRING "Installation directory for pkgconfig (.pc) files" FORCE) + set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE + INTERNAL "Target name of libquazip" FORCE) + + add_subdirectory(quazip) + + if(UNIX AND NOT APPLE) +- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/quazip.pc.cmakein +- ${CMAKE_CURRENT_BINARY_DIR}/quazip.pc @ONLY) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/quazip.pc DESTINATION "${INSTALL_PKGCONFIG_DIR}") ++ configure_file(quazip.pc.cmakein quazip.pc @ONLY) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/quazip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + +-install(FILES QuaZipConfig.cmake DESTINATION ${LIB_DESTINATION}/cmake/QuaZip${QUAZIP_LIB_VERSION_SUFFIX} RENAME QuaZip${QUAZIP_LIB_VERSION_SUFFIX}Config.cmake) ++install(FILES QuaZipConfig.cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QuaZip${QUAZIP_LIB_VERSION_SUFFIX} ++ RENAME QuaZip${QUAZIP_LIB_VERSION_SUFFIX}Config.cmake) +diff --git a/quazip.pc.cmakein b/quazip.pc.cmakein +index e46d4c6..50d280e 100644 +--- a/quazip.pc.cmakein ++++ b/quazip.pc.cmakein +@@ -1,12 +1,12 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/lib@LIB_SUFFIX@ +-includedir=${prefix}/include ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/quazip@QUAZIP_LIB_VERSION_SUFFIX@ + + + Name: Quazip + Description: Quazip Library + Version: @QUAZIP_LIB_VERSION@ + Libs: -lquazip@QUAZIP_LIB_VERSION_SUFFIX@ +-Cflags: ++Cflags: -I${includedir} + Requires: Qt5Core +diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt +index 84607f6..74e02fe 100644 +--- a/quazip/CMakeLists.txt ++++ b/quazip/CMakeLists.txt +@@ -18,5 +18,5 @@ set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_ + # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty) + target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) + +-install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) +-install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) ++install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/quazip${QUAZIP_LIB_VERSION_SUFFIX}) ++install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-- +2.27.0 + diff --git a/dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch b/dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch new file mode 100644 index 000000000000..f0ce3e6e392f --- /dev/null +++ b/dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch @@ -0,0 +1,40 @@ +From c061634452fe259dc5eb62395fbdb9159d4c9e09 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 9 Jul 2020 22:54:59 +0200 +Subject: [PATCH] Disable static lib + +--- + quazip/CMakeLists.txt | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + +diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt +index 1efb5e2..84607f6 100644 +--- a/quazip/CMakeLists.txt ++++ b/quazip/CMakeLists.txt +@@ -11,21 +11,12 @@ qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) + set(SRCS ${SRCS} ${MOC_SRCS}) + + add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS}) +-add_library(quazip_static STATIC ${SRCS}) +- +-# Windows uses .lib extension for both static and shared library +-# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name +-if (NOT WIN32) +- set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX}) +-endif () + + target_include_directories(${QUAZIP_LIB_TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS}) +-target_include_directories(quazip_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS}) +-set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d) ++set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d) + + # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty) + target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) +-target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) + + install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) +-install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) ++install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) +-- +2.27.0 + diff --git a/dev-libs/quazip/quazip-0.9.1.ebuild b/dev-libs/quazip/quazip-0.9.1.ebuild new file mode 100644 index 000000000000..2a480a28d814 --- /dev/null +++ b/dev-libs/quazip/quazip-0.9.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic qmake-utils + +DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package" +HOMEPAGE="https://stachenov.github.io/quazip/" +SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + sys-libs/zlib[minizip] +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-no-static-lib.patch" + "${FILESDIR}/${P}-gnuinstalldirs.patch" +) + +src_install() { + cmake_src_install + + # compatibility with not yet fixed rdeps (Gentoo bug #598136) + dosym libquazip5.so /usr/$(get_libdir)/libquazip.so +} |