diff options
Diffstat (limited to 'dev-libs/quazip')
| -rw-r--r-- | dev-libs/quazip/Manifest | 1 | ||||
| -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 | 33 |
4 files changed, 0 insertions, 164 deletions
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest index 8ca86518b22a..6ac806794bbb 100644 --- a/dev-libs/quazip/Manifest +++ b/dev-libs/quazip/Manifest @@ -1,2 +1 @@ -DIST quazip-0.9.1.tar.gz 155775 BLAKE2B 76710f94d055e86e1885f74b85f3e6b25f053eedbb73b4b11163e243d003ea3bad50cf1568fd2dbd37bc5db05fd0a6f8d49f48bd5df22d30b1aad3747e8ab780 SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0 DIST quazip-1.1.tar.gz 153870 BLAKE2B c784d21d7c9623472fabf9bbf68c9d191dd0765f6b7114f0ea0b2597bbb31a9957feaea4d0325f98116d71acc4a7057f5c28ce5b84c6317cd25fdade30a279da SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c diff --git a/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch b/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch deleted file mode 100644 index c8dc5b6e3ad8..000000000000 --- a/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch +++ /dev/null @@ -1,90 +0,0 @@ -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 deleted file mode 100644 index f0ce3e6e392f..000000000000 --- a/dev-libs/quazip/files/quazip-0.9.1-no-static-lib.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index cec7a955d1d5..000000000000 --- a/dev-libs/quazip/quazip-0.9.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake 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" - -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 -} |